Commit Graph

856 Commits (07d1d8acee1978f6d4d0c4718e90f73a9781504a)

Author SHA1 Message Date
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 987db2f7ab fix an edge case which may cause old messages coming back 3 years ago
ryanzhao 567a9befd4 prevent call info message fires multiple notification 3 years ago
Morgan Pretty 531ddcb079 Replaced the GoogleWebRTC library (deprecated) with WebRTC-lib 3 years ago
Morgan Pretty 6b1fc0f552 Fixed an issue where I had 'whisperTo' and 'whisperMods' acting in a mutually exclusive way 3 years ago
Ryan Zhao 2a18c8e9c9 Merge branch 'dev' into authentication-1 3 years ago
Morgan Pretty 38bb6e79e2 Combined the Register/Unregister response objects in the PushNotificationAPI (they are identical) 3 years ago
ryanzhao dac3f10dd1 tweaks on closed group polling logic 3 years ago
ryanzhao 782d51c1d6 minor change on hardfork version check 3 years ago
ryanzhao 372e87e70f minor fix 3 years ago
ryanzhao fb65173b06 poll closed group messages in both default namespace and closed group namespace 3 years ago
ryanzhao e540497724 update last hash persistence 3 years ago
ryanzhao 4224a1fa3c tweaks for sending message to snode 3 years ago
Ryan Zhao 034f2ecc22 send messages with authentication 3 years ago
Ryan Zhao 0b0f0a3787 retrieve messages authenticated for 1-1 chats 3 years ago
Morgan Pretty 4eaa8c4d36 Updated Nimble to the latest version
Fixed some flaky OpenGroupManager tests
3 years ago
Ryan Zhao f9bb1517a1 fix an issue where closed groups stop to be updated part 1 3 years ago
Ryan Zhao 9c994ff176 Merge branch 'dev' into bug-fixes-1.11.25 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
Ryan Zhao 662ec71116 fix a dead lock on receiving message request approval 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 ad575f6fb5 fix an issue where incoming call is not showed for non-voip notifications 3 years ago
Ryan Zhao fba6dbcf9b refactor to make CallKit disabled for China mainland 3 years ago
Ryan Zhao 9542b0e0f9 add CallKit supported filter for NSE 3 years ago
ryanzhao abafffbfe2 potentially fix a issue that the calls won't get connected 3 years ago
Ryan Zhao b23038087f try to fix a call issue when iOS is on lock screen 3 years ago
ryanzhao f1445a2191 add missed call notification 3 years ago
ryanzhao 343df684d9 fix race condition for callkit 3 years ago
ryanzhao 6cb3e1db22 add interaction for showing missed call tips if the permission is denied 3 years ago
ryanzhao f2cfa29b21 add call related logs to log file 3 years ago
ryanzhao 7d3df3a016 Merge branch 'bug-fixes-1.11.25' into voice-calls-2 3 years ago
Ryan Zhao 43ca54c0a0 refactor to use Atomic wrapper 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 f7091dca28 Removed an empty notification observer 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 5cbc0b55b3 Merge branch 'fix-message-requests-reverse' into voice-calls-2 3 years ago
ryanzhao 801f0d68a8 fix an edge case where a config message might get isApproved set to false 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 8b3d3fffb5 Merge branch 'dev' into voice-calls-2 3 years ago
RyanZhao 7cd0079b37
Merge pull request #599 from mpretty-cyro/fix/update-last-message-hash-after-registering-jobs
Fix - Update last message hash after registering jobs
3 years ago