Hide UI elements about public share when this is disabled in the server

diff --git a/res/layout/share_file_layout.xml b/res/layout/share_file_layout.xml
index 23581e7..27a6133 100644 (file)
--- a/res/layout/share_file_layout.xml
+++ b/res/layout/share_file_layout.xml
@@ -228,7 +228,7 @@
         </RelativeLayout>
 
         <android.support.v7.widget.AppCompatButton
         </RelativeLayout>
 
         <android.support.v7.widget.AppCompatButton

-            android:id="@+id/shareViewLinkGetLinkButton"
+            android:id="@+id/shareViaLinkGetLinkButton"

             style="@style/ownCloud.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             style="@style/ownCloud.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

diff --git a/src/com/owncloud/android/files/FileMenuFilter.java b/src/com/owncloud/android/files/FileMenuFilter.java
index c895109..e562af0 100644 (file)
--- a/src/com/owncloud/android/files/FileMenuFilter.java
+++ b/src/com/owncloud/android/files/FileMenuFilter.java
@@ -184,15 +184,14 @@ public class FileMenuFilter {
         }
 
         // SHARE FILE
         }
 
         // SHARE FILE

-        // TODO add check on SHARE available on server side?

         boolean shareAllowed = (mContext != null  &&
                 mContext.getString(R.string.share_feature).equalsIgnoreCase("on"));
         boolean shareAllowed = (mContext != null  &&
                 mContext.getString(R.string.share_feature).equalsIgnoreCase("on"));

-
-        // SHARE FILE, with Users

         OCCapability capability = mComponentsGetter.getStorageManager().getCapability(mAccount.name);
         boolean shareApiEnabled  = capability != null &&
         OCCapability capability = mComponentsGetter.getStorageManager().getCapability(mAccount.name);
         boolean shareApiEnabled  = capability != null &&

-                (capability.getFilesSharingApiEnabled().isTrue() || capability.getFilesSharingApiEnabled().isUnknown());
-        if (!shareAllowed ||  mFile == null || !shareApiEnabled ) {
+                (capability.getFilesSharingApiEnabled().isTrue() ||
+                        capability.getFilesSharingApiEnabled().isUnknown()
+                );
+        if (!shareAllowed ||  mFile == null || !shareApiEnabled) {

             toHide.add(R.id.action_share_file);
         } else {
             toShow.add(R.id.action_share_file);
             toHide.add(R.id.action_share_file);
         } else {
             toShow.add(R.id.action_share_file);

diff --git a/src/com/owncloud/android/ui/activity/ShareActivity.java b/src/com/owncloud/android/ui/activity/ShareActivity.java
index 047e62d..7bfc4c5 100644 (file)
--- a/src/com/owncloud/android/ui/activity/ShareActivity.java
+++ b/src/com/owncloud/android/ui/activity/ShareActivity.java
@@ -188,6 +188,7 @@ public class ShareActivity extends FileActivity
         ShareFileFragment shareFileFragment = getShareFileFragment();
         if (shareFileFragment != null
                 && shareFileFragment.isAdded()) {   // only if added to the view hierarchy!!
         ShareFileFragment shareFileFragment = getShareFileFragment();
         if (shareFileFragment != null
                 && shareFileFragment.isAdded()) {   // only if added to the view hierarchy!!

+            shareFileFragment.refreshCapabilitiesFromDB();

             shareFileFragment.refreshUsersOrGroupsListFromDB();
             shareFileFragment.refreshPublicShareFromDB();
         }
             shareFileFragment.refreshUsersOrGroupsListFromDB();
             shareFileFragment.refreshPublicShareFromDB();
         }

diff --git a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
index e7a76cb..18c8d08 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -23,10 +23,8 @@ package com.owncloud.android.ui.fragment;
 
 import android.accounts.Account;
 import android.app.Activity;
 
 import android.accounts.Account;
 import android.app.Activity;

-import android.content.Intent;

 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.graphics.Bitmap;
 import android.os.Bundle;

-import android.support.v4.app.DialogFragment;

 import android.support.v4.app.Fragment;
 import android.support.v7.widget.AppCompatButton;
 import android.view.LayoutInflater;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.AppCompatButton;
 import android.view.LayoutInflater;


@@ -46,10 +44,10 @@ import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;

-import com.owncloud.android.files.FileOperationsHelper;

 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;

+import com.owncloud.android.lib.resources.status.OCCapability;

 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.adapter.ShareUserListAdapter;
 import com.owncloud.android.ui.dialog.ExpirationDatePickerDialogFragment;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.adapter.ShareUserListAdapter;
 import com.owncloud.android.ui.dialog.ExpirationDatePickerDialogFragment;


@@ -98,6 +96,9 @@ public class ShareFileFragment extends Fragment
     /** List of private shares bound to the file */
     private ArrayList<OCShare> mPrivateShares;
 
     /** List of private shares bound to the file */
     private ArrayList<OCShare> mPrivateShares;
 

+    /** Capabilities of the server */
+    private OCCapability mCapabilities;
+

     /** Adapter to show private shares */
     private ShareUserListAdapter mUserGroupsAdapter = null;
 
     /** Adapter to show private shares */
     private ShareUserListAdapter mUserGroupsAdapter = null;
 


@@ -117,6 +118,7 @@ public class ShareFileFragment extends Fragment
      */
     private OnExpirationDateInteractionListener mOnExpirationDateInteractionListener = null;
 
      */
     private OnExpirationDateInteractionListener mOnExpirationDateInteractionListener = null;
 

+

     /**
      * Public factory method to create new ShareFileFragment instances.
      *
     /**
      * Public factory method to create new ShareFileFragment instances.
      *


@@ -230,7 +232,6 @@ public class ShareFileFragment extends Fragment
         return view;
     }
 
         return view;
     }
 

-

     /**
      * Binds listener for user actions that start any update on a expiration date
      * for the public link to the views receiving the user events.
     /**
      * Binds listener for user actions that start any update on a expiration date
      * for the public link to the views receiving the user events.


@@ -388,6 +389,9 @@ public class ShareFileFragment extends Fragment
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 

+        // Load known capabilities of the server from DB
+        refreshCapabilitiesFromDB();
+

         // Load data into the list of private shares
         refreshUsersOrGroupsListFromDB();
 
         // Load data into the list of private shares
         refreshUsersOrGroupsListFromDB();
 


@@ -412,6 +416,21 @@ public class ShareFileFragment extends Fragment
         mListener = null;
     }
 
         mListener = null;
     }
 

+
+    /**
+     * Get known server capabilities from DB
+     *
+     * Depends on the parent Activity provides a {@link com.owncloud.android.datamodel.FileDataStorageManager}
+     * instance ready to use. If not ready, does nothing.
+     */
+    public void refreshCapabilitiesFromDB() {
+        if (((FileActivity)mListener).getStorageManager() != null) {
+            mCapabilities = ((FileActivity)mListener).getStorageManager().
+                    getCapability(mAccount.name);
+        }
+    }
+
+

     /**
      * Get users and groups from the DB to fill in the "share with" list.
      *
     /**
      * Get users and groups from the DB to fill in the "share with" list.
      *


@@ -472,11 +491,16 @@ public class ShareFileFragment extends Fragment
     /**
      * Get public link from the DB to fill in the "Share link" section in the UI.
      *
     /**
      * Get public link from the DB to fill in the "Share link" section in the UI.
      *

+     * Takes into account server capabilities before reading database.
+     *

      * Depends on the parent Activity provides a {@link com.owncloud.android.datamodel.FileDataStorageManager}
      * instance ready to use. If not ready, does nothing.
      */
     public void refreshPublicShareFromDB() {
      * Depends on the parent Activity provides a {@link com.owncloud.android.datamodel.FileDataStorageManager}
      * instance ready to use. If not ready, does nothing.
      */
     public void refreshPublicShareFromDB() {

-        if (((FileActivity) mListener).getStorageManager() != null) {
+        if (isPublicShareDisabled()) {
+            hidePublicShare();
+
+        } else if (((FileActivity) mListener).getStorageManager() != null) {

             // Get public share
             mPublicShare = ((FileActivity) mListener).getStorageManager().getFirstShareByPathAndType(
                     mFile.getRemotePath(),
             // Get public share
             mPublicShare = ((FileActivity) mListener).getStorageManager().getFirstShareByPathAndType(
                     mFile.getRemotePath(),


@@ -490,6 +514,15 @@ public class ShareFileFragment extends Fragment
     }
 
     /**
     }
 
     /**

+     * @return  'True' when public share is disabled in the server
+     */
+    private boolean isPublicShareDisabled() {
+        return (mCapabilities != null &&
+                mCapabilities.getFilesSharingPublicEnabled().isFalse()
+        );
+    }
+
+    /**

      * 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
      */


@@ -521,7 +554,6 @@ public class ShareFileFragment extends Fragment
             });
 
             /// update state of expiration date switch and message depending on expiration date
             });
 
             /// update state of expiration date switch and message depending on expiration date

-            /// update state of expiration date switch and message depending on expiration date

             Switch expirationDateSwitch = getExpirationDateSwitch();
             // set null listener before setChecked() to prevent infinite loop of calls
             expirationDateSwitch.setOnCheckedChangeListener(null);
             Switch expirationDateSwitch = getExpirationDateSwitch();
             // set null listener before setChecked() to prevent infinite loop of calls
             expirationDateSwitch.setOnCheckedChangeListener(null);


@@ -615,7 +647,17 @@ public class ShareFileFragment extends Fragment
     }
 
     private AppCompatButton getGetLinkButton() {
     }
 
     private AppCompatButton getGetLinkButton() {

-        return (AppCompatButton) getView().findViewById(R.id.shareViewLinkGetLinkButton);
+        return (AppCompatButton) getView().findViewById(R.id.shareViaLinkGetLinkButton);
+    }
+
+    /**
+     * Hides all the UI elements related to public share
+     */
+    private void hidePublicShare() {
+        getShareViaLinkSwitch().setVisibility(View.GONE);
+        getExpirationDateSection().setVisibility(View.GONE);
+        getPasswordSection().setVisibility(View.GONE);
+        getGetLinkButton().setVisibility(View.GONE);

     }
 
     public static void setListViewHeightBasedOnChildren(ListView listView) {
     }
 
     public static void setListViewHeightBasedOnChildren(ListView listView) {


@@ -639,7 +681,7 @@ public class ShareFileFragment extends Fragment
         listView.setLayoutParams(params);
         listView.requestLayout();
     }
         listView.setLayoutParams(params);
         listView.requestLayout();
     }

-    
+

     /**
      * This interface must be implemented by activities that contain this
      * fragment to allow an interaction in this fragment to be communicated
     /**
      * This interface must be implemented by activities that contain this
      * fragment to allow an interaction in this fragment to be communicated