Morgan Pretty
290bce5ce0
Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor
...
# Conflicts:
# Podfile
# Podfile.lock
# Session.xcodeproj/project.pbxproj
# Session/Closed Groups/EditClosedGroupVC.swift
# Session/Closed Groups/NewClosedGroupVC.swift
# Session/Conversations/Context Menu/ContextMenuVC+Action.swift
# Session/Conversations/Context Menu/ContextMenuVC.swift
# Session/Conversations/ConversationMessageMapping.swift
# Session/Conversations/ConversationSearch.swift
# Session/Conversations/ConversationVC+Interaction.swift
# Session/Conversations/ConversationVC.swift
# Session/Conversations/ConversationViewItem.h
# Session/Conversations/ConversationViewItem.m
# Session/Conversations/ConversationViewModel.m
# Session/Conversations/Input View/InputView.swift
# Session/Conversations/Input View/MentionSelectionView.swift
# Session/Conversations/LongTextViewController.swift
# Session/Conversations/Message Cells/Content Views/LinkPreviewView.swift
# Session/Conversations/Message Cells/MessageCell.swift
# Session/Conversations/Message Cells/VisibleMessageCell.swift
# Session/Conversations/Settings/OWSConversationSettingsViewController.m
# Session/Conversations/Views & Modals/ConversationTitleView.swift
# Session/Conversations/Views & Modals/DownloadAttachmentModal.swift
# Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
# Session/Conversations/Views & Modals/LinkPreviewModal.swift
# Session/Conversations/Views & Modals/MessagesTableView.swift
# Session/Conversations/Views & Modals/URLModal.swift
# Session/Home/GlobalSearch/GlobalSearchViewController.swift
# Session/Home/HomeVC.swift
# Session/Home/Message Requests/MessageRequestsViewController.swift
# Session/Media Viewing & Editing/MediaDetailViewController.m
# Session/Media Viewing & Editing/MediaPageViewController.swift
# Session/Meta/AppDelegate.m
# Session/Meta/AppDelegate.swift
# Session/Meta/AppEnvironment.swift
# Session/Meta/Signal-Bridging-Header.h
# Session/Meta/Translations/en.lproj/Localizable.strings
# Session/Meta/Translations/hi.lproj/Localizable.strings
# Session/Meta/Translations/si.lproj/Localizable.strings
# Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
# Session/Notifications/AppNotifications.swift
# Session/Open Groups/JoinOpenGroupVC.swift
# Session/Settings/NukeDataModal.swift
# Session/Settings/SeedModal.swift
# Session/Settings/SettingsVC.swift
# Session/Settings/ShareLogsModal.swift
# Session/Shared/ConversationCell.swift
# Session/Shared/UserSelectionVC.swift
# Session/Utilities/BackgroundPoller.swift
# Session/Utilities/MentionUtilities.swift
# Session/Utilities/MockDataGenerator.swift
# SessionMessagingKit/Database/OWSPrimaryStorage.m
# SessionMessagingKit/Database/SSKPreferences.swift
# SessionMessagingKit/Database/Storage+Contacts.swift
# SessionMessagingKit/Database/Storage+Jobs.swift
# SessionMessagingKit/Database/Storage+Messaging.swift
# SessionMessagingKit/Database/Storage+OpenGroups.swift
# SessionMessagingKit/Database/TSDatabaseView.m
# SessionMessagingKit/File Server/FileServerAPIV2.swift
# SessionMessagingKit/Jobs/AttachmentDownloadJob.swift
# SessionMessagingKit/Jobs/AttachmentUploadJob.swift
# SessionMessagingKit/Jobs/JobQueue.swift
# SessionMessagingKit/Jobs/MessageReceiveJob.swift
# SessionMessagingKit/Jobs/MessageSendJob.swift
# SessionMessagingKit/Jobs/NotifyPNServerJob.swift
# SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift
# SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift
# SessionMessagingKit/Messages/Message+Destination.swift
# SessionMessagingKit/Messages/Signal/TSIncomingMessage.h
# SessionMessagingKit/Messages/Signal/TSIncomingMessage.m
# SessionMessagingKit/Messages/Signal/TSInfoMessage.h
# SessionMessagingKit/Messages/Signal/TSInfoMessage.m
# SessionMessagingKit/Messages/Signal/TSInteraction.h
# SessionMessagingKit/Messages/Signal/TSInteraction.m
# SessionMessagingKit/Messages/Signal/TSMessage.h
# SessionMessagingKit/Messages/Signal/TSMessage.m
# SessionMessagingKit/Open Groups/OpenGroupAPIV2+ObjC.swift
# SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
# SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
# SessionMessagingKit/Open Groups/OpenGroupMessageV2.swift
# SessionMessagingKit/Sending & Receiving/Mentions/MentionsManager.swift
# SessionMessagingKit/Sending & Receiving/MessageReceiver+Decryption.swift
# SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
# SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
# SessionMessagingKit/Sending & Receiving/MessageSender+ClosedGroups.swift
# SessionMessagingKit/Sending & Receiving/MessageSender+Encryption.swift
# SessionMessagingKit/Sending & Receiving/MessageSender.swift
# SessionMessagingKit/Sending & Receiving/Notifications/NotificationsProtocol.h
# SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift
# SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
# SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
# SessionMessagingKit/Storage.swift
# SessionMessagingKit/Threads/Notification+Thread.swift
# SessionMessagingKit/Threads/TSContactThread.h
# SessionMessagingKit/Threads/TSContactThread.m
# SessionMessagingKit/Threads/TSGroupModel.h
# SessionMessagingKit/Threads/TSGroupModel.m
# SessionMessagingKit/Threads/TSGroupThread.m
# SessionMessagingKit/Utilities/General.swift
# SessionNotificationServiceExtension/NSENotificationPresenter.swift
# SessionNotificationServiceExtension/NotificationServiceExtension.swift
# SessionSnodeKit/OnionRequestAPI+Encryption.swift
# SessionSnodeKit/OnionRequestAPI.swift
# SessionSnodeKit/SnodeAPI.swift
# SessionSnodeKit/SnodeMessage.swift
# SessionSnodeKit/Storage+SnodeAPI.swift
# SessionSnodeKit/Storage.swift
# SessionUtilitiesKit/General/Array+Utilities.swift
# SessionUtilitiesKit/General/Dictionary+Utilities.swift
# SessionUtilitiesKit/General/SNUserDefaults.swift
# SessionUtilitiesKit/General/Set+Utilities.swift
# SessionUtilitiesKit/Meta/SessionUtilitiesKit.h
# SessionUtilitiesKit/Utilities/Optional+Utilities.swift
# SessionUtilitiesKit/Utilities/Sodium+Conversion.swift
# SignalUtilitiesKit/Configuration.swift
# SignalUtilitiesKit/Database/Migrations/OpenGroupServerIdLookupMigration.swift
# SignalUtilitiesKit/Messaging/FullTextSearcher.swift
# SignalUtilitiesKit/Messaging/Sending & Receiving/MessageSender+Convenience.swift
# SignalUtilitiesKit/Profile Pictures/Identicon+ObjC.swift
# SignalUtilitiesKit/To Do/OWSProfileManager.m
# SignalUtilitiesKit/Utilities/NoopNotificationsManager.swift
# SignalUtilitiesKit/Utilities/UIView+OWS.swift
2022-06-08 14:29:51 +10:00
Morgan Pretty
c500d4c6ca
Fixed a few bugs, resolved a number of TODOs and deleted more unused code
...
Fixed a couple of bugs with search term highlighting (updated the logic to make the highlighted content follow similar logic to what terms would have actually matched)
Fixed a bug where info messages in search results weren't rendering correctly
Shifted some duplicate query code for global search into variables
Fixed a small bug where sending attachments could incorrectly result in the mentions UI being visible
Fixed a bug where quote content was appearing incorrectly
Consolidated the ShareExtension Item and the ConversationCell.ViewModel into one type (with a more-limited query) to remove duplicate code
Added back a missing asset (deleted a long time ago)
2022-05-23 17:16:14 +10:00
Ryan Zhao
f489e78deb
Merge branch 'dev' into voice-calls-2
2022-03-10 15:12:42 +11:00
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
2022-03-10 14:33:20 +11:00
Ryan Zhao
52407aec03
Merge branch 'ipad-support-1' into voice-calls-2
2022-03-02 14:31:31 +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
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
ryanzhao
0a23065fb1
change home screen title to SESSION
2022-01-13 11:41:21 +11:00
Ryan Zhao
e42c8ea592
Merge branch 'doc-with-text' into voice-calls-2
2021-12-07 15:54:09 +11:00
Ryan Zhao
6225c12ced
minor improvement on pre-sending file page icon
2021-12-07 15:53:58 +11:00
Ryan Zhao
300f6f50cf
add size label for file type attachment
2021-12-07 15:25:05 +11:00
Ryan Zhao
d2f29e7db2
Merge branch 'doc-with-text' into voice-calls-2
2021-12-07 14:14:34 +11:00
Ryan Zhao
5e521a8192
fix the issue where no text will show along with a doc type attachment
2021-12-07 14:12:48 +11:00
Ryan Zhao
9e4e126ef3
add call missed tips
2021-11-30 15:51:15 +11:00
Ryan Zhao
44837b57e5
improve the audio output device displaying
2021-11-30 11:48:04 +11:00
Ryan Zhao
6703d8c7f4
add timestamp to call message UI
2021-11-29 14:49:53 +11:00
Ryan Zhao
9e6c81d28b
improve call message UI
2021-11-29 12:10:33 +11:00
Ryan Zhao
0a3d84d5c8
WIP: Call message Ui improvements
2021-11-26 16:57:57 +11:00
Ryan Zhao
a6a297048c
Merge branch 'pin-chats' into voice-calls-2
2021-11-23 14:34:19 +11:00
Ryan Zhao
1cc2f17469
pin conversations
2021-11-17 15:51:53 +11:00
ryanzhao
95c8606408
deal with audio I/O change
2021-11-15 12:22:31 +11:00
ryanzhao
67f979e014
update icons
2021-11-12 17:01:57 +11:00
ryanzhao
fb156b7d52
minor fix
2021-10-22 09:20:39 +11:00
ryanzhao
1231b9c20a
add preview before staring video
2021-10-21 16:28:48 +11:00
ryanzhao
7b23b8f601
Merge branch 'dev' of https://github.com/oxen-io/session-ios into voice-calls-2
2021-10-20 10:20:09 +11:00
ryanzhao
02932bca93
Appearance based on system theme
2021-10-19 11:03:59 +11:00
ryanzhao
5354185696
improve UI
2021-09-23 12:55:28 +10:00
ryanzhao
019a2cd299
add options for voice call and video call
2021-09-22 11:44:35 +10:00
ryanzhao
e8500d75a7
fix input panel issue & make local video view draggable
2021-09-21 15:11:48 +10:00
ryanzhao
8013cdacff
add operations for video call
2021-09-08 14:55:52 +10:00
Niels Andriesse
b54cd3b026
Add call button to conversation screen
2021-08-16 16:24:49 +10:00
Ryan Zhao
86ab6c03eb
use single pdf for image assets
2021-07-30 09:20:56 +10:00
ryanzhao
798b541241
add UI in conversation settings
2021-07-26 15:42:04 +10:00
Niels Andriesse
4773350cb1
Fix crash
2021-05-17 13:42:17 +10:00
Niels Andriesse
1d539bc898
Fix crash
2021-05-04 16:13:56 +10:00
Niels Andriesse
2892c12243
Fix crash
2021-05-04 16:11:09 +10:00
Niels Andriesse
3cd6e9bdfa
Fix crash
2021-05-03 08:34:28 +10:00
Niels Andriesse
c9c9bcbab8
Fix crash
2021-04-30 15:14:13 +10:00
Niels Andriesse
e6b91fdbee
Delete unused assets
2021-04-30 14:19:30 +10:00
Niels Andriesse
40fba3379e
Add Oxen logo to settings
2021-04-30 11:26:52 +10:00
Niels Andriesse
b8f82c98eb
Show moderator icons in open groups
2021-02-19 14:30:16 +11:00
nielsandriesse
299cfedc02
Clean up mentions UI
2021-02-17 15:57:07 +11:00
nielsandriesse
f12d18f90e
Fix crash
2021-02-15 16:16:22 +11:00
Niels Andriesse
90e53e5cef
Redesign conversation screen part 1
2021-02-09 15:14:18 +11:00
Niels Andriesse
b64f316b39
Use actual icon
2020-12-16 14:22:31 +11:00
nielsandriesse
58e69aae9c
Organize files
2020-11-12 08:48:41 +11:00
