Skip to content

Commit e9d6f2f

Browse files
committed
Merge branch 'release/v5.2.7'
2 parents c9d6f7d + a974885 commit e9d6f2f

29 files changed

+75
-37
lines changed

TwoFAS/Content/Assets/Assets.car

1.02 MB
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.
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.

TwoFAS/Data/Interactors/NewCodeInteractor.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private extension NewCodeInteractor {
148148

149149
interactorModify.addService(
150150
name: codeName,
151-
secret: code.secret,
151+
secret: code.secret.uppercased(),
152152
serviceTypeID: serviceDefinition?.serviceTypeID,
153153
additionalInfo: additionalInfoValue?.sanitizeInfo(),
154154
rawIssuer: code.issuer,

TwoFAS/Data/MainRepository/MainRepositoryImpl+Storage.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ extension MainRepositoryImpl {
7676
let result = storageRepository
7777
.addService(
7878
name: name,
79-
secret: secret,
79+
secret: secret.uppercased(),
8080
serviceTypeID: serviceTypeID,
8181
additionalInfo: additionalInfo,
8282
rawIssuer: rawIssuer,
@@ -121,7 +121,7 @@ extension MainRepositoryImpl {
121121
let result = storageRepository
122122
.addService(
123123
name: name,
124-
secret: secret,
124+
secret: secret.uppercased(),
125125
serviceTypeID: serviceTypeID,
126126
additionalInfo: additionalInfo,
127127
rawIssuer: rawIssuer,

TwoFAS/TwoFAS.xcodeproj/project.pbxproj

+40-22
Original file line numberDiff line numberDiff line change
@@ -9807,6 +9807,7 @@
98079807
"@executable_path/Frameworks",
98089808
"@loader_path/Frameworks",
98099809
);
9810+
MARKETING_VERSION = 5.2.7;
98109811
MERGEABLE_LIBRARY = NO;
98119812
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
98129813
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
@@ -9849,6 +9850,7 @@
98499850
"@executable_path/Frameworks",
98509851
"@loader_path/Frameworks",
98519852
);
9853+
MARKETING_VERSION = 5.2.7;
98529854
MERGEABLE_LIBRARY = NO;
98539855
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
98549856
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
@@ -9890,6 +9892,7 @@
98909892
"@executable_path/Frameworks",
98919893
"@loader_path/Frameworks",
98929894
);
9895+
MARKETING_VERSION = 5.2.7;
98939896
MERGEABLE_LIBRARY = NO;
98949897
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
98959898
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
@@ -9933,6 +9936,7 @@
99339936
"@executable_path/Frameworks",
99349937
"@loader_path/Frameworks",
99359938
);
9939+
MARKETING_VERSION = 5.2.7;
99369940
MERGEABLE_LIBRARY = NO;
99379941
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
99389942
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
@@ -9974,6 +9978,7 @@
99749978
"@executable_path/Frameworks",
99759979
"@loader_path/Frameworks",
99769980
);
9981+
MARKETING_VERSION = 5.2.7;
99779982
MERGEABLE_LIBRARY = NO;
99789983
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
99799984
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
@@ -10021,6 +10026,7 @@
1002110026
"@executable_path/Frameworks",
1002210027
"@loader_path/Frameworks",
1002310028
);
10029+
MARKETING_VERSION = 5.2.7;
1002410030
MERGEABLE_LIBRARY = NO;
1002510031
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1002610032
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
@@ -10192,7 +10198,7 @@
1019210198
"@executable_path/Frameworks",
1019310199
);
1019410200
MACH_O_TYPE = mh_execute;
10195-
MARKETING_VERSION = 5.2.6;
10201+
MARKETING_VERSION = 5.2.7;
1019610202
MERGED_BINARY_TYPE = manual;
1019710203
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
1019810204
OTHER_LDFLAGS = (
@@ -10237,7 +10243,7 @@
1023710243
"@executable_path/Frameworks",
1023810244
);
1023910245
MACH_O_TYPE = mh_execute;
10240-
MARKETING_VERSION = 5.2.6;
10246+
MARKETING_VERSION = 5.2.7;
1024110247
MERGED_BINARY_TYPE = manual;
1024210248
OTHER_LDFLAGS = (
1024310249
"$(OTHER_LDFLAGS)",
@@ -10284,7 +10290,7 @@
1028410290
"@executable_path/Frameworks",
1028510291
"@loader_path/Frameworks",
1028610292
);
10287-
MARKETING_VERSION = 1.0;
10293+
MARKETING_VERSION = 5.2.7;
1028810294
MERGEABLE_LIBRARY = NO;
1028910295
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1029010296
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
@@ -10331,7 +10337,7 @@
1033110337
"@executable_path/Frameworks",
1033210338
"@loader_path/Frameworks",
1033310339
);
10334-
MARKETING_VERSION = 1.0;
10340+
MARKETING_VERSION = 5.2.7;
1033510341
MERGEABLE_LIBRARY = NO;
1033610342
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1033710343
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
@@ -10374,6 +10380,7 @@
1037410380
"@executable_path/Frameworks",
1037510381
"@loader_path/Frameworks",
1037610382
);
10383+
MARKETING_VERSION = 5.2.7;
1037710384
MERGEABLE_LIBRARY = NO;
1037810385
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1037910386
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
@@ -10417,6 +10424,7 @@
1041710424
"@executable_path/Frameworks",
1041810425
"@loader_path/Frameworks",
1041910426
);
10427+
MARKETING_VERSION = 5.2.7;
1042010428
MERGEABLE_LIBRARY = NO;
1042110429
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1042210430
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
@@ -10461,7 +10469,7 @@
1046110469
"@loader_path/Frameworks",
1046210470
);
1046310471
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
10464-
MARKETING_VERSION = 1.0;
10472+
MARKETING_VERSION = 5.2.7;
1046510473
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1046610474
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
1046710475
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
@@ -10506,7 +10514,7 @@
1050610514
"@loader_path/Frameworks",
1050710515
);
1050810516
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
10509-
MARKETING_VERSION = 1.0;
10517+
MARKETING_VERSION = 5.2.7;
1051010518
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1051110519
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
1051210520
MTL_FAST_MATH = YES;
@@ -10543,7 +10551,7 @@
1054310551
"@executable_path/Frameworks",
1054410552
"@executable_path/../../Frameworks",
1054510553
);
10546-
MARKETING_VERSION = 5.2.6;
10554+
MARKETING_VERSION = 5.2.7;
1054710555
MERGED_BINARY_TYPE = manual;
1054810556
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASAuth;
1054910557
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -10577,7 +10585,7 @@
1057710585
"@executable_path/Frameworks",
1057810586
"@executable_path/../../Frameworks",
1057910587
);
10580-
MARKETING_VERSION = 5.2.6;
10588+
MARKETING_VERSION = 5.2.7;
1058110589
MERGED_BINARY_TYPE = manual;
1058210590
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASAuth;
1058310591
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -10616,6 +10624,7 @@
1061610624
"@executable_path/Frameworks",
1061710625
"@loader_path/Frameworks",
1061810626
);
10627+
MARKETING_VERSION = 5.2.7;
1061910628
MERGEABLE_LIBRARY = NO;
1062010629
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1062110630
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
@@ -10660,6 +10669,7 @@
1066010669
"@executable_path/Frameworks",
1066110670
"@loader_path/Frameworks",
1066210671
);
10672+
MARKETING_VERSION = 5.2.7;
1066310673
MERGEABLE_LIBRARY = NO;
1066410674
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1066510675
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
@@ -10684,6 +10694,7 @@
1068410694
BUNDLE_LOADER = "$(TEST_HOST)";
1068510695
CLANG_ENABLE_OBJC_WEAK = YES;
1068610696
CODE_SIGN_STYLE = Automatic;
10697+
CURRENT_PROJECT_VERSION = 1;
1068710698
DEBUG_INFORMATION_FORMAT = dwarf;
1068810699
DEVELOPMENT_TEAM = ZY8UR5ADFW;
1068910700
INFOPLIST_FILE = TwoFASTests/Info.plist;
@@ -10694,6 +10705,7 @@
1069410705
"@executable_path/Frameworks",
1069510706
"@loader_path/Frameworks",
1069610707
);
10708+
MARKETING_VERSION = 5.2.7;
1069710709
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASTests;
1069810710
PRODUCT_NAME = "$(TARGET_NAME)";
1069910711
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -10712,6 +10724,7 @@
1071210724
BUNDLE_LOADER = "$(TEST_HOST)";
1071310725
CLANG_ENABLE_OBJC_WEAK = YES;
1071410726
CODE_SIGN_STYLE = Automatic;
10727+
CURRENT_PROJECT_VERSION = 1;
1071510728
DEVELOPMENT_TEAM = ZY8UR5ADFW;
1071610729
INFOPLIST_FILE = TwoFASTests/Info.plist;
1071710730
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Two Factor Authentication Service, Inc. All rights reserved.";
@@ -10721,6 +10734,7 @@
1072110734
"@executable_path/Frameworks",
1072210735
"@loader_path/Frameworks",
1072310736
);
10737+
MARKETING_VERSION = 5.2.7;
1072410738
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASTests;
1072510739
PRODUCT_NAME = "$(TARGET_NAME)";
1072610740
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -10753,7 +10767,7 @@
1075310767
"@executable_path/Frameworks",
1075410768
"@executable_path/../../Frameworks",
1075510769
);
10756-
MARKETING_VERSION = 5.2.6;
10770+
MARKETING_VERSION = 5.2.7;
1075710771
MERGED_BINARY_TYPE = manual;
1075810772
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
1075910773
MTL_FAST_MATH = YES;
@@ -10789,7 +10803,7 @@
1078910803
"@executable_path/Frameworks",
1079010804
"@executable_path/../../Frameworks",
1079110805
);
10792-
MARKETING_VERSION = 5.2.6;
10806+
MARKETING_VERSION = 5.2.7;
1079310807
MERGED_BINARY_TYPE = manual;
1079410808
MTL_FAST_MATH = YES;
1079510809
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASWidget;
@@ -10822,7 +10836,7 @@
1082210836
"@executable_path/Frameworks",
1082310837
"@executable_path/../../Frameworks",
1082410838
);
10825-
MARKETING_VERSION = 5.2.6;
10839+
MARKETING_VERSION = 5.2.7;
1082610840
MERGED_BINARY_TYPE = manual;
1082710841
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
1082810842
MTL_FAST_MATH = YES;
@@ -10856,7 +10870,7 @@
1085610870
"@executable_path/Frameworks",
1085710871
"@executable_path/../../Frameworks",
1085810872
);
10859-
MARKETING_VERSION = 5.2.6;
10873+
MARKETING_VERSION = 5.2.7;
1086010874
MERGED_BINARY_TYPE = manual;
1086110875
MTL_FAST_MATH = YES;
1086210876
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASServiceIntent;
@@ -10884,7 +10898,7 @@
1088410898
GENERATE_INFOPLIST_FILE = YES;
1088510899
IPHONEOS_DEPLOYMENT_TARGET = 16.4;
1088610900
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
10887-
MARKETING_VERSION = 1.0;
10901+
MARKETING_VERSION = 5.2.7;
1088810902
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
1088910903
MTL_FAST_MATH = YES;
1089010904
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.DataTests;
@@ -10913,7 +10927,7 @@
1091310927
GENERATE_INFOPLIST_FILE = YES;
1091410928
IPHONEOS_DEPLOYMENT_TARGET = 16.4;
1091510929
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
10916-
MARKETING_VERSION = 1.0;
10930+
MARKETING_VERSION = 5.2.7;
1091710931
MTL_FAST_MATH = YES;
1091810932
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.DataTests;
1091910933
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -10953,7 +10967,7 @@
1095310967
"@loader_path/Frameworks",
1095410968
);
1095510969
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
10956-
MARKETING_VERSION = 1.0;
10970+
MARKETING_VERSION = 5.2.7;
1095710971
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1095810972
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
1095910973
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
@@ -11000,7 +11014,7 @@
1100011014
"@loader_path/Frameworks",
1100111015
);
1100211016
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
11003-
MARKETING_VERSION = 1.0;
11017+
MARKETING_VERSION = 5.2.7;
1100411018
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1100511019
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
1100611020
MTL_FAST_MATH = YES;
@@ -11045,7 +11059,7 @@
1104511059
"@loader_path/Frameworks",
1104611060
);
1104711061
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
11048-
MARKETING_VERSION = 1.0;
11062+
MARKETING_VERSION = 5.2.7;
1104911063
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1105011064
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
1105111065
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
@@ -11092,7 +11106,7 @@
1109211106
"@loader_path/Frameworks",
1109311107
);
1109411108
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
11095-
MARKETING_VERSION = 1.0;
11109+
MARKETING_VERSION = 5.2.7;
1109611110
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1109711111
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
1109811112
MTL_FAST_MATH = YES;
@@ -11137,7 +11151,7 @@
1113711151
"@loader_path/Frameworks",
1113811152
);
1113911153
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
11140-
MARKETING_VERSION = 1.0;
11154+
MARKETING_VERSION = 5.2.7;
1114111155
MERGEABLE_LIBRARY = NO;
1114211156
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1114311157
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
@@ -11185,7 +11199,7 @@
1118511199
"@loader_path/Frameworks",
1118611200
);
1118711201
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
11188-
MARKETING_VERSION = 1.0;
11202+
MARKETING_VERSION = 5.2.7;
1118911203
MERGEABLE_LIBRARY = NO;
1119011204
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1119111205
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
@@ -11231,7 +11245,7 @@
1123111245
"@loader_path/Frameworks",
1123211246
);
1123311247
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
11234-
MARKETING_VERSION = 1.0;
11248+
MARKETING_VERSION = 5.2.7;
1123511249
MERGEABLE_LIBRARY = NO;
1123611250
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1123711251
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
@@ -11279,7 +11293,7 @@
1127911293
"@loader_path/Frameworks",
1128011294
);
1128111295
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
11282-
MARKETING_VERSION = 1.0;
11296+
MARKETING_VERSION = 5.2.7;
1128311297
MERGEABLE_LIBRARY = NO;
1128411298
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1128511299
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
@@ -11305,6 +11319,7 @@
1130511319
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(EMBEDDED_CONTENT_CONTAINS_SWIFT)";
1130611320
CLANG_ENABLE_OBJC_WEAK = YES;
1130711321
CODE_SIGN_STYLE = Automatic;
11322+
CURRENT_PROJECT_VERSION = 1;
1130811323
DEBUG_INFORMATION_FORMAT = dwarf;
1130911324
DEVELOPMENT_TEAM = ZY8UR5ADFW;
1131011325
INFOPLIST_FILE = ProtectionTests/Info.plist;
@@ -11315,6 +11330,7 @@
1131511330
"@executable_path/Frameworks",
1131611331
"@loader_path/Frameworks",
1131711332
);
11333+
MARKETING_VERSION = 5.2.7;
1131811334
MTL_ENABLE_DEBUG_INFO = YES;
1131911335
MTL_FAST_MATH = YES;
1132011336
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.ProtectionTests;
@@ -11335,6 +11351,7 @@
1133511351
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(EMBEDDED_CONTENT_CONTAINS_SWIFT)";
1133611352
CLANG_ENABLE_OBJC_WEAK = YES;
1133711353
CODE_SIGN_STYLE = Automatic;
11354+
CURRENT_PROJECT_VERSION = 1;
1133811355
DEVELOPMENT_TEAM = ZY8UR5ADFW;
1133911356
INFOPLIST_FILE = ProtectionTests/Info.plist;
1134011357
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Two Factor Authentication Service, Inc. All rights reserved.";
@@ -11344,6 +11361,7 @@
1134411361
"@executable_path/Frameworks",
1134511362
"@loader_path/Frameworks",
1134611363
);
11364+
MARKETING_VERSION = 5.2.7;
1134711365
MTL_FAST_MATH = YES;
1134811366
PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.ProtectionTests;
1134911367
PRODUCT_NAME = "$(TARGET_NAME)";

0 commit comments

Comments
 (0)