From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 7 May 2014 08:03:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/refactor_update_filelist_from_database' into... 
X-Git-Tag: oc-android-1.7.0_signed~309^2~46
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e42fcc1e32fcf129889e5b58b3bc2a9fda5f4c16

Merge remote-tracking branch 'origin/refactor_update_filelist_from_database' into refactor_update_filelist_from_database
---

e42fcc1e32fcf129889e5b58b3bc2a9fda5f4c16
diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index b46693e8,df56c133..43efac68
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -957,7 -997,9 +957,7 @@@ OnSslUntrustedCertListener, EditNameDia
                      (uploadedRemotePath.startsWith(currentDir.getRemotePath()));
              
              if (sameAccount && isDescendant) {
-                 refeshListOfFilesFragment();
 -                
+                 refreshListOfFilesFragment();
 -                
              }
              
              boolean uploadWasFine = intent.getBooleanExtra(FileUploader.EXTRA_UPLOAD_RESULT, false);
@@@ -1012,7 -1054,9 +1012,7 @@@
              boolean isDescendant = isDescendant(downloadedRemotePath);
  
              if (sameAccount && isDescendant) {
-                 refeshListOfFilesFragment();
 -                
+                 refreshListOfFilesFragment();
 -                
                  refreshSecondFragment(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false));
              }