Commit Graph

15607 Commits

Author SHA1 Message Date
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
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
Morgan Pretty b85c113da6 Added code to preview PDF attachments 2022-01-28 16:24:18 +11:00
Ryan Zhao c729967953 Merge branch 'dev' of https://github.com/oxen-io/session-ios into global-search 2022-01-28 15:56:16 +11:00
Ryan Zhao a101bfbf82 Merge branch 'dev' of https://github.com/oxen-io/session-ios into 1.11.21 2022-01-28 15:55:48 +11:00
RyanZhao 6aac2a9966
Merge pull request #550 from mpretty-cyro/fix/open-group-initial-mention-list
Fix open group initial mention list population
2022-01-28 15:55:21 +11:00
Ryan Zhao c81e0e517d fix ui issue after making unread message count 4 digits 2022-01-28 15:03:19 +11:00
Ryan Zhao 99022006da Make the unread message count 4 digits instead of 2 2022-01-28 14:21:54 +11:00
Ryan Zhao 2c7dfe6a37 fix conversation screen scrolling to bottom issue 2022-01-28 14:10:35 +11:00
Ryan Zhao 70a562344c minor issue fix 2022-01-28 14:09:57 +11:00
Ryan Zhao 8ed77435d8 update translation 2022-01-28 14:08:43 +11:00
Ryan Zhao d96d7468a4 fix read more button colour 2022-01-28 14:04:41 +11:00
Ryan Zhao 6ae84d3e37 update outgoing message text colour in light mode 2022-01-28 13:45:27 +11:00
Ryan Zhao d642d8a4ed improve image message ratio 2022-01-28 13:14:57 +11:00
Ryan Zhao bcc5da75b6 minor fix on debug mode to prevent crashing 2022-01-28 13:14:02 +11:00
RyanZhao 8a1e916bcc
Merge pull request #549 from mpretty-cyro/feature/more-link-previews
Default link previews to use HTTPS
2022-01-28 12:16:28 +11:00
Ryan Zhao 16f6d49cec add note to self to the default global search screen with empty search text 2022-01-28 09:59:05 +11:00
Ryan Zhao 124d908686 add author for group messages 2022-01-27 16:39:22 +11:00
Ryan Zhao 18fea4ab73 Merge branch 'dev' into global-search 2022-01-27 15:43:54 +11:00