Commit graph

308 commits

Author SHA1 Message Date
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
Morgan Pretty e4def22472 Moved the Storage.write call into the self.approveMessageRequestIfNeeded call 2022-03-24 15:46:53 +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 990edd20df Swapped a force-unwrap to an optional unwrap 2022-03-24 13:42:49 +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
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
Ryan Zhao 95797d427c fix link preview text colour 2022-03-17 10:43:11 +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 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
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
Morgan Pretty bdaae2b347 Moved the copy for the message request approval error into Localizable.strings 2022-03-02 10:06:46 +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 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
Ryan Zhao 279892e83b fix some scrolling to bottom and button issue 2022-03-01 14:03:10 +11:00
Ryan Zhao 821bd4cadb fix visible message bubble round corner issue 2022-03-01 11:46:29 +11:00
Ryan Zhao 78e2c4f55c minor refactor in search bar & message request vc 2022-03-01 11:21:07 +11:00
Ryan Zhao ccae9141ff rollback to fix an odd scrolling issue 2022-03-01 10:45:34 +11:00
Ryan Zhao 7e92391740 Merge branch 'dev' of https://github.com/oxen-io/session-ios into preformance-improvement 2022-03-01 10:30:51 +11:00
Morgan Pretty 110c7bb01a Addressed PR comments
Moved the 'backBarButtonItem' into the BaseVC (and removed it for being duplicated in various view controllers)
Removed a redundant line of code
2022-03-01 10:25:54 +11:00
Morgan Pretty e6b941ea8a Fixed a number of tweaks and bugs with message requests
Removed the "Back" text from the back buttons
Removed the inset on the 'Path' settings button so the text remains horizontally centered
Hid the settings button from message request threads
Fixed an issue where the back button would remain visible in a conversation when the search field was visible
Fixed an issue where the tintColor of the conversation search field didn't match the global search field
Fixed an issue where sending an attachment response to a message request wouldn't approve the message request
Updated the size and positioning of the message request 'Clear All' button to match the DM 'Next' button
Updated the message request 'Clear All' button to start visible (so it's visible during the push animation) since that's the most likely state it'll be in
Updated the 'Message Requests' cell to use the pinned background colour
Updated the fallback for contact thread names to be a middle-truncated string (4 characters either side)
2022-02-28 17:23:34 +11:00
Ryan Zhao 27e7c25197 fix scroll to bottom crash 2022-02-28 16:35:28 +11:00
Ryan Zhao 629d952944 clean 2022-02-28 16:08:36 +11:00
Ryan Zhao 885ab66550 minor improvements on scroll to bottom 2022-02-28 16:02:28 +11:00
Ryan Zhao ec40922cb4 reduce initial loading on conversation screen 2022-02-28 15:27:00 +11:00
Ryan Zhao 2ae0ae40d4 minor improvements to reduce the database read on UI thread 2022-02-28 15:22:38 +11:00
Ryan Zhao f22672ccd7 Merge branch 'dev' of https://github.com/oxen-io/session-ios into preformance-improvement 2022-02-25 14:58:20 +11:00
Morgan Pretty 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
2022-02-25 12:48:38 +11:00
Ryan Zhao 66567ba9f5 clean 2022-02-25 11:50:56 +11:00
Ryan Zhao c85e3ef86b clean up unused code 2022-02-25 10:57:02 +11:00
Morgan Pretty 819d5a39e1 Disabled the disappearing message settings for the recipient of a message request as well 2022-02-24 16:29:06 +11:00
Ryan Zhao 97bf861809 Merge branch 'dev' of https://github.com/oxen-io/session-ios into preformance-improvement 2022-02-24 09:53:31 +11:00
Morgan Pretty 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
2022-02-23 17:12:57 +11:00
Morgan Pretty 6f1a8fcdc5 Fixed a bug where the most recent message couldn't be interacted with due to message request UI changes 2022-02-22 11:42:11 +11:00
Ryan Zhao e428333b7b minor update to reduce database read on ui thread 2022-02-21 16:58:42 +11:00
Morgan Pretty dfbee2a520 Removed the single message restriction from message requests (still text only) 2022-02-21 10:10:32 +11:00
Morgan Pretty 3639a21bc8 Fixed bugs raised by QA
Added some missing localised strings
Prevented 'Read' and 'Typing' indicators from functioning on Message Requests
Prevented link previews on the first message of a message request
Added a confirmation alert when trying to clear all message requests
Added a confirmation alert when trying to delete a message request
Added an empty state to the MessageRequestsViewController
Updated the back behaviour of the ConversationVC to behave more nicely with approving/declining message requests
Updated the OWSBlockingManager to also update the stored contacts 'isBlocked' flag to match
2022-02-17 16:29:14 +11:00
Morgan Pretty 999d4a1082 Merge branch 'dev' into feature/message-requests
# Conflicts:
#	Session/Conversations/ConversationVC+Interaction.swift
2022-02-17 11:52:23 +11:00
Ryan Zhao 529bc58d05 fix swiping to reply for very short messages 2022-02-16 13:17:56 +11:00
Morgan Pretty 051f03f4b4 PR comments and a few missed use cases
Disabled the attachments and voice message buttons for the first message
Disabled the Disappearing Messages flag for the until the conversation is approved
Fixed a bug where the recipient of a message request could incorrectly get the 'pending approval' state
Refactored some standard auto layout code to use the custom extension code
2022-02-14 17:49:08 +11:00
Morgan Pretty 1b820c48c6 Added support for Microsoft Word, Excel & Powerpoint previews 2022-02-14 10:02:33 +11:00
Morgan Pretty 161a90ad28 Updated the code to show the document interaction controller for text files as well 2022-02-14 09:54:17 +11:00
Morgan Pretty 6009c30805 Removed a resolved todo and fixed some variable naming 2022-02-11 17:17:09 +11:00
Morgan Pretty bdf2b825ad Updated the code to disable input for unapproved conversations after sending the first message 2022-02-11 11:26:04 +11:00
Morgan Pretty ad9282a7b9 Removed 'publicKey' from the MessageRequestResponse and updated logic to use 'message.sender' isntead 2022-02-11 10:47:27 +11:00
Morgan Pretty 185b2d2a97 Merge branch 'dev' into feature/pdf-preview
# Conflicts:
#	Session/Conversations/ConversationVC+Interaction.swift
2022-02-04 11:51:51 +11:00