oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
15,895 Commits 5 Branches 133 Tags 227 MiB
Commit Graph

15895 Commits

Author SHA1 Message Date
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
Ryan Zhao 38f972ec9a fix magic number 2022-03-04 14:32:48 +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 c08b1617c2 slim the button width again 2022-03-03 13:35:27 +11:00
Ryan Zhao ea64469c2b Merge branch 'dev' into ipad-support-1 2022-03-03 13:28:21 +11:00
Ryan Zhao f6ef0b9f45 Merge branch 'dev' into voice-calls-2 2022-03-03 13:26:27 +11:00
Ryan Zhao e8f996306d show call permission required modal when calls are nor enabled 2022-03-03 13:25:53 +11:00
RyanZhao 8542564692
Merge pull request #569 from mpretty-cyro/fix/database-threading-crash 
Fix database threading crash
 2022-03-03 10:40:45 +11:00
Morgan Pretty 22921a6b5a Fixed a crash due to not passing the transaction when accessing the database 2022-03-03 10:37:50 +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 952a3d3414 minor fix for merging 2022-03-02 14:46:23 +11:00
Ryan Zhao 52407aec03 Merge branch 'ipad-support-1' into voice-calls-2 2022-03-02 14:31:31 +11:00
Ryan Zhao 9b075efe0c Merge branch 'dev' into ipad-support-1 2022-03-02 11:32:45 +11:00
Ryan Zhao e243fb8817 fix unread message request count issues 2022-03-02 11:31:33 +11:00
Morgan Pretty f370b050a3 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-02 11:24:58 +11:00
Ryan Zhao 167d68870a show conversation settings button after approving message requests 2022-03-02 10:50:15 +11:00
RyanZhao 0332250498
Merge pull request #568 from mpretty-cyro/fix/failable-message-request-response 
Fix for failing message request responses
 2022-03-02 10:35:54 +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
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
Morgan Pretty b648d27ba1 Merge remote-tracking branch 'upstream/dev' into dev 2022-03-01 15:17:13 +11:00
Ryan Zhao 04d25577f4 Merge branch 'dev' into ipad-support-1 2022-03-01 13:26:41 +11:00
RyanZhao ae7abf6fc1
Merge pull request #567 from mpretty-cyro/feature/message-request-tweaks 
Message request fixes and tweaks
 2022-03-01 10:29:57 +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 b077061714 Updated the code to parse an open group URL to handle a '/r/' before the room name 2022-02-28 17:29:17 +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
Morgan Pretty f8c0700ba0 Merge remote-tracking branch 'upstream/dev' into dev 2022-02-28 10:34:10 +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
RyanZhao 6573610ee9
Merge pull request #559 from mpretty-cyro/feature/message-requests 
Message Requests Phase 1
 2022-02-25 13:37:19 +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
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
Ryan Zhao b32a8cbab2 fix alert vc for iPad 2022-02-24 16:02:24 +11:00
Ryan Zhao a8c7f517eb clean 2022-02-24 15:39:07 +11:00
Ryan Zhao 24d8122d78 fix sharing UI for iPad 2022-02-24 15:35:35 +11:00
Ryan Zhao 348331d9ab fix present view controller UI issue for iPad 2022-02-24 14:03:50 +11:00
Ryan Zhao 9ff369fbd0 fix settings screen presentation on iPad 2022-02-24 13:19:16 +11:00
Ryan Zhao efab374e7f refactor on session search bar decoration 2022-02-24 13:16:50 +11:00
Ryan Zhao ab0714af00 fix search bar cancel button for iPad 2022-02-24 12:03:46 +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