a154b56e22
Merge branch 'dev' into feature/session-id-blinding-part-2
4 years ago
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
4 years ago
f95fe15d46
add session turn server info
4 years ago
95d120266d
show incoming call banner for CallKit disabled cases
4 years ago
f1445a2191
add missed call notification
4 years ago
6cb3e1db22
add interaction for showing missed call tips if the permission is denied
4 years ago
5fa63286da
refactor timeout logic for calls incoming and reconnecting
4 years ago
49b4c7b586
fix an edge case for callkit notification
4 years ago
93f248d149
Merge branch 'dev' into feature/session-id-blinding-part-2
...
# Conflicts:
# SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
# SessionMessagingKit/Storage.swift
4 years ago
36094eed7f
Merge branch 'remove-unused-code' into voice-calls-2
4 years ago
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
4 years ago
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
4 years ago
49d6a64194
Merge branch 'remove-OWSBlockingManager' into voice-calls-2
4 years ago
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)
4 years ago
9e3c02f79b
Removed the unused legacy OWSBackup code
4 years ago
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
4 years ago
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
4 years ago
fc093a0157
Merge branch 'dev' into bug-fix-for-call
4 years ago
8daf804fd5
Merge pull request #597 from mpretty-cyro/fix/ui-call-running-on-background-thread
...
Fix for a UI call running on background thread
4 years ago
fdde7e4fe0
Merge branch 'fix/tweaks-to-config-message-generation' of https://github.com/mpretty-cyro/session-ios into bug-fix-for-call
4 years ago
e4def22472
Moved the Storage.write call into the `self.approveMessageRequestIfNeeded` call
4 years ago
212c5e87aa
Re-added the transaction requirement when generating the current config message
4 years ago
29c53223e0
More tweaks to fix crash
...
Wrapped the force sync calls within their own Storage.write blocks to ensure they have the latest data and aren't accessing a transaction completed in a different thread
Reverted a number of the unneeded changes
4 years ago
e7c564914d
makes more sense on call timeout
4 years ago
5bb3bd7bc1
Cleaned up some config sync logic and allowed migrations to trigger them
...
Updated the migrations so they can specify whether a configuration sync is required
Moved the config sync logic into a MessageSender extension (makes far more sense than AppDelegate)
Fixed a bug where the ShareVC was triggering the 'versionMigrationsDidComplete' twice
Removed a couple of imports for files that had been deleted
4 years ago
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
4 years ago
01742af16b
Added an initial call to `isRTL` on the main thread to prevent a background thread calling it first
4 years ago
c415fc9e06
Merge branch 'dev' into feature/session-id-blinding-part-2
...
# Conflicts:
# Session/Open Groups/OpenGroupSuggestionGrid.swift
# SessionMessagingKit/Open Groups/OpenGroupAPIV2+ObjC.swift
# SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
# SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
4 years ago
f489e78deb
Merge branch 'dev' into voice-calls-2
4 years ago
3e380ede4e
A couple of message request fixes
...
Added an error state to the OpenGroupSuggestionGrid
Fixed a bug where the settings button wouldn't appear for the sender of a message request once approved
4 years ago
1e6c21a7ba
Merge branch 'ipad-support-1' into voice-calls-2
4 years ago
273b799d16
fix iPad multitasking issue
4 years ago
a68ed28a7a
Merge branch 'dev' into voice-calls-2
4 years ago
3e0ccaea4c
Merge branch 'dev' into feature/session-id-blinding-part-2
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Utilities/MentionUtilities.swift
# SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
# SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
# SignalUtilitiesKit/Messaging/Sending & Receiving/MessageSender+Convenience.swift
4 years ago
e8f996306d
show call permission required modal when calls are nor enabled
4 years ago
52407aec03
Merge branch 'ipad-support-1' into voice-calls-2
4 years ago
9b075efe0c
Merge branch 'dev' into ipad-support-1
4 years ago
cb288ca09c
Merge branch 'dev' into feature/session-id-blinding-part-2
...
# Conflicts:
# Session/Conversations/ConversationVC+Interaction.swift
# SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
4 years ago
daf0705d42
Merge branch 'dev' into preformance-improvement
4 years ago
bdaae2b347
Moved the copy for the message request approval error into Localizable.strings
4 years ago
3e97782d18
Merge branch 'dev' into feature/session-id-blinding-part-2
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Conversations/ConversationVC.swift
# Session/Meta/Translations/de.lproj/Localizable.strings
# Session/Meta/Translations/en.lproj/Localizable.strings
# Session/Meta/Translations/es.lproj/Localizable.strings
# Session/Meta/Translations/fa.lproj/Localizable.strings
# Session/Meta/Translations/fi.lproj/Localizable.strings
# Session/Meta/Translations/fr.lproj/Localizable.strings
# Session/Meta/Translations/hi.lproj/Localizable.strings
# Session/Meta/Translations/hr.lproj/Localizable.strings
# Session/Meta/Translations/id-ID.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/sv.lproj/Localizable.strings
# Session/Meta/Translations/th.lproj/Localizable.strings
# Session/Meta/Translations/vi-VN.lproj/Localizable.strings
# Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
# Session/Meta/Translations/zh_CN.lproj/Localizable.strings
4 years ago
f22672ccd7
Merge branch 'dev' of https://github.com/oxen-io/session-ios into preformance-improvement
4 years ago
c0615fe11d
Merge branch 'dev' of https://github.com/oxen-io/session-ios into ipad-support-1
4 years ago
028ba0c77a
Merge branch 'dev' into feature/message-requests
...
# Conflicts:
# Session/Meta/Translations/de.lproj/Localizable.strings
# Session/Meta/Translations/en.lproj/Localizable.strings
# Session/Meta/Translations/es.lproj/Localizable.strings
# Session/Meta/Translations/fa.lproj/Localizable.strings
# Session/Meta/Translations/fi.lproj/Localizable.strings
# Session/Meta/Translations/fr.lproj/Localizable.strings
# Session/Meta/Translations/hi.lproj/Localizable.strings
# Session/Meta/Translations/hr.lproj/Localizable.strings
# Session/Meta/Translations/id-ID.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/sv.lproj/Localizable.strings
# Session/Meta/Translations/th.lproj/Localizable.strings
# Session/Meta/Translations/vi-VN.lproj/Localizable.strings
# Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
# Session/Meta/Translations/zh_CN.lproj/Localizable.strings
4 years ago
a8c7f517eb
clean
4 years ago
ab0714af00
fix search bar cancel button for iPad
4 years ago
faa8918cd4
Replaced the remaining non-file legacy methods with their non-legacy equivalents
...
Updated the OpenGroup polling to run on a non-main thread
Updated the TSGroupModel to store moderatorIds as well as the adminIds (new endpoint is only going to give diffs)
Updated the BatchRequest to support json, base64 encoded strings and raw bytes for it's body
Replaced the 'lastMessageServerID' methods with 'OpenGroupSequenceNumber' methods (since we have swapped the property over)
Added an alert when banning fails (previously it would fail silently)
Fixed a bug where sent blinded messages were appearing as incoming messages
Fixed a bug where the OpenGroup infoUpdates wasn't getting decoded correctly
Fixed an issue where the ConversationVC wouldn't become the first responder again after the ban alerts disappeared
Fixed an issue where I'd incorrectly used the message 'seqNo' in place of the message server id
Fixed an issue where open group messages were setting their `sentTimestamp` to seconds instead of milliseconds for incoming messages
4 years ago
97bf861809
Merge branch 'dev' of https://github.com/oxen-io/session-ios into preformance-improvement
4 years ago
4c89c165d8
Fixed a few bugs uncovered by QA
...
Fixed a bug where the ConfigurationMessage was getting generated before the contact state was persisted to the database in the message request flow causing odd behaviours (now generating the ConfigurationMessage within the same transaction)
Fixed a bug where sending a message to an existing message request thread once the message requests item has been hidden would show the message requests notification and trigger the section to re-appear on the home screen
Fixed a bug where blocked contacts weren't getting excluded from the contacts list in the configuration message
4 years ago
30cbe77366
Added labels to the NewConversationButtonSet
4 years ago
Morgan Pretty
Ryan Zhao