From: masensio <masensio@solidgear.es>
Date: Fri, 4 Sep 2015 12:31:10 +0000 (+0200)
Subject: Merge branch 'master' into text_file_preview_pr_707_with_develop
X-Git-Tag: oc-android-1.8~17^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fc5c4d899c1e51af26ee1d0c5818c4580386181c?ds=sidebyside;hp=--cc

Merge branch 'master' into text_file_preview_pr_707_with_develop

Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
---

fc5c4d899c1e51af26ee1d0c5818c4580386181c
diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index ede00340,6c09cbfd..20bcdce4
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -824,8 -845,8 +851,9 @@@ public class FileDisplayActivity extend
          downloadIntentFilter.addAction(FileDownloader.getDownloadFinishMessage());
          mDownloadFinishReceiver = new DownloadFinishReceiver();
          registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
+ 
          Log_OC.v(TAG, "onResume() end");
 +
      }
  
  
@@@ -919,7 -939,8 +947,8 @@@
                                          .equals(event));
                                  
                          if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.
 -                                    equals(event) &&
 -                                /// TODO refactor and make common
 +                                    equals(event) &&/// TODO refactor and make common
++
                                  synchResult != null && !synchResult.isSuccess() &&
                                  (synchResult.getCode() == ResultCode.UNAUTHORIZED ||
                                          synchResult.isIdPRedirection() ||
@@@ -1315,7 -1337,8 +1348,6 @@@
          }
  
      }
-     
 -
 -
      private void onCreateShareOperationFinish(CreateShareOperation operation,
                                                RemoteOperationResult result) {
          if (result.isSuccess()) {
@@@ -1345,11 -1369,9 +1377,12 @@@
                  if (details instanceof PreviewMediaFragment) {
                      // Refresh  OCFile of the fragment
                      ((PreviewMediaFragment) details).updateFile(file);
 +                } else if (details instanceof PreviewTextFragment) {
 +                    // Refresh  OCFile of the fragment
 +                    ((PreviewTextFragment) details).updateFile(file);
-                 } else
+                 } else {
                      showDetails(file);
+                 }
              }
              invalidateOptionsMenu();
          }
@@@ -1365,9 -1387,10 +1398,10 @@@
      private void onRemoveFileOperationFinish(RemoveFileOperation operation,
                                               RemoteOperationResult result) {
          dismissLoadingDialog();
+ 
          Toast msg = Toast.makeText(this,
                  ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
 -                Toast.LENGTH_LONG); 
 +                Toast.LENGTH_LONG);
          msg.show();
  
          if (result.isSuccess()) {
@@@ -1448,17 -1495,9 +1506,17 @@@
                      } else {
                          getFileOperationsHelper().openFile(renamedFile);
                      }
 +                } else if (details instanceof PreviewTextFragment &&
 +                        renamedFile.equals(details.getFile())) {
 +                    ((PreviewTextFragment) details).updateFile(renamedFile);
 +                    if (PreviewTextFragment.canBePreviewed(renamedFile)) {
 +                        startTextPreview(renamedFile);
 +                    } else {
 +                        getFileOperationsHelper().openFile(renamedFile);
 +                    }
                  }
              }
-             
+ 
              if (getStorageManager().getFileById(renamedFile.getParentId()).equals(getCurrentDir())){
                  refreshListOfFilesFragment();
              }
diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index e0004b17,8d76e3aa..0c96ea2c
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@@ -55,13 -53,14 +53,14 @@@ import com.owncloud.android.ui.dialog.R
  import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
  import com.owncloud.android.ui.preview.PreviewImageFragment;
  import com.owncloud.android.ui.preview.PreviewMediaFragment;
- import com.owncloud.android.utils.DialogMenuItem;
  import com.owncloud.android.utils.FileStorageUtils;
 +import com.owncloud.android.ui.preview.PreviewTextFragment;
  
+ import java.io.File;
 -import java.util.Vector;
+ 
  /**
   * A Fragment that lists all files and folders in a given path.
-  * 
+  *
   * TODO refactor to get rid of direct dependency on FileDisplayActivity
   */
  public class OCFileListFragment extends ExtendedListFragment implements FileActionsDialogFragment.FileActionsDialogFragmentListener {