Commit graph

113 commits

Author SHA1 Message Date
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 7165b9e4f6 Merge branch 'dev' into feature/remove-OWSBlockingManager
# Conflicts:
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Meta/AppDelegate.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
2022-03-24 16:51:34 +11:00
Ryan Zhao fdde7e4fe0 Merge branch 'fix/tweaks-to-config-message-generation' of https://github.com/mpretty-cyro/session-ios into bug-fix-for-call 2022-03-24 16:33:10 +11:00
Morgan Pretty 1214005c59 Updated the cachedEncodedPublicKey to be Atomic
Added the Atomic wrapper for thread safe variables
2022-03-24 14:42:25 +11:00
Morgan Pretty 5bb3bd7bc1 Cleaned up some config sync logic and allowed migrations to trigger them
Updated the migrations so they can specify whether a configuration sync is required
Moved the config sync logic into a MessageSender extension (makes far more sense than AppDelegate)
Fixed a bug where the ShareVC was triggering the 'versionMigrationsDidComplete' twice
Removed a couple of imports for files that had been deleted
2022-03-24 10:03:51 +11:00
Ryan Zhao 37614fe3d8 Merge branch 'dev' into voice-calls-2 2022-03-21 14:21:51 +11:00
Morgan Pretty 2e10ccf99d Updated the code to cache the retrieval of the user public key 2022-03-15 16:06:53 +11:00
Ryan Zhao 88876138db Merge branch 'ipad-support-1' into voice-calls-2 2022-03-04 15:27:20 +11:00
Ryan Zhao 4edb666580 UI minor adjustment to modals 2022-03-04 15:23:02 +11:00
Morgan Pretty 1c474955de File upload working, further code cleanup
Got the updated file upload working
Removed the legacy 'room' header
Consolidated a number of types between SOGS, FileServer and general requests
Updated the OnionRequestAPI to deal with a Data payload (rather than encoding it to a string and then back to data)
2022-03-04 13:33:06 +11:00
Ryan Zhao 6a9a5b2752 fix session id label width 2022-03-03 14:31:18 +11:00
Ryan Zhao 23508fb936 fix bottom margin & copy/share button width 2022-03-03 14:12:32 +11:00
Ryan Zhao e8f996306d show call permission required modal when calls are nor enabled 2022-03-03 13:25:53 +11:00
Ryan Zhao 2bfbf25c75 Merge branch 'ipad-support-1' into voice-calls-2 2022-03-03 09:34:37 +11:00
Ryan Zhao 094fbfec2e improvements on sizes to make the UI look much better 2022-03-02 17:21:10 +11:00
Ryan Zhao 52407aec03 Merge branch 'ipad-support-1' into voice-calls-2 2022-03-02 14:31:31 +11:00
Ryan Zhao 04d25577f4 Merge branch 'dev' into ipad-support-1 2022-03-01 13:26:41 +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 c0615fe11d Merge branch 'dev' of https://github.com/oxen-io/session-ios into ipad-support-1 2022-02-25 13:43:49 +11:00
Ryan Zhao b32a8cbab2 fix alert vc for iPad 2022-02-24 16:02:24 +11:00
Ryan Zhao 24d8122d78 fix sharing UI for iPad 2022-02-24 15:35:35 +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 4d62ddbd77 Merge branch 'dev' into fix/safari-sharing
# Conflicts:
#	Podfile.lock
2022-02-03 08:32:17 +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 20a3b6ee26 move path button into setttings 2022-01-25 15:56:23 +11:00
Morgan Pretty 3b07be4eed Fixed a couple of crashes
Fixed an issue where sharing form Safari without adding comments would result in an invalid message getting sent.
Fixed a crash when sharing plain text from safari.
Fixed a crash when localising 'OK' (key and value can't be the same when using the new extension).
2022-01-13 16:37:23 +11:00
Ryan Zhao 42b7c0eebd mark calls in settings as beta 2021-12-13 11:57:33 +11:00
ryanzhao 336c694b52 refactoring on showing call ip exposure 2021-11-11 12:12:12 +11:00
ryanzhao 02932bca93 Appearance based on system theme 2021-10-19 11:03:59 +11:00
ryanzhao ccbc819cc4 include more info in logs 2021-10-05 15:45:54 +11:00
ryanzhao 7aa751ca45 share log files in settings vc 2021-10-01 09:18:40 +10:00
ryanzhao 69b262a081 add new survey button 2021-09-17 16:24:09 +10:00
Niels Andriesse 5fed33a661 Clean 2021-07-14 14:10:26 +10:00
Niels Andriesse 873279b65b Add FAQ button to settings 2021-07-14 14:05:40 +10:00
Niels Andriesse 0307eba6ef Debug 2021-07-12 14:07:42 +10:00
Niels Andriesse 0338b976d4 Implement UI for delete entire account option 2021-07-12 13:53:59 +10:00
Niels Andriesse e3671291c5 Merge branch 'dev' into cleanup 2021-05-07 13:06:48 +10:00
Niels Andriesse ea668f0344 Use newly translated strings 2021-05-07 11:05:16 +10:00
nielsandriesse e1ad33e832 Clean 2021-05-05 14:22:29 +10:00
nielsandriesse 06f795169b Merge branch 'dev' into cleanup 2021-05-05 14:10:19 +10:00
nielsandriesse 49f3b9f7db Rename contactIdentifier → contactSessionID 2021-05-05 10:00:39 +10:00
Niels Andriesse f552d51423 Remove unused code 2021-05-04 15:06:41 +10:00
Niels Andriesse 77da612103 Slight visual adjustment 2021-04-30 11:59:50 +10:00
Niels Andriesse 40fba3379e Add Oxen logo to settings 2021-04-30 11:26:52 +10:00
Niels Andriesse b7273c9da5 Add help us translate button 2021-04-30 10:14:28 +10:00
Niels Andriesse 06e4672a12 Clean up onboarding 2021-04-29 16:30:39 +10: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 10e6d114a0 Sync profile updates 2021-02-23 16:01:06 +11:00
Niels Andriesse e4aca65af0 Clean 2021-02-23 14:20:21 +11:00
Niels Andriesse d532badd09 Merge branch 'dev' into multi-device 2021-02-22 15:18:12 +11:00
Niels Andriesse 66a00d4167 Clean 2021-02-22 15:10:01 +11:00
Niels Andriesse 870f4d38d7 Clean 2021-02-22 14:47:40 +11:00
Niels Andriesse 994ee82a89 WIP 2021-02-18 15:32:56 +11:00
Niels Andriesse c1d9270f1b Fix view controller popping animation bug 2021-02-12 15:52:14 +11:00
Niels Andriesse 90e53e5cef Redesign conversation screen part 1 2021-02-09 15:14:18 +11:00
Niels Andriesse 1f3135d9d5 Don't enable multi device yet 2021-01-28 15:59:07 +11:00
nielsandriesse 947287e42f Debug 2021-01-13 15:19:17 +11:00
nielsandriesse 3ec4e0ae52 Force sync configuration upon enabling multi device or clearing data 2021-01-13 14:20:12 +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