63658f70d7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into standardised-strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								e235b6059f 
								
							
								 
							
						 
						
							
							
								
								fix an issue where the keyboard can be covering voice call buttons  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								6a04ba5fc2 
								
							
								 
							
						 
						
							
							
								
								fix untouched strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								0ebf0ea365 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into standardised-strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f5afdae646 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								8f0b6d8202 
								
							
								 
							
						 
						
							
							
								
								WIP: Replace strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f9ef58c9d3 
								
							
								 
							
						 
						
							
							
								
								WIP: add strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								661720a988 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/Translations/ar.lproj/Localizable.strings
#	Session/Meta/Translations/be.lproj/Localizable.strings
#	Session/Meta/Translations/bg.lproj/Localizable.strings
#	Session/Meta/Translations/bn.lproj/Localizable.strings
#	Session/Meta/Translations/cs.lproj/Localizable.strings
#	Session/Meta/Translations/da.lproj/Localizable.strings
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/el.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/eo.lproj/Localizable.strings
#	Session/Meta/Translations/es-ES.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fil.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/hu.lproj/Localizable.strings
#	Session/Meta/Translations/id.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/ko.lproj/Localizable.strings
#	Session/Meta/Translations/ku.lproj/Localizable.strings
#	Session/Meta/Translations/lt.lproj/Localizable.strings
#	Session/Meta/Translations/lv.lproj/Localizable.strings
#	Session/Meta/Translations/ne-NP.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/no.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt-BR.lproj/Localizable.strings
#	Session/Meta/Translations/pt-PT.lproj/Localizable.strings
#	Session/Meta/Translations/ro.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/si-LK.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sl.lproj/Localizable.strings
#	Session/Meta/Translations/sv-SE.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/tr.lproj/Localizable.strings
#	Session/Meta/Translations/uk.lproj/Localizable.strings
#	Session/Meta/Translations/vi.lproj/Localizable.strings
#	Session/Meta/Translations/zh-CN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-TW.lproj/Localizable.strings
#	SessionMessagingKit/Configuration.swift
#	SessionUtilitiesKit/Database/Storage.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								3f19c776d9 
								
							
								 
							
						 
						
							
							
								
								Fixed a few issues around jumping between messages  
							
							... 
							
							
							
							Fixed a bug where tapping on quotes could break after loading lots of visible cells
Fixed a bug where a cell which contained both links and a quote would only ever let you interact with the quote
Fixed an issue where message highlight wasn't working when jumping between messages 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								16fbffd3d5 
								
							
								 
							
						 
						
							
							
								
								fix underline for links  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								2a10ab208a 
								
							
								 
							
						 
						
							
							
								
								clean up and implementation in message info screen  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f603b422b0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into message-detail-screen  
							
							... 
							
							
							
							# Conflicts:
#	Session/Media Viewing & Editing/MediaInfoVC+MediaPreviewView.swift
#	SignalUtilitiesKit/Media Viewing & Editing/OWSVideoPlayer.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								a6931bb922 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Shared/SessionTableViewController.swift
#	Session/Shared/SessionTableViewModel.swift
#	Session/Shared/Types/SessionTableSection.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUIKit/Components/SessionButton.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								89b38dc2f5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #928  from mpretty-cyro/fix/blocked-contacts-crash  
							
							... 
							
							
							
							Fixed a crash on the blocked contacts screen and refactoring 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								f97170fdcd 
								
							
								 
							
						 
						
							
							
								
								Fixed a crash on the blocked contacts screen and refactoring  
							
							... 
							
							
							
							Refactored the SessionThreadViewModel to reduce boilerplate and clean up the interface a little
Refactored the MessageRequestsViewController to use the SessionTableViewController
Fixed a crash when returning from the background on the BlockedContactsViewModel
Fixed some minor lag on the NotificationSoundViewModel
Added an optional initial loading message to the SessionTableViewController 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								3a9ada581d 
								
							
								 
							
						 
						
							
							
								
								Fixed an issue where theme changes stopped updating nav styling  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								6e9cbe402f 
								
							
								 
							
						 
						
							
							
								
								add accessibility id for radio buttons  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								a0ea28234f 
								
							
								 
							
						 
						
							
							
								
								wrap profile picture view for swiftui  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								01ee543758 
								
							
								 
							
						 
						
							
							
								
								refactor on profile picture view  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								a5f12649c1 
								
							
								 
							
						 
						
							
							
								
								link real data  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								3ccf5995f2 
								
							
								 
							
						 
						
							
							
								
								add full screen button on message info screen  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								8e1e74b9c0 
								
							
								 
							
						 
						
							
							
								
								WIP: binding real infos  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								2851e167ff 
								
							
								 
							
						 
						
							
							
								
								WIP: add message failing status  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								c2f57700a5 
								
							
								 
							
						 
						
							
							
								
								infinite loop carousel  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								b4d414bbfe 
								
							
								 
							
						 
						
							
							
								
								add carousel view to message details screen  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								6568ab0d19 
								
							
								 
							
						 
						
							
							
								
								carousel view with swiftui  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								9bbd8f31cc 
								
							
								 
							
						 
						
							
							
								
								WIP: message detail screen with swiftui  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								ddf4c5b5ad 
								
							
								 
							
						 
						
							
							
								
								WIP: wrap profile picture view with swift ui  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								9ae6d2f506 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'updated-user-config-handling' into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								53a5db0ea5 
								
							
								 
							
						 
						
							
							
								
								Fixed a number of issues found during internal testing  
							
							... 
							
							
							
							Added copy for an unrecoverable startup case
Added some additional logs to better debug ValueObservation query errors
Increased the pageSize to 20 on iPad devices (to prevent it immediately loading a second page)
Cleaned up a bunch of threading logic (try to avoid overriding subscribe/receive threads specified at subscription)
Consolidated the 'sendMessage' and 'sendAttachments' functions
Updated the various frameworks to use 'DAWRF with DSYM' to allow for better debugging during debug mode (at the cost of a longer build time)
Updated the logic to optimistically insert messages when sending to avoid any database write delays
Updated the logic to avoid sending notifications for messages which are already marked as read by the config
Fixed an issue where multiple paths could incorrectly get built at the same time in some cases
Fixed an issue where other job queues could be started before the blockingQueue finishes
Fixed a potential bug with the snode version comparison (was just a string comparison which would fail when getting to double-digit values)
Fixed a bug where you couldn't remove the last reaction on a message
Fixed the broken media message zoom animations
Fixed a bug where the last message read in a conversation wouldn't be correctly detected as already read
Fixed a bug where the QuoteView had no line limits (resulting in the '@You' mention background highlight being incorrectly positioned in the quote preview)
Fixed a bug where a large number of configSyncJobs could be scheduled (only one would run at a time but this could result in performance impacts) 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								e3537e55ca 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'updated-user-config-handling' into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								d2c82cb915 
								
							
								 
							
						 
						
							
							
								
								Started working on some config contact pruning logic  
							
							... 
							
							
							
							Added support for a ConfirmationModal with an input field
Added a mechanism on Debug builds to export the database and it's key
Added logic to catch exceptions thrown within libSession (need to actually plug it in)
Added a debug-only mechanism to export the users database and (encrypted) database key
Added a few unit tests to check the CONTACTS config message size constraints 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								32d7dd2ea6 
								
							
								 
							
						 
						
							
							
								
								refactor on accessibility of SessionButton.Info, and fix some unit tests on disappearing messages config  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								43e38c5644 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'updated-user-config-handling' into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								c455a13a7b 
								
							
								 
							
						 
						
							
							
								
								Finished adding logic to ignore messages invalidated by config  
							
							... 
							
							
							
							Added timestamps to the Profile table to avoid overriding current profile info with older info
Updated the MessageReceiver to ignore the rest of the messages invalidated by the config
Updated to the latest libSession
Updated the JobRunner to expose some more info about the currently running jobs
Made some tweaks to the ConfigurationSyncJob to better support concurrent jobs running for different targets 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								0cfd87ee27 
								
							
								 
							
						 
						
							
							
								
								Fixed a bug where the ProfilePictureView could incorrectly take up space when hidden  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								afb456b710 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'updated-user-config-handling' into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								5d88db7a8a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/Call Management/SessionCall.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/Input View/MentionSelectionView.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Shared/Views/SessionAvatarCell.swift
#	Session/Shared/Views/SessionCell+AccessoryView.swift
#	SessionUIKit/Components/ConfirmationModal.swift
#	SessionUIKit/Components/PlaceholderIcon.swift
#	SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								22303f2458 
								
							
								 
							
						 
						
							
							
								
								Colour tweak  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								cf2e198a64 
								
							
								 
							
						 
						
							
							
								
								Updated the profile picture modal  
							
							... 
							
							
							
							Moved the ProfilePictureView into SessionUIKit
Fixed a couple of minor ProfilePictureView bugs 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								edfe8a61b0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'feature/updated-user-config-handling' of  https://github.com/mpretty-cyro/session-ios  into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								2053b6b0cd 
								
							
								 
							
						 
						
							
							
								
								Added some accessibility info  
							
							... 
							
							
							
							Fixed an issue where the Display Picture update modal wouldn't rendering animated images actually animating 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								86705d88e3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'feature/updated-user-config-handling' into disappearing-message-redesign  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								534343f8b0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling  
							
							... 
							
							
							
							# Conflicts:
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/GlobalSearch/GlobalSearchViewController.swift
#	Session/Home/HomeVC.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.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/Settings/BlockedContactsViewController.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Settings/SettingsViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionUIKit/Components/ConfirmationModal.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								9c8653aa21 
								
							
								 
							
						 
						
							
							
								
								Updated the profile picture management UI  
							
							... 
							
							
							
							Updated the UI to use a modal
Added the ability to remove the profile picture 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								be7881ad2e 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Conversations/Views & Modals/ConversationTitleView.swift
#	Session/Notifications/AppNotifications.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Shared/SessionTableViewModel.swift
#	Session/Shared/Views/SessionCell.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Contact.swift
#	SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
#	SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift
#	SessionMessagingKit/Messages/Message.swift
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Protos/Generated/SNProto.swift
#	SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift
#	SessionMessagingKit/Protos/SessionProtos.proto
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift
#	SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift
#	SessionSnodeKit/Models/SnodeAPIEndpoint.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUtilitiesKit/General/Features.swift 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								5e3dd3c731 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign  
							
							... 
							
							
							
							# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
#	Session/Shared/Views/SessionCell+AccessoryView.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionUtilitiesKit/Database/Models/Job.swift 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								2983086837 
								
							
								 
							
						 
						
							
							
								
								Fixed an accessibility regression  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								fde34a6c45 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								e1c83dc999 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into fix/appium-interaction-issues  
							
							... 
							
							
							
							# Conflicts:
#	Session/Conversations/Message Cells/VisibleMessageCell.swift 
							
						 
						
							3 years ago