Merge pull request #1050 from owncloud/favourites_context_menu

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

diff --combined src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 4152c53,8e8048f..33fa57f
--- 1/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
--- 2/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
                      }\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
 +                            (!file.isFolder() || !mGridMode)) {\r
 +                        sharedWithMeIconV.setVisibility(View.VISIBLE);\r
 +                    } else {\r
 +                        sharedWithMeIconV.setVisibility(View.GONE);\r
                      }\r
  \r
                      break;\r
@@@ -285,7 -286,7 +285,7 @@@
              \r
              // this if-else is needed even though favorite icon is visible by default\r
              // because android reuses views in listview\r
-             if (!file.keepInSync()) {\r
+             if (!file.isFavorite()) {\r
                  view.findViewById(R.id.favoriteIcon).setVisibility(View.GONE);\r
              } else {\r
                  view.findViewById(R.id.favoriteIcon).setVisibility(View.VISIBLE);\r