changes according to CR

src/com/owncloud/android/datamodel/OCFile.java

@@ -91,8 +91,6 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
      */
     private Uri mLocalUri;
 
-    private boolean mShowGridView;
-
 
     /**
      * Create new {@link OCFile} with given path.

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -320,7 +320,7 @@ public class FileDisplayActivity extends HookActivity
                     startTextPreview(file);
             }
 
-            switchLayout(getFile());
+            switchLayout(getCurrentDir());
 
         } else {
             Log_OC.wtf(TAG, "initFragments() called with invalid NULLs!");
@@ -334,7 +334,7 @@ public class FileDisplayActivity extends HookActivity
     }
 
     private void switchLayout(OCFile file){
-        if (DisplayUtils.isGridView(file, getStorageManager())){
+        if (DisplayUtils.isGridViewPreferred(file, getStorageManager())){
             switchToGridView();
         } else {
             switchToListView();
@@ -508,8 +508,6 @@ public class FileDisplayActivity extends HookActivity
         inflater.inflate(R.menu.main_menu, menu);
         mOptionsMenu = menu;
 
-        MenuItem menuItem = mOptionsMenu.findItem(R.id.action_switch_view);
-
         changeGridIcon();
 
         return true;
@@ -709,7 +707,6 @@ public class FileDisplayActivity extends HookActivity
             Toast t = Toast.makeText(this, getString(R.string.filedisplay_no_file_selected),
                     Toast.LENGTH_LONG);
             t.show();
-            return;
         }
     }
 
@@ -834,7 +831,7 @@ public class FileDisplayActivity extends HookActivity
 
     private void changeGridIcon(){
         MenuItem menuItem = mOptionsMenu.findItem(R.id.action_switch_view);
-        if (DisplayUtils.isGridView(getFile(), getStorageManager())) {
+        if (DisplayUtils.isGridViewPreferred(getFile(), getStorageManager())){
             menuItem.setTitle(getApplicationContext().getString(R.string.action_switch_list_view));
             menuItem.setIcon(ContextCompat.getDrawable(getApplicationContext(),
                     R.drawable.ic_view_list));
@@ -1256,8 +1253,6 @@ public class FileDisplayActivity extends HookActivity
         // Sync Folder
         startSyncFolderOperation(directory, false);
 
-        MenuItem menuItem = mOptionsMenu.findItem(R.id.action_switch_view);
-
         changeGridIcon();
         switchLayout(directory);
     }

src/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -218,20 +218,22 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
             item.setEnabled(false);
         }
 
+        Boolean dualPane = getResources().getBoolean(R.bool.large_land_layout);
+
         item = menu.findItem(R.id.action_switch_view);
-        if (item != null){
+        if (item != null && !dualPane){
             item.setVisible(false);
             item.setEnabled(false);
         }
 
         item = menu.findItem(R.id.action_sync_account);
-        if (item != null) {
+        if (item != null && !dualPane) {
             item.setVisible(false);
             item.setEnabled(false);
         }
 
         item = menu.findItem(R.id.action_sort);
-        if (item != null) {
+        if (item != null && !dualPane) {
             item.setVisible(false);
             item.setEnabled(false);
         }

src/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -523,7 +523,7 @@ public class OCFileListFragment extends ExtendedListFragment
             OwnCloudVersion version = AccountUtils.getServerVersion(
                     ((FileActivity)mContainerActivity).getAccount());
             if (version != null && version.supportsRemoteThumbnails() &&
-                    DisplayUtils.isGridView(mFile, mContainerActivity.getStorageManager())) {
+                    DisplayUtils.isGridViewPreferred(mFile, mContainerActivity.getStorageManager())) {
                 switchToGridView();
                 registerLongClickListener();
             } else {

src/com/owncloud/android/ui/preview/PreviewTextFragment.java

@@ -291,14 +291,16 @@ public class PreviewTextFragment extends FileFragment {
             item.setEnabled(false);
         }
 
+        Boolean dualPane = getResources().getBoolean(R.bool.large_land_layout);
+
         item = menu.findItem(R.id.action_switch_view);
-        if (item != null){
+        if (item != null && !dualPane){
             item.setVisible(false);
             item.setEnabled(false);
         }
 
         item = menu.findItem(R.id.action_sort);
-        if (item != null) {
+        if (item != null && !dualPane) {
             item.setVisible(false);
             item.setEnabled(false);
         }

src/com/owncloud/android/utils/DisplayUtils.java

@@ -298,7 +298,7 @@ public class DisplayUtils {
      * @param storageManager
      * @return
      */
-    public static boolean isGridView(OCFile file, FileDataStorageManager storageManager){
+    public static boolean isGridViewPreferred(OCFile file, FileDataStorageManager storageManager){
         if (file != null) {
             OCFile fileToTest = file;
             OCFile parentDir = null;
@@ -307,8 +307,8 @@ public class DisplayUtils {
             SharedPreferences setting = MainApp.getAppContext().getSharedPreferences(
                     "viewMode", Context.MODE_PRIVATE);
 
-            if (setting.contains(fileToTest.getRemoteId())) {
-                return setting.getBoolean(fileToTest.getRemoteId(), false);
+            if (setting.contains(String.valueOf(fileToTest.getFileId()))) {
+                return setting.getBoolean(String.valueOf(fileToTest.getFileId()), false);
             } else {
                 do {
                     if (fileToTest.getParentId() != FileDataStorageManager.ROOT_PARENT_ID) {
@@ -328,7 +328,7 @@ public class DisplayUtils {
                     }
                     fileToTest = parentDir;
                 } while (endWhile(parentDir, setting));
-                return setting.getBoolean(fileToTest.getRemoteId(), false);
+                return setting.getBoolean(String.valueOf(fileToTest.getFileId()), false);
             }
         } else {
             return false;
@@ -339,7 +339,7 @@ public class DisplayUtils {
         if (parentDir.getRemotePath().compareToIgnoreCase(OCFile.ROOT_PATH) == 0) {
             return false;
         } else {
-            return !setting.contains(parentDir.getRemoteId());
+            return !setting.contains(String.valueOf(parentDir.getFileId()));
         }
     }
 
@@ -348,7 +348,7 @@ public class DisplayUtils {
                 "viewMode", Context.MODE_PRIVATE);
 
         SharedPreferences.Editor editor = setting.edit();
-        editor.putBoolean(file.getRemoteId(), setGrid);
+        editor.putBoolean(String.valueOf(file.getFileId()), setGrid);
         editor.commit();
     }