in gridview in the folder, icons are not shown
authorpurigarcia <pgarcia@solidgear.es>
Wed, 8 Jul 2015 16:14:38 +0000 (18:14 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Wed, 8 Jul 2015 16:14:38 +0000 (18:14 +0200)
src/com/owncloud/android/ui/adapter/FileListListAdapter.java

index cac10cf..1878846 100644 (file)
@@ -233,13 +233,14 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                 case GRID_IMAGE:\r
                     // sharedIcon\r
                     ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);\r
-                    if (file.isShareByLink()) {\r
+                    if (file.isShareByLink() && ((mGridMode && !file.isFolder()) || !mGridMode)) {\r
                         sharedIconV.setVisibility(View.VISIBLE);\r
                         sharedIconV.bringToFront();\r
                     } else {\r
                         sharedIconV.setVisibility(View.GONE);\r
                     }\r
 \r
+\r
                     // local state\r
                     ImageView localStateView = (ImageView) view.findViewById(R.id.localFileIndicator);\r
                     localStateView.bringToFront();\r
@@ -271,13 +272,15 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                     ImageView sharedWithMeIconV = (ImageView)\r
                             view.findViewById(R.id.sharedWithMeIcon);\r
                     sharedWithMeIconV.bringToFront();\r
-                    if (checkIfFileIsSharedWithMe(file)) {\r
+                    if (checkIfFileIsSharedWithMe(file) &&\r
+                            ((mGridMode && !file.isFolder()) || !mGridMode)) {\r
                         sharedWithMeIconV.setVisibility(View.VISIBLE);\r
                     } else {\r
                         sharedWithMeIconV.setVisibility(View.GONE);\r
                     }\r
 \r
 \r
+\r
                     break;\r
             }\r
             \r