Morgan Pretty
07d1d8acee
Merge branch 'dev' into feature/session-id-blinding-part-2
...
# Conflicts:
# Podfile
# Podfile.lock
# Session/Calls/Views & Modals/CallVideoView.swift
# Session/Utilities/BackgroundPoller.swift
# SessionSnodeKit/SnodeAPI.swift
3 years ago
Morgan Pretty
9216506847
Merge branch 'dev' into feature/session-id-blinding-part-2
...
# Conflicts:
# Session/Calls/Views & Modals/CallVideoView.swift
# Session/Meta/Translations/de.lproj/Localizable.strings
# Session/Meta/Translations/es.lproj/Localizable.strings
# Session/Meta/Translations/fi.lproj/Localizable.strings
# Session/Meta/Translations/fr.lproj/Localizable.strings
# Session/Meta/Translations/hr.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/zh-Hant.lproj/Localizable.strings
# Session/Meta/Translations/zh_CN.lproj/Localizable.strings
# Session/Utilities/BackgroundPoller.swift
# SessionSnodeKit/OnionRequestAPI.swift
# SessionSnodeKit/SnodeAPI.swift
3 years ago
Ryan Zhao
ab7bd24ad5
change in-conversation search result highlight UI to match with global search
3 years ago
ryanzhao
2edcba3342
fix https://github.com/oxen-io/session-ios/issues/628
3 years ago
Ryan Zhao
bc9ff65659
fix for conversation screen title position with call button
3 years ago
Ryan Zhao
9c994ff176
Merge branch 'dev' into bug-fixes-1.11.25
3 years ago
Ryan Zhao
7b33c541a4
minor fix for conversation screen title position
3 years ago
Morgan Pretty
1c575e520d
Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2
...
# Conflicts:
# Podfile.lock
# Session.xcodeproj/project.pbxproj
# Session/Conversations/ConversationVC+Interaction.swift
# Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
# Session/Home/HomeVC.swift
# Session/Open Groups/JoinOpenGroupVC.swift
# Session/Utilities/BackgroundPoller.swift
# SessionMessagingKit/Jobs/AttachmentUploadJob.swift
# SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
# SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
# SessionNotificationServiceExtension/NotificationServiceExtension.swift
3 years ago
Ryan Zhao
102a29b8e3
further fix for input view not scrollable issue
3 years ago
Ryan Zhao
e664cb8235
Merge branch 'bug-fixes-1.11.25' into bug-fix-for-calls
3 years ago
Ryan Zhao
37dc1631b5
fix an issue where the textview is not scrollable after the app goes into background and goes back in foreground.
3 years ago
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
3 years ago
Ryan Zhao
49d6a64194
Merge branch 'remove-OWSBlockingManager' into voice-calls-2
3 years ago
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
3 years ago
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
3 years ago
Ryan Zhao
f489e78deb
Merge branch 'dev' into voice-calls-2
3 years ago
Morgan Pretty
3e380ede4e
A couple of message request fixes
...
Added an error state to the OpenGroupSuggestionGrid
Fixed a bug where the settings button wouldn't appear for the sender of a message request once approved
3 years ago
Ryan Zhao
a68ed28a7a
Merge branch 'dev' into voice-calls-2
3 years ago
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
3 years ago
Ryan Zhao
e8f996306d
show call permission required modal when calls are nor enabled
3 years ago
Ryan Zhao
2bfbf25c75
Merge branch 'ipad-support-1' into voice-calls-2
3 years ago
Ryan Zhao
094fbfec2e
improvements on sizes to make the UI look much better
3 years ago
Ryan Zhao
52407aec03
Merge branch 'ipad-support-1' into voice-calls-2
3 years ago
Ryan Zhao
9b075efe0c
Merge branch 'dev' into ipad-support-1
3 years ago
Morgan Pretty
cb288ca09c
Merge branch 'dev' into feature/session-id-blinding-part-2
...
# Conflicts:
# Session/Conversations/ConversationVC+Interaction.swift
# SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
3 years ago
Ryan Zhao
daf0705d42
Merge branch 'dev' into preformance-improvement
3 years ago
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)
3 years ago
Ryan Zhao
da66b1af2c
fix swiping back for approved message request conversation
3 years ago
Morgan Pretty
a26ee12f8d
Further work on Id Blinding
...
Renamed the setter for the SOGS 'Server' object for consistency
Updated the Curve25519Kit repo to use an Oxen fork
Updated the MockDataGenerator to accomodate the latest changes
Updated the ConversationVC to better support getting replaced when the conversion from blinded to unblinded happens while on that screen
Added a cache for the mapping between blinded ids and standard ids (gets cached whenever a valid match is found)
Added a migration to remove the old 'authToken, 'lastMessageServerId' and 'lastDeletionServerId' collections (redundant in SOGS V4)
3 years ago
Ryan Zhao
279892e83b
fix some scrolling to bottom and button issue
3 years ago
Ryan Zhao
04d25577f4
Merge branch 'dev' into ipad-support-1
3 years ago
Ryan Zhao
78e2c4f55c
minor refactor in search bar & message request vc
3 years ago
Ryan Zhao
ccae9141ff
rollback to fix an odd scrolling issue
3 years ago
Ryan Zhao
7e92391740
Merge branch 'dev' of https://github.com/oxen-io/session-ios into preformance-improvement
3 years ago
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
3 years ago
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)
3 years ago
Ryan Zhao
27e7c25197
fix scroll to bottom crash
3 years ago
Ryan Zhao
629d952944
clean
3 years ago
Ryan Zhao
885ab66550
minor improvements on scroll to bottom
3 years ago
Ryan Zhao
ec40922cb4
reduce initial loading on conversation screen
3 years ago
Ryan Zhao
2ae0ae40d4
minor improvements to reduce the database read on UI thread
3 years ago
Morgan Pretty
3e97782d18
Merge branch 'dev' into feature/session-id-blinding-part-2
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Conversations/ConversationVC.swift
# 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
3 years ago
Ryan Zhao
f22672ccd7
Merge branch 'dev' of https://github.com/oxen-io/session-ios into preformance-improvement
3 years ago
Ryan Zhao
c0615fe11d
Merge branch 'dev' of https://github.com/oxen-io/session-ios into ipad-support-1
3 years ago
Ryan Zhao
c85e3ef86b
clean up unused code
3 years ago
Ryan Zhao
efab374e7f
refactor on session search bar decoration
3 years ago
Ryan Zhao
ab0714af00
fix search bar cancel button for iPad
3 years ago
Morgan Pretty
6f1a8fcdc5
Fixed a bug where the most recent message couldn't be interacted with due to message request UI changes
3 years ago
Ryan Zhao
e428333b7b
minor update to reduce database read on ui thread
3 years ago
Morgan Pretty
dfbee2a520
Removed the single message restriction from message requests (still text only)
3 years ago