Commit graph

15624 commits

Author SHA1 Message Date
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
Morgan Pretty c7196a96bc Merge remote-tracking branch 'upstream/dev' into dev 2022-02-25 12:38:16 +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
RyanZhao 164201de4f
Merge pull request #563 from RyanRory/fix-swiping-to-reply
Fix swiping to reply
2022-02-24 09:53:02 +11:00
RyanZhao ea68749b8d
Merge pull request #564 from mpretty-cyro/feature/menuLabels
Added labels to the new conversation buttons
2022-02-24 09:51:58 +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 e1cc9cde0e Added labels to the NewConversationButtonSet (part 2) 2022-02-22 16:59:33 +11:00
Morgan Pretty 30cbe77366 Added labels to the NewConversationButtonSet 2022-02-22 16:59:10 +11:00
Morgan Pretty 2d6dad67eb Added back another missing localised string 2022-02-22 16:08:07 +11:00
Morgan Pretty 948cbe2c0b Updated a couple of comments 2022-02-22 15:52:30 +11:00
Morgan Pretty 582ff0997a Fixed a couple of crashes and added some mock data generation logic
Possibly fixed a crash due to a database deadlock
Fixed a crash when the first message requests gets added if there are no other threads
Added code to generate a bunch of random thread data (Needs some testing to ensure no data leaves the device)
2022-02-22 15:51:17 +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
Morgan Pretty 47314bd639 Added a notification to indicate the user has a new message request
Fixed a bug where the notification count could be increased for message requests
Fixed a bug where an approved contact could be 'unapproved' due to an order of execution issue when generating the config sync message
Fixed a check to avoid registering for push notifications when on the simulator (old check didn't cater for M1 Macs)
Moved the 'hasHiddenMessageRequests' into the group user defaults so it can be accessed within the notification extension
Added code to handle an edge case where an old client could incorrectly un-approve a contact via a legacy configuration message
2022-02-21 14:48:53 +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
Morgan Pretty 42761d65c9 Merge remote-tracking branch 'upstream/dev' into dev 2022-02-17 11:51:10 +11:00
Morgan Pretty d490cf7d19 Fixed an issue where only the first sync config message would be processed 2022-02-17 11:45:59 +11:00
Morgan Pretty 56bdee3919 Updated the message request processing to handle both 'didApproveMe' and 'isApproved' contact flags 2022-02-17 11:40:35 +11:00
Ryan Zhao d7303b3916 update podfile.lock 2022-02-16 13:18:09 +11:00
Ryan Zhao 529bc58d05 fix swiping to reply for very short messages 2022-02-16 13:17:56 +11:00
RyanZhao d221a5bef9
Merge pull request #558 from mpretty-cyro/feature/pdf-preview
Added code to allow previewing PDF attachments within the app
2022-02-16 11:20:33 +11:00
RyanZhao a333fe2960
Merge pull request #561 from mpretty-cyro/fix/share-text-file-and-share-dark-mode
Fixed a couple of bugs with the share extension
2022-02-16 09:32:47 +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 140cc97829 Fixed a couple of bugs with the share extension
Fixed a bug where sharing a text file was resulting in the entire contents being put into the message input field
Fixed a bug where sharing from within the app where the app was in dark mode but the device was in light mode would result in buggy UI
2022-02-11 13:05:10 +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 27d9e41eaf Fixed a couple of build errors due to merging dev 2022-02-07 11:38:33 +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
Morgan Pretty 67d2a13dfb Ran pod install to update the Podfile.lock 2022-02-04 11:50:57 +11:00
Morgan Pretty cd61fb8df0 Merge branch 'dev' into feature/message-requests
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	SignalUtilitiesKit/Utilities/UIColor+Extensions.swift
2022-02-04 11:49:54 +11:00
Ryan Zhao 69e464e8ae bump up version & build number 2022-02-03 16:33:26 +11:00
RyanZhao a12ff0cbe2
Merge pull request #557 from RyanRory/1.11.21
Fix bugs and crashes for 1.11.21
2022-02-03 16:31:20 +11:00
Ryan Zhao e543f86c8b Merge branch 'dev' of https://github.com/oxen-io/session-ios into 1.11.21 2022-02-03 11:02:19 +11:00
RyanZhao 8afe5b0896
Merge pull request #548 from mpretty-cyro/fix/safari-sharing
Fix issues with sharing from Safari
2022-02-03 10:52:08 +11:00
Morgan Pretty 16ab4be537 Merge branch 'dev' into feature/pdf-preview 2022-02-03 08:33:58 +11:00
Morgan Pretty 4d62ddbd77 Merge branch 'dev' into fix/safari-sharing
# Conflicts:
#	Podfile.lock
2022-02-03 08:32:17 +11:00
Morgan Pretty 7f479bbca4 Merge branch 'dev' into feature/message-requests 2022-02-02 17:00:40 +11:00
Morgan Pretty 9db5083cc5 Built out the Message Request functionality
Added the MessageRequestsViewController
Added a 'Message Requests' button to the settings screen
Added accept/reject buttons for message requests to the ConversationVC
Added the ability to hide the message request item on the HomeVC (re-appears if you get a new message request)
Added code to handle an edge-case where the message request approval state wouldn't be returned to the sender due to the recipient running an old version of the app
Prevented contacts which aren't associated with an approved thread from appearing when creating a closed group
Disabled notifications for threads which aren't approved
Updated the app notification count to exclude unapproved messages
Updated the app to ignore closed group creation messages if the group has no admins which are approved contacts
Fixed up the keyboard avoidance behaviour in the ConversationVC
Fixed a couple of minor interaction issues which affected some devices
Fixed an issue where the database migrations would run on the 2nd launch when creating a new account (causing odd behaviours)
2022-02-02 16:59:56 +11:00
Ryan Zhao ebb7507728 Merge branch 'dev' of https://github.com/oxen-io/session-ios into 1.11.21 2022-02-02 13:33:25 +11:00
RyanZhao b4782896b1
Merge pull request #555 from RyanRory/global-search
Global Search Phase 1
2022-02-02 13:31:30 +11:00
Ryan Zhao 166fbff26c improve selected message animation for global search 2022-02-02 11:32:37 +11:00
Ryan Zhao 5ce7aa49ee mark messages with undownloaded attachments as read as well 2022-02-01 15:12:48 +11:00
Morgan Pretty bee36423da Fixed a couple of issue with sharing large attachments
Added back localized attachment error messages
Fixed an issue where sending an attachment could fail and the screen would be dismissed before the user had a chance to read the error
2022-02-01 14:55:03 +11:00
Morgan Pretty c7e7d30dea Merge branch 'dev' into fix/safari-sharing 2022-02-01 13:57:34 +11:00
Ryan Zhao ce83de5c46 fix crash of dictionary.subscript.getter for closed groups 2022-01-31 14:09:56 +11:00
Morgan Pretty 0f20c37afa Regenerated the SessionProtos for message requests 2022-01-31 08:56:42 +11:00