e5f57a6e94
update submodule
1 year 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
1 year ago
593acd8e37
Fixed some broken tests and removed remaining remnants of the 'syncExpiries' job
1 year 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
1 year ago
6685dc0572
Dropping messages which shouldn't be processed without a thread
...
Removed an extra localised string value
1 year ago
a9afb2d1d1
Accessibility and copy tweaks
1 year ago
2983086837
Fixed an accessibility regression
1 year ago
56164ab7f4
Fixed a build issue
1 year ago
8cf2cef050
Fixed an issue where a migration could incorrectly hide the 'Note to Self' conversation
1 year ago
0e1dea8f62
Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
...
# Conflicts:
# Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
1 year ago
6fd574916b
Fixed a few bugs and build libSession-util from source
...
Added libSession-util as a submodule and wired into build
Updated the logic to run migrations when returning from the background as well (since we will have feature-flag controlled migrations it's possible for a "new" migration to become available at this point)
Fixed an issue where the 'Note to Self' conversation could appear when linking a device for a new user
Fixed an issue where the app would process the ConfigSyncJob before completing onboarding
1 year ago
4dfe243965
Merge pull request #840 from mpretty-cyro/fix/app-permission-descriptions
...
Updated permission descriptions to appease Apple
1 year ago
11b4c82bc3
Updated permission descriptions to appease Apple
1 year ago
6832b788d9
Increase build number
1 year ago
14f78e584d
Merge pull request #837 from mpretty-cyro/fix/broken-mentions
...
Fixed an issue where mentions weren't working
1 year ago
08853e7333
Fixed an issue where mentions weren't working
1 year ago
27e494dcb5
Increased build and version numbers
1 year ago
f63d7c21fa
Merge pull request #835 from mpretty-cyro/fix/broken-share-extension
...
Fixed a broken share extension
1 year ago
61b30c8858
Merge pull request #834 from mpretty-cyro/fix/remove-icloud-entitlements
...
Removed the iCloud entitlements
1 year ago
39b005172b
Merge pull request #833 from mpretty-cyro/fix/incorrect-status-query
...
Fix recipientState query bug
1 year ago
55c9160f4d
Merge pull request #831 from oxen-io/fix/incorrect-disappearing-message-setting
...
Disabled the disappearing messages setting when not a group member
1 year ago
1d85fa35bd
Fixed a broken query preventing threads from appearing in the share extension
1 year ago
16bfbd4bad
Removed the iCloud entitlements
1 year ago
982e25d61d
Fixed an incorrect query resulting in always showing the 'sending' status
1 year ago
ad3e53d235
Fixed issues found during QA
...
Fixed a crash when removing a member from a group
Fixed an issue with accepting a message request breaking the UI
Fixed an issue where the mute optimistic update wasn't working
1 year ago
19856c7ef5
Disabled the disappearing messages setting when not a group member
1 year ago
8c8453d922
Updated to the latest libSession, fixed remaining items
...
Updated to the latest libSession version
Updated the 'hidden' logic to be based on a negative 'priority' value
Added an index on the Quote table to speed up conversation query
Fixed an odd behaviour with GRDB and Combine (simplified the interface as well)
Fixed an issue where migrations could fail
1 year ago
fa39b5f61c
Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Calls/CallVC.swift
# Session/Conversations/Message Cells/Content Views/DocumentView.swift
# Session/Conversations/Settings/OWSMessageTimerView.m
# SessionMessagingKit/File Server/FileServerAPI.swift
# SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
# SessionMessagingKit/Open Groups/OpenGroupManager.swift
# SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
# SessionMessagingKit/Shared Models/MessageViewModel.swift
# SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
# SessionSnodeKit/SnodeAPI.swift
# SessionUtilitiesKit/Networking/HTTP.swift
# SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift
1 year ago
b5004f38df
Increased build and version numbers
1 year ago
7e39ed369f
Merge pull request #782 from RyanRory/message-and-image-info
...
Media info
1 year ago
73f5608f16
Merge branch 'dev' into message-and-image-info
1 year ago
ce5b1ca9e4
Merge pull request #824 from mpretty-cyro/fix/new-certificates
...
Updated the seed node certificates
1 year ago
699a8200ae
Updated the port being used for the seed nodes
1 year ago
6699e7ea0d
Merge branch 'dev' into message-and-image-info
1 year ago
a21839536c
Merge remote-tracking branch 'upstream/dev' into fix/new-certificates
1 year ago
7145bac72a
Merge pull request #823 from mpretty-cyro/feature/optimisations
...
Optimisations and Fixes
1 year ago
5cbb4f632d
Fix for PR comment
1 year ago
2a693df4c1
Updated the seed node certificates and removed the workaround
1 year ago
cac2831208
Fixed a few issues with albums and attachments
...
Fixed an issue where the JobRunner could schedule dependent jobs which were already running (eg. uploading attachments multiple times)
Fixed an issue where the image used for quotes might not be the first in an album message
Fixed an issue where sending an album message wouldn't send attachments in the correct order
Fixed an issue where album attachments wouldn't be downloaded in the correct order
1 year ago
70ce967df6
Made a few optimisations and fixes
...
Made a couple of DB query optimisations for the Home and Conversation screens
Removed some compiler-complex global generic functions
Increased the timeout for file uploads
Fixed a few import issues
Fixed an issue preventing calls on the simulator from working (disable CallKit on the simulator)
Fixed an issue where opening a conversation with a draft would result in a typing indicator notification being sent (if enabled)
Fixed a truncation issue on the CallVC
1 year ago
fa1d786ece
Merge pull request #792 from RyanRory/switch-video-view
...
Swapping video views in call
1 year ago
5241327b07
Merge pull request #820 from oxen-io/fix/certificate-issues
...
Fixed a couple of issues with seed node requests
1 year ago
b270133f68
Fixed a couple of issues with seed node requests
...
Updated the seed node certificates to use the new 10 year ones
Fixed an issue where multiple seed node requests could be triggered at once
Increased the version & build numbers
1 year ago
93ff94186a
fix an issue when quoting messages with multiple attachments, the quoted attachment doesn't stay the same.
1 year ago
e261678d6d
Merge branch 'dev' into switch-video-view
1 year ago
cac8d22e0b
Merge branch 'dev' into message-and-image-info
1 year ago
f4d6babca2
Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
...
# Conflicts:
# Podfile.lock
# Session.xcodeproj/project.pbxproj
# Session/Closed Groups/EditClosedGroupVC.swift
# Session/Conversations/Settings/ThreadSettingsViewModel.swift
# Session/Home/HomeVC.swift
# Session/Home/HomeViewModel.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/Shared/FullConversationCell.swift
# SessionMessagingKit/Configuration.swift
# SessionMessagingKit/Database/Models/SessionThread.swift
# SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
# SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
# SessionUIKit/Utilities/UIContextualAction+Theming.swift
# SessionUtilitiesKit/Database/Models/Job.swift
# SessionUtilitiesKit/General/Dictionary+Utilities.swift
# SessionUtilitiesKit/JobRunner/JobRunner.swift
1 year ago
dd0a24894b
Merge pull request #816 from oxen-io/fix/cocoapods-build-issue
...
Added a workaround for a Cocoapods XCode 14.3 issue
1 year ago
eb56d603e5
Added a workaround for a Cocoapods XCode 14.3 issue
1 year ago
fbdb033365
Increased build & version numbers
1 year ago
ryanzhao
Morgan Pretty
Morgan Pretty