Use service catalog

[pithos-macos] / pithos-macos / PithosSyncDaemon.m

diff --git a/pithos-macos/PithosSyncDaemon.m b/pithos-macos/PithosSyncDaemon.m
index 35675d7..937a48c 100644 (file)
--- a/pithos-macos/PithosSyncDaemon.m
+++ b/pithos-macos/PithosSyncDaemon.m
@@ -411,25 +411,27 @@
 - (void)setPithos:(ASIPithos *)aPithos {
     if (!pithos) {
         pithos = [ASIPithos pithos];
-        pithos.authUser = [aPithos.authUser copy];
         pithos.authToken = [aPithos.authToken copy];
+        pithos.authUser = [aPithos.authUser copy];
+        pithos.ignoreSSLErrors = aPithos.ignoreSSLErrors;
+        pithos.tokensURL = [aPithos.tokensURL copy];
         pithos.storageURLPrefix = [aPithos.storageURLPrefix copy];
-        pithos.authURL = [aPithos.authURL copy];
         pithos.publicURLPrefix = [aPithos.publicURLPrefix copy];
         pithos.userCatalogURL = [aPithos.userCatalogURL copy];
     }
     if (aPithos && 
         (![aPithos.authUser isEqualToString:pithos.authUser] || 
-         ![aPithos.authToken isEqualToString:pithos.authToken] || 
-         ![aPithos.storageURLPrefix isEqualToString:pithos.storageURLPrefix])) {
+         ![aPithos.authToken isEqualToString:pithos.authToken] ||
+         ![aPithos.storageURLPrefix isEqual:pithos.storageURLPrefix])) {
         [self resetDaemon];
         if (![aPithos.authUser isEqualToString:pithos.authUser] || 
-            ![aPithos.storageURLPrefix isEqualToString:pithos.storageURLPrefix])
+            ![aPithos.storageURLPrefix isEqual:pithos.storageURLPrefix])
             [self resetLocalStateWithAll:YES];
-        pithos.authUser = [aPithos.authUser copy];
         pithos.authToken = [aPithos.authToken copy];
+        pithos.authUser = [aPithos.authUser copy];
+        pithos.ignoreSSLErrors = aPithos.ignoreSSLErrors;
+        pithos.tokensURL = [aPithos.tokensURL copy];
         pithos.storageURLPrefix = [aPithos.storageURLPrefix copy];
-        pithos.authURL = [aPithos.authURL copy];
         pithos.publicURLPrefix = [aPithos.publicURLPrefix copy];
         pithos.userCatalogURL = [aPithos.userCatalogURL copy];
     }
@@ -552,7 +554,7 @@
         return;
     }
     // Update user catalog for accountsNames.
-    ASIPithosRequest *userCatalogRequest = [pithosAccount updateUserCatalogForForDisplaynames:nil UUIDs:accountsNames];
+    ASIPithosRequest *userCatalogRequest = [pithosAccount updateUserCatalogForDisplaynames:nil UUIDs:accountsNames];
     if (userCatalogRequest.error || ((userCatalogRequest.responseStatusCode != 200) && (userCatalogRequest.responseStatusCode != 404))) {
         // Update failed try sync again later.
         [self syncOperationFinishedWithSuccess:NO];