Ryan Zhao
fdde7e4fe0
Merge branch 'fix/tweaks-to-config-message-generation' of https://github.com/mpretty-cyro/session-ios into bug-fix-for-call
2022-03-24 16:33:10 +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
Ryan Zhao
e7c564914d
makes more sense on call timeout
2022-03-24 15:05:00 +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
Ryan Zhao
cef9a2a076
Merge branch 'fix/tweaks-to-config-message-generation' of https://github.com/mpretty-cyro/session-ios into bug-fix-for-call
2022-03-24 14:24:18 +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
Ryan Zhao
c2ab454499
fix conversation screen title & button arrangement after message request is approved
2022-03-22 10:08:14 +11:00
Morgan Pretty
88f63c1434
Merge remote-tracking branch 'upstream/dev' into dev
2022-03-21 16:56:21 +11:00
Ryan Zhao
47e009394a
update version number
2022-03-21 15:00:04 +11:00
Ryan Zhao
a96ede823e
bump up builder number
2022-03-21 14:59:06 +11:00
Ryan Zhao
2a6d453809
Merge branch 'dev' into voice-calls-2
2022-03-21 14:53:47 +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
Ryan Zhao
37614fe3d8
Merge branch 'dev' into voice-calls-2
2022-03-21 14:21:51 +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
Morgan Pretty
d3b54b84d0
Prevent the user from joining duplicate open groups due to url differences
...
Updated the OpenGroupManagerV2 to handle HTTP scheme variants and official host variants when checking if the user is already in an open group
2022-03-21 13:52:18 +11:00
Morgan Pretty
452614d190
Fixed a bug where the OpenGroup url parsing wasn't working for a certain URL structure
2022-03-18 10:20:59 +11:00
Ryan Zhao
7fb6726d43
refactor on media+text message cell
2022-03-17 16:08:45 +11:00
Ryan Zhao
81317db165
fix message with two links and a link preview, second link uses address of first
2022-03-17 15:48:33 +11:00
Morgan Pretty
d4c0acb2a7
Updated the configuration message to sync the blocked state correctly
2022-03-17 14:17:33 +11:00
Ryan Zhao
95797d427c
fix link preview text colour
2022-03-17 10:43:11 +11:00
Ryan Zhao
6bc0177bd4
fix path building crash
2022-03-17 10:13:00 +11:00
Morgan Pretty
07658b8893
Changed the labels on the conversation menu items to be bold
2022-03-16 11:41:30 +11:00
Morgan Pretty
22e5352983
Swapped a number of areas to use the built-in tintColor instead of the custom asTintedImage
2022-03-15 16:35:38 +11:00
Morgan Pretty
2e10ccf99d
Updated the code to cache the retrieval of the user public key
2022-03-15 16:06:53 +11:00
Morgan Pretty
d3e9fff893
Merge remote-tracking branch 'upstream/dev' into dev
2022-03-15 15:19:54 +11:00
Ryan Zhao
b14e6af682
bump up build number
2022-03-15 14:35:38 +11:00
Ryan Zhao
343a3afc0a
Merge branch 'message-replication-fix' into voice-calls-2
2022-03-15 14:35:08 +11:00
Ryan Zhao
e73fe4fe31
bump up build number
2022-03-15 14:34:22 +11:00
RyanZhao
79d148a8d6
Merge pull request #582 from RyanRory/message-replication-fix
...
Further message replication fix
2022-03-15 14:33:19 +11:00
Ryan Zhao
6f927a5003
minor refactor
2022-03-15 14:27:11 +11:00
Ryan Zhao
a1e47419c8
minor refactor
2022-03-15 14:03:17 +11:00
Ryan Zhao
b920dbcc10
check if the incoming message is already in database before persisting
2022-03-15 14:00:36 +11:00
Ryan Zhao
5206d5af11
fix an issue where suggested open groups are not tappable
2022-03-15 10:13:18 +11:00