From 1ace509e4f5183c64e3b07753e0e090446d9fe69 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 18 Jul 2016 17:27:38 +0200
Subject: [PATCH 01/11] wip

---
 res/layout/share_file_layout.xml              | 34 +++++++++++++++++++
 res/values/strings.xml                        |  1 +
 .../ui/fragment/ShareFileFragment.java        | 29 ++++++++++++++++
 3 files changed, 64 insertions(+)

diff --git a/res/layout/share_file_layout.xml b/res/layout/share_file_layout.xml
index b2fe3f6a62a8..b6910ddafe9c 100644
--- a/res/layout/share_file_layout.xml
+++ b/res/layout/share_file_layout.xml
@@ -190,6 +190,40 @@
 
                 </RelativeLayout>
 
+                <RelativeLayout
+                    android:id="@+id/shareViaLinkHideListPermissionSection"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="invisible"
+                    android:layout_marginBottom="@dimen/standard_half_margin"
+                    >
+
+                    <android.support.v7.widget.SwitchCompat
+                        android:id="@+id/shareViaLinkHideListPermissionSwitch"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerInParent="true"
+                        android:padding="@dimen/standard_half_padding"
+                        />
+
+                    <TextView
+                        android:id="@+id/shareViaLinkHideListPermissionLabel"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
+                        android:layout_toLeftOf="@id/shareViaLinkHideListPermissionSwitch"
+                        android:layout_toStartOf="@id/shareViaLinkHideListPermissionSwitch"
+                        android:padding="@dimen/standard_half_padding"
+                        android:text="@string/share_via_link_hide_file_listing_permission_label"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        />
+
+                </RelativeLayout>
+
                 <RelativeLayout
                     android:id="@+id/shareViaLinkPasswordSection"
                     android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0451ea06612e..b0e1589e5261 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -424,6 +424,7 @@
     <string name="share_via_link_password_label">Password protect</string>
     <string name="share_via_link_password_title">Secured</string>
     <string name="share_via_link_edit_permission_label">Allow editing</string>
+    <string name="share_via_link_hide_file_listing_permission_label">Hide file listing</string>
     <string name="share_get_public_link_button">Get link</string>
     <string name="share_with_title">Share with &#8230;</string>
     <string name="share_with_edit_title">Share with %1$s</string>
diff --git a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
index a0e3086cb63d..24eeb2e39169 100644
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -674,6 +674,7 @@ private void updatePublicShareSection() {
             getPasswordSection().setVisibility(View.VISIBLE);
             if (mFile.isFolder() && !mCapabilities.getFilesSharingPublicUpload().isFalse()) {
                 getEditPermissionSection().setVisibility(View.VISIBLE);
+                getFileListingPermissionSection().setVisibility(View.VISIBLE);
             } else {
                 getEditPermissionSection().setVisibility(View.GONE);
             }
@@ -754,6 +755,26 @@ public void onClick(View v) {
                     mOnEditPermissionInteractionListener
             );
 
+            /// update state of the hide file listing permission switch
+            SwitchCompat hideFileListingPermissionSwitch = getHideFileListingPermissionSwitch();
+
+            // set null listener before setChecked() to prevent infinite loop of calls
+            hideFileListingPermissionSwitch.setOnCheckedChangeListener(null);
+            if (mPublicShare.getPermissions() > OCShare.READ_PERMISSION_FLAG) {
+                if (!hideFileListingPermissionSwitch.isChecked()) {
+                    hideFileListingPermissionSwitch.toggle();
+                }
+            } else {
+                if (hideFileListingPermissionSwitch.isChecked()) {
+                    hideFileListingPermissionSwitch.toggle();
+                }
+            }
+            // recover listener
+            // TODO Tobi
+//            hideFileListingPermissionSwitch.setOnCheckedChangeListener(
+//                    mOnEditPermissionInteractionListener
+//            );
+
         } else {
             /// no public share -> collapse section
             SwitchCompat shareViaLinkSwitch = getShareViaLinkSwitch();
@@ -810,6 +831,14 @@ private SwitchCompat getEditPermissionSwitch() {
         return (SwitchCompat) getView().findViewById(R.id.shareViaLinkEditPermissionSwitch);
     }
 
+    private View getFileListingPermissionSection() {
+        return getView().findViewById(R.id.shareViaLinkHideListPermissionSection);
+    }
+
+    private SwitchCompat getHideFileListingPermissionSwitch() {
+        return (SwitchCompat) getView().findViewById(R.id.shareViaLinkHideListPermissionSwitch);
+    }
+
     private AppCompatButton getGetLinkButton() {
         return (AppCompatButton) getView().findViewById(R.id.shareViaLinkGetLinkButton);
     }

From 5890f554cdca6170bac03d59d41fe6cddd672f44 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 18 Jul 2016 18:39:59 +0200
Subject: [PATCH 02/11] wip

---
 .../android/files/FileOperationsHelper.java   | 30 ++++++++++++
 .../ui/fragment/ShareFileFragment.java        | 46 +++++++++++++++++--
 2 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java
index 149abbf0acbc..4e688d0808ff 100644
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@ -36,6 +36,7 @@
 
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.db.OCUpload;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
@@ -397,6 +398,35 @@ public void setUploadPermissionsToShare(OCFile folder, boolean uploadPermission)
         queueShareIntent(updateShareIntent);
     }
 
+    /**
+     * Updates a public share on a folder to set its hide file listing permission.
+     * Starts a request to do it in {@link OperationsService}
+     *
+     * @param share                    {@link OCShare} instance which permissions will be updated.
+     * @param hideFileListing          New state of the permission for editing the folder shared via link.
+     */
+    public void setHideFileListingPermissionsToShare(OCShare share, boolean hideFileListing) {
+        Intent updateShareIntent = new Intent(mFileActivity, OperationsService.class);
+        updateShareIntent.setAction(OperationsService.ACTION_UPDATE_SHARE);
+        updateShareIntent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
+        updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_ID, share.getId());
+
+        int permission = share.getPermissions();
+        share.setPermissions(permission);
+
+        if(!hideFileListing) {
+            permission |= OCShare.READ_PERMISSION_FLAG;
+        } else {
+            permission &= ~OCShare.READ_PERMISSION_FLAG;
+        }
+
+        updateShareIntent.putExtra(
+                OperationsService.EXTRA_SHARE_PERMISSIONS,
+                permission
+        );
+        queueShareIntent(updateShareIntent);
+    }
+
 
     /**
      * @return 'True' if the server supports the Search Users API
diff --git a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
index 24eeb2e39169..c21fd9370328 100644
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -142,6 +142,11 @@ public class ShareFileFragment extends Fragment
      */
     private OnEditPermissionInteractionListener mOnEditPermissionInteractionListener = null;
 
+    /**
+     * Listener for user actions to set or unset hide file listing permission on public link
+     */
+    private OnHideFileListingPermissionInteractionListener mOnHideFileListingPermissionInteractionListener = null;
+
 
     /**
      * Public factory method to create new ShareFileFragment instances.
@@ -509,6 +514,40 @@ public void onCheckedChanged(CompoundButton switchView, boolean isChecked) {
 
     }
 
+    /**
+     * Listener for user actions that start any update on the hide file listing permissions for the public link.
+     */
+    private class OnHideFileListingPermissionInteractionListener
+            implements CompoundButton.OnCheckedChangeListener {
+
+        /**
+         * Called by R.id.shareViaLinkHideListPermissionSwitch to set or clear the edit permission.
+         *
+         * @param switchView {@link SwitchCompat} toggled by the user, R.id.shareViaLinkHideListPermissionSwitch
+         * @param isChecked  New switch state.
+         */
+        @Override
+        public void onCheckedChanged(CompoundButton switchView, boolean isChecked) {
+            if (!isResumed()) {
+                // very important, setChecked(...) is called automatically during
+                // Fragment recreation on device rotations
+                return;
+            }
+
+            ((FileActivity) getActivity()).getFileOperationsHelper().
+                    setHideFileListingPermissionsToShare(
+                            mPublicShare,
+                            isChecked
+                    );
+            ;
+
+            // undo the toggle to grant the view will be correct if the dialog is cancelled
+            switchView.setOnCheckedChangeListener(null);
+            switchView.toggle();
+            switchView.setOnCheckedChangeListener(mOnHideFileListingPermissionInteractionListener);
+        }
+    }
+
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
@@ -770,10 +809,9 @@ public void onClick(View v) {
                 }
             }
             // recover listener
-            // TODO Tobi
-//            hideFileListingPermissionSwitch.setOnCheckedChangeListener(
-//                    mOnEditPermissionInteractionListener
-//            );
+            hideFileListingPermissionSwitch.setOnCheckedChangeListener(
+                    mOnHideFileListingPermissionInteractionListener
+            );
 
         } else {
             /// no public share -> collapse section

From 923d4b6293d4b2ba2c0936c62d8bbece26116b25 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 20 Jul 2016 20:18:18 +0200
Subject: [PATCH 03/11] wip

---
 .../ui/fragment/ShareFileFragment.java        | 42 +++++++++++++++----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
index c21fd9370328..e98f48bd4a84 100644
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -247,6 +247,10 @@ public void onClick(View view) {
         // Set listener for user actions on edit permission
         initEditPermissionListener(view);
 
+        // Set listener for hide file listing
+        // TODO only if "allow editing" is true
+        initHideFileListingListener(view);
+
         // Hide share features sections that are not enabled
         hideNotEnabledShareSections(view);
 
@@ -479,6 +483,21 @@ private void initEditPermissionListener(View shareView) {
 
     }
 
+    /**
+     * Binds listener for user actions that start any update the hide file listing permissions
+     * for the public link to the views receiving the user events.
+     *
+     * @param shareView Root view in the fragment.
+     */
+    private void initHideFileListingListener(View shareView) {
+        mOnHideFileListingPermissionInteractionListener =
+                new OnHideFileListingPermissionInteractionListener();
+
+        ((SwitchCompat) shareView.findViewById(R.id.shareViaLinkHideListPermissionSwitch)).
+                setOnCheckedChangeListener(mOnHideFileListingPermissionInteractionListener);
+
+    }
+
     /**
      * Listener for user actions that start any update on the edit permissions for the public link.
      */
@@ -799,15 +818,20 @@ public void onClick(View v) {
 
             // set null listener before setChecked() to prevent infinite loop of calls
             hideFileListingPermissionSwitch.setOnCheckedChangeListener(null);
-            if (mPublicShare.getPermissions() > OCShare.READ_PERMISSION_FLAG) {
-                if (!hideFileListingPermissionSwitch.isChecked()) {
-                    hideFileListingPermissionSwitch.toggle();
-                }
-            } else {
-                if (hideFileListingPermissionSwitch.isChecked()) {
-                    hideFileListingPermissionSwitch.toggle();
-                }
-            }
+
+            boolean readOnly = (mPublicShare.getPermissions() & OCShare.READ_PERMISSION_FLAG) != 0;
+            hideFileListingPermissionSwitch.setChecked(!readOnly);
+
+//            if ((mPublicShare.getPermissions() & OCShare.READ_PERMISSION_FLAG) != 0) {
+//                if (!hideFileListingPermissionSwitch.isChecked()) {
+//
+//                }
+//            } else {
+//                if (hideFileListingPermissionSwitch.isChecked()) {
+//                    hideFileListingPermissionSwitch.toggle();
+//                }
+//            }
+
             // recover listener
             hideFileListingPermissionSwitch.setOnCheckedChangeListener(
                     mOnHideFileListingPermissionInteractionListener

From e26dc7654d5150c54090b76054a2a56f152c96a5 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 21 Jul 2016 18:17:46 +0200
Subject: [PATCH 04/11] wip

---
 .../android/ui/fragment/ShareFileFragment.java  | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
index e98f48bd4a84..7b0a05a29292 100644
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -803,10 +803,12 @@ public void onClick(View v) {
                 if (!editPermissionSwitch.isChecked()) {
                     editPermissionSwitch.toggle();
                 }
+                getHideFileListingPermissionSection().setVisibility(View.VISIBLE);
             } else {
                 if (editPermissionSwitch.isChecked()) {
                     editPermissionSwitch.toggle();
                 }
+                getHideFileListingPermissionSection().setVisibility(View.GONE);
             }
             // recover listener
             editPermissionSwitch.setOnCheckedChangeListener(
@@ -822,16 +824,6 @@ public void onClick(View v) {
             boolean readOnly = (mPublicShare.getPermissions() & OCShare.READ_PERMISSION_FLAG) != 0;
             hideFileListingPermissionSwitch.setChecked(!readOnly);
 
-//            if ((mPublicShare.getPermissions() & OCShare.READ_PERMISSION_FLAG) != 0) {
-//                if (!hideFileListingPermissionSwitch.isChecked()) {
-//
-//                }
-//            } else {
-//                if (hideFileListingPermissionSwitch.isChecked()) {
-//                    hideFileListingPermissionSwitch.toggle();
-//                }
-//            }
-
             // recover listener
             hideFileListingPermissionSwitch.setOnCheckedChangeListener(
                     mOnHideFileListingPermissionInteractionListener
@@ -901,6 +893,10 @@ private SwitchCompat getHideFileListingPermissionSwitch() {
         return (SwitchCompat) getView().findViewById(R.id.shareViaLinkHideListPermissionSwitch);
     }
 
+    private View getHideFileListingPermissionSection() {
+        return getView().findViewById(R.id.shareViaLinkHideListPermissionSection);
+    }
+
     private AppCompatButton getGetLinkButton() {
         return (AppCompatButton) getView().findViewById(R.id.shareViaLinkGetLinkButton);
     }
@@ -914,6 +910,7 @@ private void hidePublicShare() {
         getPasswordSection().setVisibility(View.GONE);
         getEditPermissionSection().setVisibility(View.GONE);
         getGetLinkButton().setVisibility(View.GONE);
+        getHideFileListingPermissionSection().setVisibility(View.GONE);
     }
 
     public static void setListViewHeightBasedOnChildren(ListView listView) {

From 352ea77aa801f61cfbc861d5595280cf89caf76b Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 21 Jul 2016 18:26:52 +0200
Subject: [PATCH 05/11] wip

---
 src/com/owncloud/android/files/FileOperationsHelper.java   | 6 ------
 .../owncloud/android/ui/fragment/ShareFileFragment.java    | 7 +------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java
index 4e688d0808ff..a4376d8b35b5 100644
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@ -36,11 +36,8 @@
 
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.db.OCUpload;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
-import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -52,13 +49,10 @@
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.ShareActivity;
 import com.owncloud.android.ui.dialog.ShareLinkToDialog;
-import com.owncloud.android.ui.dialog.SharePasswordDialogFragment;
 
 import java.util.Collection;
 import java.util.List;
 
-import java.util.ArrayList;
-
 /**
  *
  */
diff --git a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
index 7b0a05a29292..30f531763ea9 100644
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -248,7 +248,6 @@ public void onClick(View view) {
         initEditPermissionListener(view);
 
         // Set listener for hide file listing
-        // TODO only if "allow editing" is true
         initHideFileListingListener(view);
 
         // Hide share features sections that are not enabled
@@ -732,7 +731,7 @@ private void updatePublicShareSection() {
             getPasswordSection().setVisibility(View.VISIBLE);
             if (mFile.isFolder() && !mCapabilities.getFilesSharingPublicUpload().isFalse()) {
                 getEditPermissionSection().setVisibility(View.VISIBLE);
-                getFileListingPermissionSection().setVisibility(View.VISIBLE);
+                getHideFileListingPermissionSection().setVisibility(View.VISIBLE);
             } else {
                 getEditPermissionSection().setVisibility(View.GONE);
             }
@@ -885,10 +884,6 @@ private SwitchCompat getEditPermissionSwitch() {
         return (SwitchCompat) getView().findViewById(R.id.shareViaLinkEditPermissionSwitch);
     }
 
-    private View getFileListingPermissionSection() {
-        return getView().findViewById(R.id.shareViaLinkHideListPermissionSection);
-    }
-
     private SwitchCompat getHideFileListingPermissionSwitch() {
         return (SwitchCompat) getView().findViewById(R.id.shareViaLinkHideListPermissionSwitch);
     }

From 9cf1676cc75ee714f6cfa31d07d0dab6e666367a Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 2 Aug 2016 17:17:20 +0200
Subject: [PATCH 06/11] hide file listing switch visibility fix when share link
 gets deactivated

---
 src/com/owncloud/android/ui/fragment/ShareFileFragment.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
index 30f531763ea9..a08480db9b27 100644
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -841,6 +841,7 @@ public void onClick(View v) {
             getExpirationDateSection().setVisibility(View.GONE);
             getPasswordSection().setVisibility(View.GONE);
             getEditPermissionSection().setVisibility(View.GONE);
+            getHideFileListingPermissionSection().setVisibility(View.GONE);
             getGetLinkButton().setVisibility(View.GONE);
         }
     }

From 8c53483f1e873a898dce06ccc234c7cab89ac080 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 2 Aug 2016 17:53:27 +0200
Subject: [PATCH 07/11] minor formattings

---
 .../android/ui/fragment/ShareFileFragment.java       | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
index a08480db9b27..926ecc74e2f0 100644
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -489,19 +489,16 @@ private void initEditPermissionListener(View shareView) {
      * @param shareView Root view in the fragment.
      */
     private void initHideFileListingListener(View shareView) {
-        mOnHideFileListingPermissionInteractionListener =
-                new OnHideFileListingPermissionInteractionListener();
+        mOnHideFileListingPermissionInteractionListener = new OnHideFileListingPermissionInteractionListener();
 
         ((SwitchCompat) shareView.findViewById(R.id.shareViaLinkHideListPermissionSwitch)).
                 setOnCheckedChangeListener(mOnHideFileListingPermissionInteractionListener);
-
     }
 
     /**
      * Listener for user actions that start any update on the edit permissions for the public link.
      */
-    private class OnEditPermissionInteractionListener
-            implements CompoundButton.OnCheckedChangeListener {
+    private class OnEditPermissionInteractionListener implements CompoundButton.OnCheckedChangeListener {
 
         /**
          * Called by R.id.shareViaLinkEditPermissionSwitch to set or clear the edit permission.
@@ -535,8 +532,7 @@ public void onCheckedChanged(CompoundButton switchView, boolean isChecked) {
     /**
      * Listener for user actions that start any update on the hide file listing permissions for the public link.
      */
-    private class OnHideFileListingPermissionInteractionListener
-            implements CompoundButton.OnCheckedChangeListener {
+    private class OnHideFileListingPermissionInteractionListener implements CompoundButton.OnCheckedChangeListener {
 
         /**
          * Called by R.id.shareViaLinkHideListPermissionSwitch to set or clear the edit permission.
@@ -599,7 +595,6 @@ public void onDetach() {
         mListener = null;
     }
 
-
     /**
      * Get known server capabilities from DB
      * <p/>
@@ -613,7 +608,6 @@ public void refreshCapabilitiesFromDB() {
         }
     }
 
-
     /**
      * Get users and groups from the DB to fill in the "share with" list.
      * <p/>

From 90f582105f5eb7809bc5ba2e46ca8e86a2bdcce5 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 5 Sep 2016 16:22:03 +0200
Subject: [PATCH 08/11] show compatibility warning

---
 res/values/setup.xml                          |  1 +
 res/values/strings.xml                        |  2 ++
 .../datamodel/FileDataStorageManager.java     |  3 ++
 src/com/owncloud/android/db/ProviderMeta.java |  3 +-
 .../android/files/FileOperationsHelper.java   |  6 ++--
 .../providers/FileContentProvider.java        | 18 +++++++++++-
 .../ui/fragment/ShareFileFragment.java        | 28 +++++++++++++++----
 7 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/res/values/setup.xml b/res/values/setup.xml
index 43f16524924e..3ea27878a35b 100644
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -66,6 +66,7 @@
     <string name="mail_recommend">"mailto:"</string>
     <string name="mail_feedback">"mailto:android@nextcloud.com"</string>
     <string name="url_app_download">"https://play.google.com/store/apps/details?id=com.nextcloud.client"</string>
+    <string name="url_server_install">https://nextcloud.com/install</string>
 
     <!--Destination mail for sending log files -->
     <string name="mail_logger"></string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b0e1589e5261..1747aa64f194 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -465,6 +465,8 @@
     <string name="confirmation_remove_folders_alert">Do you really want to remove the selected items and their contents?</string>
     <string name="uploads_view_upload_status_waiting_for_charging">Waiting for device charging</string>
     <string name="actionbar_search">Search</string>
+    <string name="files_drop_not_supported">This is a Nextcloud feature, please update.</string>
+    <string name="learn_more">Learn more</string>
     <plurals name="items_selected_count">
         <!--
              As a developer, you should always supply "one" and "other"
diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index b2ec1b4b4aae..594361e3f875 100644
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -1911,6 +1911,7 @@ public OCCapability saveCapabilities(OCCapability capability){
         cv.put(ProviderTableMeta.CAPABILITIES_FILES_BIGFILECHUNKING, capability.getFilesBigFileChuncking().getValue());
         cv.put(ProviderTableMeta.CAPABILITIES_FILES_UNDELETE, capability.getFilesUndelete().getValue());
         cv.put(ProviderTableMeta.CAPABILITIES_FILES_VERSIONING, capability.getFilesVersioning().getValue());
+        cv.put(ProviderTableMeta.CAPABILITIES_FILES_DROP, capability.getFilesFileDrop().getValue());
 
         if (capabilityExists(mAccount.name)) {
             if (getContentResolver() != null) {
@@ -2051,6 +2052,8 @@ private OCCapability createCapabilityInstance(Cursor c) {
                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_FILES_UNDELETE))));
             capability.setFilesVersioning(CapabilityBooleanType.fromValue(c.getInt(c
                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_FILES_VERSIONING))));
+            capability.setFilesFileDrop(CapabilityBooleanType.fromValue(c.getInt(c
+                    .getColumnIndex(ProviderTableMeta.CAPABILITIES_FILES_DROP))));
 
         }
         return capability;
diff --git a/src/com/owncloud/android/db/ProviderMeta.java b/src/com/owncloud/android/db/ProviderMeta.java
index 807af4f33aba..6d7adbe4bee7 100644
--- a/src/com/owncloud/android/db/ProviderMeta.java
+++ b/src/com/owncloud/android/db/ProviderMeta.java
@@ -33,7 +33,7 @@
 public class ProviderMeta {
 
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 14;
+    public static final int DB_VERSION = 15;
 
     private ProviderMeta() {
     }
@@ -131,6 +131,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String CAPABILITIES_FILES_BIGFILECHUNKING = "files_bigfilechunking";
         public static final String CAPABILITIES_FILES_UNDELETE = "files_undelete";
         public static final String CAPABILITIES_FILES_VERSIONING = "files_versioning";
+        public static final String CAPABILITIES_FILES_DROP = "files_drop";
 
         public static final String CAPABILITIES_DEFAULT_SORT_ORDER = CAPABILITIES_ACCOUNT_NAME
                 + " collate nocase asc";
diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java
index a4376d8b35b5..9c5ab4c7e23a 100644
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@ -408,10 +408,10 @@ public void setHideFileListingPermissionsToShare(OCShare share, boolean hideFile
         int permission = share.getPermissions();
         share.setPermissions(permission);
 
-        if(!hideFileListing) {
-            permission |= OCShare.READ_PERMISSION_FLAG;
+        if(hideFileListing) {
+            permission = OCShare.CREATE_PERMISSION_FLAG;
         } else {
-            permission &= ~OCShare.READ_PERMISSION_FLAG;
+            permission = OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER;
         }
 
         updateShareIntent.putExtra(
diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java
index 114e555bff44..2a6584a6d6e2 100644
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/com/owncloud/android/providers/FileContentProvider.java
@@ -764,6 +764,21 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
                 }
             }
 
+            if (oldVersion < 15 && newVersion >= 15) {
+                Log_OC.i("SQL", "Entering in the #15 ADD in onUpgrade");
+                db.beginTransaction();
+                try {
+                    // drop old capabilities table
+                    db.execSQL("DROP TABLE IF EXISTS " + "capabilities" + ";");
+                    // Create uploads table
+                    createCapabilitiesTable(db);
+                    upgraded = true;
+                    db.setTransactionSuccessful();
+                } finally {
+                    db.endTransaction();
+                }
+            }
+
             if (!upgraded)
                 Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion +
                         ", newVersion == " + newVersion);
@@ -844,7 +859,8 @@ private void createCapabilitiesTable(SQLiteDatabase db){
                 + ProviderTableMeta.CAPABILITIES_SHARING_FEDERATION_INCOMING + " INTEGER, "     // boolean
                 + ProviderTableMeta.CAPABILITIES_FILES_BIGFILECHUNKING + " INTEGER, "   // boolean
                 + ProviderTableMeta.CAPABILITIES_FILES_UNDELETE + " INTEGER, "  // boolean
-                + ProviderTableMeta.CAPABILITIES_FILES_VERSIONING + " INTEGER );" );   // boolean
+                + ProviderTableMeta.CAPABILITIES_FILES_VERSIONING + " INTEGER, "   // boolean
+                + ProviderTableMeta.CAPABILITIES_FILES_DROP + " INTEGER );" );   // boolean
     }
 
     private void createUploadsTable(SQLiteDatabase db){
diff --git a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
index 926ecc74e2f0..51d3da8ba490 100644
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -23,8 +23,11 @@
 
 import android.accounts.Account;
 import android.app.Activity;
+import android.content.Intent;
 import android.graphics.Bitmap;
+import android.net.Uri;
 import android.os.Bundle;
+import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.AppCompatButton;
 import android.support.v7.widget.SwitchCompat;
@@ -548,12 +551,25 @@ public void onCheckedChanged(CompoundButton switchView, boolean isChecked) {
                 return;
             }
 
-            ((FileActivity) getActivity()).getFileOperationsHelper().
-                    setHideFileListingPermissionsToShare(
-                            mPublicShare,
-                            isChecked
-                    );
-            ;
+            if (mCapabilities.getFilesFileDrop().isTrue()) {
+                ((FileActivity) getActivity()).getFileOperationsHelper().
+                        setHideFileListingPermissionsToShare(
+                                mPublicShare,
+                                isChecked
+                        );
+            } else {
+                // not supported in ownCloud
+                Snackbar.make(getView(), R.string.files_drop_not_supported, Snackbar.LENGTH_LONG)
+                        .setAction(R.string.learn_more, new View.OnClickListener(){
+                            @Override
+                            public void onClick(View v) {
+                                Intent i = new Intent(Intent.ACTION_VIEW);
+                                i.setData(Uri.parse(getString(R.string.url_server_install)));
+                                startActivity(i);
+                            }
+                        })
+                        .show();
+            }
 
             // undo the toggle to grant the view will be correct if the dialog is cancelled
             switchView.setOnCheckedChangeListener(null);

From de41f95d93757270c723e7cc0236ba8f81206837 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 5 Sep 2016 18:12:10 +0200
Subject: [PATCH 09/11] bump andrid lib to 1.0.7

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 098dc8ed7592..3d69236fb3f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ dependencies {
     /// dependencies for app building
     compile name: 'touch-image-view'
 
-    compile 'com.github.nextcloud:android-library:1.0.6'
+    compile 'com.github.nextcloud:android-library:1.0.7'
     compile "com.android.support:support-v4:${supportLibraryVersion}"
     compile "com.android.support:design:${supportLibraryVersion}"
     compile 'com.jakewharton:disklrucache:2.0.2'

From b8905bdb320f4a93fc3ee3a707d4b001e714a0a1 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 6 Sep 2016 14:04:28 +0200
Subject: [PATCH 10/11] minor code reformattings and cleanup

---
 res/layout/share_file_layout.xml              |  12 +-
 .../android/files/FileOperationsHelper.java   |  15 +--
 .../ui/fragment/ShareFileFragment.java        | 107 +++++++-----------
 3 files changed, 51 insertions(+), 83 deletions(-)

diff --git a/res/layout/share_file_layout.xml b/res/layout/share_file_layout.xml
index b6910ddafe9c..56b45ac2e6f3 100644
--- a/res/layout/share_file_layout.xml
+++ b/res/layout/share_file_layout.xml
@@ -191,15 +191,15 @@
                 </RelativeLayout>
 
                 <RelativeLayout
-                    android:id="@+id/shareViaLinkHideListPermissionSection"
+                    android:id="@+id/shareViaLinkHideFileListingPermissionSection"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="invisible"
                     android:layout_marginBottom="@dimen/standard_half_margin"
+                    android:visibility="invisible"
                     >
 
                     <android.support.v7.widget.SwitchCompat
-                        android:id="@+id/shareViaLinkHideListPermissionSwitch"
+                        android:id="@+id/shareViaLinkFileListingPermissionSwitch"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -209,13 +209,13 @@
                         />
 
                     <TextView
-                        android:id="@+id/shareViaLinkHideListPermissionLabel"
+                        android:id="@+id/shareViaLinkFileListingPermissionLabel"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
-                        android:layout_toLeftOf="@id/shareViaLinkHideListPermissionSwitch"
-                        android:layout_toStartOf="@id/shareViaLinkHideListPermissionSwitch"
+                        android:layout_toLeftOf="@id/shareViaLinkFileListingPermissionSwitch"
+                        android:layout_toStartOf="@id/shareViaLinkFileListingPermissionSwitch"
                         android:padding="@dimen/standard_half_padding"
                         android:text="@string/share_via_link_hide_file_listing_permission_label"
                         android:textColor="@color/black"
diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java
index 9c5ab4c7e23a..fa5e1683c757 100644
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@ -405,23 +405,16 @@ public void setHideFileListingPermissionsToShare(OCShare share, boolean hideFile
         updateShareIntent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
         updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_ID, share.getId());
 
-        int permission = share.getPermissions();
-        share.setPermissions(permission);
-
-        if(hideFileListing) {
-            permission = OCShare.CREATE_PERMISSION_FLAG;
+        if (hideFileListing) {
+            updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS, OCShare.CREATE_PERMISSION_FLAG);
         } else {
-            permission = OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER;
+            updateShareIntent.
+                    putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS, OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER);
         }
 
-        updateShareIntent.putExtra(
-                OperationsService.EXTRA_SHARE_PERMISSIONS,
-                permission
-        );
         queueShareIntent(updateShareIntent);
     }
 
-
     /**
      * @return 'True' if the server supports the Search Users API
      */
diff --git a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
index 51d3da8ba490..3d473b463976 100644
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -82,7 +82,7 @@ public class ShareFileFragment extends Fragment
     private static final String TAG = ShareFileFragment.class.getSimpleName();
 
     /**
-     * The fragment initialization parameters
+     * The fragment initialization parameters.
      */
     private static final String ARG_FILE = "FILE";
     private static final String ARG_ACCOUNT = "ACCOUNT";
@@ -91,66 +91,65 @@ public class ShareFileFragment extends Fragment
 //    private static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";
 
     /**
-     * File to share, received as a parameter in construction time
+     * File to share, received as a parameter in construction time.
      */
     private OCFile mFile;
 
     /**
-     * OC account holding the file to share, received as a parameter in construction time
+     * OC account holding the file to share, received as a parameter in construction time.
      */
     private Account mAccount;
 
     /**
-     * Reference to parent listener
+     * Reference to parent listener.
      */
     private ShareFragmentListener mListener;
 
     /**
-     * List of private shares bound to the file
+     * List of private shares bound to the file.
      */
     private ArrayList<OCShare> mPrivateShares;
 
     /**
-     * Capabilities of the server
+     * Capabilities of the server.
      */
     private OCCapability mCapabilities;
 
     /**
-     * Adapter to show private shares
+     * Adapter to show private shares.
      */
     private ShareUserListAdapter mUserGroupsAdapter = null;
 
     /**
-     * Public share bound to the file
+     * Public share bound to the file.
      */
     private OCShare mPublicShare;
 
     /**
-     * Listener for changes on switch to share / unshare publicly
+     * Listener for changes on switch to share / unshare publicly.
      */
     private CompoundButton.OnCheckedChangeListener mOnShareViaLinkSwitchCheckedChangeListener;
 
     /**
-     * Listener for user actions to set, update or clear password on public link
+     * Listener for user actions to set, update or clear password on public link.
      */
     private OnPasswordInteractionListener mOnPasswordInteractionListener = null;
 
     /**
-     * Listener for user actions to set, update or clear expiration date on public link
+     * Listener for user actions to set, update or clear expiration date on public link.
      */
     private OnExpirationDateInteractionListener mOnExpirationDateInteractionListener = null;
 
     /**
-     * Listener for user actions to set or unset edit permission on public link
+     * Listener for user actions to set or unset edit permission on public link.
      */
     private OnEditPermissionInteractionListener mOnEditPermissionInteractionListener = null;
 
     /**
-     * Listener for user actions to set or unset hide file listing permission on public link
+     * Listener for user actions to set or unset hide file listing permission on public link.
      */
     private OnHideFileListingPermissionInteractionListener mOnHideFileListingPermissionInteractionListener = null;
 
-
     /**
      * Public factory method to create new ShareFileFragment instances.
      *
@@ -168,14 +167,11 @@ public static ShareFileFragment newInstance(OCFile fileToShare, Account account)
     }
 
     /**
-     * Required empty public constructor
+     * Required empty public constructor.
      */
     public ShareFileFragment() {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -186,10 +182,6 @@ public void onCreate(Bundle savedInstanceState) {
         }
     }
 
-
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -210,9 +202,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 icon.setImageBitmap(thumbnail);
             }
         }
+
         // Name
         TextView fileNameHeader = (TextView) view.findViewById(R.id.shareFileName);
         fileNameHeader.setText(getResources().getString(R.string.share_file, mFile.getFileName()));
+
         // Size
         TextView size = (TextView) view.findViewById(R.id.shareFileSize);
         if (mFile.isFolder()) {
@@ -320,7 +314,6 @@ public void onCheckedChanged(CompoundButton switchView, boolean isChecked) {
         }
     }
 
-
     /**
      * Binds listener for user actions that start any update on a expiration date
      * for the public link to the views receiving the user events.
@@ -368,8 +361,7 @@ public void onCheckedChanged(CompoundButton switchView, boolean isChecked) {
                 );
 
             } else {
-                ((FileActivity) getActivity()).getFileOperationsHelper().
-                        setExpirationDateToShareViaLink(mFile, -1);
+                ((FileActivity) getActivity()).getFileOperationsHelper().setExpirationDateToShareViaLink(mFile, -1);
             }
 
             // undo the toggle to grant the view will be correct if the dialog is cancelled
@@ -379,8 +371,8 @@ public void onCheckedChanged(CompoundButton switchView, boolean isChecked) {
         }
 
         /**
-         * Called by R.id.shareViaLinkExpirationLabel or R.id.shareViaLinkExpirationValue
-         * to change the current expiration date.
+         * Called by R.id.shareViaLinkExpirationLabel or R.id.shareViaLinkExpirationValue to change the current
+         * expiration date.
          *
          * @param expirationView Label or value view touched by the user.
          */
@@ -392,10 +384,7 @@ public void onClick(View expirationView) {
                     chosenDateInMillis = mPublicShare.getExpirationDate();
                 }
                 ExpirationDatePickerDialogFragment dialog =
-                        ExpirationDatePickerDialogFragment.newInstance(
-                                mFile,
-                                chosenDateInMillis
-                        );
+                        ExpirationDatePickerDialogFragment.newInstance(mFile, chosenDateInMillis);
                 dialog.show(
                         getActivity().getSupportFragmentManager(),
                         ExpirationDatePickerDialogFragment.DATE_PICKER_DIALOG
@@ -404,10 +393,9 @@ public void onClick(View expirationView) {
         }
     }
 
-
     /**
-     * Binds listener for user actions that start any update on a password for the public link
-     * to the views receiving the user events.
+     * Binds listener for user actions that start any update on a password for the public link to the views receiving
+     * the user events.
      *
      * @param shareView Root view in the fragment.
      */
@@ -417,11 +405,9 @@ private void initPasswordListener(View shareView) {
         ((SwitchCompat) shareView.findViewById(R.id.shareViaLinkPasswordSwitch)).
                 setOnCheckedChangeListener(mOnPasswordInteractionListener);
 
-        shareView.findViewById(R.id.shareViaLinkPasswordLabel).
-                setOnClickListener(mOnPasswordInteractionListener);
+        shareView.findViewById(R.id.shareViaLinkPasswordLabel).setOnClickListener(mOnPasswordInteractionListener);
 
-        shareView.findViewById(R.id.shareViaLinkPasswordValue).
-                setOnClickListener(mOnPasswordInteractionListener);
+        shareView.findViewById(R.id.shareViaLinkPasswordValue).setOnClickListener(mOnPasswordInteractionListener);
     }
 
 
@@ -494,7 +480,7 @@ private void initEditPermissionListener(View shareView) {
     private void initHideFileListingListener(View shareView) {
         mOnHideFileListingPermissionInteractionListener = new OnHideFileListingPermissionInteractionListener();
 
-        ((SwitchCompat) shareView.findViewById(R.id.shareViaLinkHideListPermissionSwitch)).
+        ((SwitchCompat) shareView.findViewById(R.id.shareViaLinkFileListingPermissionSwitch)).
                 setOnCheckedChangeListener(mOnHideFileListingPermissionInteractionListener);
     }
 
@@ -517,19 +503,13 @@ public void onCheckedChanged(CompoundButton switchView, boolean isChecked) {
                 return;
             }
 
-            ((FileActivity) getActivity()).getFileOperationsHelper().
-                    setUploadPermissionsToShare(
-                            mFile,
-                            isChecked
-                    );
-            ;
+            ((FileActivity) getActivity()).getFileOperationsHelper().setUploadPermissionsToShare(mFile, isChecked);
 
             // undo the toggle to grant the view will be correct if the dialog is cancelled
             switchView.setOnCheckedChangeListener(null);
             switchView.toggle();
             switchView.setOnCheckedChangeListener(mOnEditPermissionInteractionListener);
         }
-
     }
 
     /**
@@ -600,8 +580,7 @@ public void onAttach(Activity activity) {
         try {
             mListener = (ShareFragmentListener) activity;
         } catch (ClassCastException e) {
-            throw new ClassCastException(activity.toString()
-                    + " must implement OnShareFragmentInteractionListener");
+            throw new ClassCastException(activity.toString() + " must implement OnShareFragmentInteractionListener");
         }
     }
 
@@ -619,8 +598,7 @@ public void onDetach() {
      */
     public void refreshCapabilitiesFromDB() {
         if (((FileActivity) mListener).getStorageManager() != null) {
-            mCapabilities = ((FileActivity) mListener).getStorageManager().
-                    getCapability(mAccount.name);
+            mCapabilities = ((FileActivity) mListener).getStorageManager().getCapability(mAccount.name);
         }
     }
 
@@ -686,7 +664,6 @@ public void editShare(OCShare share) {
         mListener.showEditShare(share);
     }
 
-
     /**
      * Get public link from the DB to fill in the "Share link" section in the UI.
      * <p/>
@@ -722,8 +699,8 @@ private boolean isPublicShareDisabled() {
     }
 
     /**
-     * Updates in the UI the section about public share with the information in the current
-     * public share bound to mFile, if any
+     * Updates in the UI the section about public share with the information in the current public share bound to
+     * mFile, if any.
      */
     private void updatePublicShareSection() {
         if (mPublicShare != null && ShareType.PUBLIC_LINK.equals(mPublicShare.getShareType())) {
@@ -745,6 +722,7 @@ private void updatePublicShareSection() {
             } else {
                 getEditPermissionSection().setVisibility(View.GONE);
             }
+
             // GetLink button
             AppCompatButton getLinkButton = getGetLinkButton();
             getLinkButton.setVisibility(View.VISIBLE);
@@ -778,10 +756,9 @@ public void onClick(View v) {
                 }
                 getExpirationDateValue().setText(R.string.empty);
             }
+
             // recover listener
-            expirationDateSwitch.setOnCheckedChangeListener(
-                    mOnExpirationDateInteractionListener
-            );
+            expirationDateSwitch.setOnCheckedChangeListener(mOnExpirationDateInteractionListener);
 
             /// update state of password switch and message depending on password protection
             SwitchCompat passwordSwitch = getPasswordSwitch();
@@ -798,10 +775,9 @@ public void onClick(View v) {
                 }
                 getPasswordValue().setVisibility(View.INVISIBLE);
             }
+
             // recover listener
-            passwordSwitch.setOnCheckedChangeListener(
-                    mOnPasswordInteractionListener
-            );
+            passwordSwitch.setOnCheckedChangeListener(mOnPasswordInteractionListener);
 
             /// update state of the edit permission switch
             SwitchCompat editPermissionSwitch = getEditPermissionSwitch();
@@ -819,10 +795,9 @@ public void onClick(View v) {
                 }
                 getHideFileListingPermissionSection().setVisibility(View.GONE);
             }
+
             // recover listener
-            editPermissionSwitch.setOnCheckedChangeListener(
-                    mOnEditPermissionInteractionListener
-            );
+            editPermissionSwitch.setOnCheckedChangeListener(mOnEditPermissionInteractionListener);
 
             /// update state of the hide file listing permission switch
             SwitchCompat hideFileListingPermissionSwitch = getHideFileListingPermissionSwitch();
@@ -896,11 +871,11 @@ private SwitchCompat getEditPermissionSwitch() {
     }
 
     private SwitchCompat getHideFileListingPermissionSwitch() {
-        return (SwitchCompat) getView().findViewById(R.id.shareViaLinkHideListPermissionSwitch);
+        return (SwitchCompat) getView().findViewById(R.id.shareViaLinkFileListingPermissionSwitch);
     }
 
     private View getHideFileListingPermissionSection() {
-        return getView().findViewById(R.id.shareViaLinkHideListPermissionSection);
+        return getView().findViewById(R.id.shareViaLinkHideFileListingPermissionSection);
     }
 
     private AppCompatButton getGetLinkButton() {
@@ -956,7 +931,8 @@ public void requestPasswordForShareViaLink(boolean createShare) {
 
     /**
      * Hide share features sections that are not enabled
-     * @param view
+     *
+     * @param view share file view
      */
     private void hideNotEnabledShareSections(View view) {
         LinearLayout shareWithUsersSection = (LinearLayout) view.findViewById(R.id.shareWithUsersSection);
@@ -975,5 +951,4 @@ private void hideNotEnabledShareSections(View view) {
             shareWithUsersSection.setVisibility(View.GONE);
         }
     }
-
 }

From ffa3d15088346dbbc59ebeffb869b742b61991e3 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 6 Sep 2016 14:24:05 +0200
Subject: [PATCH 11/11] RC1 versioning

---
 AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1dfa3d04ae58..b1be51a49db6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,8 +20,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="10020099"
-    android:versionName="1.2.0">
+    android:versionCode="10030001"
+    android:versionName="1.3.0 RC1">
 
     <uses-sdk
         android:minSdkVersion="14"