ryanzhao
							
						 
						
							 
							
							
							
								
							
								548aad69a9 
								
							
								 
							
						 
						
							
							
								
								update build number  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								b281ea528a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #609  from RyanRory/fix-message-requests-reverse  
							
							 
							
							... 
							
							
							
							Fix approved chats back to message requests inbox 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								801f0d68a8 
								
							
								 
							
						 
						
							
							
								
								fix an edge case where a config message might get isApproved set to false  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								21924ee81a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into feature/remove-OWSBlockingManager  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj 
							
						 
						
							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  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								5286af841c 
								
							
								 
							
						 
						
							
							
								
								bump up version and build number  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								8b3d3fffb5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into voice-calls-2  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								479da9cc67 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #605  from RyanRory/bug-fix-for-call  
							
							 
							
							... 
							
							
							
							Bug fix for call 
							
						 
						
							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  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								34355c74ee 
								
							
								 
							
						 
						
							
							
								
								add some comments  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								07c18927f2 
								
							
								 
							
						 
						
							
							
								
								minor fix to prevent redundant offer  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								9df52a0a89 
								
							
								 
							
						 
						
							
							
								
								implement new approach for call reconnection  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								7165b9e4f6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into feature/remove-OWSBlockingManager  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Meta/AppDelegate.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								2530cb4492 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into dev  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								fc093a0157 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into bug-fix-for-call  
							
							 
							
							
							
						 
						
							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  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								fdde7e4fe0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'fix/tweaks-to-config-message-generation' of  https://github.com/mpretty-cyro/session-ios  into bug-fix-for-call  
							
							 
							
							
							
						 
						
							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
							
						 
						
							 
							
							
							
								
							
								b815a9f348 
								
							
								 
							
						 
						
							
							
								
								Fixed up a potential threading issue with the sync configuration logic  
							
							 
							
							... 
							
							
							
							Moved all the sync configuration calls to be within the existing 'write' blocks instead of waiting until the completion 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								e7c564914d 
								
							
								 
							
						 
						
							
							
								
								makes more sense on call timeout  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								1214005c59 
								
							
								 
							
						 
						
							
							
								
								Updated the cachedEncodedPublicKey to be Atomic  
							
							 
							
							... 
							
							
							
							Added the Atomic wrapper for thread safe variables 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								cef9a2a076 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'fix/tweaks-to-config-message-generation' of  https://github.com/mpretty-cyro/session-ios  into bug-fix-for-call  
							
							 
							
							
							
						 
						
							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
							
						 
						
							 
							
							
							
								
							
								5bb3bd7bc1 
								
							
								 
							
						 
						
							
							
								
								Cleaned up some config sync logic and allowed migrations to trigger them  
							
							 
							
							... 
							
							
							
							Updated the migrations so they can specify whether a configuration sync is required
Moved the config sync logic into a MessageSender extension (makes far more sense than AppDelegate)
Fixed a bug where the ShareVC was triggering the 'versionMigrationsDidComplete' twice
Removed a couple of imports for files that had been deleted 
							
						 
						
							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
							
						 
						
							 
							
							
							
								
							
								78c0d000be 
								
							
								 
							
						 
						
							
							
								
								Removed the OWSBlockingManager replacing it with the config sync  
							
							 
							
							... 
							
							
							
							Fixed an issue where the "block" button would appear in the NoteToSelf swipe menu
Removed the OWSBlockingManager and supporting files
Removed a number of unused classes and methods
Refactored the BlockListUIUtils to Swift 
							
						 
						
							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  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								c2ab454499 
								
							
								 
							
						 
						
							
							
								
								fix conversation screen title & button arrangement after message request is approved  
							
							 
							
							
							
						 
						
							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  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								47e009394a 
								
							
								 
							
						 
						
							
							
								
								update version number  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								a96ede823e 
								
							
								 
							
						 
						
							
							
								
								bump up builder number  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								2a6d453809 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into voice-calls-2  
							
							 
							
							
							
						 
						
							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