Fix activatedVPNID.

digisonny · Jan 20, 2015 · 53801f3 · 53801f3
1 parent 1fa3ae0
commit 53801f3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/VPNOnData/VPN.swift b/VPNOnData/VPN.swift
@@ -34,7 +34,7 @@ public class VPN : NSManagedObject{
     @NSManaged var isp:         String!
 
     var ID : String {
-        if let id = objectID.URIRepresentation().lastPathComponent {
+        if let id = objectID.URIRepresentation().absoluteString {
             return id
         }
         return ""

diff --git a/VPNOnData/VPNDataManager+VPN.swift b/VPNOnData/VPNDataManager+VPN.swift
@@ -84,8 +84,12 @@ extension VPNDataManager
     func VPNByIDString(ID: String) -> VPN?
     {
         if let URL = NSURL(string: ID) {
-            if let moid = self.persistentStoreCoordinator!.managedObjectIDForURIRepresentation(URL) {
-                return self.VPNByID(moid)
+            if let scheme = URL.scheme {
+                if scheme.lowercaseString == "x-coredata" {
+                    if let moid = self.persistentStoreCoordinator!.managedObjectIDForURIRepresentation(URL) {
+                        return self.VPNByID(moid)
+                    }
+                }
             }
         }
         return .None

diff --git a/VPNOnKit/VPNKeychainWrapper.h b/VPNOnKit/VPNKeychainWrapper.h
@@ -15,15 +15,15 @@
 
 @interface VPNKeychainWrapper : NSObject
 
-+ (BOOL) setPassword:(NSString*)password forVPNID:(NSString*)VPNID;
++ (BOOL) setPassword:(NSString *)password forVPNID:(NSString *)VPNID;
 
-+ (BOOL) setSecret:(NSString*)secret forVPNID:(NSString*)VPNID;
++ (BOOL) setSecret:(NSString*)secret forVPNID:(NSString *)VPNID;
 
-+ (NSData*) passwordForVPNID:(NSString*)VPNID;
++ (NSData *) passwordForVPNID:(NSString *)VPNID;
 
-+ (NSData*) secretForVPNID:(NSString*)VPNID;
++ (NSData *) secretForVPNID:(NSString *)VPNID;
 
-+ (void)destoryKeyForVPNID:(NSString*)VPNID;
++ (void) destoryKeyForVPNID:(NSString *)VPNID;
 
 @end
 

diff --git a/VPNOnKit/VPNKeychainWrapper.swift b/VPNOnKit/VPNKeychainWrapper.swift
@@ -15,30 +15,35 @@ let kKeychainServiceName = "com.LexTang.VPNOn"
 class VPNKeychainWrapper
 {
     class func setPassword(password: String, forVPNID VPNID: String) -> Bool {
+        let key = NSURL(string: VPNID)!.lastPathComponent!
         KeychainWrapper.serviceName = kKeychainServiceName
-        KeychainWrapper.removeObjectForKey(VPNID)
-        return KeychainWrapper.setString(password, forKey: VPNID)
+        KeychainWrapper.removeObjectForKey(key)
+        return KeychainWrapper.setString(password, forKey: key)
     }
 
     class func setSecret(secret: String, forVPNID VPNID: String) -> Bool {
+        let key = NSURL(string: VPNID)!.lastPathComponent!
         KeychainWrapper.serviceName = kKeychainServiceName
-        KeychainWrapper.removeObjectForKey("\(VPNID)psk")
-        return KeychainWrapper.setString(secret, forKey: "\(VPNID)psk")
+        KeychainWrapper.removeObjectForKey("\(key)psk")
+        return KeychainWrapper.setString(secret, forKey: "\(key)psk")
     }
 
     class func passwordForVPNID(VPNID: String) -> NSData? {
+        let key = NSURL(string: VPNID)!.lastPathComponent!
         KeychainWrapper.serviceName = kKeychainServiceName
-        return KeychainWrapper.dataForKey(VPNID)
+        return KeychainWrapper.dataForKey(key)
     }
 
     class func secretForVPNID(VPNID: String) -> NSData? {
+        let key = NSURL(string: VPNID)!.lastPathComponent!
         KeychainWrapper.serviceName = kKeychainServiceName
-        return KeychainWrapper.dataForKey("\(VPNID)psk")
+        return KeychainWrapper.dataForKey("\(key)psk")
     }
 
     class func destoryKeyForVPNID(VPNID: String) {
+        let key = NSURL(string: VPNID)!.lastPathComponent!
         KeychainWrapper.serviceName = kKeychainServiceName
-        KeychainWrapper.removeObjectForKey(VPNID)
-        KeychainWrapper.removeObjectForKey("\(VPNID)psk")
+        KeychainWrapper.removeObjectForKey(key)
+        KeychainWrapper.removeObjectForKey("\(key)psk")
     }
 }