Commit Graph

16156 Commits

Author SHA1 Message Date
Ryan Zhao b8463585fa fix UI collapse issue when keyboard showing up on small screen devices in join open group vc 2022-03-11 13:18:21 +11:00
Ryan Zhao 06958babcb fix unread mention indicator showing after the message is deleted 2022-03-11 11:43:21 +11:00
Ryan Zhao 02c816cd52 Merge branch 'dev' into ipad-support-1 2022-03-11 10:09:21 +11:00
Morgan Pretty 3e711811c3 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-11 09:41:23 +11:00
Ryan Zhao a31fb7f957 Merge branch 'dev' into voice-calls-2 2022-03-11 09:35:51 +11:00
Ryan Zhao 30e1f34782 fix configuration message may include contacts that shouldn't be visible 2022-03-10 17:22:39 +11:00
RyanZhao a31cfd2142
Merge pull request #578 from mpretty-cyro/feature/two-character-initials
Update the fallback avatar to be two characters
2022-03-10 17:04:20 +11:00
RyanZhao 99da263a50
Merge pull request #579 from mpretty-cyro/fix/message-request-crash
Fix message request bugs
2022-03-10 17:04:12 +11:00
Morgan Pretty 0e15c63e6b Fixed a case where a the share extension wasn't using a transaction version of a method 2022-03-10 16:58:08 +11:00
Morgan Pretty c2e13f02bc Fixed a crash which could occur while processing message request notifications due to not using a DB transaction 2022-03-10 16:50:48 +11:00
Morgan Pretty d3734efc16 Updated the casing for the avatar text 2022-03-10 16:09:42 +11:00
Morgan Pretty e786102f03 Updated the profile icon to default to using two characters (initials if possible) 2022-03-10 15:19:38 +11:00
Ryan Zhao ec12ca769d Merge branch 'dev' into voice-calls-2 2022-03-10 15:16:54 +11:00
Morgan Pretty b3d18b0135 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-10 15:16:46 +11:00
Ryan Zhao 195a91ac8b fix potential crash for nested transaction 2022-03-10 15:16:40 +11:00
Ryan Zhao f489e78deb Merge branch 'dev' into voice-calls-2 2022-03-10 15:12:42 +11:00
RyanZhao 20f99df0be
Merge pull request #577 from RyanRory/bug-fix-1-11-22
Bug fix 1.11.22
2022-03-10 14:53:06 +11:00
RyanZhao d3064efc1e
Merge pull request #576 from mpretty-cyro/fix/message-request-tweaks
Message request tweaks
2022-03-10 14:52:53 +11:00
Ryan Zhao e72f0f528d fix notification body for attachments 2022-03-10 14:50:39 +11:00
Morgan Pretty 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
2022-03-10 14:33:20 +11:00
Morgan Pretty 57c1e8afbf Merge remote-tracking branch 'upstream/dev' into dev 2022-03-10 11:35:29 +11:00
Ryan Zhao 05e2457f8b fix message request notification title 2022-03-10 10:42:08 +11:00
Ryan Zhao eb4c90b0d4 fix global search results cell UI for groups without member 2022-03-10 10:41:21 +11:00
Ryan Zhao 5c7176982c Merge branch 'dev' into voice-calls-2 2022-03-10 10:03:53 +11:00
RyanZhao d7bbd03dab
Merge pull request #575 from mpretty-cyro/fix/config-message-bugs
Fixes for config message handling
2022-03-10 10:02:49 +11:00
Morgan Pretty c0e90152ce Fixes for config message handling
Updated the config message handling to try fetch the existing contact first before creating a new one
Updated the OpenGroupManagerV2 to avoid joining an open group if the user already has a thread for it and is polling it
2022-03-09 17:44:34 +11:00
Morgan Pretty 8a9704f6bd Merge remote-tracking branch 'upstream/dev' into dev 2022-03-09 17:38:42 +11:00
Ryan Zhao 1e6c21a7ba Merge branch 'ipad-support-1' into voice-calls-2 2022-03-09 13:48:31 +11:00
Ryan Zhao 273b799d16 fix iPad multitasking issue 2022-03-09 13:48:19 +11:00
RyanZhao 81f9f5c12d
Merge pull request #574 from oxen-io/dev
1.11.22
2022-03-09 13:36:20 +11:00
Ryan Zhao fb9f6fa3ec bump up build number 2022-03-09 12:07:41 +11:00
Ryan Zhao 2a0f70b3a8 Merge branch 'dev' into voice-calls-2 2022-03-09 12:07:04 +11:00
RyanZhao d80042cf7f
Merge pull request #573 from mpretty-cyro/fix/only-sync-closed-groups-once
Fix to Only Sync Closed Groups Once
2022-03-09 12:05:13 +11:00
Morgan Pretty 0f78e1af61 Updated the code to only add closed groups for the first config message received 2022-03-09 11:52:12 +11:00
Ryan Zhao b632f6a925 avoid conflicts with call beta in TSInfoMessageType 2022-03-09 11:48:49 +11:00
Ryan Zhao 6bb951ecce bump up version & build number 2022-03-09 11:40:30 +11:00
Ryan Zhao 5326d925b8 add SessionUtilitiesKit frameworks to SessionMessagingKit 2022-03-09 11:37:06 +11:00
Ryan Zhao a68ed28a7a Merge branch 'dev' into voice-calls-2 2022-03-09 11:33:18 +11:00
Morgan Pretty a6ceaa3cc4 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-09 09:43:10 +11:00
Ryan Zhao 5762445128 Merge branch 'ipad-support-1' into voice-calls-2 2022-03-08 17:10:40 +11:00
Ryan Zhao ce95b97f02 fix CFBundleIdentifier Collision 2022-03-08 17:02:34 +11:00
Ryan Zhao da298756f8 bump up version & build number 2022-03-08 16:31:21 +11:00
RyanZhao 482b872c42
Merge pull request #541 from RyanRory/preformance-improvement
Performance & UX Improvement Phase 1
2022-03-08 16:22:57 +11:00
Ryan Zhao eae8e91735 Merge branch 'dev' into preformance-improvement 2022-03-08 14:03:55 +11:00
Ryan Zhao d3342094a4 Merge branch 'dev' into ipad-support-1 2022-03-08 14:03:37 +11:00
RyanZhao 49c995ee92
Merge pull request #572 from RyanRory/fix-closed-group-not-restored
Fix closed groups not restored
2022-03-08 14:02:02 +11:00
Ryan Zhao b1fb202eab mark current user as approved in message request migration 2022-03-08 13:55:34 +11:00
Ryan Zhao 9a04c7a4fe mark current user as approved on preregistering 2022-03-08 13:17:01 +11:00
Ryan Zhao 60e8da3bff Merge branch 'dev' into preformance-improvement 2022-03-08 11:08:45 +11:00
Morgan Pretty 7b142eadcf Merge remote-tracking branch 'upstream/dev' into dev 2022-03-08 10:36:49 +11:00