ecd066f7a1 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into strings  
							
							... 
							
							
							
							# Conflicts:
#	Session/Media Viewing & Editing/PhotoCaptureViewController.swift
#	Session/Notifications/AppNotifications.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Utilities/Permissions.swift
#	SessionMessagingKit/Messages/Control Messages/CallMessage.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionShareExtension/ThreadPickerVC.swift 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								b0ab84a86d 
								
							
								 
							
						 
						
							
							
								
								fix group control messages  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								597f94a954 
								
							
								 
							
						 
						
							
							
								
								Fixed an issue where you could answer calls without having the mic permission  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								5d03a8057e 
								
							
								 
							
						 
						
							
							
								
								clean  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								2bcd8e28ab 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into standardised-strings  
							
							... 
							
							
							
							# Conflicts:
#	Scripts/LintLocalizableStrings.swift
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/EditClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Message Cells/Content Views/QuoteView.swift
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Conversations/Views & Modals/ConversationTitleView.swift
#	Session/Home/GlobalSearch/GlobalSearchViewController.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Media Viewing & Editing/PhotoCaptureViewController.swift
#	Session/Media Viewing & Editing/PhotoLibrary.swift
#	Session/Notifications/UserNotificationsAdaptee.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Shared/ScanQRCodeWrapperVC.swift
#	SessionMessagingKit/Database/Models/Attachment.swift
#	SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
#	SessionMessagingKit/Database/Models/RecipientState.swift
#	SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift
#	SessionShareExtension/ShareNavController.swift
#	SessionShareExtension/ThreadPickerVC.swift
#	SessionUIKit/Components/TopBannerController.swift
#	SessionUtilitiesKit/General/String+Utilities.swift
#	SessionUtilitiesKit/Networking/IPv4.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalInputAccessoryView.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalViewController.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift
#	SignalUtilitiesKit/Screen Lock/ScreenLock.swift 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								2032dafc74 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager  
							
							... 
							
							
							
							# Conflicts:
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionSnodeKit/Networking/SnodeAPI.swift
#	SessionUtilitiesKit/Media/DataSource.h
#	SessionUtilitiesKit/Media/DataSource.m 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								ce01f128f3 
								
							
								 
							
						 
						
							
							
								
								Replaced Cocoapods with Swift Package Manager for dependency management  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								b198699c4f 
								
							
								 
							
						 
						
							
							
								
								refactor and clean up on Expiration Timer Update messages  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								ad03d2a3ff 
								
							
								 
							
						 
						
							
							
								
								WIP: refactor expiration update message  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								07389bf592 
								
							
								 
							
						 
						
							
							
								
								clean up stage 1  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								003816117f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into standardised-strings  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								db796896f4 
								
							
								 
							
						 
						
							
							
								
								Tweaks to notification extension  
							
							... 
							
							
							
							• Fixed an issue where the notification extension could end up in an invalid state if you delete and create a new account in rapid succession
• Fixed an issue where notification processing errors weren't getting handled correctly resulting in the notification extension timing out
• Stopped the notification extension from trying to download profile images
• Added commit hash to version info
• Tweaked the notification extension logic flow to be more straight forward 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								527c921df3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'onboarding' into standardised-strings  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								a91024f0bb 
								
							
								 
							
						 
						
							
							
								
								Separate streams for attachment upload/download and bug fixes  
							
							... 
							
							
							
							• Updated the code to stop sending legacy PNs outside of legacy group conversations
• Updated the logger logic to clean things up and use the local date/time (with time zone info) to ease debugging user reports
• Fixed an issue where messages in a community could incorrectly accept disappearing message settings
• Fixed an issue where duplicate messages could be sent in some cases
• Fixed an issue where the conversation might not scroll to the bottom after sending an attachment
• Fixed an issue where attachment encryption was happening in a db write thread 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								d9a64e0148 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into standardised-strings  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/EditClosedGroupVC.swift
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/Emoji Picker/EmojiPickerCollectionView.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Emoji/Emoji+Available.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Meta/AppDelegate.swift
#	Session/Meta/SessionApp.swift
#	Session/Onboarding/PNModeVC.swift
#	Session/Path/PathVC.swift
#	Session/Utilities/IP2Country.swift
#	SessionMessagingKit/Messages/Control Messages/SharedConfigMessage.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
#	SessionNotificationServiceExtension/NotificationError.swift
#	SessionUIKit/Style Guide/Values.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								9491b4a97b 
								
							
								 
							
						 
						
							
							
								
								Fixed a crash and config issue  
							
							... 
							
							
							
							• Fixed a bad memory crash which could occur when returning from the background
• Fixed an issue where config messages were incorrectly getting double wrapped in protobuf wrappers 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								534c0a13df 
								
							
								 
							
						 
						
							
							
								
								rename dynamic variables in strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								99abcdebf6 
								
							
								 
							
						 
						
							
							
								
								Removed some unneeded code and fixed a couple of bugs  
							
							... 
							
							
							
							• Removed the 'runOnceTransient' behaviour (no longer have jobs that run before the user exists)
• Removed the session id from the message snippet in the conversation list
• Fixed an issue where the SyncPushTokensJob might not run because the paths hadn't been built yet 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								5c9140cb4c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into standardised-strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								8c467dc511 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/fix/sync-message-issues' into feature/lib-quic-integration  
							
							... 
							
							
							
							# Conflicts:
#	.drone.jsonnet
#	SessionSnodeKit/Networking/SnodeAPI.swift
#	SessionSnodeKit/Types/OnionRequestAPIError.swift
#	SessionSnodeKit/Types/SnodeAPIError.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								c065abc584 
								
							
								 
							
						 
						
							
							
								
								Cleaned up a bunch of warnings, renamed a couple of folders  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								749aeea6de 
								
							
								 
							
						 
						
							
							
								
								Tweaked a comment  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								686768f8b2 
								
							
								 
							
						 
						
							
							
								
								Fixed a few bugs with sync messages  
							
							... 
							
							
							
							Fixed an issue where sync messages were failing to send if the message wasn't disappearing
Fixed an issue where the 'Failed to Sync' statuses wouldn't be shown
Updated the MessageSenderError, SnodeAPIError and OnionRequestAPIError to actually output our error strings when included in strings
Updated the tryFlatMapWithRandomSnode function to include context of the last error thrown
Cleaned up the 'isSyncMessage' logic 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								88a8ac3d01 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into standardised-strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								6a04ba5fc2 
								
							
								 
							
						 
						
							
							
								
								fix untouched strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								4054796da1 
								
							
								 
							
						 
						
							
							
								
								apply new localized string format  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								0ebf0ea365 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into standardised-strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								e1bb6de7d6 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/drop-yap-database-support  
							
							... 
							
							
							
							# Conflicts:
#	Podfile.lock
#	SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								b4f01db37e 
								
							
								 
							
						 
						
							
							
								
								extend expire timer update message TTL to be default 14 days  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								4cf739eeef 
								
							
								 
							
						 
						
							
							
								
								clean  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								8f0b6d8202 
								
							
								 
							
						 
						
							
							
								
								WIP: Replace strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								fdae955288 
								
							
								 
							
						 
						
							
							
								
								fix data extraction message DaR  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								4c340188c2 
								
							
								 
							
						 
						
							
							
								
								fix ttl for legacy mode  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								43e2983f49 
								
							
								 
							
						 
						
							
							
								
								fix call messages and data extraction messages with their expiration info and refactor  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								ac30b3c797 
								
							
								 
							
						 
						
							
							
								
								fix unsend requests  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								ff691529c4 
								
							
								 
							
						 
						
							
							
								
								Do NOT expire control messages in groups  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								e38fb400ea 
								
							
								 
							
						 
						
							
							
								
								refactor on the way that attaching disappearing messages config to messages  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								9fc5f8fa68 
								
							
								 
							
						 
						
							
							
								
								WIP: refactoring the way of applying disappearing messages settings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								7d0e0d5164 
								
							
								 
							
						 
						
							
							
								
								remove attached disappearing messages settings for some control messages  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								5d2a307d5e 
								
							
								 
							
						 
						
							
							
								
								WIP: update copies and implement following setting  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								60684bc977 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/drop-yap-database-support  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								928d7f2b1e 
								
							
								 
							
						 
						
							
							
								
								add comments and minor refactor  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								18b296bcd8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'disappearing-message-redesign' into feature/drop-yap-database-support  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/AppDelegate.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/es-ES.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.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/sk.lproj/Localizable.strings
#	Session/Meta/Translations/zh-CN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-TW.lproj/Localizable.strings
#	SessionMessagingKit/Database/LegacyDatabase/SMKLegacy.swift
#	SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage.swift
#	SessionSnodeKit/Database/LegacyDatabase/SSKLegacy.swift
#	SessionSnodeKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionUtilitiesKit/Database/LegacyDatabase/SUKLegacy.swift
#	SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								01671438d5 
								
							
								 
							
						 
						
							
							
								
								fix issues that the expiresStartAtMs not being set correctly  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								33ef2b0920 
								
							
								 
							
						 
						
							
							
								
								refactor and fix issues that some control messages were not following disappearing messages settings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								ba1d468e9b 
								
							
								 
							
						 
						
							
							
								
								fix an issue where call messages were not attached with disappearing messages setting  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								77ceac54e0 
								
							
								 
							
						 
						
							
							
								
								fix closed group default disappearing messages settings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								e1950ed0b5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into feature/drop-yap-database-support  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionUtilitiesKit/Database/Storage.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								9e1f68380a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								9c9fb09254 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/blinded-message-request-setting  
							
							... 
							
							
							
							# Conflicts:
#	SessionMessagingKit/Configuration.swift 
							
						 
						
							2 years ago