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?ds=inline;hp=-c

merge develop
---

f068a156c56122c3239d1af64e654280b49aff8b
diff --combined src/com/owncloud/android/files/FileOperationsHelper.java
index e1568523,2f2907da..ddee2050
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@@ -40,6 -40,7 +40,7 @@@ import com.owncloud.android.lib.common.
  import com.owncloud.android.lib.common.utils.Log_OC;
  import com.owncloud.android.lib.resources.status.OwnCloudVersion;
  import com.owncloud.android.services.OperationsService;
+ import com.owncloud.android.services.observer.FileObserverService;
  import com.owncloud.android.ui.activity.FileActivity;
  import com.owncloud.android.ui.dialog.ShareLinkToDialog;
  
@@@ -187,14 -188,12 +188,14 @@@ public class FileOperationsHelper 
      
      public void sendDownloadedFile(OCFile file) {
          if (file != null) {
 +            String storagePath = file.getStoragePath();
 +            String encodedStoragePath = WebdavUtils.encodePath(storagePath);
              Intent sendIntent = new Intent(android.content.Intent.ACTION_SEND);
              // set MimeType
              sendIntent.setType(file.getMimetype());
 -            sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + file.getStoragePath()));
 +            sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + encodedStoragePath));
              sendIntent.putExtra(Intent.ACTION_SEND, true);      // Send Action
 -            
 +
              // Show dialog, without the own app
              String[] packagesToExclude = new String[] { mFileActivity.getPackageName() };
              DialogFragment chooserDialog = ShareLinkToDialog.newInstance(sendIntent, packagesToExclude, file);
@@@ -225,6 -224,24 +226,24 @@@
              mFileActivity.startService(intent);
          }
      }
+ 
+     public void toggleFavorite(OCFile file, boolean isFavorite) {
+         file.setFavorite(isFavorite);
+         mFileActivity.getStorageManager().saveFile(file);
+ 
+         /// register the OCFile instance in the observer service to monitor local updates
+         Intent observedFileIntent = FileObserverService.makeObservedFileIntent(
+                 mFileActivity,
+                 file,
+                 mFileActivity.getAccount(),
+                 isFavorite);
+         mFileActivity.startService(observedFileIntent);
+ 
+         /// immediate content synchronization
+         if (file.isFavorite()) {
+             syncFile(file);
+         }
+     }
      
      public void renameFile(OCFile file, String newFilename) {
          // RenameFile
@@@ -284,8 -301,8 +303,8 @@@
              downloaderBinder.cancel(account, file);
  
              // TODO - review why is this here, and solve in a better way
-             // Remove etag for parent, if file is a keep_in_sync
-             if (file.keepInSync()) {
+             // Remove etag for parent, if file is a favorite
+             if (file.isFavorite()) {
                  OCFile parent = mFileActivity.getStorageManager().getFileById(file.getParentId());
                  parent.setEtag("");
                  mFileActivity.getStorageManager().saveFile(parent);
diff --combined 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;
@@@ -286,7 -285,7 +286,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);