e1bb6de7d6
Merge remote-tracking branch 'upstream/dev' into feature/drop-yap-database-support
...
# Conflicts:
# Podfile.lock
# SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
2 years ago
2ee6c84199
Updated build number and feature flag timestamp
2 years ago
f528742752
Bumped build number and re-enabled feature flag
2 years ago
da0a459e89
Merge branch 'disappearing-message-redesign' of https://github.com/RyanRory/loki-messenger-ios into disappearing-message-redesign
2 years ago
d63f3a8bee
fix disappearing message settings subtitle copy
2 years ago
92299e92a9
Updated build number
2 years ago
5ff9ae96c7
Updated build number
2 years ago
8777d1b2d0
Updated build number
2 years ago
91760c00bb
minor fix
2 years ago
b2360d8e1a
fix an issue where DaR messages are read on linked devices won't have correct expiration start time
2 years ago
9951d5c75d
Increased build & version number, removed ATS hack
2 years ago
84492be016
Fixed build issues, removed invalid unit tests and missing copy
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
bac1f7b3a5
Increase build and version numbers
2 years ago
e1d6a9dfc1
Added a migration to recreate any invalid FTS tables
2 years ago
cbcdb9b37f
Refactored AppContext and AppRediness to Swift
2 years ago
3667d304f2
Merge branch 'dev' into disappearing-message-redesign
2 years ago
f532496ee4
Increased build and version numbers
2 years ago
60684bc977
Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/drop-yap-database-support
2 years ago
83a64c5ca1
clean
2 years ago
61df9e2cf1
refactor disappearing timer view from objc to swift
2 years ago
12347c9f2f
Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
...
# Conflicts:
# Session/Media Viewing & Editing/MediaDetailViewController.swift
2 years ago
de7d85f4cb
Merge remote-tracking branch 'upstream/dev' into fix/media-interactions
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
bd98db2612
Fixed a few bugs and crashes around media interactions
...
Fixed a crash when trying to grant permission to access additional photos
Fixed a bug where audio files would incorrectly get recognised as voice messages
Replaced our custom video/audio players with the native ones (which have additional built-in controls)
Updated the errors from SSKKeychainStorage to include useful information
Updated layout for audio attachments
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
085a1a59aa
Fixed an issue where the messages might not get reprocessed when they should
...
Dropped the auto-incrementing id from the SnodeReceivedMessageInfo
Changed the 'key, hash' from a uniqueKey to a primaryKey to allow "upsert" behaviours to work
2 years ago
e43ec1db43
Removed another random deleted file reference from the pbxproj
2 years ago
88fd134228
Removed some invalid references
2 years ago
18b296bcd8
Merge branch 'disappearing-message-redesign' into feature/drop-yap-database-support
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Meta/AppDelegate.swift
# Session/Meta/Translations/de.lproj/Localizable.strings
# Session/Meta/Translations/es-ES.lproj/Localizable.strings
# Session/Meta/Translations/fi.lproj/Localizable.strings
# Session/Meta/Translations/fr.lproj/Localizable.strings
# Session/Meta/Translations/it.lproj/Localizable.strings
# Session/Meta/Translations/ja.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/sk.lproj/Localizable.strings
# Session/Meta/Translations/zh-CN.lproj/Localizable.strings
# Session/Meta/Translations/zh-TW.lproj/Localizable.strings
# SessionMessagingKit/Database/LegacyDatabase/SMKLegacy.swift
# SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
# SessionMessagingKit/Messages/Control Messages/ConfigurationMessage.swift
# SessionSnodeKit/Database/LegacyDatabase/SSKLegacy.swift
# SessionSnodeKit/Database/Migrations/_003_YDBToGRDBMigration.swift
# SessionUtilitiesKit/Database/LegacyDatabase/SUKLegacy.swift
# SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift
2 years ago
90cd3fb5e0
Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
...
# Conflicts:
# _SharedTestUtilities/MockJobRunner.swift
2 years ago
ed33e1f2e2
Merge remote-tracking branch 'upstream/dev' into fix/blocked-contacts-issues
2 years ago
2cff251e8d
Fixed a bug with the blocked contacts list
...
Fixed a bug where blocked contacts without profile information wouldn't be included in the blocked contacts list
Fixed broken test build issues
Increased build and version numbers
2 years ago
42b49e0227
Added unit tests to verify migrations between all versions work
...
Fixed a busted test import
2 years ago
5b7c9d866c
Updated the 'MessageReceiverDisappearingMessagesSpec' to the updated pattern
2 years ago
bf58831313
Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
...
# Conflicts:
# Scripts/LintLocalizableStrings.swift
2 years ago
5917cf103f
Refactored the LintLocalizableStrings
...
Added inline errors & warnings (regex could use some work to remove invalid cases)
Added a build step to validate the strings are included in the app and it's extensions
2 years ago
2d0bbe4455
Merge branch 'dev' into disappearing-message-redesign
...
# Session/Meta/Translations/de.lproj/Localizable.strings
# Session/Meta/Translations/en.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/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/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/vi.lproj/Localizable.strings
# Session/Meta/Translations/zh-CN.lproj/Localizable.strings
# Session/Meta/Translations/zh-TW.lproj/Localizable.strings
2 years ago
b280c0a852
Increased Build and Version Numbers and removed extra strings
2 years ago
7628edbb1c
Merge remote-tracking branch 'upstream/dev' into fix/xcode-15-build-issues
2 years ago
c4aadaff1c
Fixed the broken tests and updated test dependencies
...
Properly fixed the busted migration issue
Updated to the latest version of Quick and Nimble (unit testing libraries)
Updated the tests based on the above
2 years ago
8fee4edf34
Updated to the latest translations from Crowdin
2 years ago
66e37cef07
Merge branch 'dev' into disappearing-message-redesign
2 years ago
4c934d2fda
[WIP] Started work fixing XCode 15 build issues
...
Reworked the EmojiGenerator to structure the 'EmojiWithSkinTones+String" file as the original structure was causing XCode 15 to build forever
Reworked the seed node certificate loading in an effort to fix a crash
Updated to the latest version of webp
Commented out a line causing build issues
Fixed a number of build warnings
Fixed an issue which could cause migration issues when upgrading from certain old versions
2 years ago
67ab1e5194
Increased the build number for RC build
2 years ago
a2f1f36d2c
Fixed a number of issues with the Notification Service Extension
...
Fixed an issue where receiving a PN for outgoing messages could break the NotificationServiceExtension
Fixed an issue where the NotificationServiceExtension could startup in an invalid way resulting in subsequent PNs failing to process
Fixed an issue where you could incorrectly receive multiple generic notifications after receiving an incoming call notification
Fixed an issue where the read state syncing might not clear notifications from the notification center
Fixed an issue with parsing Bencoded data
Updated the PN subscription to subscribe to CONVO_INFO_VOLATILE notifications (update read state)
Updated the NotificationServiceExtension to use standard message processing where possible
Updated the NotificationServiceExtension to update the app badge based on a database query
2 years ago
8b529676a4
Merge branch 'dev' into disappearing-message-redesign
2 years ago
a4ade7fdb4
Merge remote-tracking branch 'upstream/dev' into feature/drop-yap-database-support
2 years ago
e1950ed0b5
Merge branch 'dev' into feature/drop-yap-database-support
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
# SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
# SessionUtilitiesKit/Database/Storage.swift
2 years ago
Morgan Pretty
Ryan ZHAO
Ryan Zhao
Morgan Pretty