Morgan Pretty
07d1d8acee
Merge branch 'dev' into feature/session-id-blinding-part-2
...
# Conflicts:
# Podfile
# Podfile.lock
# Session/Calls/Views & Modals/CallVideoView.swift
# Session/Utilities/BackgroundPoller.swift
# SessionSnodeKit/SnodeAPI.swift
3 years ago
Morgan Pretty
9216506847
Merge branch 'dev' into feature/session-id-blinding-part-2
...
# Conflicts:
# Session/Calls/Views & Modals/CallVideoView.swift
# Session/Meta/Translations/de.lproj/Localizable.strings
# Session/Meta/Translations/es.lproj/Localizable.strings
# Session/Meta/Translations/fi.lproj/Localizable.strings
# Session/Meta/Translations/fr.lproj/Localizable.strings
# Session/Meta/Translations/hr.lproj/Localizable.strings
# Session/Meta/Translations/it.lproj/Localizable.strings
# Session/Meta/Translations/ja.lproj/Localizable.strings
# Session/Meta/Translations/nl.lproj/Localizable.strings
# Session/Meta/Translations/pl.lproj/Localizable.strings
# Session/Meta/Translations/pt_BR.lproj/Localizable.strings
# Session/Meta/Translations/ru.lproj/Localizable.strings
# Session/Meta/Translations/si.lproj/Localizable.strings
# Session/Meta/Translations/sk.lproj/Localizable.strings
# Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
# Session/Meta/Translations/zh_CN.lproj/Localizable.strings
# Session/Utilities/BackgroundPoller.swift
# SessionSnodeKit/OnionRequestAPI.swift
# SessionSnodeKit/SnodeAPI.swift
3 years ago
Ryan Zhao
21fbf57aaa
update build number
3 years ago
Ryan Zhao
db71664feb
bump up version & build number
3 years ago
ryanzhao
567a9befd4
prevent call info message fires multiple notification
3 years ago
ryanzhao
f92ae4084c
bump up build number
3 years ago
ryanzhao
6b15db7437
update version & build number
3 years ago
Morgan Pretty
38bb6e79e2
Combined the Register/Unregister response objects in the PushNotificationAPI (they are identical)
3 years ago
Morgan Pretty
949b043867
Updated the unit tests to build with a host app (needed due to the x86_64 build requirement...)
...
Fixed the broken tests
3 years ago
Morgan Pretty
1c575e520d
Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2
...
# Conflicts:
# Podfile.lock
# Session.xcodeproj/project.pbxproj
# Session/Conversations/ConversationVC+Interaction.swift
# Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
# Session/Home/HomeVC.swift
# Session/Open Groups/JoinOpenGroupVC.swift
# Session/Utilities/BackgroundPoller.swift
# SessionMessagingKit/Jobs/AttachmentUploadJob.swift
# SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
# SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
# SessionNotificationServiceExtension/NotificationServiceExtension.swift
3 years ago
Ryan Zhao
d0764adaf3
ask formic permission when enabled call for the first time & update build number
3 years ago
Ryan Zhao
8821d796dd
bump up build number
3 years ago
Ryan Zhao
fba6dbcf9b
refactor to make CallKit disabled for China mainland
3 years ago
Ryan Zhao
8f1b7c5718
update build number
3 years ago
Ryan Zhao
8958f8fd3b
update build number
3 years ago
ryanzhao
d5d1c822a8
update build number
3 years ago
ryanzhao
9825023bdd
update build number
3 years ago
ryanzhao
6c19c5cd49
bump up build number
3 years ago
ryanzhao
2730c3ba91
bump up version & build number
3 years ago
ryanzhao
49b4c7b586
fix an edge case for callkit notification
3 years ago
Morgan Pretty
93f248d149
Merge branch 'dev' into feature/session-id-blinding-part-2
...
# Conflicts:
# SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
# SessionMessagingKit/Storage.swift
3 years ago
Ryan Zhao
36094eed7f
Merge branch 'remove-unused-code' into voice-calls-2
3 years ago
Morgan Pretty
c3b855646f
Merge branch 'dev' into feature/session-id-blinding-part-2
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
# Session/Open Groups/JoinOpenGroupVC.swift
# Session/Settings/SettingsVC.swift
# SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
# SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
3 years ago
Morgan Pretty
1633105ce2
Merge branch 'dev' into feature/remove-unused-code
...
# Conflicts:
# Session/Backups/OWSBackup.m
# Session/Backups/OWSBackupImportJob.m
# SignalUtilitiesKit/Sharing/SelectRecipientViewController.m
# SignalUtilitiesKit/Sharing/SelectThreadViewController.m
3 years ago
Ryan Zhao
49d6a64194
Merge branch 'remove-OWSBlockingManager' into voice-calls-2
3 years ago
RyanZhao
82606a6244
Merge pull request #602 from mpretty-cyro/feature/remove-OWSBlockingManager
...
Remove the OWSBlockingManager
3 years ago
Morgan Pretty
89e80da625
Removed AppPreferences (unused)
3 years ago
Morgan Pretty
0842dbff1e
Removed a bunch of unused code
...
Removed the legacy Theme code (replaced with SessionUIKit equivalents)
Removed the OWSOrphanDataCleaner (unused)
Removed the OWSReceiptType_Delivery from the OWSOutgoingReceiptManager (unused)
Removed the TSStorageKeys and TSStorageHeaders files (unused)
Removed the LKMessageIDCollection (unused - only had methods for deleting data from the collection)
Removed the OWSPrimaryStorageTrustedKeysCollection and OWSIdentityManager_QueuedVerificationStateSyncMessages (unused)
Removed collections and notifications from OWSProfileManager (unused)
3 years ago
Morgan Pretty
9e3c02f79b
Removed the unused legacy OWSBackup code
3 years ago
ryanzhao
faf1a0e28a
update build number
3 years ago
ryanzhao
548aad69a9
update build number
3 years ago
Morgan Pretty
8344ed5d81
Fixed the unit tests broken by the merge
...
Added the ability to mock the GeneralCache data
Added a couple additional tests to validate some updated OpenGroupManager code
3 years ago
Morgan Pretty
e3622088ad
Fixed missed framework complication errors from merge
3 years ago
Morgan Pretty
5ca227434b
Merge branch 'dev' into feature/session-id-blinding-part-2
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Utilities/BackgroundPoller.swift
# SessionMessagingKit/Database/Storage+OpenGroups.swift
# SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift
# SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
# SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
# SessionMessagingKit/Sending & Receiving/MessageSender.swift
# SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
# SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
# SessionMessagingKit/Storage.swift
# SessionMessagingKit/Utilities/General.swift
# SessionSnodeKit/SnodeAPI.swift
# SessionUtilitiesKit/General/Atomic.swift
3 years ago
Morgan Pretty
21924ee81a
Merge branch 'dev' into feature/remove-OWSBlockingManager
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
3 years ago
Ryan Zhao
59f112c55f
bump up version & build number
3 years ago
Ryan Zhao
5286af841c
bump up version and build number
3 years ago
Ryan Zhao
8b3d3fffb5
Merge branch 'dev' into voice-calls-2
3 years ago
RyanZhao
74f1d9a6d4
Merge pull request #596 from mpretty-cyro/feature/improve-open-group-deletion-processing
...
Performance: Improve open group deletion processing
3 years ago
Morgan Pretty
7165b9e4f6
Merge branch 'dev' into feature/remove-OWSBlockingManager
...
# Conflicts:
# Session/Conversations/ConversationVC+Interaction.swift
# Session/Meta/AppDelegate.swift
# SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift
# SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
3 years ago
Ryan Zhao
fdde7e4fe0
Merge branch 'fix/tweaks-to-config-message-generation' of https://github.com/mpretty-cyro/session-ios into bug-fix-for-call
3 years ago
Morgan Pretty
1214005c59
Updated the cachedEncodedPublicKey to be Atomic
...
Added the Atomic wrapper for thread safe variables
3 years ago
Morgan Pretty
78c0d000be
Removed the OWSBlockingManager replacing it with the config sync
...
Fixed an issue where the "block" button would appear in the NoteToSelf swipe menu
Removed the OWSBlockingManager and supporting files
Removed a number of unused classes and methods
Refactored the BlockListUIUtils to Swift
3 years ago
Morgan Pretty
4e26ece92a
Merge branch 'dev' into feature/improve-open-group-deletion-processing
3 years ago
Morgan Pretty
1492232224
Made some optimisations to open group deletion handling
...
Added a new OpenGroupServerIdLookup to make it easier to get a database id via an open group server id
Added a migration to generate the above data
Updated the handleCompactBody method to stop early if there are no messages to delete (would previously enumerate all interactions regardless)
Updated the handleCompactBody to fetch the mapping for the deleted message so we can avoid enumerating all interactions
3 years ago
Ryan Zhao
47e009394a
update version number
3 years ago
Ryan Zhao
a96ede823e
bump up builder number
3 years ago
Ryan Zhao
eb939a746c
bump up version & build number
3 years ago
Ryan Zhao
37614fe3d8
Merge branch 'dev' into voice-calls-2
3 years ago
RyanZhao
9e020948d6
Merge pull request #594 from RyanRory/bug-fixes-1.11.23
...
Bug fixes for 1.11.22
3 years ago