From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 24 Oct 2013 14:31:56 +0000 (+0200)
Subject: Merge branch 'develop' into refresh_folder_contents_when_browsed_into
X-Git-Tag: oc-android-1.5.5~155^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e16f63591d6315081dc8eefaba3541f366dd14b9?ds=inline

Merge branch 'develop' into refresh_folder_contents_when_browsed_into
---

e16f63591d6315081dc8eefaba3541f366dd14b9
diff --cc src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index 47f72ac2,c7791cc7..09683d63
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@@ -511,47 -360,4 +511,46 @@@ public class SynchronizeFolderOperatio
          }
      }
  
- 
 +    /**
 +     * Scans the default location for saving local copies of files searching for
 +     * a 'lost' file with the same full name as the {@link OCFile} received as 
 +     * parameter.
 +     *  
 +     * @param file      File to associate a possible 'lost' local file.
 +     */
 +    private void searchForLocalFileInDefaultPath(OCFile file) {
 +        if (file.getStoragePath() == null && !file.isFolder()) {
 +            File f = new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, file));
 +            if (f.exists()) {
 +                file.setStoragePath(f.getAbsolutePath());
 +                file.setLastSyncDateForData(f.lastModified());
 +            }
 +        }
 +    }
 +
 +    
 +    /**
 +     * Sends a message to any application component interested in the progress of the synchronization.
 +     * 
 +     * @param inProgress        'True' when the synchronization progress is not finished.
 +     * @param dirRemotePath     Remote path of a folder that was just synchronized (with or without success)
 +     */
 +    private void sendStickyBroadcast(boolean inProgress, String dirRemotePath, RemoteOperationResult result) {
 +        Intent i = new Intent(FileSyncService.getSyncMessage());
 +        i.putExtra(FileSyncService.IN_PROGRESS, inProgress);
 +        i.putExtra(FileSyncService.ACCOUNT_NAME, mAccount.name);
 +        if (dirRemotePath != null) {
 +            i.putExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH, dirRemotePath);
 +        }
 +        if (result != null) {
 +            i.putExtra(FileSyncService.SYNC_RESULT, result);
 +        }
 +        mContext.sendStickyBroadcast(i);
 +    }
 +
 +
 +    public boolean getRemoteFolderChanged() {
 +        return mRemoteFolderChanged;
 +    }
 +
  }