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  
				
					
						
							
							
								 
						
							
							
								bef27ee0c7 
								
							
								 
							
						 
						
							
							
								
								Fixed build issues resulting from rebase after Onboarding  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								ed34ebcae9 
								
							
								 
							
						 
						
							
							
								
								Fixed the share extension and moved the WebRTC logic  
							
							... 
							
							
							
							Moved the WebRTC dependency out of SessionMessagingKit and into the main Session app (it's the only one that used it and it was causing library linker issues in the share extension because it wasn't directly linked) 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								ce01f128f3 
								
							
								 
							
						 
						
							
							
								
								Replaced Cocoapods with Swift Package Manager for dependency management  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								da6c407e9f 
								
							
								 
							
						 
						
							
							
								
								Minor tweaks  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								07389bf592 
								
							
								 
							
						 
						
							
							
								
								clean up stage 1  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								d4e66dde14 
								
							
								 
							
						 
						
							
							
								
								Fixed a few more issues found during testing  
							
							... 
							
							
							
							• Fixed an issue where the conversation 'created' timestamp wasn't correctly getting set when creating a group
• Fixed an issue where sending a message to 'Note to Self' may not show the conversation in the conversation list
• Fixed an issue where sharing a message with an attachment might not include the attachment
• Fixed an issue where list paging wouldn't work in some cases after values were inserted into the database after the currently loaded pages
• Added some handling for invalid 'joinedAt' values for groups (seems like we can have an incorrect resolution) 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								756e256d9a 
								
							
								 
							
						 
						
							
							
								
								Moving libSession into SessionUtilitiesKit to expose it to other targets  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f5afdae646 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								bd0a25bbe9 
								
							
								 
							
						 
						
							
							
								
								fix an issue that a disappearing messages control message will be removed by a race condition  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								ce1eee2018 
								
							
								 
							
						 
						
							
							
								
								fix an issue where disappearing messages settings in groups won't be synced on new linked devices  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								2eac3d79f2 
								
							
								 
							
						 
						
							
							
								
								fix an issue where after creating a group, the group will have a DaS-1D default setting  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								4c0c1cda1a 
								
							
								 
							
						 
						
							
							
								
								Do not process outdated expiration update messages  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								c473c6cb23 
								
							
								 
							
						 
						
							
							
								
								fix an issue where disappearing messages config in legacy group was not updated  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								87309ccba1 
								
							
								 
							
						 
						
							
							
								
								fix an issue where note to self may show expiration update control messages which should be removed already.  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								9231f57636 
								
							
								 
							
						 
						
							
							
								
								minor fix  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								04d734ef87 
								
							
								 
							
						 
						
							
							
								
								use local disappearing messages setting for call messages and data extraction notifications  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								10d1c64c29 
								
							
								 
							
						 
						
							
							
								
								remove outdated client banner when receiving a message from new version  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								7693e53183 
								
							
								 
							
						 
						
							
							
								
								minor refactor and fix expiration update message for control messages  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								42f2440067 
								
							
								 
							
						 
						
							
							
								
								fix disappearing messages update control messages for legacy groups and linked devices  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								74efe8cc72 
								
							
								 
							
						 
						
							
							
								
								fix an issue for legacy groups disappearing message update control message  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								490cde57ce 
								
							
								 
							
						 
						
							
							
								
								fix disappearing messages update control messages for legacy groups  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								4ec1d730cd 
								
							
								 
							
						 
						
							
							
								
								remove previous logic for expiring control messages indicating disappearing messages turned off  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								5d2a307d5e 
								
							
								 
							
						 
						
							
							
								
								WIP: update copies and implement following setting  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								e8ec91ba8b 
								
							
								 
							
						 
						
							
							
								
								keep disappearing message update control message for legacy mode  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								adf1a76acc 
								
							
								 
							
						 
						
							
							
								
								fix outdated client version check  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								21c4a17a85 
								
							
								 
							
						 
						
							
							
								
								minor fix: only show banner when V2 is enabled  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								5f0835c41b 
								
							
								 
							
						 
						
							
							
								
								feat : display outdated client banner for linked devices  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								928d7f2b1e 
								
							
								 
							
						 
						
							
							
								
								add comments and minor refactor  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								c787d2558f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								bf58831313 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Scripts/LintLocalizableStrings.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								5917cf103f 
								
							
								 
							
						 
						
							
							
								
								Refactored the LintLocalizableStrings  
							
							... 
							
							
							
							Added inline errors & warnings (regex could use some work to remove invalid cases)
Added a build step to validate the strings are included in the app and it's extensions 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								33ef2b0920 
								
							
								 
							
						 
						
							
							
								
								refactor and fix issues that some control messages were not following disappearing messages settings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								2d0bbe4455 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into disappearing-message-redesign  
							
							... 
							
							
							
							#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.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/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/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/vi.lproj/Localizable.strings
#	Session/Meta/Translations/zh-CN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-TW.lproj/Localizable.strings 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								20ce1deb23 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into fix/xcode-15-build-issues  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								d415ea5781 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								77ceac54e0 
								
							
								 
							
						 
						
							
							
								
								fix closed group default disappearing messages settings  
							
							
							
						 
						
							2 years ago