Skip to content

Commit

Permalink
Merge branch 'release/v5.2.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
@adocyn
adocyn committed Feb 20, 2024
2 parents c9d6f7d + a974885 commit e9d6f2f
Show file tree
Hide file tree
Showing 29 changed files with 75 additions and 37 deletions.
Binary file modified TwoFAS/Content/Assets/Assets.car
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database0.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database1.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database2.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database3.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database4.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database5.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database6.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database7.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database8.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database9.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database0.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database1.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database2.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database3.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database4.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database5.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database6.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database7.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database8.swift
View file
Binary file not shown.
Binary file modified TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database9.swift
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion TwoFAS/Data/Interactors/NewCodeInteractor.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ private extension NewCodeInteractor {

interactorModify.addService(
name: codeName,
secret: code.secret,
secret: code.secret.uppercased(),
serviceTypeID: serviceDefinition?.serviceTypeID,
additionalInfo: additionalInfoValue?.sanitizeInfo(),
rawIssuer: code.issuer,
Expand Down
4 changes: 2 additions & 2 deletions TwoFAS/Data/MainRepository/MainRepositoryImpl+Storage.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ extension MainRepositoryImpl {
let result = storageRepository
.addService(
name: name,
secret: secret,
secret: secret.uppercased(),
serviceTypeID: serviceTypeID,
additionalInfo: additionalInfo,
rawIssuer: rawIssuer,
Expand Down Expand Up @@ -121,7 +121,7 @@ extension MainRepositoryImpl {
let result = storageRepository
.addService(
name: name,
secret: secret,
secret: secret.uppercased(),
serviceTypeID: serviceTypeID,
additionalInfo: additionalInfo,
rawIssuer: rawIssuer,
Expand Down
62 changes: 40 additions & 22 deletions TwoFAS/TwoFAS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9807,6 +9807,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
Expand Down Expand Up @@ -9849,6 +9850,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
Expand Down Expand Up @@ -9890,6 +9892,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
Expand Down Expand Up @@ -9933,6 +9936,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
Expand Down Expand Up @@ -9974,6 +9978,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
Expand Down Expand Up @@ -10021,6 +10026,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
Expand Down Expand Up @@ -10192,7 +10198,7 @@
"@executable_path/Frameworks",
);
MACH_O_TYPE = mh_execute;
MARKETING_VERSION = 5.2.6;
MARKETING_VERSION = 5.2.7;
MERGED_BINARY_TYPE = manual;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -10237,7 +10243,7 @@
"@executable_path/Frameworks",
);
MACH_O_TYPE = mh_execute;
MARKETING_VERSION = 5.2.6;
MARKETING_VERSION = 5.2.7;
MERGED_BINARY_TYPE = manual;
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
Expand Down Expand Up @@ -10284,7 +10290,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
Expand Down Expand Up @@ -10331,7 +10337,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
Expand Down Expand Up @@ -10374,6 +10380,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
Expand Down Expand Up @@ -10417,6 +10424,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
Expand Down Expand Up @@ -10461,7 +10469,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 5.2.7;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand Down Expand Up @@ -10506,7 +10514,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 5.2.7;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -10543,7 +10551,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.6;
MARKETING_VERSION = 5.2.7;
MERGED_BINARY_TYPE = manual;
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASAuth;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -10577,7 +10585,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.6;
MARKETING_VERSION = 5.2.7;
MERGED_BINARY_TYPE = manual;
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASAuth;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -10616,6 +10624,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
Expand Down Expand Up @@ -10660,6 +10669,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
Expand All @@ -10684,6 +10694,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = ZY8UR5ADFW;
INFOPLIST_FILE = TwoFASTests/Info.plist;
Expand All @@ -10694,6 +10705,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.7;
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand All @@ -10712,6 +10724,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = ZY8UR5ADFW;
INFOPLIST_FILE = TwoFASTests/Info.plist;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Two Factor Authentication Service, Inc. All rights reserved.";
Expand All @@ -10721,6 +10734,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.7;
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand Down Expand Up @@ -10753,7 +10767,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.6;
MARKETING_VERSION = 5.2.7;
MERGED_BINARY_TYPE = manual;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -10789,7 +10803,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.6;
MARKETING_VERSION = 5.2.7;
MERGED_BINARY_TYPE = manual;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASWidget;
Expand Down Expand Up @@ -10822,7 +10836,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.6;
MARKETING_VERSION = 5.2.7;
MERGED_BINARY_TYPE = manual;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -10856,7 +10870,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.6;
MARKETING_VERSION = 5.2.7;
MERGED_BINARY_TYPE = manual;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASServiceIntent;
Expand Down Expand Up @@ -10884,7 +10898,7 @@
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16.4;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 5.2.7;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.DataTests;
Expand Down Expand Up @@ -10913,7 +10927,7 @@
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16.4;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 5.2.7;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.DataTests;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -10953,7 +10967,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 5.2.7;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand Down Expand Up @@ -11000,7 +11014,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 5.2.7;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -11045,7 +11059,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 5.2.7;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand Down Expand Up @@ -11092,7 +11106,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 5.2.7;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -11137,7 +11151,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
Expand Down Expand Up @@ -11185,7 +11199,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
Expand Down Expand Up @@ -11231,7 +11245,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
Expand Down Expand Up @@ -11279,7 +11293,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 5.2.7;
MERGEABLE_LIBRARY = NO;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
Expand All @@ -11305,6 +11319,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(EMBEDDED_CONTENT_CONTAINS_SWIFT)";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = ZY8UR5ADFW;
INFOPLIST_FILE = ProtectionTests/Info.plist;
Expand All @@ -11315,6 +11330,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.7;
MTL_ENABLE_DEBUG_INFO = YES;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.ProtectionTests;
Expand All @@ -11335,6 +11351,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(EMBEDDED_CONTENT_CONTAINS_SWIFT)";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = ZY8UR5ADFW;
INFOPLIST_FILE = ProtectionTests/Info.plist;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Two Factor Authentication Service, Inc. All rights reserved.";
Expand All @@ -11344,6 +11361,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.7;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.ProtectionTests;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
Loading

0 comments on commit e9d6f2f

Please sign in to comment.