Update to pairing code logic

mzarra · Jul 2, 2010 · 320caf8 · 320caf8
1 parent de4517f
commit 320caf8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/DesktopCode/ZSyncConnectionDelegate.m b/DesktopCode/ZSyncConnectionDelegate.m
@@ -322,7 +322,11 @@ - (void)registerSyncClient:(BLIPRequest*)request
   ISyncClient *syncClient = [[ISyncManager sharedManager] clientWithIdentifier:clientID];
   if (!syncClient) {
     NSString *clientDescription = [plugin pathForResource:@"clientDescription" ofType:@"plist"];
-    syncClient = [[ISyncManager sharedManager] registerClientWithIdentifier:clientID descriptionFilePath:clientDescription];
+    @try {
+      syncClient = [[ISyncManager sharedManager] registerClientWithIdentifier:clientID descriptionFilePath:clientDescription];
+    } @catch (NSException *exception) {
+      DLog(@"exception caught: %@", exception);
+    }
     NSString *displayName = [syncClient displayName];
     displayName = [displayName stringByAppendingFormat:@": %@", [request valueOfProperty:zsDeviceName]];
     [syncClient setDisplayName:displayName];

diff --git a/DeviceCode/ZSyncTouchHandler.m b/DeviceCode/ZSyncTouchHandler.m
@@ -562,22 +562,18 @@ - (void)connectionEstablished
         [self uploadDataToServer];
       } else {
         //We are not paired so we need to request a pairing session
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [dictionary setValue:zsActID(zsActionRequestPairing) forKey:zsAction];
-
         NSString *deviceUUID = [[NSUserDefaults standardUserDefaults] valueForKey:zsDeviceID];
         if (!deviceUUID) {
           deviceUUID = [[NSProcessInfo processInfo] globallyUniqueString];
           [[NSUserDefaults standardUserDefaults] setValue:deviceUUID forKey:zsDeviceID];
         }
 
-        [dictionary setValue:deviceUUID forKey:zsDeviceID];
-
-        BLIPRequest *request = [BLIPRequest requestWithBody:nil properties:dictionary];
+        [self setPasscode:[self generatePairingCode]];
+        BLIPRequest *request = [BLIPRequest requestWithBodyString:[self passcode]];
+        [request setValue:zsActID(zsActionRequestPairing) ofProperty:zsAction];
+        [request setValue:deviceUUID ofProperty:zsDeviceID];
         [[self connection] sendRequest:request];
 
-        //Need to push the passcode
-        [self setPasscode:[self generatePairingCode]];
         [[self delegate] zSyncHandler:self displayPairingCode:[self passcode]];
       }
       break;