Commit graph

15722 commits

Author SHA1 Message Date
Morgan Pretty
b3d18b0135 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-10 15:16:46 +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
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
fb9f6fa3ec bump up build number 2022-03-09 12:07:41 +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
Morgan Pretty
a6ceaa3cc4 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-09 09:43:10 +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
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
RyanZhao
e287241bc5
Merge pull request #571 from mpretty-cyro/fix/unrecognised-selector-crash
Fixed unrecognised selector crash
2022-03-08 10:22:21 +11:00
Morgan Pretty
af543b980b Made a couple of changes to how the ConfigurationMessage is generated and handled
Stopped configuration messages from automatically creating threads for sync'ed contacts (now they will only be created if there are messages)
Updated the ConfigurationMessage to stop truncating the list of contacts but filter the full set (also update the logic to include previously approved contacts)
2022-03-07 10:22:46 +11:00
Morgan Pretty
decb946bf3 Fixed an unrecognised selector crash hidden by the conversion of Objective-C to Swift 2022-03-04 17:17:58 +11:00
Morgan Pretty
f316eb4e24 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-04 15:03:12 +11:00
Ryan Zhao
5d97754635 Merge branch 'dev' into preformance-improvement 2022-03-03 13:27:57 +11:00
RyanZhao
8542564692
Merge pull request #569 from mpretty-cyro/fix/database-threading-crash
Fix database threading crash
2022-03-03 10:40:45 +11:00
Morgan Pretty
22921a6b5a Fixed a crash due to not passing the transaction when accessing the database 2022-03-03 10:37:50 +11:00
Ryan Zhao
1fb4952f5e Merge branch 'dev' into preformance-improvement 2022-03-02 11:31:53 +11:00
Ryan Zhao
e243fb8817 fix unread message request count issues 2022-03-02 11:31:33 +11:00
Morgan Pretty
f370b050a3 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-02 11:24:58 +11:00
Ryan Zhao
3ab7192b26 clean up some code related to unread message (requests) count 2022-03-02 11:23:13 +11:00
Ryan Zhao
daf0705d42 Merge branch 'dev' into preformance-improvement 2022-03-02 10:53:42 +11:00
Ryan Zhao
167d68870a show conversation settings button after approving message requests 2022-03-02 10:50:15 +11:00
RyanZhao
0332250498
Merge pull request #568 from mpretty-cyro/fix/failable-message-request-response
Fix for failing message request responses
2022-03-02 10:35:54 +11:00
Morgan Pretty
bdaae2b347 Moved the copy for the message request approval error into Localizable.strings 2022-03-02 10:06:46 +11:00
Ryan Zhao
f7bfeb6e6d fix typo 2022-03-02 09:42:13 +11:00
Ryan Zhao
f632763eee revert debug code 2022-03-02 09:41:23 +11:00
Morgan Pretty
1b3f6c0ca6 Minor tweaks to the message request banner on the HomeVC
Fixed the unread message counting for message requests
Updated the message request banner to indicate the number of message requests with an unread message
Updated the message request banner to automatically disappear if the user has no unread message requests
Renamed a variable for ReadReceipt management to make it a bit more self-documenting (it looked like it would trigger a read receipt to be sent regardless of the setting)
2022-03-01 17:25:53 +11:00
Ryan Zhao
1609812e5b remove useless expiration flag in data message 2022-03-01 17:15:38 +11:00
Ryan Zhao
da66b1af2c fix swiping back for approved message request conversation 2022-03-01 16:51:16 +11:00
Ryan Zhao
e014fe0367 prevent the message bubble not being wide enough to show the corner radius for very short message 2022-03-01 16:49:59 +11:00
Morgan Pretty
9251d98bde Added a loading state when approving a message request
Removed the 'presentTimer' logic from the 'ModalActivityIndicatorViewController' (the delay looked buggy, if it does have "blipping" issues then we can fix those separately)
2022-03-01 16:48:47 +11:00
Morgan Pretty
f0f4128db2 Fixed an issue where the MessageRequestResponse could fail to send but would be flagged locally as approved 2022-03-01 15:26:14 +11:00
Morgan Pretty
b648d27ba1 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-01 15:17:13 +11:00
Ryan Zhao
279892e83b fix some scrolling to bottom and button issue 2022-03-01 14:03:10 +11:00