Skip to content

Commit 9d6a211

Browse files
committed
Replace SSKeychian with SAMKeychain
1 parent 46a8d1a commit 9d6a211

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

PHPHub/AppDelegate.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#import "JpushHandler.h"
1616
#import "LaunchScreenAdHandler.h"
1717
#import "ExceptionHandler.h"
18-
#import "SSKeychain.h"
18+
#import "SAMKeychain.h"
1919

2020
@interface AppDelegate ()
2121

@@ -98,7 +98,7 @@ - (void)basicSetup {
9898
[SVProgressHUD setMinimumDismissTimeInterval:1];
9999

100100
// Setup SSKeyChain
101-
[SSKeychain setAccessibilityType:kSecAttrAccessibleWhenUnlocked];
101+
[SAMKeychain setAccessibilityType:kSecAttrAccessibleWhenUnlocked];
102102
}
103103

104104
#pragma mark - APNs

PHPHub/BaseClasses/CurrentUser.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#import "AccessTokenHandler.h"
1111
#import "JpushHandler.h"
1212
#import "NotificationModel.h"
13-
#import "SSKeychain.h"
13+
#import "SAMKeychain.h"
1414

1515
@implementation CurrentUser
1616
+ (CurrentUser *)Instance {
@@ -68,7 +68,7 @@ - (void)checkNoticeCount {
6868
}
6969

7070
- (void)logOut {
71-
[SSKeychain deletePasswordForService:KeyChainService account:KeyChainAccount];
71+
[SAMKeychain deletePasswordForService:KeyChainService account:KeyChainAccount];
7272
[GVUserDefaults standardUserDefaults].currentUserId = nil;
7373
[JpushHandler sendEmptyAlias];
7474
}

PHPHub/Handlers/AccessTokenHandler.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
#import "AccessTokenHandler.h"
10-
#import "SSKeychain.h"
10+
#import "SAMKeychain.h"
1111

1212
@implementation AccessTokenHandler
1313
#pragma mark - Client Grant
@@ -62,17 +62,17 @@ + (void)fetchClientGrantTokenWithRetryTimes:(NSInteger)times callback:(BaseResul
6262
#pragma mark - Password Grant
6363

6464
+ (NSString *)getLoginTokenGrantAccessToken {
65-
NSString *token = [SSKeychain passwordForService:KeyChainService account:KeyChainAccount];
65+
NSString *token = [SAMKeychain passwordForService:KeyChainService account:KeyChainAccount];
6666
return [NSString stringWithFormat:@"Bearer %@", token];
6767
}
6868

6969
+ (void)storeLoginTokenGrantAccessToken:(NSString *)token {
70-
[SSKeychain setPassword:token forService:KeyChainService account:KeyChainAccount];
70+
[SAMKeychain setPassword:token forService:KeyChainService account:KeyChainAccount];
7171
[[BaseApi loginTokenGrantInstance] setUpLoginTokenGrantRequest];
7272
}
7373

7474
+ (void)clearToken {
75-
[SSKeychain deletePasswordForService:KeyChainService account:KeyChainAccount];
75+
[SAMKeychain deletePasswordForService:KeyChainService account:KeyChainAccount];
7676
[GVUserDefaults standardUserDefaults].userClientToken = nil;
7777
}
7878

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ target "PHPHub" do
3434
pod 'DZNEmptyDataSet'
3535
pod 'WebViewJavascriptBridge'
3636
pod 'JTSImageViewController'
37-
pod 'SSKeychain'
37+
pod 'SAMKeychain'
3838
end

Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ PODS:
6161
- HappyDNS (~> 0.2)
6262
- QRCodeReaderViewController (3.5.2)
6363
- Reachability (3.2)
64+
- SAMKeychain (1.5.2)
6465
- SDWebImage (3.7.3):
6566
- SDWebImage/Core (= 3.7.3)
6667
- SDWebImage/Core (3.7.3)
67-
- SSKeychain (1.2.3)
6868
- SVProgressHUD (2.0.3)
6969
- UIActionSheet+Blocks (0.9)
7070
- UIActivityIndicator-for-SDWebImage (1.2):
@@ -98,8 +98,8 @@ DEPENDENCIES:
9898
- Qiniu
9999
- QRCodeReaderViewController (from `https://github.com/zhengjinghua/MQRCodeReaderViewController.git`)
100100
- Reachability
101+
- SAMKeychain
101102
- SDWebImage
102-
- SSKeychain
103103
- SVProgressHUD (= 2.0.3)
104104
- UIActionSheet+Blocks
105105
- UIActivityIndicator-for-SDWebImage
@@ -148,8 +148,8 @@ SPEC CHECKSUMS:
148148
Qiniu: d899770cc7b9a7abb3bff9fd993adc93c9475d45
149149
QRCodeReaderViewController: 557e3291d8fe8adf20d62b7f6bd79a3941f8ec31
150150
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
151+
SAMKeychain: 1865333198217411f35327e8da61b43de79b635b
151152
SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
152-
SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
153153
SVProgressHUD: b0830714205bea1317ea1a2ebc71e5633af334d4
154154
UIActionSheet+Blocks: e180b7dad0a721ab7f212ac9742af799008bb358
155155
UIActivityIndicator-for-SDWebImage: 7bf7ebbf0ed1747dedc0d6e949c4603a6d0f9e0c
@@ -159,6 +159,6 @@ SPEC CHECKSUMS:
159159
UMengSocial: 85882abe5b20aa38ad558ece71360e16b5d50909
160160
WebViewJavascriptBridge: f10ac16f2cd3adf2b941bd79477c55a8f6e01044
161161

162-
PODFILE CHECKSUM: 5efc83d717d9a17f203cbbd2b71f45398143d8b2
162+
PODFILE CHECKSUM: 218f28d4935673973e859ea6da2ea60ad76d0c63
163163

164164
COCOAPODS: 1.1.1

0 commit comments

Comments
 (0)