Commit graph

15803 commits

Author SHA1 Message Date
Morgan Pretty
459502f1c3 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-31 11:47:52 +11:00
RyanZhao
82606a6244
Merge pull request #602 from mpretty-cyro/feature/remove-OWSBlockingManager
Remove the OWSBlockingManager
2022-03-31 10:56:35 +11:00
Morgan Pretty
0e09d4b935 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-30 09:04:12 +11:00
ryanzhao
548aad69a9 update build number 2022-03-29 15:39:09 +11:00
RyanZhao
b281ea528a
Merge pull request #609 from RyanRory/fix-message-requests-reverse
Fix approved chats back to message requests inbox
2022-03-29 15:37:56 +11:00
ryanzhao
801f0d68a8 fix an edge case where a config message might get isApproved set to false 2022-03-29 13:51:34 +11:00
Morgan Pretty
21924ee81a Merge branch 'dev' into feature/remove-OWSBlockingManager
# Conflicts:
#	Session.xcodeproj/project.pbxproj
2022-03-29 08:45:48 +11:00
Morgan Pretty
1b5eea7b4f Merge remote-tracking branch 'upstream/dev' into dev 2022-03-29 08:40:49 +11:00
Ryan Zhao
59f112c55f bump up version & build number 2022-03-28 14:45:50 +11:00
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
2022-03-28 14:06:03 +11:00
RyanZhao
74f1d9a6d4
Merge pull request #596 from mpretty-cyro/feature/improve-open-group-deletion-processing
Performance: Improve open group deletion processing
2022-03-28 14:05:46 +11:00
RyanZhao
f05c695756
Merge pull request #588 from mpretty-cyro/fix/message-request-count-bug
Performance: Count unread message requests thread-first rather than unread-message-first
2022-03-28 14:00:41 +11:00
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
2022-03-24 16:51:34 +11:00
Morgan Pretty
2530cb4492 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-24 16:38:36 +11:00
RyanZhao
8daf804fd5
Merge pull request #597 from mpretty-cyro/fix/ui-call-running-on-background-thread
Fix for a UI call running on background thread
2022-03-24 16:36:34 +11:00
RyanZhao
7c18609aa8
Merge pull request #601 from mpretty-cyro/fix/double-url-share
Fix double url share
2022-03-24 16:36:20 +11:00
RyanZhao
3e20519a6a
Merge pull request #603 from mpretty-cyro/fix/link-preview-crash
Fix link preview crash
2022-03-24 16:36:10 +11:00
RyanZhao
0f34972134
Merge pull request #604 from mpretty-cyro/fix/tweaks-to-config-message-generation
Tweaks to config message generation
2022-03-24 16:36:00 +11:00
Morgan Pretty
3663e63bc7 Swapped the Config message 'filter' to a 'compactMap' because apparently that doesn't crash 2022-03-24 16:27:56 +11:00
Morgan Pretty
e4def22472 Moved the Storage.write call into the self.approveMessageRequestIfNeeded call 2022-03-24 15:46:53 +11:00
Morgan Pretty
212c5e87aa Re-added the transaction requirement when generating the current config message 2022-03-24 15:34:46 +11:00
Morgan Pretty
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
2022-03-24 15:25:47 +11:00
Morgan Pretty
b815a9f348 Fixed up a potential threading issue with the sync configuration logic
Moved all the sync configuration calls to be within the existing 'write' blocks instead of waiting until the completion
2022-03-24 15:08:24 +11:00
Morgan Pretty
1214005c59 Updated the cachedEncodedPublicKey to be Atomic
Added the Atomic wrapper for thread safe variables
2022-03-24 14:42:25 +11:00
Morgan Pretty
f8dfbd4244 Reverting change and fixing a force-cast crash 2022-03-24 14:23:47 +11:00
Morgan Pretty
6205e72eab Change to make the 'getUser(using:)' method more consistent 2022-03-24 14:16:38 +11:00
Morgan Pretty
7aa1221987 Tweaks to the ConfigurationMessage generation logic
Removed force unwraps
Updated the closed group storage methods to take a transaction parameter
2022-03-24 14:13:35 +11:00
Morgan Pretty
990edd20df Swapped a force-unwrap to an optional unwrap 2022-03-24 13:42:49 +11:00
Morgan Pretty
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
2022-03-24 10:03:51 +11:00
Morgan Pretty
e7e8aba69a Fixed a bug where sharing a url with LinkPreviews disabled could result in it being duplicated in the message 2022-03-23 10:00:49 +11:00
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
2022-03-23 09:59:38 +11:00
Morgan Pretty
b90904ebbd Updated the code to only update the last message hash once the MessageReceiveJobs have been created 2022-03-22 14:09:47 +11:00
Morgan Pretty
01742af16b Added an initial call to isRTL on the main thread to prevent a background thread calling it first 2022-03-21 17:18:12 +11:00
Morgan Pretty
4e26ece92a Merge branch 'dev' into feature/improve-open-group-deletion-processing 2022-03-21 16:56:35 +11:00
Morgan Pretty
88f63c1434 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-21 16:56:21 +11:00
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
2022-03-21 16:53:12 +11:00
RyanZhao
aa34484174
Merge pull request #595 from mpretty-cyro/fix/open-group-existing-url-matching
Fix open group existing url matching
2022-03-21 14:44:57 +11:00
Morgan Pretty
c9edac4ea8 Updated the code to add the port if present... 2022-03-21 14:42:11 +11:00
Ryan Zhao
eb939a746c bump up version & build number 2022-03-21 14:39:04 +11:00
Morgan Pretty
7ae1342341 Fixed an issue where open groups with no scheme in the url might not match correctly 2022-03-21 14:32:48 +11:00
Morgan Pretty
a7895d6581 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-21 14:31:58 +11:00
RyanZhao
c7bf20dd85
Merge pull request #593 from mpretty-cyro/fix/duplicate-open-groups-from-url-differences
Fix duplicate open groups from url differences
2022-03-21 14:16:40 +11:00
RyanZhao
9e020948d6
Merge pull request #594 from RyanRory/bug-fixes-1.11.23
Bug fixes for 1.11.22
2022-03-21 14:11:42 +11:00
RyanZhao
34bc0e54d6
Merge pull request #590 from mpretty-cyro/fix/open-group-url-parsing
Fix for parsing open group urls with no scheme
2022-03-21 13:59:27 +11:00
RyanZhao
c1632bee36
Merge pull request #589 from mpretty-cyro/fix/ensure-contacts-blocked-state-syncs-correctly
Fix to ensure contacts blocked state syncs correctly
2022-03-21 13:58:59 +11:00
Morgan Pretty
83fa679574 Fixed some incorrect logic (previously prevented joining other rooms in a server) 2022-03-21 13:57:06 +11:00
RyanZhao
9eeec36cc6
Merge pull request #586 from mpretty-cyro/feature/conversation-menu-font-weight
Increased the conversation menu label font weights
2022-03-21 13:57:02 +11:00
RyanZhao
1b21951335
Merge pull request #585 from mpretty-cyro/feature/image-tinting-optimisations
Performance: Image tinting optimisations
2022-03-21 13:56:51 +11:00
RyanZhao
05352daecb
Merge pull request #584 from mpretty-cyro/feature/cache-public-key-retrieval
Performance: Cache public key retrieval
2022-03-21 13:56:39 +11:00
Ryan Zhao
8652268557 add logs & fix PN 2022-03-21 13:55:51 +11:00