Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								1a383ea850 
								
							
								 
							
						 
						
							
							
								
								Fixed a crash due to an assertion for encryption on the main thread  
							
							 
							
							... 
							
							
							
							Removed some commented out code 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								c293bbca3a 
								
							
								 
							
						 
						
							
							
								
								Fixed a couple of migration issues and minor tweaks  
							
							 
							
							... 
							
							
							
							Added the ability to define requirements for migrations (in case some data or state needs to be loaded for a migration to be able to be performed correctly)
Fixed a bug where the migration would throw because the user config might not have loaded it's state yet
Fixed a bug where the migration would throw if the user didn't exist yet
Commented out some logic in the ConfigSyncJob that could be problemmatic 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								63be502434 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionSnodeKit/Networking/SnodeAPI.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUtilitiesKit/General/Dictionary+Utilities.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								0e952b40bb 
								
							
								 
							
						 
						
							
							
								
								Removed 'useSharedUtilForUserConfig' flag and most legacy config logic  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								87668d86a1 
								
							
								 
							
						 
						
							
							
								
								Fixed an issue where the device might not reregister for push notifications  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								18ee9d34fa 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	SessionMessagingKit/Open Groups/Types/SodiumProtocols.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionMessagingKitTests/_TestUtilities/MockAeadXChaCha20Poly1305Ietf.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								4d098914b2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #813  from oxen-io/feature/job-runner-unit-tests  
							
							 
							
							... 
							
							
							
							JobRunner unit tests 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								0ac7f7b339 
								
							
								 
							
						 
						
							
							
								
								Remove double dash from suffix  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								ae0597a50f 
								
							
								 
							
						 
						
							
							
								
								Attempt alternate config base approach  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								3d755e7125 
								
							
								 
							
						 
						
							
							
								
								More CI debugging  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								b04867705f 
								
							
								 
							
						 
						
							
							
								
								Testing values  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								a2c75465c1 
								
							
								 
							
						 
						
							
							
								
								Further CI logic tweaks  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								b9512d8c4f 
								
							
								 
							
						 
						
							
							
								
								Tweaks to PR checking logic  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								eb3af31f0c 
								
							
								 
							
						 
						
							
							
								
								Updated pipelines to be conditional based on logic instead of config  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								c76b391d68 
								
							
								 
							
						 
						
							
							
								
								CI structure tweak  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								76b37c2ad6 
								
							
								 
							
						 
						
							
							
								
								Further tweaks to CI setup  
							
							 
							
							... 
							
							
							
							Added a suffix to distinguish the output files for upload
Attempting to exclude the Sim and AppStore builds from PR builds (they can't upload anyway) 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								bf98199800 
								
							
								 
							
						 
						
							
							
								
								Another incorrect statement in the upload script  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								66b94778e0 
								
							
								 
							
						 
						
							
							
								
								Fixed the build issues and a bug where a new legacy group wasn't subscribile  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								635a5182bc 
								
							
								 
							
						 
						
							
							
								
								Fixed a typo in the upload script  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								1b0fda56ad 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/AppDelegate.swift
#	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
#	Session/Notifications/SyncPushTokensJob.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionShareExtension/ShareNavController.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								2f05f3f3a2 
								
							
								 
							
						 
						
							
							
								
								Fixed a couple of invalid checks  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								715a5b583f 
								
							
								 
							
						 
						
							
							
								
								Fix a CI script typo  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								2341fbf59f 
								
							
								 
							
						 
						
							
							
								
								Further tweaks to CI scripts  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								00aef6ca97 
								
							
								 
							
						 
						
							
							
								
								Attempt to handle an invalid pod manifest file  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								15104da58e 
								
							
								 
							
						 
						
							
							
								
								More CI tweaks  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								c29827356c 
								
							
								 
							
						 
						
							
							
								
								Attempt to fix the cocoapods_cache lock logic to handle failures  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								b471a32209 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session/Conversations/ConversationVC+Interaction.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPI.swift
#	SessionMessagingKit/Open Groups/OpenGroupManager.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								a41f1c1366 
								
							
								 
							
						 
						
							
							
								
								Fixed the broken tests  
							
							 
							
							... 
							
							
							
							Cleaned up the Dependencies so that tests can run synchronously without having to custom set queues as much
Sorted out the crypto and network dependencies to avoid needing weird dependency inheritance
Fixed the flaky tests so they are no longer flaky
Fixed some unexpected JobRunner behaviours
Updated the CI config to use a local build directory for derivedData (now works with build tweaks) 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								43247b6ffa 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into disappearing-message-redesign  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								5464d9c97a 
								
							
								 
							
						 
						
							
							
								
								fix import  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								2b2d67a444 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into disappearing-message-redesign  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								RyanZhao
							
						 
						
							 
							
							
								
								
							
							
								
							
								19beff509b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #864  from f-person/feat/all-orientations-for-ipad  
							
							 
							
							... 
							
							
							
							feat: Enable upside down orientation for iPad 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Zhao
							
						 
						
							 
							
							
							
								
							
								cbc8a7806d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into disappearing-message-redesign  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								a3b3d2a485 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #873  from oxen-io/dev  
							
							 
							
							... 
							
							
							
							Release 2.3.2 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								8a47adfe79 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #868  from mpretty-cyro/fix/user-config-crashes  
							
							 
							
							... 
							
							
							
							Fixes for user config crashes 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								6ad303d450 
								
							
								 
							
						 
						
							
							
								
								Updated build and version numbers  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								a3adb23bad 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into fix/user-config-crashes  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session/Media Viewing & Editing/PhotoCapture.swift 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								18d3ab0e0e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into disappearing-message-redesign  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								7aa3c9ff66 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #870  from oxen-io/dev  
							
							 
							
							... 
							
							
							
							Release 2.3.1 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								8ac44b132d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #869  from mpretty-cyro/fix/cherry-pick-certain-fixes  
							
							 
							
							... 
							
							
							
							Include specific fixes from the other branch 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								b12497e305 
								
							
								 
							
						 
						
							
							
								
								Include specific fixes from the other branch  
							
							 
							
							... 
							
							
							
							Fixed a crash with the QRCode scanner
Fixed a crash when trying to take a video attachment 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								f373a989a8 
								
							
								 
							
						 
						
							
							
								
								Fixes for user config crashes  
							
							 
							
							... 
							
							
							
							Added a method to determine if the database is suspended
Updated the code to show the "Failed" state if sending a message fails due to a suspended database
Prevented a crash which could occur in rare cases when accessing the Seed via the home screen prompt (direct user to share logs with session - db locked or device in an invalid state)
Prevented a crash which could occur when trying to send a message due to failing to retrieve the mnemonic (db locked or device in an invalid state)
Fixed a bug where optimistic messages could end up appearing multiple times
Fixed a crash with the QRCode scanner
Fixed a crash when trying to take a video attachment
Fixed a crash where the image picker grid could go out of bounds when selecting elements
Fixed a crash which could occur when a user provides a recovery password with a word that contains less than 3 characters
Fixed a potential issue where the dependency injection could result in a stale date being used in some places (removing the DI here, proper fix requires larger changes in another branch) 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								e768bebe6d 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/Session-Prefix.pch
#	Session/Notifications/SyncPushTokensJob.swift
#	Session/Utilities/BackgroundPoller.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Profile.swift
#	SessionMessagingKit/Jobs/Types/AttachmentDownloadJob.swift
#	SessionMessagingKit/Jobs/Types/AttachmentUploadJob.swift
#	SessionMessagingKit/Jobs/Types/DisappearingMessagesJob.swift
#	SessionMessagingKit/Jobs/Types/FailedAttachmentDownloadsJob.swift
#	SessionMessagingKit/Jobs/Types/FailedMessageSendsJob.swift
#	SessionMessagingKit/Jobs/Types/GroupLeavingJob.swift
#	SessionMessagingKit/Jobs/Types/MessageReceiveJob.swift
#	SessionMessagingKit/Jobs/Types/MessageSendJob.swift
#	SessionMessagingKit/Jobs/Types/NotifyPushServerJob.swift
#	SessionMessagingKit/Jobs/Types/RetrieveDefaultOpenGroupRoomsJob.swift
#	SessionMessagingKit/Jobs/Types/SendReadReceiptsJob.swift
#	SessionMessagingKit/Jobs/Types/UpdateProfilePictureJob.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift
#	SessionMessagingKit/Utilities/AppReadiness.m
#	SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift
#	SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift
#	SessionShareExtension/ShareNavController.swift
#	SessionSnodeKit/Jobs/GetSnodePoolJob.swift
#	SessionUtilitiesKit/Configuration.swift
#	SessionUtilitiesKit/Database/Utilities/Database+Utilities.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
#	SignalUtilitiesKit/Meta/SignalUtilitiesKit.h
#	SignalUtilitiesKit/Utilities/SSKAsserts.h 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								b7e77ea24b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #865  from oxen-io/dev  
							
							 
							
							... 
							
							
							
							Release 2.3.0 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
								
								
							
							
								
							
								6ba9d1df89 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #751  from mpretty-cyro/feature/updated-user-config-handling  
							
							 
							
							... 
							
							
							
							Updated User Config Handling 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								703b1d9788 
								
							
								 
							
						 
						
							
							
								
								CI tweaks and tweak for initial UX issue with 'blinded25' id  
							
							 
							
							... 
							
							
							
							Added parallelisation for the unit tests
Added the SSH_KEY env variable for the 'Upload artifacts' step
Disabled xcbeautify for the prod build (as I expect it's suppressing the build error)
Disabled support for starting a conversation with a 'blinded25' id (would be invalid at this stage)
Fixed a broken unit test 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								bc5d8d0931 
								
							
								 
							
						 
						
							
							
								
								Cleaning up final things before release  
							
							 
							
							... 
							
							
							
							Added basic support for the '25' blinded prefix
Fixed a unit test CI issue 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								d4aaca9291 
								
							
								 
							
						 
						
							
							
								
								fix build issues after merge  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								ryanzhao
							
						 
						
							 
							
							
							
								
							
								31976048bd 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'feature/updated-user-config-handling' of  https://github.com/mpretty-cyro/session-ios  into disappearing-message-redesign  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Morgan Pretty
							
						 
						
							 
							
							
							
								
							
								f13f75eedf 
								
							
								 
							
						 
						
							
							
								
								Fixed some bad CI script commas  
							
							 
							
							
							
						 
						
							2 years ago