keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild

Browse Source 
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionSnodeKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionUtilitiesKit/Database/Storage.swift
pull/941/head
Morgan Pretty 2 years ago
parent f1075e9123 3e4a2013d3
commit 6dd4c797a7
7 changed files with 1882 additions and 49 deletions
Show Stats Download Patch File Download Diff File

2
Session.xcodeproj/project.pbxproj
Unescape Escape View File

@ -6233,6 +6233,8 @@
FD245C56285065EA00B966DD /* SNProto.swift in Sources */,
FD09798B27FD1CFE00936362 /* Capability.swift in Sources */,
C3BBE0C72554F1570050F1E3 /* FixedWidthInteger+BigEndian.swift in Sources */,
FD1D732A2A85AA2000E3F410 /* Setting+Utilities.swift in Sources */,
FD17D79C27F40B2E00122BE0 /* SMKLegacy.swift in Sources */,
FD09798127FCFEE800936362 /* SessionThread.swift in Sources */,
FD09C5EA282A1BB2000CE219 /* ThreadTypingIndicator.swift in Sources */,
FDB5DADA2A95D839002C8721 /* GroupUpdateInfoChangeMessage.swift in Sources */,

1864
Session/Meta/Settings.bundle/Pods-GlobalDependencies-Session-settings-metadata.plist
View File

File diff suppressed because it is too large Load Diff

50
Session/Meta/Settings.bundle/Root.plist
Unescape Escape View File

@ -7,54 +7,12 @@
<key>PreferenceSpecifiers</key>
<array>
<dict>
<key>Type</key>
<string>PSGroupSpecifier</string>
<key>Title</key>
<string>Group</string>
</dict>
<dict>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>File</key>
<string>Pods-GlobalDependencies-Session-settings-metadata</string>
<key>Title</key>
<string>Name</string>
<key>Key</key>
<string>name_preference</string>
<key>DefaultValue</key>
<string></string>
<key>IsSecure</key>
<false/>
<key>KeyboardType</key>
<string>Alphabet</string>
<key>AutocapitalizationType</key>
<string>None</string>
<key>AutocorrectionType</key>
<string>No</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Enabled</string>
<key>Key</key>
<string>enabled_preference</string>
<key>DefaultValue</key>
<true/>
</dict>
<dict>
<string>Acknowledgements</string>
<key>Type</key>
<string>PSSliderSpecifier</string>
<key>Key</key>
<string>slider_preference</string>
<key>DefaultValue</key>
<real>0.5</real>
<key>MinimumValue</key>
<integer>0</integer>
<key>MaximumValue</key>
<integer>1</integer>
<key>MinimumValueImage</key>
<string></string>
<key>MaximumValueImage</key>
<string></string>
<string>PSChildPaneSpecifier</string>
</dict>
</array>
</dict>

BIN
Session/Meta/Settings.bundle/en.lproj/Root.strings
View File

Binary file not shown.

5
SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
Unescape Escape View File

@ -13,7 +13,10 @@ enum _003_YDBToGRDBMigration: Migration {
static let minExpectedRunDuration: TimeInterval = 0.1
static func migrate(_ db: Database, using dependencies: Dependencies) throws {
guard !SNUtilitiesKit.isRunningTests else { return Storage.update(progress: 1, for: self, in: target) }
guard
!SNUtilitiesKit.isRunningTests &&
Identity.userExists(db)
else { return Storage.update(progress: 1, for: self, in: target) }
SNLogNotTests("[Migration Error] Attempted to perform legacy migation")
throw StorageError.migrationNoLongerSupported

5
SessionSnodeKit/Database/Migrations/_003_YDBToGRDBMigration.swift
Unescape Escape View File

@ -11,7 +11,10 @@ enum _003_YDBToGRDBMigration: Migration {
static let minExpectedRunDuration: TimeInterval = 0.1
static func migrate(_ db: Database, using dependencies: Dependencies) throws {
guard !SNUtilitiesKit.isRunningTests else { return Storage.update(progress: 1, for: self, in: target) }
guard
!SNUtilitiesKit.isRunningTests &&
Identity.userExists(db)
else { return Storage.update(progress: 1, for: self, in: target) }
SNLogNotTests("[Migration Error] Attempted to perform legacy migation")
throw StorageError.migrationNoLongerSupported

5
SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift
Unescape Escape View File

@ -10,7 +10,10 @@ enum _003_YDBToGRDBMigration: Migration {
static let minExpectedRunDuration: TimeInterval = 0.1
static func migrate(_ db: Database, using dependencies: Dependencies) throws {
guard !SNUtilitiesKit.isRunningTests else { return Storage.update(progress: 1, for: self, in: target) }
guard
!SNUtilitiesKit.isRunningTests &&
Identity.userExists(db)
else { return Storage.update(progress: 1, for: self, in: target) }
SNLogNotTests("[Migration Error] Attempted to perform legacy migation")
throw StorageError.migrationNoLongerSupported

Write Preview
Loading…
Cancel
Save