From: purigarcia Date: Wed, 8 Jul 2015 16:14:38 +0000 (+0200) Subject: in gridview in the folder, icons are not shown X-Git-Tag: oc-android-1.8~54^2~7 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/451513a35d9051c932d33656b1f3c8cf53629f5a?ds=inline;hp=--cc in gridview in the folder, icons are not shown --- 451513a35d9051c932d33656b1f3c8cf53629f5a diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java index cac10cf2..18788468 100644 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@ -233,13 +233,14 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { case GRID_IMAGE: // sharedIcon ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon); - if (file.isShareByLink()) { + if (file.isShareByLink() && ((mGridMode && !file.isFolder()) || !mGridMode)) { sharedIconV.setVisibility(View.VISIBLE); sharedIconV.bringToFront(); } else { sharedIconV.setVisibility(View.GONE); } + // local state ImageView localStateView = (ImageView) view.findViewById(R.id.localFileIndicator); localStateView.bringToFront(); @@ -271,13 +272,15 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { ImageView sharedWithMeIconV = (ImageView) view.findViewById(R.id.sharedWithMeIcon); sharedWithMeIconV.bringToFront(); - if (checkIfFileIsSharedWithMe(file)) { + if (checkIfFileIsSharedWithMe(file) && + ((mGridMode && !file.isFolder()) || !mGridMode)) { sharedWithMeIconV.setVisibility(View.VISIBLE); } else { sharedWithMeIconV.setVisibility(View.GONE); } + break; }