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

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index b46693e,df56c13..43efac6
--- 1/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
--- 2/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));
              }