Revision baaf1397 pithos-macos/PithosSyncDaemon.m

b/pithos-macos/PithosSyncDaemon.m
411 411 
- (void)setPithos:(ASIPithos *)aPithos {
412 412 
    if (!pithos) {
413 413 
        pithos = [ASIPithos pithos];
414 
        pithos.authUser = [aPithos.authUser copy];
415 414 
        pithos.authToken = [aPithos.authToken copy];
415 
        pithos.authUser = [aPithos.authUser copy];
416 
        pithos.ignoreSSLErrors = aPithos.ignoreSSLErrors;
417 
        pithos.tokensURL = [aPithos.tokensURL copy];
416 418 
        pithos.storageURLPrefix = [aPithos.storageURLPrefix copy];
417 
        pithos.authURL = [aPithos.authURL copy];
418 419 
        pithos.publicURLPrefix = [aPithos.publicURLPrefix copy];
419 420 
        pithos.userCatalogURL = [aPithos.userCatalogURL copy];
420 421 
    }
421 422 
    if (aPithos &&
422 423 
        (![aPithos.authUser isEqualToString:pithos.authUser] ||
423 
         ![aPithos.authToken isEqualToString:pithos.authToken] ||
424 
         ![aPithos.storageURLPrefix isEqualToString:pithos.storageURLPrefix])) {
424 
         ![aPithos.authToken isEqualToString:pithos.authToken] ||
425 
         ![aPithos.storageURLPrefix isEqual:pithos.storageURLPrefix])) {
425 426 
        [self resetDaemon];
426 427 
        if (![aPithos.authUser isEqualToString:pithos.authUser] ||
427 
            ![aPithos.storageURLPrefix isEqualToString:pithos.storageURLPrefix])
428 
            ![aPithos.storageURLPrefix isEqual:pithos.storageURLPrefix])
428 429 
            [self resetLocalStateWithAll:YES];
429 
        pithos.authUser = [aPithos.authUser copy];
430 430 
        pithos.authToken = [aPithos.authToken copy];
431 
        pithos.authUser = [aPithos.authUser copy];
432 
        pithos.ignoreSSLErrors = aPithos.ignoreSSLErrors;
433 
        pithos.tokensURL = [aPithos.tokensURL copy];
431 434 
        pithos.storageURLPrefix = [aPithos.storageURLPrefix copy];
432 
        pithos.authURL = [aPithos.authURL copy];
433 435 
        pithos.publicURLPrefix = [aPithos.publicURLPrefix copy];
434 436 
        pithos.userCatalogURL = [aPithos.userCatalogURL copy];
435 437 
    }
......
552 554 
        return;
553 555 
    }
554 556 
    // Update user catalog for accountsNames.
555 
    ASIPithosRequest *userCatalogRequest = [pithosAccount updateUserCatalogForForDisplaynames:nil UUIDs:accountsNames];
557 
    ASIPithosRequest *userCatalogRequest = [pithosAccount updateUserCatalogForDisplaynames:nil UUIDs:accountsNames];
556 558 
    if (userCatalogRequest.error || ((userCatalogRequest.responseStatusCode != 200) && (userCatalogRequest.responseStatusCode != 404))) {
557 559 
        // Update failed try sync again later.
558 560 
        [self syncOperationFinishedWithSuccess:NO];

Also available in: Unified diff