Do not use the shared cache in sharing account requests.

diff --git a/pithos-macos/PithosAccountNode.m b/pithos-macos/PithosAccountNode.m
index 64a4930..fed83ed 100644 (file)
--- a/pithos-macos/PithosAccountNode.m
+++ b/pithos-macos/PithosAccountNode.m
@@ -112,6 +112,8 @@ static NSImage *sharedIcon = nil;
                                                                                      until:nil] retain];
                 if (sharingAccount)
                     [accountRequest setRequestUserFromDefaultTo:sharingAccount withPithos:pithos];
+                else if (!forcedRefresh)
+                    accountRequest.downloadCache = [ASIDownloadCache sharedCache];
                 accountRequest.delegate = self;
                 accountRequest.didFinishSelector = @selector(performRequestFinishedDelegateInBackground:);
                 accountRequest.didFailSelector = @selector(performRequestFailedDelegateInBackground:);
@@ -121,8 +123,6 @@ static NSImage *sharedIcon = nil;
                                            NSStringFromSelector(@selector(accountRequestFinished:)), @"didFinishSelector", 
                                            NSStringFromSelector(@selector(accountRequestFailed:)), @"didFailSelector", 
                                            nil];
-                if (!forcedRefresh)
-                    accountRequest.downloadCache = [ASIDownloadCache sharedCache];
                 [[PithosUtilities prepareRequest:accountRequest priority:NSOperationQueuePriorityVeryHigh] startAsynchronous];
                 break;
             case PithosNodeStateRefreshing:
@@ -254,6 +254,8 @@ static NSImage *sharedIcon = nil;
                                                                                  until:nil] retain];
             if (sharingAccount)
                 [accountRequest setRequestUserFromDefaultTo:sharingAccount withPithos:pithos];
+            else if (!forcedRefresh)
+                accountRequest.downloadCache = [ASIDownloadCache sharedCache];
             accountRequest.delegate = self;
             accountRequest.didFinishSelector = @selector(performRequestFinishedDelegateInBackground:);
             accountRequest.didFailSelector = @selector(performRequestFailedDelegateInBackground:);
@@ -263,8 +265,6 @@ static NSImage *sharedIcon = nil;
                                        NSStringFromSelector(@selector(accountRequestFinished:)), @"didFinishSelector", 
                                        NSStringFromSelector(@selector(accountRequestFailed:)), @"didFailSelector", 
                                        nil];
-            if (!forcedRefresh)
-                accountRequest.downloadCache = [ASIDownloadCache sharedCache];
             [[PithosUtilities prepareRequest:accountRequest priority:NSOperationQueuePriorityVeryHigh] startAsynchronous];
         }
     } else if (accountRequest.responseStatusCode == 304) {
@@ -381,7 +381,8 @@ static NSImage *sharedIcon = nil;
                                                       NSStringFromSelector(@selector(accountMetadataRequestFinished:)), @"didFinishSelector", 
                                                       NSStringFromSelector(@selector(accountMetadataRequestFailed:)), @"didFailSelector", 
                                                       nil];
-            refreshMetadataAccountRequest.downloadCache = [ASIDownloadCache sharedCache];
+            if (!sharingAccount)
+                refreshMetadataAccountRequest.downloadCache = [ASIDownloadCache sharedCache];
             [[PithosUtilities prepareRequest:refreshMetadataAccountRequest priority:NSOperationQueuePriorityHigh] startAsynchronous];
         }
     }

diff --git a/pithos-macos/PithosContainerNode.m b/pithos-macos/PithosContainerNode.m
index dbfc9c0..19f1f77 100644 (file)
--- a/pithos-macos/PithosContainerNode.m
+++ b/pithos-macos/PithosContainerNode.m
@@ -141,6 +141,8 @@ static NSImage *sharedIcon = nil;
                                                                                       until:nil] retain];
                 if (sharingAccount)
                     [containerRequest setRequestUserFromDefaultTo:sharingAccount withPithos:pithos];
+                else if (!forcedRefresh)
+                    containerRequest.downloadCache = [ASIDownloadCache sharedCache];
                 containerRequest.delegate = self;
                 containerRequest.didFinishSelector = @selector(performRequestFinishedDelegateInBackground:);
                 containerRequest.didFailSelector = @selector(performRequestFailedDelegateInBackground:);
@@ -150,8 +152,6 @@ static NSImage *sharedIcon = nil;
                                              NSStringFromSelector(@selector(containerRequestFinished:)), @"didFinishSelector", 
                                              NSStringFromSelector(@selector(containerRequestFailed:)), @"didFailSelector", 
                                              nil];
-                if (!forcedRefresh)
-                    containerRequest.downloadCache = [ASIDownloadCache sharedCache];
                 [[PithosUtilities prepareRequest:containerRequest priority:NSOperationQueuePriorityVeryHigh] startAsynchronous];
                 break;
             case PithosNodeStateRefreshing:
@@ -384,6 +384,8 @@ static NSImage *sharedIcon = nil;
                                                                                   until:nil] retain];
             if (sharingAccount)
                 [containerRequest setRequestUserFromDefaultTo:sharingAccount withPithos:pithos];
+            else if (!forcedRefresh)
+                containerRequest.downloadCache = [ASIDownloadCache sharedCache];
             containerRequest.delegate = self;
             containerRequest.didFinishSelector = @selector(performRequestFinishedDelegateInBackground:);
             containerRequest.didFailSelector = @selector(performRequestFailedDelegateInBackground:);
@@ -393,8 +395,6 @@ static NSImage *sharedIcon = nil;
                                          NSStringFromSelector(@selector(containerRequestFinished:)), @"didFinishSelector", 
                                          NSStringFromSelector(@selector(containerRequestFailed:)), @"didFailSelector", 
                                          nil];
-            if (!forcedRefresh)
-            containerRequest.downloadCache = [ASIDownloadCache sharedCache];
             [[PithosUtilities prepareRequest:containerRequest priority:NSOperationQueuePriorityVeryHigh] startAsynchronous];
         }
     } else if (containerRequest.responseStatusCode == 304) {
@@ -515,7 +515,8 @@ static NSImage *sharedIcon = nil;
                                                         NSStringFromSelector(@selector(containerMetadataRequestFinished:)), @"didFinishSelector", 
                                                         NSStringFromSelector(@selector(containerMetadataRequestFailed:)), @"didFailSelector", 
                                                         nil];
-            refreshMetadataContainerRequest.downloadCache = [ASIDownloadCache sharedCache];
+            if (!sharingAccount)
+                refreshMetadataContainerRequest.downloadCache = [ASIDownloadCache sharedCache];
             [[PithosUtilities prepareRequest:refreshMetadataContainerRequest priority:NSOperationQueuePriorityHigh] startAsynchronous];
         }
     }

diff --git a/pithos-macos/PithosNode.h b/pithos-macos/PithosNode.h
index 22c97b0..99041b3 100644 (file)
--- a/pithos-macos/PithosNode.h
+++ b/pithos-macos/PithosNode.h
@@ -95,7 +95,7 @@
 - (void)refresh;
 - (void)forceRefresh;
 
-- (void) postChildrenUpdatedNotificationName;
+- (void)postChildrenUpdatedNotificationName;
 
 - (void)showPithosNodeInfo:(id)sender;
 - (void)pithosNodeInfoWillClose:(id)sender;

diff --git a/pithos-macos/PithosNode.m b/pithos-macos/PithosNode.m
index 941b08e..37fa8bc 100644 (file)
--- a/pithos-macos/PithosNode.m
+++ b/pithos-macos/PithosNode.m
@@ -37,7 +37,6 @@
 
 #import "PithosNode.h"
 #import "PithosNodeInfoController.h"
-#import "ASIDownloadCache.h"
 #import "ASIPithosRequest.h"
 
 @implementation PithosNode

diff --git a/pithos-macos/PithosObjectNode.m b/pithos-macos/PithosObjectNode.m
index 7ee0181..1bc73a4 100644 (file)
--- a/pithos-macos/PithosObjectNode.m
+++ b/pithos-macos/PithosObjectNode.m
@@ -302,7 +302,8 @@
                                                      NSStringFromSelector(@selector(objectRequestFinished:)), @"didFinishSelector", 
                                                      NSStringFromSelector(@selector(objectRequestFailed:)), @"didFailSelector", 
                                                      nil];
-            refreshMetadataObjectRequest.downloadCache = [ASIDownloadCache sharedCache];
+            if (!sharingAccount)
+                refreshMetadataObjectRequest.downloadCache = [ASIDownloadCache sharedCache];
             [[PithosUtilities prepareRequest:refreshMetadataObjectRequest priority:NSOperationQueuePriorityHigh] startAsynchronous];
         }
     }
@@ -329,7 +330,8 @@
                                                      NSStringFromSelector(@selector(objectRequestFinished:)), @"didFinishSelector", 
                                                      NSStringFromSelector(@selector(objectRequestFailed:)), @"didFailSelector", 
                                                      nil];
-            refreshVersionsObjectRequest.downloadCache = [ASIDownloadCache sharedCache];
+            if (!sharingAccount)
+                refreshVersionsObjectRequest.downloadCache = [ASIDownloadCache sharedCache];
             [[PithosUtilities prepareRequest:refreshVersionsObjectRequest priority:NSOperationQueuePriorityHigh] startAsynchronous];
         }
     }

diff --git a/pithos-macos/PithosSharingAccountsNode.m b/pithos-macos/PithosSharingAccountsNode.m
index f96b598..4be9024 100644 (file)
--- a/pithos-macos/PithosSharingAccountsNode.m
+++ b/pithos-macos/PithosSharingAccountsNode.m
@@ -101,8 +101,8 @@
                                                    NSStringFromSelector(@selector(sharingAccountsRequestFinished:)), @"didFinishSelector", 
                                                    NSStringFromSelector(@selector(sharingAccountsRequestFailed:)), @"didFailSelector", 
                                                    nil];
-                if (!forcedRefresh)
-                    sharingAccountsRequest.downloadCache = [ASIDownloadCache sharedCache];
+//                if (!forcedRefresh)
+//                    sharingAccountsRequest.downloadCache = [ASIDownloadCache sharedCache];
                 [[PithosUtilities prepareRequest:sharingAccountsRequest priority:NSOperationQueuePriorityVeryHigh] startAsynchronous];
                 break;
             case PithosNodeStateRefreshing:
@@ -231,8 +231,8 @@
                                                NSStringFromSelector(@selector(sharingAccountsRequestFinished:)), @"didFinishSelector", 
                                                NSStringFromSelector(@selector(sharingAccountsRequestFailed:)), @"didFailSelector", 
                                                nil];
-            if (!forcedRefresh)
-                sharingAccountsRequest.downloadCache = [ASIDownloadCache sharedCache];
+//            if (!forcedRefresh)
+//                sharingAccountsRequest.downloadCache = [ASIDownloadCache sharedCache];
             [[PithosUtilities prepareRequest:sharingAccountsRequest priority:NSOperationQueuePriorityVeryHigh] startAsynchronous];
         }
     } else {

diff --git a/pithos-macos/PithosSubdirNode.m b/pithos-macos/PithosSubdirNode.m
index c4149d5..af338b4 100644 (file)
--- a/pithos-macos/PithosSubdirNode.m
+++ b/pithos-macos/PithosSubdirNode.m
@@ -399,7 +399,8 @@ static NSImage *sharedIcon = nil;
                                                      NSStringFromSelector(@selector(objectRequestFinished:)), @"didFinishSelector", 
                                                      NSStringFromSelector(@selector(objectRequestFailed:)), @"didFailSelector", 
                                                      nil];
-            refreshMetadataObjectRequest.downloadCache = [ASIDownloadCache sharedCache];
+            if (!sharingAccount)
+                refreshMetadataObjectRequest.downloadCache = [ASIDownloadCache sharedCache];
             [[PithosUtilities prepareRequest:refreshMetadataObjectRequest priority:NSOperationQueuePriorityHigh] startAsynchronous];
         }
     }
@@ -428,7 +429,8 @@ static NSImage *sharedIcon = nil;
                                                      NSStringFromSelector(@selector(objectRequestFinished:)), @"didFinishSelector", 
                                                      NSStringFromSelector(@selector(objectRequestFailed:)), @"didFailSelector", 
                                                      nil];
-            refreshVersionsObjectRequest.downloadCache = [ASIDownloadCache sharedCache];
+            if (!sharingAccount)
+                refreshVersionsObjectRequest.downloadCache = [ASIDownloadCache sharedCache];
             [[PithosUtilities prepareRequest:refreshVersionsObjectRequest priority:NSOperationQueuePriorityHigh] startAsynchronous];
         }
     }

diff --git a/pithos-macos/pithos_macosAppDelegate.m b/pithos-macos/pithos_macosAppDelegate.m
index a03fd36..5048895 100644 (file)
--- a/pithos-macos/pithos_macosAppDelegate.m
+++ b/pithos-macos/pithos_macosAppDelegate.m
@@ -42,7 +42,6 @@
 #import "PithosSyncDaemon.h"
 #import "ASIPithosRequest.h"
 #import "ASIPithos.h"
-#import "ASIDownloadCache.h"
 #import "LastCompletedSyncTransformer.h"
 
 @implementation pithos_macosAppDelegate