Skip to content

Commit 923fa76

Browse files
mattrubinmattrubin
committed
Merge branch 'onetimepassword'
2 parents cf83812 + 6eafadd commit 923fa76

30 files changed

+56
-1048
lines changed

‎Authenticator.xcodeproj/project.pbxproj

Lines changed: 8 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,16 @@
1212
43B5E4365C6C4081AEF41717 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B03839CF35E4014987A36CA /* libPods.a */; };
1313
8B0028B511EB75920092DE18 /* OTPScannerOverlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B0028B411EB75920092DE18 /* OTPScannerOverlayView.m */; };
1414
8BF23A7213D4EF7000F3FD82 /* UIColor+OTP.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BF23A7113D4EF7000F3FD82 /* UIColor+OTP.m */; };
15-
C9044FC31821BD63002C3C3F /* OTPToken+Persistence.m in Sources */ = {isa = PBXBuildFile; fileRef = C9044FC21821BD63002C3C3F /* OTPToken+Persistence.m */; };
16-
C9044FC71821C466002C3C3F /* OTPToken+Serialization.m in Sources */ = {isa = PBXBuildFile; fileRef = C9044FC61821C466002C3C3F /* OTPToken+Serialization.m */; };
17-
C9044FCF18224D32002C3C3F /* OTPAlgorithm.m in Sources */ = {isa = PBXBuildFile; fileRef = C9044FCE18224D32002C3C3F /* OTPAlgorithm.m */; };
1815
C9044FD61824CDE7002C3C3F /* OTPBase32Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = C9044FD51824CDE7002C3C3F /* OTPBase32Tests.m */; };
19-
C9044FD91824E05E002C3C3F /* NSString+PercentEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = C9044FD81824E05E002C3C3F /* NSString+PercentEncoding.m */; };
20-
C9044FDC1824E711002C3C3F /* NSDictionary+QueryString.m in Sources */ = {isa = PBXBuildFile; fileRef = C9044FDB1824E711002C3C3F /* NSDictionary+QueryString.m */; };
16+
C93AF8DD1977B0F100853591 /* NSString+PercentEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = C9044FD81824E05E002C3C3F /* NSString+PercentEncoding.m */; };
17+
C93AF8DE1977B0F500853591 /* NSDictionary+QueryString.m in Sources */ = {isa = PBXBuildFile; fileRef = C9044FDB1824E711002C3C3F /* NSDictionary+QueryString.m */; };
2118
C940A981183EEFA300F7D04A /* OTPTokenGenerationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C940A980183EEFA300F7D04A /* OTPTokenGenerationTests.m */; };
22-
C958CC4D1829DB9E00DD47D0 /* OTPToken+Generation.m in Sources */ = {isa = PBXBuildFile; fileRef = C958CC4C1829DB9E00DD47D0 /* OTPToken+Generation.m */; };
23-
C958CC51182A1FDD00DD47D0 /* OTPTokenType.m in Sources */ = {isa = PBXBuildFile; fileRef = C958CC50182A1FDD00DD47D0 /* OTPTokenType.m */; };
2419
C958CC54183043A600DD47D0 /* OTPTokenSerializationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C958CC53183043A600DD47D0 /* OTPTokenSerializationTests.m */; };
2520
C9745D0B17DA5861008B6E23 /* UIAlertView+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = C9745D0A17DA5861008B6E23 /* UIAlertView+Blocks.m */; };
2621
C9777A021908064500B4A7F5 /* OTPTokenEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C9777A011908064500B4A7F5 /* OTPTokenEditViewController.m */; };
2722
C97B68C717D9226D005D1FE0 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = C97B68C617D9226D005D1FE0 /* Settings.bundle */; };
2823
C99069D1180CBAC900BAEF53 /* OTPScannerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C99069D0180CBAC900BAEF53 /* OTPScannerViewController.m */; };
2924
C99069D4180E07A100BAEF53 /* OTPTokenEntryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C99069D3180E07A100BAEF53 /* OTPTokenEntryViewController.m */; };
30-
C999C693181344F40013C1C6 /* OTPToken.m in Sources */ = {isa = PBXBuildFile; fileRef = C999C692181344F40013C1C6 /* OTPToken.m */; };
3125
C9ABDACF17DD3CF500A86AB5 /* OTPTokenCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C9ABDACE17DD3CF500A86AB5 /* OTPTokenCell.m */; };
3226
C9C6CC841842C5BC000100C2 /* OTPTokenPersistenceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C9C6CC831842C5BC000100C2 /* OTPTokenPersistenceTests.m */; };
3327
C9C6CCA21842E331000100C2 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C9C6CCA11842E331000100C2 /* Images.xcassets */; };
@@ -64,22 +58,12 @@
6458
8BF23A7113D4EF7000F3FD82 /* UIColor+OTP.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+OTP.m"; sourceTree = "<group>"; };
6559
8BF5147F118799AE005C936F /* Authenticator-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Authenticator-Info.plist"; sourceTree = "<group>"; };
6660
9B03839CF35E4014987A36CA /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
67-
C9044FC11821BD63002C3C3F /* OTPToken+Persistence.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OTPToken+Persistence.h"; sourceTree = "<group>"; };
68-
C9044FC21821BD63002C3C3F /* OTPToken+Persistence.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "OTPToken+Persistence.m"; sourceTree = "<group>"; };
69-
C9044FC51821C466002C3C3F /* OTPToken+Serialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OTPToken+Serialization.h"; sourceTree = "<group>"; };
70-
C9044FC61821C466002C3C3F /* OTPToken+Serialization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "OTPToken+Serialization.m"; sourceTree = "<group>"; };
71-
C9044FCD18224D32002C3C3F /* OTPAlgorithm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPAlgorithm.h; sourceTree = "<group>"; };
72-
C9044FCE18224D32002C3C3F /* OTPAlgorithm.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPAlgorithm.m; sourceTree = "<group>"; };
7361
C9044FD51824CDE7002C3C3F /* OTPBase32Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPBase32Tests.m; sourceTree = "<group>"; };
7462
C9044FD71824E05E002C3C3F /* NSString+PercentEncoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+PercentEncoding.h"; sourceTree = "<group>"; };
7563
C9044FD81824E05E002C3C3F /* NSString+PercentEncoding.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+PercentEncoding.m"; sourceTree = "<group>"; };
7664
C9044FDA1824E711002C3C3F /* NSDictionary+QueryString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+QueryString.h"; sourceTree = "<group>"; };
7765
C9044FDB1824E711002C3C3F /* NSDictionary+QueryString.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+QueryString.m"; sourceTree = "<group>"; };
7866
C940A980183EEFA300F7D04A /* OTPTokenGenerationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPTokenGenerationTests.m; sourceTree = "<group>"; };
79-
C958CC4B1829DB9E00DD47D0 /* OTPToken+Generation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OTPToken+Generation.h"; sourceTree = "<group>"; };
80-
C958CC4C1829DB9E00DD47D0 /* OTPToken+Generation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "OTPToken+Generation.m"; sourceTree = "<group>"; };
81-
C958CC4F182A1FDD00DD47D0 /* OTPTokenType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPTokenType.h; sourceTree = "<group>"; };
82-
C958CC50182A1FDD00DD47D0 /* OTPTokenType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPTokenType.m; sourceTree = "<group>"; };
8367
C958CC53183043A600DD47D0 /* OTPTokenSerializationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPTokenSerializationTests.m; sourceTree = "<group>"; };
8468
C959A63C190A69120042DEC0 /* Icon.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Icon.svg; sourceTree = "<group>"; };
8569
C959A63E190A69E60042DEC0 /* GenerateIcons.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = GenerateIcons.sh; sourceTree = "<group>"; };
@@ -95,8 +79,6 @@
9579
C99069D3180E07A100BAEF53 /* OTPTokenEntryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPTokenEntryViewController.m; sourceTree = "<group>"; };
9680
C99069D5180E09D700BAEF53 /* OTPTokenSourceDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTPTokenSourceDelegate.h; sourceTree = "<group>"; };
9781
C9906A2E1812522100BAEF53 /* AuthenticatorTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AuthenticatorTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
98-
C999C691181344F40013C1C6 /* OTPToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPToken.h; sourceTree = "<group>"; };
99-
C999C692181344F40013C1C6 /* OTPToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPToken.m; sourceTree = "<group>"; };
10082
C9A4FA1317CF9D3100CD5EDC /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = "<group>"; };
10183
C9ABDACD17DD3CF500A86AB5 /* OTPTokenCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPTokenCell.h; sourceTree = "<group>"; };
10284
C9ABDACE17DD3CF500A86AB5 /* OTPTokenCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPTokenCell.m; sourceTree = "<group>"; };
@@ -142,7 +124,6 @@
142124
1D3623250D0F684500981E51 /* OTPAppDelegate.m */,
143125
C98C1C4917D2F03400A07D3F /* Display */,
144126
C98C1C4617D2EE6500A07D3F /* Entry */,
145-
C98C1C4817D2F01A00A07D3F /* Core */,
146127
C98C1C4E17D2F14500A07D3F /* Categories */,
147128
);
148129
path = Classes;
@@ -243,25 +224,6 @@
243224
name = Entry;
244225
sourceTree = "<group>";
245226
};
246-
C98C1C4817D2F01A00A07D3F /* Core */ = {
247-
isa = PBXGroup;
248-
children = (
249-
C999C691181344F40013C1C6 /* OTPToken.h */,
250-
C999C692181344F40013C1C6 /* OTPToken.m */,
251-
C9044FC51821C466002C3C3F /* OTPToken+Serialization.h */,
252-
C9044FC61821C466002C3C3F /* OTPToken+Serialization.m */,
253-
C9044FC11821BD63002C3C3F /* OTPToken+Persistence.h */,
254-
C9044FC21821BD63002C3C3F /* OTPToken+Persistence.m */,
255-
C958CC4B1829DB9E00DD47D0 /* OTPToken+Generation.h */,
256-
C958CC4C1829DB9E00DD47D0 /* OTPToken+Generation.m */,
257-
C958CC4F182A1FDD00DD47D0 /* OTPTokenType.h */,
258-
C958CC50182A1FDD00DD47D0 /* OTPTokenType.m */,
259-
C9044FCD18224D32002C3C3F /* OTPAlgorithm.h */,
260-
C9044FCE18224D32002C3C3F /* OTPAlgorithm.m */,
261-
);
262-
name = Core;
263-
sourceTree = "<group>";
264-
};
265227
C98C1C4917D2F03400A07D3F /* Display */ = {
266228
isa = PBXGroup;
267229
children = (
@@ -283,10 +245,6 @@
283245
8BF23A7113D4EF7000F3FD82 /* UIColor+OTP.m */,
284246
C9745D0917DA5861008B6E23 /* UIAlertView+Blocks.h */,
285247
C9745D0A17DA5861008B6E23 /* UIAlertView+Blocks.m */,
286-
C9044FD71824E05E002C3C3F /* NSString+PercentEncoding.h */,
287-
C9044FD81824E05E002C3C3F /* NSString+PercentEncoding.m */,
288-
C9044FDA1824E711002C3C3F /* NSDictionary+QueryString.h */,
289-
C9044FDB1824E711002C3C3F /* NSDictionary+QueryString.m */,
290248
);
291249
name = Categories;
292250
sourceTree = "<group>";
@@ -303,6 +261,10 @@
303261
C9906A331812522100BAEF53 /* AuthenticatorTests */ = {
304262
isa = PBXGroup;
305263
children = (
264+
C9044FD71824E05E002C3C3F /* NSString+PercentEncoding.h */,
265+
C9044FD81824E05E002C3C3F /* NSString+PercentEncoding.m */,
266+
C9044FDA1824E711002C3C3F /* NSDictionary+QueryString.h */,
267+
C9044FDB1824E711002C3C3F /* NSDictionary+QueryString.m */,
306268
C958CC53183043A600DD47D0 /* OTPTokenSerializationTests.m */,
307269
C9C6CC831842C5BC000100C2 /* OTPTokenPersistenceTests.m */,
308270
C940A980183EEFA300F7D04A /* OTPTokenGenerationTests.m */,
@@ -480,28 +442,20 @@
480442
isa = PBXSourcesBuildPhase;
481443
buildActionMask = 2147483647;
482444
files = (
483-
C9044FD91824E05E002C3C3F /* NSString+PercentEncoding.m in Sources */,
484445
1D60589B0D05DD56006BFB54 /* main.m in Sources */,
485446
1D3623260D0F684500981E51 /* OTPAppDelegate.m in Sources */,
486447
C9D6C8461906CD54004F0E08 /* OTPTextFieldCell.m in Sources */,
487448
C9F75C9C1843D31A00B6FA14 /* OTPTokenManager.m in Sources */,
488-
C999C693181344F40013C1C6 /* OTPToken.m in Sources */,
489-
C958CC4D1829DB9E00DD47D0 /* OTPToken+Generation.m in Sources */,
490-
C9044FC71821C466002C3C3F /* OTPToken+Serialization.m in Sources */,
491-
C958CC51182A1FDD00DD47D0 /* OTPTokenType.m in Sources */,
492449
C9F75CA21843F9BE00B6FA14 /* OTPTokenListViewController.m in Sources */,
493450
C9D6C84C19075044004F0E08 /* OTPProgressRing.m in Sources */,
494-
C9044FC31821BD63002C3C3F /* OTPToken+Persistence.m in Sources */,
495451
C99069D1180CBAC900BAEF53 /* OTPScannerViewController.m in Sources */,
496452
C9D6C83F1906BD68004F0E08 /* OTPSegmentedControlCell.m in Sources */,
497453
8B0028B511EB75920092DE18 /* OTPScannerOverlayView.m in Sources */,
498454
8BF23A7213D4EF7000F3FD82 /* UIColor+OTP.m in Sources */,
499455
C9745D0B17DA5861008B6E23 /* UIAlertView+Blocks.m in Sources */,
500456
C99069D4180E07A100BAEF53 /* OTPTokenEntryViewController.m in Sources */,
501457
C9ABDACF17DD3CF500A86AB5 /* OTPTokenCell.m in Sources */,
502-
C9044FCF18224D32002C3C3F /* OTPAlgorithm.m in Sources */,
503458
C9777A021908064500B4A7F5 /* OTPTokenEditViewController.m in Sources */,
504-
C9044FDC1824E711002C3C3F /* NSDictionary+QueryString.m in Sources */,
505459
);
506460
runOnlyForDeploymentPostprocessing = 0;
507461
};
@@ -511,8 +465,10 @@
511465
files = (
512466
C9044FD61824CDE7002C3C3F /* OTPBase32Tests.m in Sources */,
513467
C940A981183EEFA300F7D04A /* OTPTokenGenerationTests.m in Sources */,
468+
C93AF8DE1977B0F500853591 /* NSDictionary+QueryString.m in Sources */,
514469
C958CC54183043A600DD47D0 /* OTPTokenSerializationTests.m in Sources */,
515470
C9C6CC841842C5BC000100C2 /* OTPTokenPersistenceTests.m in Sources */,
471+
C93AF8DD1977B0F100853591 /* NSString+PercentEncoding.m in Sources */,
516472
);
517473
runOnlyForDeploymentPostprocessing = 0;
518474
};

‎Authenticator/Classes/OTPAlgorithm.h

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎Authenticator/Classes/OTPAlgorithm.m

Lines changed: 0 additions & 77 deletions
This file was deleted.

‎Authenticator/Classes/OTPAppDelegate.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
//
2424

2525
#import "OTPAppDelegate.h"
26-
#import "OTPToken+Serialization.h"
26+
#import <OneTimePassword/OneTimePassword.h>
2727
#import "OTPTokenListViewController.h"
2828
#import "UIAlertView+Blocks.h"
2929

‎Authenticator/Classes/OTPScannerViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#import "OTPScannerViewController.h"
2626
@import AVFoundation;
2727
#import "OTPScannerOverlayView.h"
28-
#import "OTPToken+Serialization.h"
28+
#import <OneTimePassword/OneTimePassword.h>
2929
#import "OTPTokenEntryViewController.h"
3030

3131

‎Authenticator/Classes/OTPToken+Generation.h

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)