be7881ad2e 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Conversations/Views & Modals/ConversationTitleView.swift
#	Session/Notifications/AppNotifications.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Shared/SessionTableViewModel.swift
#	Session/Shared/Views/SessionCell.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Contact.swift
#	SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
#	SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift
#	SessionMessagingKit/Messages/Message.swift
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Protos/Generated/SNProto.swift
#	SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift
#	SessionMessagingKit/Protos/SessionProtos.proto
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift
#	SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift
#	SessionSnodeKit/Models/SnodeAPIEndpoint.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUtilitiesKit/General/Features.swift 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								1334a64031 
								
							
								 
							
						 
						
							
							
								
								Removed usages of Box.KeyPair, removed a TODO  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								f30b383bb8 
								
							
								 
							
						 
						
							
							
								
								Updated to the latest version of libSession-util  
							
							... 
							
							
							
							Updated the SharedConfigMessage type to have a TTL of 30 days
Updated the SnodeAPI to have a 'poll' method to be more consistent with the OpenGroupAPI (it also does multiple things now so is cleaner)
Added logic to limit the number of config messages to be retrieved per poll
Added the 'ValidatableResponse' protocol to standardise SnodeAPI response validation
Added the libSession version to the logs
Fixed an issue where the user profile pic wouldn't get synced correctly due to memory going out of scope
Fixed some threading issues
Refactored the thread variants to follow the updated terminology (will think about refactoring other code areas later)
Cleaned up the Combine error handling
Started fixing broken unit tests 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								07046db4b6 
								
							
								 
							
						 
						
							
							
								
								Updated to the latest libSession, fixed a few bugs  
							
							... 
							
							
							
							Added the logic to sync the last read state for a conversation
Added the legacyClosedGroup thread variant
Updated the config handling to be able to update the 'mergeResult' and require a dump/push due to local changes
Fixed an issue where the name on the CallVC could go off the screen
Fixed an issue where OpenGroup info could sometimes incorrectly get deleted
Fixed an issue where the ConfirmationModal on a SessionTableViewController wouldn't trigger it's action
Fixed an issue where the config handling could incorrectly trigger a contacts update when there were no changes 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								f105c1d7bc 
								
							
								 
							
						 
						
							
							
								
								clean  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								f1e9412c7a 
								
							
								 
							
						 
						
							
							
								
								Added in missing code changes unrelated to closed groups rebuild  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								1345e89809 
								
							
								 
							
						 
						
							
							
								
								Further config util logic  
							
							... 
							
							
							
							Removed the usage of the OWSAES256Key (using CryptoKit and raw data instead)
Removed the pre-compiled headers to speed up builds with minor changes (explicit imports instead)
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	SessionMessagingKit/Database/Models/ClosedGroup.swift
#	SessionMessagingKit/Protos/Generated/SNProto.swift
#	SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift
#	SessionMessagingKit/Protos/SessionProtos.proto
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/CurrentUserPoller.swift
#	SessionMessagingKit/Utilities/ProfileManager.swift
#	SessionSnodeKit/Models/DeleteAllMessagesRequest.swift
#	SessionSnodeKit/Models/GetMessagesRequest.swift
#	SessionSnodeKit/Models/SendMessageRequest.swift
#	SessionSnodeKit/Types/SnodeAPINamespace.swift 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								d4d7f6c72c 
								
							
								 
							
						 
						
							
							
								
								clean  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								601cc7b92a 
								
							
								 
							
						 
						
							
							
								
								set disappearing messages config info to all kinds of messages  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								70ba0bdc13 
								
							
								 
							
						 
						
							
							
								
								set ttl as disappearing message config  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								a59d1b8153 
								
							
								 
							
						 
						
							
							
								
								Fixed a few bugs found during regression testing  
							
							... 
							
							
							
							Increased version & build numbers for release
Fixed a bug where the closed group info messages might not include names for members added/removed when the profile was unknown
Fixed a bug where removing members from closed groups wasn't showing an info message correctly
Fixed a minor layout issue in the CallMessageCell 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								eeccfb47d5 
								
							
								 
							
						 
						
							
							
								
								Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes  
							
							... 
							
							
							
							Fixed some broken file paths
Fixed a couple of bugs with closed groups
Fixed a few migration issues
Fixed a bug with the ProfilePictureView in open groups (was including the open parenthesis in the initials)
Migrated the Id Blinding changes to work with GRDB
Migrated the call logic to work with GRDB
Updated the code to work the with hard fork changes 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								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 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								5bcc124388 
								
							
								 
							
						 
						
							
							
								
								Updated the SessionShareExtension to work with GRDB  
							
							... 
							
							
							
							Updated to the latest version of GRDB
Fixed an issue with db reentrant behaviour with the Attachment upload function
Finished up the updated 'sendNonDurability' functions 
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								32304ae5dd 
								
							
								 
							
						 
						
							
							
								
								Cleared out some of the legacy serialisation logic, further UI binding  
							
							... 
							
							
							
							Refactored the SignalApp class to Swift
Fixed a horizontal alignment issue in the ConversationTitleView
Fixed an issue where expiration timer update messages weren't migrated or rendering correctly
Fixed an issue where expiring messages weren't migrated correctly
Fixed an issue where closed groups which had been left were causing migration failures (due to data incorrectly being assumed to be required)
Shifted the Legacy Attachment types into the 'SMKLegacy' namespace
Moved all of the NSCoding logic for the TSMessage 
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								f9bb1517a1 
								
							
								 
							
						 
						
							
							
								
								fix an issue where closed groups stop to be updated part 1  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								11231599db 
								
							
								 
							
						 
						
							
							
								
								Further work on migrations and message pipeline refactoring  
							
							... 
							
							
							
							Refactored the AppDelegate from Objective C to Swift
Updated the HomeVC to use GRDB
Refactored a number of the Job types to be driven via GRDB and the new JobRunner
Fixed a bug where the LinkPreviewView wouldn't render correctly in dark mode 
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								cf66edb723 
								
							
								 
							
						 
						
							
							
								
								Further work on SessionMessagingKit migrations  
							
							... 
							
							
							
							Added migrations for contacts and started working through thread migration (have contact and closed group threads migrating)
Deprecated usage of ECKeyPair in the migrations (want to be able to remove Curve25519Kit in the future) 
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								a1b4554cdb 
								
							
								 
							
						 
						
							
							
								
								Migrated the SessionSnodeKit from YapDatabase to GRDB  
							
							... 
							
							
							
							Changed the min OS version to iOS 13.0 (support for 'Identifiable')
Removed the alternate approaches to fetching the userKeyPair and userPublicKeyHexString (no consistently routed through the caching method)
Migrated the 'OWSIdentityManager' logic to use the new 'Identity' type
Added the 'Setting' table and got the pattern working fairly nicely (unfortunately there isn't a good way to avoid key collision without proper enums)
Updated the SessionSnodeKit to migration it's data from YDB to GRDB
Updated the SessionSnodeKit to use GRDB throughout it's logic 
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								394b0646a3 
								
							
								 
							
						 
						
							
							
								
								Updated the code to support additional session id prefixes  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								356dc0cc4f 
								
							
								 
							
						 
						
							
							
								
								Clean up indentation  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								a840d61f4e 
								
							
								 
							
						 
						
							
							
								
								delete obsolete code  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								7bb7edd3c0 
								
							
								 
							
						 
						
							
							
								
								Further cleanup  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								b090227a2d 
								
							
								 
							
						 
						
							
							
								
								Fix potential crash & apply code convention  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								1f9cd92bce 
								
							
								 
							
						 
						
							
							
								
								set expiration timer for new group members  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								a76c43973f 
								
							
								 
							
						 
						
							
							
								
								Increase TTL & remove PoW  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								82690259b2 
								
							
								 
							
						 
						
							
							
								
								Clean protobuf  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								1924e01edc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'multi-device' into ui  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								dd56da7619 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'closed-groups' into multi-device  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								ece564988e 
								
							
								 
							
						 
						
							
							
								
								Allow self-sending of closed group control messages  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								90e53e5cef 
								
							
								 
							
						 
						
							
							
								
								Redesign conversation screen part 1  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								1fda8e4249 
								
							
								 
							
						 
						
							
							
								
								Add encryption key pair request message  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								82cbf2ab41 
								
							
								 
							
						 
						
							
							
								
								Clean  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								585fabca03 
								
							
								 
							
						 
						
							
							
								
								Debug  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								cf333d5e3d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'closed-groups' into multi-device  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								b7160cbb11 
								
							
								 
							
						 
						
							
							
								
								Clean  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								c9c83da3dc 
								
							
								 
							
						 
						
							
							
								
								Rename ClosedGroupUpdateV2 → ClosedGroupControlMessage  
							
							
							
						 
						
							5 years ago