Merge branch 'master' into develop

[pub/Android/ownCloud.git] / src / com / owncloud / android / services / SyncFolderHandler.java

diff --git a/src/com/owncloud/android/services/SyncFolderHandler.java b/src/com/owncloud/android/services/SyncFolderHandler.java
index b0116b3..02f8f7a 100644 (file)
--- a/src/com/owncloud/android/services/SyncFolderHandler.java
+++ b/src/com/owncloud/android/services/SyncFolderHandler.java
@@ -87,6 +87,7 @@ class SyncFolderHandler extends Handler {
     public void handleMessage(Message msg) {
         Pair<Account, String> itemSyncKey = (Pair<Account, String>) msg.obj;
         doOperation(itemSyncKey.first, itemSyncKey.second);
     public void handleMessage(Message msg) {
         Pair<Account, String> itemSyncKey = (Pair<Account, String>) msg.obj;
         doOperation(itemSyncKey.first, itemSyncKey.second);

+        Log_OC.d(TAG, "Stopping after command with id " + msg.arg1);

         mService.stopSelf(msg.arg1);
     }
 
         mService.stopSelf(msg.arg1);
     }
 


@@ -102,25 +103,26 @@ class SyncFolderHandler extends Handler {
             RemoteOperationResult result = null;
 
             try {
             RemoteOperationResult result = null;
 
             try {

-                if (mOwnCloudClient == null || !account.equals(mCurrentAccount)) {
-                    /// get client object to send the request to the ownCloud server, if cannot
+
+                if (mCurrentAccount == null || !mCurrentAccount.equals(account)) {

                     mCurrentAccount = account;
                     mStorageManager = new FileDataStorageManager(
                             account,
                             mService.getContentResolver()
                     );
                     mCurrentAccount = account;
                     mStorageManager = new FileDataStorageManager(
                             account,
                             mService.getContentResolver()
                     );

-                    OwnCloudAccount ocAccount = new OwnCloudAccount(account, mService);
-                    mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton().
-                            getClientFor(ocAccount, mService);
+                }   // else, reuse storage manager from previous operation

 
 

-                }   // else, reuse client from previous operation
+                // always get client from client manager, to get fresh credentials in case of update
+                OwnCloudAccount ocAccount = new OwnCloudAccount(account, mService);
+                mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton().
+                        getClientFor(ocAccount, mService);

 
                 result = mCurrentSyncOperation.execute(mOwnCloudClient, mStorageManager);
 
             } catch (AccountsException e) {
 
                 result = mCurrentSyncOperation.execute(mOwnCloudClient, mStorageManager);
 
             } catch (AccountsException e) {

-                Log_OC.e(TAG, "Error while trying to get autorization", e);
+                Log_OC.e(TAG, "Error while trying to get authorization", e);

             } catch (IOException e) {
             } catch (IOException e) {

-                Log_OC.e(TAG, "Error while trying to get autorization", e);
+                Log_OC.e(TAG, "Error while trying to get authorization", e);

             } finally {
                 mPendingOperations.removePayload(account, remotePath);
 
             } finally {
                 mPendingOperations.removePayload(account, remotePath);
 


@@ -154,9 +156,9 @@ class SyncFolderHandler extends Handler {
         if (synchronization != null) {
             synchronization.cancel();
         } else {
         if (synchronization != null) {
             synchronization.cancel();
         } else {

-            // TODO synchronize
+            // TODO synchronize?

             if (mCurrentSyncOperation != null && mCurrentAccount != null &&
             if (mCurrentSyncOperation != null && mCurrentAccount != null &&

-                    mCurrentSyncOperation.getFolderPath().startsWith(file.getRemotePath()) &&
+                    mCurrentSyncOperation.getRemotePath().startsWith(file.getRemotePath()) &&

                     account.name.equals(mCurrentAccount.name)) {
                 mCurrentSyncOperation.cancel();
             }
                     account.name.equals(mCurrentAccount.name)) {
                 mCurrentSyncOperation.cancel();
             }