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  
				
					
						
							
							
								 
						
							
							
								eccaa29c4a 
								
							
								 
							
						 
						
							
							
								
								Fixed the background crash issues  
							
							... 
							
							
							
							• Updated GRDB and SQLCipher
• Shifted the ThreadSettingsViewModel code into a separate function to fix a compilation issue 
							
						 
						
							2 years 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  
				
					
						
							
							
								 
						
							
							
								6d297dc2a9 
								
							
								 
							
						 
						
							
							
								
								update strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								6f6521c9ca 
								
							
								 
							
						 
						
							
							
								
								update strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								1cda8887dc 
								
							
								 
							
						 
						
							
							
								
								WIP: strings!  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f33a153c7f 
								
							
								 
							
						 
						
							
							
								
								update more strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								cdb9282313 
								
							
								 
							
						 
						
							
							
								
								replace more localized string  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								63658f70d7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into standardised-strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								c065abc584 
								
							
								 
							
						 
						
							
							
								
								Cleaned up a bunch of warnings, renamed a couple of folders  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								4818a6d074 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into feature/lib-quic-integration  
							
							... 
							
							
							
							# Conflicts:
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/Session-Info.plist 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								7eb7eda74e 
								
							
								 
							
						 
						
							
							
								
								[WIP] Cleaned up interface, error handling and redundant code  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								d8698b717e 
								
							
								 
							
						 
						
							
							
								
								add more localized strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								1ee4c29a16 
								
							
								 
							
						 
						
							
							
								
								[WIP] Pulling in a bunch of changes around request management  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								1904a795b8 
								
							
								 
							
						 
						
							
							
								
								WIP: add new strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								88a8ac3d01 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into standardised-strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								756e256d9a 
								
							
								 
							
						 
						
							
							
								
								Moving libSession into SessionUtilitiesKit to expose it to other targets  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								6dc5d3031b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								6a04ba5fc2 
								
							
								 
							
						 
						
							
							
								
								fix untouched strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								4054796da1 
								
							
								 
							
						 
						
							
							
								
								apply new localized string format  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								d9a73bea95 
								
							
								 
							
						 
						
							
							
								
								adding missing strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								0ebf0ea365 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into standardised-strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f5afdae646 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								bd0a25bbe9 
								
							
								 
							
						 
						
							
							
								
								fix an issue that a disappearing messages control message will be removed by a race condition  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								8f0b6d8202 
								
							
								 
							
						 
						
							
							
								
								WIP: Replace strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f9ef58c9d3 
								
							
								 
							
						 
						
							
							
								
								WIP: add strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								6d2e07dea6 
								
							
								 
							
						 
						
							
							
								
								fix an issue for local generated expiration update messages being removed immediately.  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								fdae955288 
								
							
								 
							
						 
						
							
							
								
								fix data extraction message DaR  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								b2360d8e1a 
								
							
								 
							
						 
						
							
							
								
								fix an issue where DaR messages are read on linked devices won't have correct expiration start time  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								9a528f8c71 
								
							
								 
							
						 
						
							
							
								
								fix disappearing message control message already read on linked devices  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								84492be016 
								
							
								 
							
						 
						
							
							
								
								Fixed build issues, removed invalid unit tests and missing copy  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								661720a988 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/Translations/ar.lproj/Localizable.strings
#	Session/Meta/Translations/be.lproj/Localizable.strings
#	Session/Meta/Translations/bg.lproj/Localizable.strings
#	Session/Meta/Translations/bn.lproj/Localizable.strings
#	Session/Meta/Translations/cs.lproj/Localizable.strings
#	Session/Meta/Translations/da.lproj/Localizable.strings
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/el.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/eo.lproj/Localizable.strings
#	Session/Meta/Translations/es-ES.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fil.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/hu.lproj/Localizable.strings
#	Session/Meta/Translations/id.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/ko.lproj/Localizable.strings
#	Session/Meta/Translations/ku.lproj/Localizable.strings
#	Session/Meta/Translations/lt.lproj/Localizable.strings
#	Session/Meta/Translations/lv.lproj/Localizable.strings
#	Session/Meta/Translations/ne-NP.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/no.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt-BR.lproj/Localizable.strings
#	Session/Meta/Translations/pt-PT.lproj/Localizable.strings
#	Session/Meta/Translations/ro.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/si-LK.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sl.lproj/Localizable.strings
#	Session/Meta/Translations/sv-SE.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/tr.lproj/Localizable.strings
#	Session/Meta/Translations/uk.lproj/Localizable.strings
#	Session/Meta/Translations/vi.lproj/Localizable.strings
#	Session/Meta/Translations/zh-CN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-TW.lproj/Localizable.strings
#	SessionMessagingKit/Configuration.swift
#	SessionUtilitiesKit/Database/Storage.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								43e2983f49 
								
							
								 
							
						 
						
							
							
								
								fix call messages and data extraction messages with their expiration info and refactor  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								1c6232e4d7 
								
							
								 
							
						 
						
							
							
								
								minor refactor  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								a563cddba8 
								
							
								 
							
						 
						
							
							
								
								Added a timeout for the MessageSendJob and additional logging  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								e1d6a9dfc1 
								
							
								 
							
						 
						
							
							
								
								Added a migration to recreate any invalid FTS tables  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								cbcdb9b37f 
								
							
								 
							
						 
						
							
							
								
								Refactored AppContext and AppRediness to Swift  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								084586e6ba 
								
							
								 
							
						 
						
							
							
								
								change call messages and data extraction notification to be DaR if needed  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								04d734ef87 
								
							
								 
							
						 
						
							
							
								
								use local disappearing messages setting for call messages and data extraction notifications  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								c9df2a73e7 
								
							
								 
							
						 
						
							
							
								
								bring back false deleted logic  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								b22fe40d6e 
								
							
								 
							
						 
						
							
							
								
								fix an issue where received expiration update control message should already be read  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								7693e53183 
								
							
								 
							
						 
						
							
							
								
								minor refactor and fix expiration update message for control messages  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								74efe8cc72 
								
							
								 
							
						 
						
							
							
								
								fix an issue for legacy groups disappearing message update control message  
							
							
							
						 
						
							2 years ago