From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 7 Sep 2015 09:16:29 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons
X-Git-Tag: beta-20151128~7^2~34
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6d670fb6786ade61eea01af32c7ccdbd09992bc9?ds=inline;hp=-c

Merge branch 'master' of https://github.com/owncloud/android into material_buttons
---

6d670fb6786ade61eea01af32c7ccdbd09992bc9
diff --combined res/layout/file_preview.xml
index dd44ed5e,f7a697a0..685f2b55
--- a/res/layout/file_preview.xml
+++ b/res/layout/file_preview.xml
@@@ -25,9 -25,9 +25,9 @@@
      android:layout_height="match_parent"
      android:background="@color/background_color"
      android:gravity="center"
-     tools:context=".ui.fragment.FilePreviewFragment" >
+     tools:context=".ui.fragment.FilePreviewFragment">
  
-     <FrameLayout 
+     <FrameLayout
          android:id="@+id/visual_area"
     	    android:layout_width="match_parent"
     	    android:layout_height="0dp"
@@@ -39,7 -39,7 +39,7 @@@
  	        android:id="@+id/image_preview"
  	        android:layout_width="match_parent"
  	        android:layout_height="match_parent"
 -	        android:layout_margin="16dp"
 +	        android:layout_margin="@dimen/standard_margin"
  	        android:layout_gravity="center"
  	        android:contentDescription="@string/preview_image_description"
  	        android:src="@drawable/logo" />
diff --combined src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 77523575,20bcdce4..fa1dd798
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -99,6 -99,7 +99,7 @@@ import com.owncloud.android.ui.fragment
  import com.owncloud.android.ui.preview.PreviewImageActivity;
  import com.owncloud.android.ui.preview.PreviewImageFragment;
  import com.owncloud.android.ui.preview.PreviewMediaFragment;
+ import com.owncloud.android.ui.preview.PreviewTextFragment;
  import com.owncloud.android.ui.preview.PreviewVideoActivity;
  import com.owncloud.android.utils.DisplayUtils;
  import com.owncloud.android.utils.ErrorMessageAdapter;
@@@ -107,7 -108,6 +108,6 @@@ import com.owncloud.android.utils.UriUt
  
  import java.io.File;
  
- 
  /**
   * Displays, what files the user has available in his ownCloud.
   */
@@@ -116,6 -116,8 +116,8 @@@ public class FileDisplayActivity extend
          implements FileFragment.ContainerActivity,
          OnSslUntrustedCertListener, OnEnforceableRefreshListener {
  
+ 
+ 
      private SyncBroadcastReceiver mSyncBroadcastReceiver;
      private UploadFinishReceiver mUploadFinishReceiver;
      private DownloadFinishReceiver mDownloadFinishReceiver;
@@@ -174,7 -176,6 +176,6 @@@
              mSyncInProgress = savedInstanceState.getBoolean(KEY_SYNC_IN_PROGRESS);
              mWaitingToSend = (OCFile) savedInstanceState.getParcelable(
                      FileDisplayActivity.KEY_WAITING_TO_SEND);
-            
          } else {
              mWaitingToPreview = null;
              mSyncInProgress = false;
@@@ -212,7 -213,7 +213,7 @@@
  
          mProgressBar.setIndeterminate(mSyncInProgress);
          // always AFTER setContentView(...) ; to work around bug in its implementation
-         
+ 
          setBackgroundText();
  
          Log_OC.v(TAG, "onCreate() end");
@@@ -264,7 -265,12 +265,7 @@@
              setFile(file);
  
              if (mAccountWasSet) {
 -                RelativeLayout navigationDrawerLayout = (RelativeLayout) findViewById(R.id.left_drawer);
 -                if (navigationDrawerLayout != null && getAccount() != null) {
 -                    TextView username = (TextView) navigationDrawerLayout.findViewById(R.id.drawer_username);
 -                    int lastAtPos = getAccount().name.lastIndexOf("@");
 -                    username.setText(getAccount().name.substring(0, lastAtPos));
 -                }
 +                setUsernameInDrawer((RelativeLayout) findViewById(R.id.left_drawer), getAccount());
              }
  
              if (!stateWasRecovered) {
@@@ -296,6 -302,7 +297,7 @@@
                  listOfFiles.listDirectory(getCurrentDir());
                  // TODO Enable when "On Device" is recovered
                  // listOfFiles.listDirectory(getCurrentDir(), MainApp.getOnlyOnDevice());
+ 
              } else {
                  Log_OC.e(TAG, "Still have a chance to lose the initializacion of list fragment >(");
              }
@@@ -307,9 -314,11 +309,11 @@@
                  setSecondFragment(secondFragment);
                  updateFragmentsVisibility(true);
                  updateActionBarTitleAndHomeButton(file);
-                 
+ 
              } else {
                  cleanSecondFragment();
+                 if (file.isDown() && PreviewTextFragment.canBePreviewed(file))
+                     startTextPreview(file);
              }
  
          } else {
@@@ -336,9 -345,11 +340,11 @@@
                  secondFragment = new PreviewMediaFragment(file, getAccount(),
                          startPlaybackPosition, autoplay);
  
+             } else if (file.isDown() && PreviewTextFragment.canBePreviewed(file)) {
+                 secondFragment = null;
              } else {
-                 secondFragment = FileDetailFragment.newInstance(file, getAccount());
-             }
+             secondFragment = FileDetailFragment.newInstance(file, getAccount());
+         }
          }
          return secondFragment;
      }
@@@ -455,6 -466,9 +461,9 @@@
                          if (PreviewMediaFragment.canBePreviewed(mWaitingToPreview)) {
                              startMediaPreview(mWaitingToPreview, 0, true);
                              detailsFragmentChanged = true;
+                         } else if (PreviewTextFragment.canBePreviewed(mWaitingToPreview)) {
+                             startTextPreview(mWaitingToPreview);
+                             detailsFragmentChanged = true;
                          } else {
                              getFileOperationsHelper().openFile(mWaitingToPreview);
                          }
@@@ -497,6 -511,7 +506,7 @@@
                  dialog.show(getSupportFragmentManager(), DIALOG_CREATE_FOLDER);
                  break;
              }
+ 
              case R.id.action_sync_account: {
                  startSynchronization();
                  break;
@@@ -505,7 -520,6 +515,6 @@@
                  UploadSourceDialogFragment dialog =
                          UploadSourceDialogFragment.newInstance(getAccount());
                  dialog.show(getSupportFragmentManager(), DIALOG_UPLOAD_SOURCE);
- 
                  break;
              }
              case android.R.id.home: {
@@@ -809,11 -823,9 +818,9 @@@
      protected void onResume() {
          Log_OC.v(TAG, "onResume() start");
          super.onResume();
- 
          // refresh Navigation Drawer account list
          mNavigationDrawerAdapter.updateAccountList();
  
- 
          // refresh list of files
          refreshListOfFilesFragment();
  
@@@ -841,6 -853,7 +848,7 @@@
          registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
  
          Log_OC.v(TAG, "onResume() end");
+ 
      }
  
  
@@@ -884,7 -897,7 +892,7 @@@
                                  FileSyncAdapter.EXTRA_RESULT);
                  boolean sameAccount = (getAccount() != null &&
                          accountName.equals(getAccount().name) && getStorageManager() != null);
-     
+ 
                  if (sameAccount) {
  
                      if (FileSyncAdapter.EVENT_FULL_SYNC_START.equals(event)) {
@@@ -905,6 -918,7 +913,7 @@@
                                                     synchFolderRemotePath),
                                              Toast.LENGTH_LONG)
                                  .show();
+ 
                              browseToRoot();
  
                          } else {
@@@ -933,8 -947,8 +942,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() ||
@@@ -948,7 -962,6 +957,6 @@@
                                          new OwnCloudAccount(getAccount(), context);
                                  client = (OwnCloudClientManagerFactory.getDefaultSingleton().
                                          removeClientFor(ocAccount));
- 
                                  if (client != null) {
                                      OwnCloudCredentials cred = client.getCredentials();
                                      if (cred != null) {
@@@ -1068,10 -1081,15 +1076,15 @@@
                          cleanSecondFragment();
                      }
  
-                     // Force the preview if the file is an image
-                     if (uploadWasFine && PreviewImageFragment.canBePreviewed(getFile())) {
-                         startImagePreview(getFile());
-                     } // TODO what about other kind of previews?
+                     // Force the preview if the file is an image or text file
+                     if (uploadWasFine) {
+                         OCFile ocFile = getFile();
+                         if (PreviewImageFragment.canBePreviewed(ocFile))
+                             startImagePreview(getFile());
+                         else if (PreviewTextFragment.canBePreviewed(ocFile))
+                             startTextPreview(ocFile);
+                         // TODO what about other kind of previews?
+                     }
                  }
  
                  mProgressBar.setIndeterminate(false);
@@@ -1120,7 -1138,7 +1133,7 @@@
                  if (mWaitingToSend != null) {
                      mWaitingToSend =
                              getStorageManager().getFileByPath(mWaitingToSend.getRemotePath());
-                     if (mWaitingToSend.isDown()) { 
+                     if (mWaitingToSend.isDown()) {
                          sendDownloadedFile();
                      }
                  }
@@@ -1168,7 -1186,6 +1181,6 @@@
              startSyncFolderOperation(root, false);
          }
          cleanSecondFragment();
- 
      }
  
  
@@@ -1247,7 -1264,7 +1259,7 @@@
              }
              // a new chance to get the mDownloadBinder through
              // getFileDownloadBinder() - THIS IS A MESS
-             OCFileListFragment listOfFiles = getListOfFilesFragment(); 
+             OCFileListFragment listOfFiles = getListOfFilesFragment();
              if (listOfFiles != null) {
                  listOfFiles.listDirectory();
                  // TODO Enable when "On Device" is recovered ?
@@@ -1331,8 -1348,6 +1343,6 @@@
          }
  
      }
- 
- 
      private void onCreateShareOperationFinish(CreateShareOperation operation,
                                                RemoteOperationResult result) {
          if (result.isSuccess()) {
@@@ -1341,7 -1356,6 +1351,6 @@@
          }
      }
  
- 
      private void onUnshareLinkOperationFinish(UnshareLinkOperation operation,
                                                RemoteOperationResult result) {
          if (result.isSuccess()) {
@@@ -1363,6 -1377,9 +1372,9 @@@
                  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 {
                      showDetails(file);
                  }
@@@ -1384,7 -1401,7 +1396,7 @@@
  
          Toast msg = Toast.makeText(this,
                  ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
-                 Toast.LENGTH_LONG); 
+                 Toast.LENGTH_LONG);
          msg.show();
  
          if (result.isSuccess()) {
@@@ -1397,7 -1414,7 +1409,7 @@@
                  setFile(getStorageManager().getFileById(removedFile.getParentId()));
                  cleanSecondFragment();
              }
-             if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())) {
+             if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())){
                  refreshListOfFilesFragment();
              }
              invalidateOptionsMenu();
@@@ -1489,6 -1506,14 +1501,14 @@@
                      } 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);
+                     }
                  }
              }
  
@@@ -1499,7 -1524,7 +1519,7 @@@
          } else {
              Toast msg = Toast.makeText(this,
                      ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
-                     Toast.LENGTH_LONG); 
+                     Toast.LENGTH_LONG);
              msg.show();
  
              if (result.isSslRecoverableException()) {
@@@ -1612,6 -1637,7 +1632,7 @@@
                  getApplicationContext()
          );
          synchFolderOp.execute(getAccount(), MainApp.getAppContext(), this, null, null);
+ 
          mProgressBar.setIndeterminate(true);
  
          setBackgroundText();
@@@ -1669,7 -1695,6 +1690,6 @@@
          showDetailsIntent.putExtra(EXTRA_FILE, file);
          showDetailsIntent.putExtra(EXTRA_ACCOUNT, getAccount());
          startActivity(showDetailsIntent);
- 
      }
  
      /**
@@@ -1691,6 -1716,23 +1711,23 @@@
      }
  
      /**
+      * Stars the preview of a text file {@link OCFile}.
+      *
+      * @param file Text {@link OCFile} to preview.
+      */
+     public void startTextPreview(OCFile file) {
+         Bundle args = new Bundle();
+         args.putParcelable(EXTRA_FILE, file);
+         args.putParcelable(EXTRA_ACCOUNT, getAccount());
+         Fragment textPreviewFragment = Fragment.instantiate(getApplicationContext(),
+                 PreviewTextFragment.class.getName(), args);
+         setSecondFragment(textPreviewFragment);
+         updateFragmentsVisibility(true);
+         //updateNavigationElementsInActionBar(file);
+         setFile(file);
+     }
+ 
+     /**
       * Requests the download of the received {@link OCFile} , updates the UI
       * to monitor the download progress and prepares the activity to preview
       * or open the file when the download finishes.