Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								4d5d201493 
								
							
								 
							
						 
						
							
							
								
								Updated the SOGSV4Migration id to be larger than the other PR values  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								5ca227434b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into feature/session-id-blinding-part-2  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Utilities/BackgroundPoller.swift
#	SessionMessagingKit/Database/Storage+OpenGroups.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
#	SessionMessagingKit/Storage.swift
#	SessionMessagingKit/Utilities/General.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionUtilitiesKit/General/Atomic.swift 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								1b5eea7b4f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into dev  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								59f112c55f 
								
							
								 
							
						 
						
							
							
								
								bump up version & build number  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								7cd0079b37 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #599  from mpretty-cyro/fix/update-last-message-hash-after-registering-jobs  
							
							 
							
							... 
							
							
							
							Fix - Update last message hash after registering jobs 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								74f1d9a6d4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #596  from mpretty-cyro/feature/improve-open-group-deletion-processing  
							
							 
							
							... 
							
							
							
							Performance: Improve open group deletion processing 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								f05c695756 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #588  from mpretty-cyro/fix/message-request-count-bug  
							
							 
							
							... 
							
							
							
							Performance: Count unread message requests thread-first rather than unread-message-first 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								2530cb4492 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into dev  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								8daf804fd5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #597  from mpretty-cyro/fix/ui-call-running-on-background-thread  
							
							 
							
							... 
							
							
							
							Fix for a UI call running on background thread 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								7c18609aa8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #601  from mpretty-cyro/fix/double-url-share  
							
							 
							
							... 
							
							
							
							Fix double url share 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								3e20519a6a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #603  from mpretty-cyro/fix/link-preview-crash  
							
							 
							
							... 
							
							
							
							Fix link preview crash 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								0f34972134 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #604  from mpretty-cyro/fix/tweaks-to-config-message-generation  
							
							 
							
							... 
							
							
							
							Tweaks to config message generation 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								3663e63bc7 
								
							
								 
							
						 
						
							
							
								
								Swapped the Config message 'filter' to a 'compactMap' because apparently that doesn't crash  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								e4def22472 
								
							
								 
							
						 
						
							
							
								
								Moved the Storage.write call into the `self.approveMessageRequestIfNeeded` call  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								212c5e87aa 
								
							
								 
							
						 
						
							
							
								
								Re-added the transaction requirement when generating the current config message  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								29c53223e0 
								
							
								 
							
						 
						
							
							
								
								More tweaks to fix crash  
							
							 
							
							... 
							
							
							
							Wrapped the force sync calls within their own Storage.write blocks to ensure they have the latest data and aren't accessing a transaction completed in a different thread
Reverted a number of the unneeded changes 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								1214005c59 
								
							
								 
							
						 
						
							
							
								
								Updated the cachedEncodedPublicKey to be Atomic  
							
							 
							
							... 
							
							
							
							Added the Atomic wrapper for thread safe variables 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								f8dfbd4244 
								
							
								 
							
						 
						
							
							
								
								Reverting change and fixing a force-cast crash  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								6205e72eab 
								
							
								 
							
						 
						
							
							
								
								Change to make the 'getUser(using:)' method more consistent  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								7aa1221987 
								
							
								 
							
						 
						
							
							
								
								Tweaks to the ConfigurationMessage generation logic  
							
							 
							
							... 
							
							
							
							Removed force unwraps
Updated the closed group storage methods to take a transaction parameter 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								990edd20df 
								
							
								 
							
						 
						
							
							
								
								Swapped a force-unwrap to an optional unwrap  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								e7e8aba69a 
								
							
								 
							
						 
						
							
							
								
								Fixed a bug where sharing a url with LinkPreviews disabled could result in it being duplicated in the message  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								b90904ebbd 
								
							
								 
							
						 
						
							
							
								
								Updated the code to only update the last message hash once the MessageReceiveJobs have been created  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								01742af16b 
								
							
								 
							
						 
						
							
							
								
								Added an initial call to `isRTL` on the main thread to prevent a background thread calling it first  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								4e26ece92a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into feature/improve-open-group-deletion-processing  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								88f63c1434 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into dev  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								1492232224 
								
							
								 
							
						 
						
							
							
								
								Made some optimisations to open group deletion handling  
							
							 
							
							... 
							
							
							
							Added a new OpenGroupServerIdLookup to make it easier to get a database id via an open group server id
Added a migration to generate the above data
Updated the handleCompactBody method to stop early if there are no messages to delete (would previously enumerate all interactions regardless)
Updated the handleCompactBody to fetch the mapping for the deleted message so we can avoid enumerating all interactions 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								ea7603bf3b 
								
							
								 
							
						 
						
							
							
								
								Renamed some variables to make it a bit clearer and made sure it supported a port in the url  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								aa34484174 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #595  from mpretty-cyro/fix/open-group-existing-url-matching  
							
							 
							
							... 
							
							
							
							Fix open group existing url matching 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								c9edac4ea8 
								
							
								 
							
						 
						
							
							
								
								Updated the code to add the port if present...  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								eb939a746c 
								
							
								 
							
						 
						
							
							
								
								bump up version & build number  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								7ae1342341 
								
							
								 
							
						 
						
							
							
								
								Fixed an issue where open groups with no scheme in the url might not match correctly  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								a7895d6581 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into dev  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								dad264c239 
								
							
								 
							
						 
						
							
							
								
								Included a fix for duplicate open groups and added unit tests for it  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								c7bf20dd85 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #593  from mpretty-cyro/fix/duplicate-open-groups-from-url-differences  
							
							 
							
							... 
							
							
							
							Fix duplicate open groups from url differences 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								9e020948d6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #594  from RyanRory/bug-fixes-1.11.23  
							
							 
							
							... 
							
							
							
							Bug fixes for 1.11.22 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								34bc0e54d6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #590  from mpretty-cyro/fix/open-group-url-parsing  
							
							 
							
							... 
							
							
							
							Fix for parsing open group urls with no scheme 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								c1632bee36 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #589  from mpretty-cyro/fix/ensure-contacts-blocked-state-syncs-correctly  
							
							 
							
							... 
							
							
							
							Fix to ensure contacts blocked state syncs correctly 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								83fa679574 
								
							
								 
							
						 
						
							
							
								
								Fixed some incorrect logic (previously prevented joining other rooms in a server)  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								9eeec36cc6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #586  from mpretty-cyro/feature/conversation-menu-font-weight  
							
							 
							
							... 
							
							
							
							Increased the conversation menu label font weights 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								1b21951335 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #585  from mpretty-cyro/feature/image-tinting-optimisations  
							
							 
							
							... 
							
							
							
							Performance: Image tinting optimisations 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								05352daecb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #584  from mpretty-cyro/feature/cache-public-key-retrieval  
							
							 
							
							... 
							
							
							
							Performance: Cache public key retrieval 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								8652268557 
								
							
								 
							
						 
						
							
							
								
								add logs & fix PN  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								d3b54b84d0 
								
							
								 
							
						 
						
							
							
								
								Prevent the user from joining duplicate open groups due to url differences  
							
							 
							
							... 
							
							
							
							Updated the OpenGroupManagerV2 to handle HTTP scheme variants and official host variants when checking if the user is already in an open group 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								8b6b4be8e3 
								
							
								 
							
						 
						
							
							
								
								Added back a missing type check  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								5710fe18fb 
								
							
								 
							
						 
						
							
							
								
								Reverted a change to the type for the serverId of a TSAttachment (change didn't match the protobuf)  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								c44256b1d6 
								
							
								 
							
						 
						
							
							
								
								Added more unit tests  
							
							 
							
							... 
							
							
							
							Fixed a possible divide by zero error
Cleaned up some of the id blinding methods (ie. removing handling for impossible error states)
Added unit tests for the new Sodium methods (used for id blinding)
Added unit tests for some of the shared code
Added unit tests for the MessageSender+Encryption extension functions
Added unit tests for the MessageReceiver+Decryption extension functions
Updated the unit test key constants to be consistent with the SOGS auth-example keys for consistency 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								452614d190 
								
							
								 
							
						 
						
							
							
								
								Fixed a bug where the OpenGroup url parsing wasn't working for a certain URL structure  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								2851d5e8c7 
								
							
								 
							
						 
						
							
							
								
								Minor tweak to the updated URL parsing logic to be extra safe  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								046269f1df 
								
							
								 
							
						 
						
							
							
								
								Finished the OpenGroupManager unit tests  
							
							 
							
							... 
							
							
							
							Fixed a bug with how the open group URL processing was working (one of the example URLs wasn't getting processed correctly) 
							
						 
						
							4 years ago