Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								f7bfeb6e6d 
								
							
								 
							
						 
						
							
							
								
								fix typo  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								f632763eee 
								
							
								 
							
						 
						
							
							
								
								revert debug code  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								1609812e5b 
								
							
								 
							
						 
						
							
							
								
								remove useless expiration flag in data message  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								da66b1af2c 
								
							
								 
							
						 
						
							
							
								
								fix swiping back for approved message request conversation  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								e014fe0367 
								
							
								 
							
						 
						
							
							
								
								prevent the message bubble not being wide enough to show the corner radius for very short message  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								279892e83b 
								
							
								 
							
						 
						
							
							
								
								fix some scrolling to bottom and button issue  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								6b231316ee 
								
							
								 
							
						 
						
							
							
								
								fix & improve voice message preview in home screen  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								821bd4cadb 
								
							
								 
							
						 
						
							
							
								
								fix visible message bubble round corner issue  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								02cc97a238 
								
							
								 
							
						 
						
							
							
								
								Change Session title in dark mode to white  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								78e2c4f55c 
								
							
								 
							
						 
						
							
							
								
								minor refactor in search bar & message request vc  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								ccae9141ff 
								
							
								 
							
						 
						
							
							
								
								rollback to fix an odd scrolling issue  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								7e92391740 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  https://github.com/oxen-io/session-ios  into preformance-improvement  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								ae7abf6fc1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #567  from mpretty-cyro/feature/message-request-tweaks  
							
							 
							
							... 
							
							
							
							Message request fixes and tweaks 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								110c7bb01a 
								
							
								 
							
						 
						
							
							
								
								Addressed PR comments  
							
							 
							
							... 
							
							
							
							Moved the 'backBarButtonItem' into the BaseVC (and removed it for being duplicated in various view controllers)
Removed a redundant line of code 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								b077061714 
								
							
								 
							
						 
						
							
							
								
								Updated the code to parse an open group URL to handle a '/r/' before the room name  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								e6b941ea8a 
								
							
								 
							
						 
						
							
							
								
								Fixed a number of tweaks and bugs with message requests  
							
							 
							
							... 
							
							
							
							Removed the "Back" text from the back buttons
Removed the inset on the 'Path' settings button so the text remains horizontally centered
Hid the settings button from message request threads
Fixed an issue where the back button would remain visible in a conversation when the search field was visible
Fixed an issue where the tintColor of the conversation search field didn't match the global search field
Fixed an issue where sending an attachment response to a message request wouldn't approve the message request
Updated the size and positioning of the message request 'Clear All' button to match the DM 'Next' button
Updated the message request 'Clear All' button to start visible (so it's visible during the push animation) since that's the most likely state it'll be in
Updated the 'Message Requests' cell to use the pinned background colour
Updated the fallback for contact thread names to be a middle-truncated string (4 characters either side) 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								27e7c25197 
								
							
								 
							
						 
						
							
							
								
								fix scroll to bottom crash  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								629d952944 
								
							
								 
							
						 
						
							
							
								
								clean  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								885ab66550 
								
							
								 
							
						 
						
							
							
								
								minor improvements on scroll to bottom  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								ec40922cb4 
								
							
								 
							
						 
						
							
							
								
								reduce initial loading on conversation screen  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								2ae0ae40d4 
								
							
								 
							
						 
						
							
							
								
								minor improvements to reduce the database read on UI thread  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								f8c0700ba0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into dev  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								936fbd27c2 
								
							
								 
							
						 
						
							
							
								
								fix message request notification  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								f22672ccd7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  https://github.com/oxen-io/session-ios  into preformance-improvement  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								6573610ee9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #559  from mpretty-cyro/feature/message-requests  
							
							 
							
							... 
							
							
							
							Message Requests Phase 1 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								028ba0c77a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into feature/message-requests  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.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/id-ID.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/si.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sv.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi-VN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								c7196a96bc 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into dev  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								66567ba9f5 
								
							
								 
							
						 
						
							
							
								
								clean  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								c85e3ef86b 
								
							
								 
							
						 
						
							
							
								
								clean up unused code  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								7a677a1800 
								
							
								 
							
						 
						
							
							
								
								move pollers to one working queue to avoid race condition  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								819d5a39e1 
								
							
								 
							
						 
						
							
							
								
								Disabled the disappearing message settings for the recipient of a message request as well  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								97bf861809 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  https://github.com/oxen-io/session-ios  into preformance-improvement  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								164201de4f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #563  from RyanRory/fix-swiping-to-reply  
							
							 
							
							... 
							
							
							
							Fix swiping to reply 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								ea68749b8d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #564  from mpretty-cyro/feature/menuLabels  
							
							 
							
							... 
							
							
							
							Added labels to the new conversation buttons 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								d61f36211d 
								
							
								 
							
						 
						
							
							
								
								bump up to show 500 global search results for all cases  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								4c89c165d8 
								
							
								 
							
						 
						
							
							
								
								Fixed a few bugs uncovered by QA  
							
							 
							
							... 
							
							
							
							Fixed a bug where the ConfigurationMessage was getting generated before the contact state was persisted to the database in the message request flow causing odd behaviours (now generating the ConfigurationMessage within the same transaction)
Fixed a bug where sending a message to an existing message request thread once the message requests item has been hidden would show the message requests notification and trigger the section to re-appear on the home screen
Fixed a bug where blocked contacts weren't getting excluded from the contacts list in the configuration message 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								d27faf551b 
								
							
								 
							
						 
						
							
							
								
								reduce unnecessary database read  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								7c2e25e25a 
								
							
								 
							
						 
						
							
							
								
								remove useless code  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								cd97b9c3e8 
								
							
								 
							
						 
						
							
							
								
								minor fix on poller threading  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								5954c109a1 
								
							
								 
							
						 
						
							
							
								
								Fix an issue where message would be sent even though the attachments are failed to upload  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								e1cc9cde0e 
								
							
								 
							
						 
						
							
							
								
								Added labels to the NewConversationButtonSet (part 2)  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								30cbe77366 
								
							
								 
							
						 
						
							
							
								
								Added labels to the NewConversationButtonSet  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								2d6dad67eb 
								
							
								 
							
						 
						
							
							
								
								Added back another missing localised string  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								948cbe2c0b 
								
							
								 
							
						 
						
							
							
								
								Updated a couple of comments  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								582ff0997a 
								
							
								 
							
						 
						
							
							
								
								Fixed a couple of crashes and added some mock data generation logic  
							
							 
							
							... 
							
							
							
							Possibly fixed a crash due to a database deadlock
Fixed a crash when the first message requests gets added if there are no other threads
Added code to generate a bunch of random thread data (Needs some testing to ensure no data leaves the device) 
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								b2ab984586 
								
							
								 
							
						 
						
							
							
								
								refactor on timer and polling threading  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								6f1a8fcdc5 
								
							
								 
							
						 
						
							
							
								
								Fixed a bug where the most recent message couldn't be interacted with due to message request UI changes  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								eec3d31109 
								
							
								 
							
						 
						
							
							
								
								WIP: timer + main thread  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								d21c5329e3 
								
							
								 
							
						 
						
							
							
								
								further improvements to move poller into background threads  
							
							 
							
							
							
						 
						
							4 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								e428333b7b 
								
							
								 
							
						 
						
							
							
								
								minor update to reduce database read on ui thread  
							
							 
							
							
							
						 
						
							4 years ago