From: purigarcia <pgarcia@solidgear.es>
Date: Tue, 28 Jul 2015 08:46:13 +0000 (+0200)
Subject: merge develop
X-Git-Tag: oc-android-1.8~54^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f068a156c56122c3239d1af64e654280b49aff8b?hp=--cc

merge develop
---

f068a156c56122c3239d1af64e654280b49aff8b
diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index c6ea0344,33fa57fd..58e92552
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -268,15 -268,14 +268,15 @@@ public class FileListListAdapter extend
                      }
  
                      // share with me icon
-                     if (!file.isFolder()) {
-                         ImageView sharedWithMeIconV = (ImageView)
-                                 view.findViewById(R.id.sharedWithMeIcon);
-                         sharedWithMeIconV.bringToFront();
-                         if (checkIfFileIsSharedWithMe(file)) {
-                             sharedWithMeIconV.setVisibility(View.VISIBLE);
-                         } else {
-                             sharedWithMeIconV.setVisibility(View.GONE);
-                         }
+                     ImageView sharedWithMeIconV = (ImageView)
+                             view.findViewById(R.id.sharedWithMeIcon);
+                     sharedWithMeIconV.bringToFront();
+                     if (checkIfFileIsSharedWithMe(file) &&
+                             (!file.isFolder() || !mGridMode)) {
+                         sharedWithMeIconV.setVisibility(View.VISIBLE);
+                     } else {
+                         sharedWithMeIconV.setVisibility(View.GONE);
++
                      }
  
                      break;