Merge branch 'develop' into shareWithYou_icon_in_fileList

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index c6ea034..ab6ebf1 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -233,6 +233,7 @@ 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() && ((mGridMode && !file.isFolder()) || !mGridMode)) {\r
                     if (file.isShareByLink()) {\r
                         sharedIconV.setVisibility(View.VISIBLE);\r
                         sharedIconV.bringToFront();\r
@@ -240,6 +241,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                         sharedIconV.setVisibility(View.GONE);\r
                     }\r
 \r
+\r
                     // local state\r
                     ImageView localStateView = (ImageView) view.findViewById(R.id.localFileIndicator);\r
                     localStateView.bringToFront();\r
@@ -268,17 +270,18 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                     }\r
 \r
                     // share with me icon\r
-                    if (!file.isFolder()) {\r
-                        ImageView sharedWithMeIconV = (ImageView)\r
-                                view.findViewById(R.id.sharedWithMeIcon);\r
-                        sharedWithMeIconV.bringToFront();\r
-                        if (checkIfFileIsSharedWithMe(file)) {\r
-                            sharedWithMeIconV.setVisibility(View.VISIBLE);\r
-                        } else {\r
-                            sharedWithMeIconV.setVisibility(View.GONE);\r
-                        }\r
+                    ImageView sharedWithMeIconV = (ImageView)\r
+                            view.findViewById(R.id.sharedWithMeIcon);\r
+                    sharedWithMeIconV.bringToFront();\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