Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index c19fb4a..39649ef 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -323,11 +323,7 @@ public class FileDisplayActivity extends HookActivity
                     startTextPreview(file);
             }
 
                     startTextPreview(file);
             }
 

-            if (DisplayUtils.isGridView(getFile(), getStorageManager())){
-                switchToGridView();
-            } else {
-                switchToListView();
-            }
+            switchLayout(getFile());

 
         } else {
             Log_OC.wtf(TAG, "initFragments() called with invalid NULLs!");
 
         } else {
             Log_OC.wtf(TAG, "initFragments() called with invalid NULLs!");


@@ -340,6 +336,14 @@ public class FileDisplayActivity extends HookActivity
         }
     }
 
         }
     }
 

+    private void switchLayout(OCFile file){
+        if (DisplayUtils.isGridView(file, getStorageManager())){
+            switchToGridView();
+        } else {
+            switchToListView();
+        }
+    }
+

     private Fragment chooseInitialSecondFragment(OCFile file) {
         Fragment secondFragment = null;
         if (file != null && !file.isFolder()) {
     private Fragment chooseInitialSecondFragment(OCFile file) {
         Fragment secondFragment = null;
         if (file != null && !file.isFolder()) {


@@ -1304,11 +1308,7 @@ public class FileDisplayActivity extends HookActivity
         MenuItem menuItem = mOptionsMenu.findItem(R.id.action_switch_view);
 
         changeGridIcon();
         MenuItem menuItem = mOptionsMenu.findItem(R.id.action_switch_view);
 
         changeGridIcon();

-        if (DisplayUtils.isGridView(directory, getStorageManager())){
-            switchToGridView();
-        } else {
-            switchToListView();
-        }
+        switchLayout(directory);

     }
 
     /**
     }
 
     /**