From: tobiasKaminsky Date: Mon, 2 Nov 2015 18:53:54 +0000 (+0100) Subject: fixed according to review X-Git-Tag: beta-20151122~25^2~3 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/300187c02ec5995451c9e937b31de7898938691f fixed according to review --- diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index 37bd66f3..57952ae9 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -322,11 +322,7 @@ public class FileDisplayActivity extends HookActivity startTextPreview(file); } - if (DisplayUtils.isGridView(getFile(), getStorageManager())){ - switchToGridView(); - } else { - switchToListView(); - } + switchLayout(getFile()); } else { Log_OC.wtf(TAG, "initFragments() called with invalid NULLs!"); @@ -339,6 +335,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()) { @@ -1250,11 +1254,7 @@ public class FileDisplayActivity extends HookActivity MenuItem menuItem = mOptionsMenu.findItem(R.id.action_switch_view); changeGridIcon(); - if (DisplayUtils.isGridView(directory, getStorageManager())){ - switchToGridView(); - } else { - switchToListView(); - } + switchLayout(directory); } /**