From: David A. Velasco <dvelasco@owncloud.com>
Date: Thu, 23 Jul 2015 07:37:13 +0000 (+0200)
Subject: Merge pull request #1050 from owncloud/favourites_context_menu
X-Git-Tag: oc-android-1.8~60
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c21fa6c6e54cdb3fa37e544d57d4c4b855476dd5?hp=-c

Merge pull request #1050 from owncloud/favourites_context_menu

'Kept-in-sync' renamed as 'Favourites' and added to context menu in list of files
---

c21fa6c6e54cdb3fa37e544d57d4c4b855476dd5
diff --combined src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 4152c53c,8e8048ff..33fa57fd
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -268,14 -268,15 +268,14 @@@ 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;
@@@ -285,7 -286,7 +285,7 @@@
              
              // this if-else is needed even though favorite icon is visible by default
              // because android reuses views in listview
-             if (!file.keepInSync()) {
+             if (!file.isFavorite()) {
                  view.findViewById(R.id.favoriteIcon).setVisibility(View.GONE);
              } else {
                  view.findViewById(R.id.favoriteIcon).setVisibility(View.VISIBLE);