Commit Graph

225 Commits

Author SHA1 Message Date
Morgan Pretty c3b855646f Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Settings/SettingsVC.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
2022-03-31 12:03:00 +11:00
Morgan Pretty 1633105ce2 Merge branch 'dev' into feature/remove-unused-code
# Conflicts:
#	Session/Backups/OWSBackup.m
#	Session/Backups/OWSBackupImportJob.m
#	SignalUtilitiesKit/Sharing/SelectRecipientViewController.m
#	SignalUtilitiesKit/Sharing/SelectThreadViewController.m
2022-03-31 11:51:59 +11:00
Ryan Zhao 49d6a64194 Merge branch 'remove-OWSBlockingManager' into voice-calls-2 2022-03-31 11:09:09 +11:00
Morgan Pretty 0842dbff1e Removed a bunch of unused code
Removed the legacy Theme code (replaced with SessionUIKit equivalents)
Removed the OWSOrphanDataCleaner (unused)
Removed the OWSReceiptType_Delivery from the OWSOutgoingReceiptManager (unused)
Removed the TSStorageKeys and TSStorageHeaders files (unused)
Removed the LKMessageIDCollection (unused - only had methods for deleting data from the collection)
Removed the OWSPrimaryStorageTrustedKeysCollection and OWSIdentityManager_QueuedVerificationStateSyncMessages (unused)
Removed collections and notifications from OWSProfileManager (unused)
2022-03-30 09:46:08 +11:00
Morgan Pretty 5ca227434b Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Utilities/BackgroundPoller.swift
#	SessionMessagingKit/Database/Storage+OpenGroups.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
#	SessionMessagingKit/Storage.swift
#	SessionMessagingKit/Utilities/General.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionUtilitiesKit/General/Atomic.swift
2022-03-29 09:15:32 +11:00
Morgan Pretty 78c0d000be Removed the OWSBlockingManager replacing it with the config sync
Fixed an issue where the "block" button would appear in the NoteToSelf swipe menu
Removed the OWSBlockingManager and supporting files
Removed a number of unused classes and methods
Refactored the BlockListUIUtils to Swift
2022-03-23 09:59:38 +11:00
Ryan Zhao 37614fe3d8 Merge branch 'dev' into voice-calls-2 2022-03-21 14:21:51 +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 8652268557 add logs & fix PN 2022-03-21 13:55:51 +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 c415fc9e06 Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session/Open Groups/OpenGroupSuggestionGrid.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2+ObjC.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
2022-03-11 17:15:55 +11:00
Ryan Zhao f489e78deb Merge branch 'dev' into voice-calls-2 2022-03-10 15:12:42 +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 a68ed28a7a Merge branch 'dev' into voice-calls-2 2022-03-09 11:33:18 +11:00
Morgan Pretty 3e0ccaea4c Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Utilities/MentionUtilities.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
#	SignalUtilitiesKit/Messaging/Sending & Receiving/MessageSender+Convenience.swift
2022-03-09 09:49:23 +11:00
Morgan Pretty 8a7db1d48f Started adding logic for the outbox endpoint
Moved the BlindedIdMapping retrieval logic to ContactUtilities so it's reusable
Added the 'outbox' endpoints (need testing as they aren't deployed to test yet)
2022-03-02 14:44:56 +11:00
Ryan Zhao 52407aec03 Merge branch 'ipad-support-1' into voice-calls-2 2022-03-02 14:31:31 +11:00
Ryan Zhao 02cc97a238 Change Session title in dark mode to white 2022-03-01 11:34:23 +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 f22672ccd7 Merge branch 'dev' of https://github.com/oxen-io/session-ios into preformance-improvement 2022-02-25 14:58:20 +11:00
ryanzhao d27faf551b reduce unnecessary database read 2022-02-23 15:49:19 +11:00
Ryan Zhao 2d9f962a97 Merge branch 'dev' of https://github.com/oxen-io/session-ios into voice-calls-2 2022-02-04 14:21:54 +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
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
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 124d908686 add author for group messages 2022-01-27 16:39:22 +11:00
Ryan Zhao e4b0ca9ebc fix `not to self` 2022-01-27 15:29:10 +11:00
Ryan Zhao 85c4b3d745 show recent search result as default for global search screen 2022-01-27 14:19:07 +11:00
Ryan Zhao 42903d835d search for name and nickname 2022-01-20 16:21:32 +11:00
Ryan Zhao 8be5768ad2 snippet for group members 2022-01-20 15:33:31 +11:00
Ryan Zhao c1c5678056 implement animation for selected search result message flickering 2022-01-20 10:48:01 +11:00
Ryan Zhao 675dde9b1e improve unhighlighted text colour and contrast 2022-01-19 11:25:20 +11:00
Ryan Zhao af7dd3e82f highlight `Note to Self` 2022-01-19 10:59:49 +11:00
Ryan Zhao 5c112064da UI improvements on contact search results 2022-01-19 10:54:00 +11:00
ryanzhao 10abbb0552 search result view UI 2022-01-17 16:56:51 +11:00
ryanzhao 75fe1e2b00 minor improvements 2022-01-13 11:44:37 +11:00
ryanzhao 0a23065fb1 change home screen title to SESSION 2022-01-13 11:41:21 +11:00
RyanZhao 2a26eda36b
Merge pull request #531 from RyanRory/1.11.19
1.11.19 bug fixes and improvements
2021-12-06 09:48:08 +11:00
Ryan Zhao d2b95c6c31 Merge branch '1.11.19' into voice-calls-2 2021-12-01 16:42:57 +11:00
Ryan Zhao 5a7fabf216 minor improvement on theme change 2021-12-01 15:05:30 +11:00
Ryan Zhao 10aa3c7fee probably fix the theme not being correct issue 2021-12-01 14:27:51 +11:00
Ryan Zhao 912f8d80a6 Merge branch 'pin-chats' into voice-calls-2 2021-11-30 13:53:14 +11:00
Ryan Zhao 7e5573c96f fix cell updating and pin icon color 2021-11-30 13:52:31 +11:00
Ryan Zhao 0a3d84d5c8 WIP: Call message Ui improvements 2021-11-26 16:57:57 +11:00
Ryan Zhao 1cc2f17469 pin conversations 2021-11-17 15:51:53 +11:00
ryanzhao 02932bca93 Appearance based on system theme 2021-10-19 11:03:59 +11:00
ryanzhao e1f87b7fd2 minor fix 2021-09-23 12:56:00 +10:00
ryanzhao a169284c85 fix iOS 15 status bar issue 2021-09-22 15:57:12 +10:00
ryanzhao fc4fcae991 only show mention indicator for group chats 2021-09-20 10:02:59 +10:00
ryanzhao 7c11285dfb fix a crash when scanning false QR code to link a device 2021-09-01 15:11:59 +10:00
ryanzhao 42d4e07724 add @ symbol when there is mention in unread messages 2021-08-30 13:22:40 +10:00
Niels Andriesse dff9f287b8 Resolve FIXME 2021-08-03 09:37:48 +10:00
Niels Andriesse 483ed4792f Fix localization & clean 2021-07-29 10:14:06 +10:00
ryanzhao b5d1ccdbc3 add only notify mentions icon in home screen cells 2021-07-26 15:43:33 +10:00
Niels Andriesse 28ea914097 Show date break header by hour instead of by day
Also ditch relative timestamps in favor of absolute ones
2021-07-08 14:30:54 +10:00
Niels Andriesse b3f45455e5 Hook up user selection screen 2021-05-07 13:50:32 +10:00
nielsandriesse 49f3b9f7db Rename contactIdentifier → contactSessionID 2021-05-05 10:00:39 +10:00
Niels Andriesse 69c30fef70 Make UI changes 2021-04-16 11:01:33 +10:00
Ryan ZHAO cf148fe845 handle access to selected photos & optimise the process of request photo library permission 2021-04-08 13:36:20 +10:00
Niels Andriesse 1822b661e4 Fix broken constraint 2021-03-04 11:12:08 +11:00
Niels Andriesse dfb2369ab8 Show unread count on scroll to bottom button 2021-03-02 11:46:29 +11:00
Niels Andriesse c3f70a641a Show unread counts 2021-03-01 14:04:54 +11:00
Niels Andriesse dd0baf0d97 Unify contacts APIs 2021-03-01 09:36:18 +11:00
Niels Andriesse 9969284a2b Clean 2021-02-26 14:42:46 +11:00
Niels Andriesse e4aca65af0 Clean 2021-02-23 14:20:21 +11:00
Niels Andriesse 870f4d38d7 Clean 2021-02-22 14:47:40 +11:00
Niels Andriesse 90e53e5cef Redesign conversation screen part 1 2021-02-09 15:14:18 +11:00
Niels Andriesse 7acb6c9ac3 Merge branch 'dev' into multi-device 2021-01-28 15:44:04 +11:00
Niels Andriesse 5524ab1932 Remove unused code 2021-01-27 14:21:13 +11:00
nielsandriesse 28e3705f7e Implement multi device UI 2021-01-13 10:52:07 +11:00
nielsandriesse a915c5ddaa Re-organize files 2021-01-12 11:05:52 +11:00