Merge oC 'release_2.0.1' downstream

AndroidManifest.xml

@@ -19,8 +19,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="20000000"
-    android:versionName="2.0.0" >
+    android:versionCode="20000001"
+    android:versionName="2.0.1" >
 
     <uses-sdk
         android:minSdkVersion="14"

oc_jb_workaround/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android.workaround.accounts"
-    android:versionCode="0100028"
-    android:versionName="1.0.28" >
+    android:versionCode="0100029"
+    android:versionName="1.0.29" >
 
     <uses-sdk
         android:minSdkVersion="16"

src/com/owncloud/android/datamodel/OCFile.java

@@ -636,6 +636,10 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         return mEtagInConflict;
     }
 
+    public boolean isInConflict() {
+        return mEtagInConflict != null && mEtagInConflict != "";
+    }
+
     public void setEtagInConflict(String etagInConflict) {
         mEtagInConflict = etagInConflict;
     }
@@ -652,4 +656,5 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         String permissions = getPermissions();
         return (permissions != null && permissions.contains(PERMISSION_SHARED_WITH_ME));
     }
+
 }

src/com/owncloud/android/operations/RefreshFolderOperation.java

@@ -527,7 +527,7 @@ public class RefreshFolderOperation extends RemoteOperation {
     private void fetchFavoritesToSyncFromLocalData() {
         List<OCFile> children = mStorageManager.getFolderContent(mLocalFolder);
         for (OCFile child : children) {
-            if (!child.isFolder() && child.isFavorite()) {
+            if (!child.isFolder() && child.isFavorite() && !child.isInConflict()) {
                 SynchronizeFileOperation operation = new SynchronizeFileOperation(
                         child,
                         child,  // cheating with the remote file to get an update to server; to refactor

src/com/owncloud/android/operations/UpdateShareViaLinkOperation.java

@@ -40,7 +40,7 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
 
     private String mPath;
     private String mPassword;
-    private boolean mPublicUpload;
+    private Boolean mPublicUpload;
     private long mExpirationDateInMillis;
 
     /**
@@ -53,7 +53,7 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
         mPath = path;
         mPassword = null;
         mExpirationDateInMillis = 0;
-        mPublicUpload = false;
+        mPublicUpload = null;
     }
 
 
@@ -85,8 +85,9 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
      * Enable upload permissions to update in Share resource.
      *
      * @param publicUpload    Upload Permission to set to the public link.
+     *                        Null results in no update applied to the upload permission.
      */
-    public void setPublicUpload(boolean publicUpload) {
+    public void setPublicUpload(Boolean publicUpload) {
         mPublicUpload = publicUpload;
     }
 

src/com/owncloud/android/services/OperationsService.java

@@ -586,8 +586,11 @@ public class OperationsService extends Service {
                                 expirationDate
                         );
 
-                        boolean publicUpload = operationIntent.getBooleanExtra(EXTRA_SHARE_PUBLIC_UPLOAD, false);
-                        ((UpdateShareViaLinkOperation) operation).setPublicUpload(publicUpload);
+                        if (operationIntent.hasExtra(EXTRA_SHARE_PUBLIC_UPLOAD)) {
+                            ((UpdateShareViaLinkOperation) operation).setPublicUpload(
+                                operationIntent.getBooleanExtra(EXTRA_SHARE_PUBLIC_UPLOAD, false)
+                            );
+                        }
 
                     } else if (shareId > 0) {
                         operation = new UpdateSharePermissionsOperation(shareId);

src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java

@@ -54,19 +54,18 @@ implements ConfirmationDialogFragmentListener {
         
         int messageStringId = R.string.confirmation_remove_alert;
         
-        int negBtn = -1;
+        int localRemoveButton = (!file.isFavorite() && (file.isFolder() || file.isDown())) ?
+            R.string.confirmation_remove_local : -1;
+
         if (file.isFolder()) {
             messageStringId = R.string.confirmation_remove_folder_alert;
-            negBtn = R.string.confirmation_remove_local;
-        } else if (file.isDown()) {
-            negBtn = R.string.confirmation_remove_local;
         }
-        
+
         args.putInt(ARG_MESSAGE_RESOURCE_ID, messageStringId);
         args.putStringArray(ARG_MESSAGE_ARGUMENTS, new String[]{file.getFileName()});
         args.putInt(ARG_POSITIVE_BTN_RES, R.string.common_yes);
         args.putInt(ARG_NEUTRAL_BTN_RES, R.string.common_no);
-        args.putInt(ARG_NEGATIVE_BTN_RES, negBtn);
+        args.putInt(ARG_NEGATIVE_BTN_RES, localRemoveButton);
         args.putParcelable(ARG_TARGET_FILE, file);
         frag.setArguments(args);