From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 29 Oct 2015 16:55:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster
X-Git-Tag: beta-20151122~25^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/65f8034c3030948b0a348f7f654821b6226f6a1d?ds=inline;hp=--cc

Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster
---

65f8034c3030948b0a348f7f654821b6226f6a1d
diff --cc src/com/owncloud/android/datamodel/OCFile.java
index 4b9b69aa,4baf1ea5..0c7cc714
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@@ -22,12 -22,11 +22,12 @@@ package com.owncloud.android.datamodel
  
  import android.os.Parcel;
  import android.os.Parcelable;
+ import android.webkit.MimeTypeMap;
  
  import com.owncloud.android.lib.common.utils.Log_OC;
- import com.owncloud.android.utils.FileStorageUtils;
  
  import java.io.File;
 +import java.util.Enumeration;
  
  import third_parties.daveKoeller.AlphanumComparator;
  public class OCFile implements Parcelable, Comparable<OCFile> {
diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 5df6c61c,240d146f..37bd66f3
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -312,17 -314,13 +315,19 @@@ public class FileDisplayActivity extend
                  setSecondFragment(secondFragment);
                  updateFragmentsVisibility(true);
                  updateActionBarTitleAndHomeButton(file);
-                 
+ 
              } else {
                  cleanSecondFragment();
+                 if (file.isDown() && PreviewTextFragment.canBePreviewed(file))
+                     startTextPreview(file);
              }
  
 +            if (DisplayUtils.isGridView(getFile(), getStorageManager())){
 +                switchToGridView();
 +            } else {
 +                switchToListView();
 +            }
 +
          } else {
              Log_OC.wtf(TAG, "initFragments() called with invalid NULLs!");
              if (getAccount() == null) {
@@@ -1756,16 -1794,9 +1849,16 @@@
          getListOfFilesFragment().sortBySize(ascending);
      }
  
-     private void sortByName(boolean ascending){
+     private void sortByName(boolean ascending) {
          getListOfFilesFragment().sortByName(ascending);
      }
 +    private boolean isGridView(){ return getListOfFilesFragment().isGridView(); }
 +    private void switchToGridView() {
 +        getListOfFilesFragment().switchToGridView();
 +    }
 +    private void switchToListView() {
 +        getListOfFilesFragment().switchToListView();
 +    }
  
     public void allFilesOption() {
         browseToRoot();
diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index ac06fc7e,02bd845d..1321fa00
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@@ -55,8 -53,10 +53,11 @@@ 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.DisplayUtils;
  import com.owncloud.android.utils.FileStorageUtils;
+ import com.owncloud.android.ui.preview.PreviewTextFragment;
+ 
+ import java.io.File;
  
  /**
   * A Fragment that lists all files and folders in a given path.
diff --cc src/com/owncloud/android/utils/DisplayUtils.java
index b835f8b6,8a281e92..374a7136
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@@ -48,9 -35,15 +47,16 @@@ import android.widget.SeekBar
  
  import com.owncloud.android.MainApp;
  import com.owncloud.android.R;
 +import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
  
+ import java.net.IDN;
+ import java.text.DateFormat;
+ import java.util.Calendar;
+ import java.util.Date;
+ import java.util.HashMap;
+ import java.util.Map;
+ 
  /**
   * A helper class for some string operations.
   */