Commit Graph

16208 Commits

Author SHA1 Message Date
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
2022-04-26 15:08:41 +10:00
Morgan Pretty a154b56e22 Merge branch 'dev' into feature/session-id-blinding-part-2 2022-04-26 13:06:51 +10:00
Morgan Pretty cc495bccc1 Merge remote-tracking branch 'upstream/dev' into dev 2022-04-26 13:06:40 +10:00
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
2022-04-26 13:06:12 +10:00
RyanZhao 75d922eb3a
Merge pull request #485 from oxen-io/voice-calls-2
P2P Voice/Video Calls
2022-04-26 11:06:47 +10:00
Ryan Zhao f95fe15d46 add session turn server info 2022-04-26 10:57:01 +10:00
Ryan Zhao d0764adaf3 ask formic permission when enabled call for the first time & update build number 2022-04-21 14:28:36 +10:00
Ryan Zhao ad575f6fb5 fix an issue where incoming call is not showed for non-voip notifications 2022-04-21 13:40:42 +10:00
Ryan Zhao 8821d796dd bump up build number 2022-04-21 12:18:53 +10:00
RyanZhao 5221537e56
Merge pull request #615 from RyanRory/bug-fix-for-calls
Fix for call release
2022-04-21 12:17:58 +10:00
Ryan Zhao 95d120266d show incoming call banner for CallKit disabled cases 2022-04-21 12:17:00 +10:00
Ryan Zhao fba6dbcf9b refactor to make CallKit disabled for China mainland 2022-04-21 12:07:21 +10:00
Ryan Zhao 9542b0e0f9 add CallKit supported filter for NSE 2022-04-21 10:34:50 +10:00
Ryan Zhao e664cb8235 Merge branch 'bug-fixes-1.11.25' into bug-fix-for-calls 2022-04-21 09:39:54 +10:00
ryanzhao 8557604064 clean up 2022-04-20 15:09:33 +10:00
ryanzhao abafffbfe2 potentially fix a issue that the calls won't get connected 2022-04-20 14:22:36 +10:00
Ryan Zhao a92d626c1e fix open group notification spam in NSE 2022-04-19 16:36:40 +10:00
Ryan Zhao 8f1b7c5718 update build number 2022-04-19 14:45:20 +10:00
Ryan Zhao 1d0475b8a0 fix notification spam 2022-04-19 13:39:36 +10:00
Ryan Zhao 37dc1631b5 fix an issue where the textview is not scrollable after the app goes into background and goes back in foreground. 2022-04-11 16:22:09 +10:00
Ryan Zhao fa9de8c9c3 Merge branch 'dev' into bug-fixes-1.11.25 2022-04-11 15:42:00 +10:00
RyanZhao 2260e76dd5
Merge pull request #613 from mpretty-cyro/fix/linkPreviewDarkModeText
Fix link preview dark mode text
2022-04-11 14:03:07 +10:00
Ryan Zhao ed0c2d1e52 Merge branch 'fix/linkPreviewDarkModeText' into voice-calls-2 2022-04-11 14:02:31 +10:00
Ryan Zhao 8958f8fd3b update build number 2022-04-11 10:37:10 +10:00
Ryan Zhao b23038087f try to fix a call issue when iOS is on lock screen 2022-04-11 10:36:21 +10:00
Morgan Pretty dbb0cdf0cb Fixed an issue where the text on the LinkPreview in dark mode wasn't visible 2022-04-11 10:21:45 +10:00
ryanzhao d5d1c822a8 update build number 2022-04-07 17:03:25 +10:00
ryanzhao 5ebb2ceee3 fix call duration label get hidden 2022-04-07 17:02:57 +10:00
ryanzhao 9825023bdd update build number 2022-04-07 15:11:08 +10:00
ryanzhao f1445a2191 add missed call notification 2022-04-07 15:10:38 +10:00
ryanzhao 343df684d9 fix race condition for callkit 2022-04-07 12:29:09 +10:00
ryanzhao 6cb3e1db22 add interaction for showing missed call tips if the permission is denied 2022-04-06 17:24:48 +10:00
ryanzhao 5fa63286da refactor timeout logic for calls incoming and reconnecting 2022-04-06 15:41:38 +10:00
ryanzhao 7ae982a328 Fix notifications don't respect the call disabled settings 2022-04-06 15:11:26 +10:00
ryanzhao 6c19c5cd49 bump up build number 2022-04-05 16:35:50 +10:00
ryanzhao f2cfa29b21 add call related logs to log file 2022-04-05 16:35:09 +10:00
ryanzhao 2730c3ba91 bump up version & build number 2022-04-05 11:38:42 +10:00
ryanzhao 7d3df3a016 Merge branch 'bug-fixes-1.11.25' into voice-calls-2 2022-04-05 11:36:56 +10:00
ryanzhao 49b4c7b586 fix an edge case for callkit notification 2022-04-05 11:29:59 +10:00
Ryan Zhao 77c00b6c37 fix #456 2022-04-04 16:10:28 +10:00
Ryan Zhao 43ca54c0a0 refactor to use Atomic wrapper 2022-04-04 14:40:24 +10:00
Morgan Pretty 93f248d149 Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
#	SessionMessagingKit/Storage.swift
2022-04-04 13:33:27 +10:00
Ryan Zhao a22dc15249 fix closed group poller unwrapping crash in background 2022-04-04 13:31:56 +10:00
Morgan Pretty 7256cc6871 Merge remote-tracking branch 'upstream/dev' into dev 2022-04-04 13:18:50 +10:00
Ryan Zhao 36094eed7f Merge branch 'remove-unused-code' into voice-calls-2 2022-04-04 11:08:54 +10:00
RyanZhao cd3c385444
Merge pull request #610 from mpretty-cyro/feature/remove-unused-code
Remove unused code
2022-04-04 10:48:41 +10:00
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
2022-03-31 12:03:00 +11:00
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
2022-03-31 11:51:59 +11:00
Morgan Pretty 459502f1c3 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-31 11:47:52 +11:00
Ryan Zhao 49d6a64194 Merge branch 'remove-OWSBlockingManager' into voice-calls-2 2022-03-31 11:09:09 +11:00