Skip to content

Commit

Permalink
Merge tag 'vv5.3.7' into develop
Browse files Browse the repository at this point in the history
v5.3.7
  • Loading branch information
adocyn committed Jun 30, 2024
2 parents a5c19be + 8029605 commit ddefdfa
Show file tree
Hide file tree
Showing 67 changed files with 322 additions and 306 deletions.
Binary file modified TwoFAS/Content/Assets/Assets.car
Binary file not shown.
Binary file modified TwoFAS/Content/AssetsWatch/Assets.car
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database0.swift
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database1.swift
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database2.swift
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database3.swift
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database4.swift
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database5.swift
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database6.swift
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database7.swift
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database8.swift
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database9.swift
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 0 additions & 3 deletions TwoFAS/Data/Interactors/ImportFromFileInteractor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,9 @@ public enum ImportFromFileParsing {
public enum AEGISParseResult {
case error
case encrypted
case newerVersion
case success(AEGISData)
}
public enum LastPassResult {
case newerVersion
case success(LastPassData)
}
case twoFAS(ExchangeDataFormat)
Expand Down Expand Up @@ -155,7 +153,6 @@ extension ImportFromFileInteractor: ImportFromFileInteracting {
}
switch error {
case .encrypted: return .aegis(.encrypted)
case .newerVersion: return .aegis(.newerVersion)
case .error: return .aegis(.error)
}
}
Expand Down
4 changes: 0 additions & 4 deletions TwoFAS/Data/MainRepository/DataTypes/AEGISData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import Foundation

public enum AEGISDataParseError: Error {
case encrypted
case newerVersion
case error
}

Expand Down Expand Up @@ -77,9 +76,6 @@ public struct AEGISData: Decodable {
} catch {
throw AEGISDataParseError.error
}
if version != 2 {
throw AEGISDataParseError.newerVersion
}
}
}

Expand Down
308 changes: 169 additions & 139 deletions TwoFAS/TwoFAS.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
{
"originHash" : "3a5d1c1c86b0fe1fe7714b4d6f9f919d15a59ac141c544a77363f813f806c0d8",
"pins" : [
{
"identity" : "abseil-cpp-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/abseil-cpp-binary.git",
"state" : {
"revision" : "bfc0b6f81adc06ce5121eb23f628473638d67c5c",
"version" : "1.2022062300.0"
"revision" : "748c7837511d0e6a507737353af268484e1745e2",
"version" : "1.2024011601.1"
}
},
{
"identity" : "app-check",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/app-check.git",
"state" : {
"revision" : "3e464dad87dad2d29bb29a97836789bf0f8f67d2",
"version" : "10.18.1"
"revision" : "076b241a625e25eac22f8849be256dfb960fcdfe",
"version" : "10.19.1"
}
},
{
Expand All @@ -33,17 +32,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/firebase-ios-sdk",
"state" : {
"revision" : "fe09d61a539e11fdbe24f269bba10144b6145fe2",
"version" : "10.22.0"
"revision" : "8bcaf973b1d84e119b7c7c119abad72ed460979f",
"version" : "10.27.0"
}
},
{
"identity" : "googleappmeasurement",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleAppMeasurement.git",
"state" : {
"revision" : "bf3bb24f6b60a7acedaef504e9ce97154203217a",
"version" : "10.22.0"
"revision" : "70df02431e216bed98dd461e0c4665889245ba70",
"version" : "10.27.0"
}
},
{
Expand All @@ -60,26 +59,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleUtilities.git",
"state" : {
"revision" : "830ffa9276e10267881f2697283c2fcd867603fd",
"version" : "7.13.0"
"revision" : "57a1d307f42df690fdef2637f3e5b776da02aad6",
"version" : "7.13.3"
}
},
{
"identity" : "grpc-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/grpc-binary.git",
"state" : {
"revision" : "a673bc2937fbe886dd1f99c401b01b6d977a9c98",
"version" : "1.49.1"
"revision" : "e9fad491d0673bdda7063a0341fb6b47a30c5359",
"version" : "1.62.2"
}
},
{
"identity" : "gtm-session-fetcher",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/gtm-session-fetcher.git",
"state" : {
"revision" : "76135c9f4e1ac85459d5fec61b6f76ac47ab3a4c",
"version" : "3.3.1"
"revision" : "0382ca27f22fb3494cf657d8dc356dc282cd1193",
"version" : "3.4.1"
}
},
{
Expand All @@ -105,17 +104,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/MobileNativeFoundation/Kronos",
"state" : {
"revision" : "a46542ce639581af2a85ab9ec1616a507a5d4ae2",
"version" : "4.2.2"
"revision" : "1b2d25bb6aad7052559035906f9fd01bb71fe6ba",
"version" : "4.3.0"
}
},
{
"identity" : "leveldb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/leveldb.git",
"state" : {
"revision" : "43aaef65e0c665daadf848761d560e446d350d3d",
"version" : "1.22.4"
"revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
"version" : "1.22.5"
}
},
{
Expand Down Expand Up @@ -159,10 +158,10 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "65e8f29b2d63c4e38e736b25c27b83e012159be8",
"version" : "1.25.2"
"revision" : "9f0c76544701845ad98716f3f6a774a892152bcb",
"version" : "1.26.0"
}
}
],
"version" : 3
"version" : 2
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
version = "2.2">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1540"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
Expand Down
2 changes: 0 additions & 2 deletions TwoFAS/TwoFAS/Other/Generated/T.generated.swift
Original file line number Diff line number Diff line change
Expand Up @@ -388,8 +388,6 @@ internal enum T {
internal static func newServices(_ p1: Int) -> String {
return T.tr("Localizable", "backup__new_services", p1, fallback: "%d new services")
}
/// This file is in a newer format version than the one the app supports
internal static let newerFormatNotSupported = T.tr("Localizable", "backup__newer_format_not_supported", fallback: "This file is in a newer format version than the one the app supports")
/// Nothing to import
internal static let noNewServices = T.tr("Localizable", "backup__no_new_services", fallback: "Nothing to import")
/// Either this file is empty, or all the services within are already available in the app
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ private extension ImporterOpenFilePresenter {
case .twoFAS(let data): checkTwoFAS(data)
case .lastPass(let result):
switch result {
case .newerVersion:
flowController.toFileError(error: .cantReadFile(reason: result.localizedDescription))
case .success(let lastPassData):
let parseResult = interactor.parseLastPass(lastPassData)
if parseResult.isEmpty {
Expand Down Expand Up @@ -124,7 +122,7 @@ private extension ImporterOpenFilePresenter {
}
case .aegis(let result):
switch result {
case .error, .encrypted, .newerVersion:
case .error, .encrypted:
flowController.toFileError(error: .cantReadFile(reason: result.localizedDescription))
case .success(let AEGISData):
let parseResult = interactor.parseAEGIS(AEGISData)
Expand Down
Loading

0 comments on commit ddefdfa

Please sign in to comment.