Added fragment to edit share permissions with basic layout

owncloud-android-library

@@ -1 +1 @@
-Subproject commit 1b7a5690409b4c694fbff126791289b9720e29f7
+Subproject commit 249cb901ebd392373d0ef812b8f0a2489705c0ea

res/layout/edit_share_layout.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <CheckBox
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/canShareCheckBox"
+        android:text="@string/share_privilege_can_share"
+        />
+
+    <CheckBox
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/canEditCheckBox"
+        android:text="@string/share_privilege_can_edit"
+        />
+
+    <CheckBox
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/canEditCreateCheckBox"
+        android:text="@string/share_privilege_can_edit_create"
+        android:visibility="gone"
+        />
+
+    <CheckBox
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/canEditChangeCheckBox"
+        android:text="@string/share_privilege_can_edit_change"
+        android:visibility="gone"
+        />
+
+    <CheckBox
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/canEditDeleteCheckBox"
+        android:text="@string/share_privilege_can_edit_delete"
+        android:visibility="gone"
+        />
+
+</LinearLayout>

res/layout/share_user_item.xml

@@ -29,7 +29,7 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0.9"
+            android:layout_weight="0.8"
             android:textSize="16dip"
             android:text="@string/username"
             android:id="@+id/userOrGroupName"
@@ -38,6 +38,16 @@
             android:singleLine="true"
             android:ellipsize="middle"/>
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="0.1"
+            android:id="@+id/editShareButton"
+            android:src="@android:drawable/ic_menu_edit"
+            android:layout_marginRight="8dp"
+            android:layout_marginLeft="4dp"
+            android:layout_gravity="center_horizontal"/>
+
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -47,6 +57,7 @@
             android:layout_marginRight="8dp"
             android:layout_marginLeft="4dp"
             android:layout_gravity="center_horizontal"/>
+
     </LinearLayout>
 
     <View

res/values/strings.xml

@@ -394,6 +394,11 @@
 
     <string name="share_sharee_unavailable">Sorry, your server version does not allow share with users within clients.
         \nPlease contact your administrator</string>
+    <string name="share_privilege_can_share">can share</string>
+    <string name="share_privilege_can_edit">can edit</string>
+    <string name="share_privilege_can_edit_create">create</string>
+    <string name="share_privilege_can_edit_change">change</string>
+    <string name="share_privilege_can_edit_delete">delete</string>
 
     <string name="action_switch_grid_view">Switch to grid view</string>
     <string name="action_switch_list_view">Switch to list view</string>

src/com/owncloud/android/ui/activity/ShareActivity.java

@@ -41,6 +41,7 @@ import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.ui.dialog.ShareLinkToDialog;
+import com.owncloud.android.ui.fragment.EditShareFragment;
 import com.owncloud.android.ui.fragment.SearchShareesFragment;
 import com.owncloud.android.ui.fragment.ShareFileFragment;
 import com.owncloud.android.utils.GetShareWithUsersAsyncTask;
@@ -60,6 +61,7 @@ public class ShareActivity extends FileActivity
 
     private static final String TAG_SHARE_FRAGMENT = "SHARE_FRAGMENT";
     private static final String TAG_SEARCH_FRAGMENT = "SEARCH_USER_AND_GROUPS_FRAGMENT";
+    private static final String TAG_EDIT_SHARE_FRAGMENT = "EDIT_SHARE_FRAGMENT";
 
     /** Tag for dialog */
     private static final String FTAG_CHOOSER_DIALOG = "CHOOSER_DIALOG";
@@ -132,6 +134,16 @@ public class ShareActivity extends FileActivity
         ft.commit();
     }
 
+    @Override
+    public void showEditShare(OCShare share) {
+        // replace current fragment with EditShareFragment on demand
+        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+        Fragment editShareFragment = EditShareFragment.newInstance(share, getFile(), getAccount());
+        ft.replace(R.id.share_fragment_container, editShareFragment, TAG_EDIT_SHARE_FRAGMENT);
+        ft.addToBackStack(null);    // BACK button will recover the previous fragment
+        ft.commit();
+    }
+
     @Override
     // Call to Unshare operation
     public void unshareWith(OCShare share) {

src/com/owncloud/android/ui/adapter/ShareUserListAdapter.java

@@ -82,6 +82,16 @@ public class ShareUserListAdapter extends ArrayAdapter {
             }
             userName.setText(name);
 
+            /// bind listener to edit privileges
+            final ImageView editShareButton = (ImageView) view.findViewById(R.id.editShareButton);
+            editShareButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    mListener.editShare(mShares.get(position));
+                }
+            });
+
+            /// bind listener to unshare
             final ImageView unshareButton = (ImageView) view.findViewById(R.id.unshareButton);
             unshareButton.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -96,6 +106,7 @@ public class ShareUserListAdapter extends ArrayAdapter {
 
     public interface ShareUserAdapterListener {
         void unshareButtonPressed(OCShare share);
+        void editShare(OCShare share);
     }
 
 

src/com/owncloud/android/ui/fragment/EditShareFragment.java

@@ -0,0 +1,321 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author masensio
+ *   @author David A. Velasco
+ *   Copyright (C) 2015 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.ui.fragment;
+
+import android.accounts.Account;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+
+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.shares.OCShare;
+
+public class EditShareFragment extends Fragment {
+
+    private static final String TAG = EditShareFragment.class.getSimpleName();
+
+    /** The fragment initialization parameters */
+    private static final String ARG_SHARE = "SHARE";
+    private static final String ARG_FILE = "FILE";
+    private static final String ARG_ACCOUNT = "ACCOUNT";
+
+    /** Ids of CheckBoxes depending on R.id.canEdit CheckBox */
+    private static final int sSubordinateCheckBoxIds[] = {
+            R.id.canEditCreateCheckBox,
+            R.id.canEditChangeCheckBox,
+            R.id.canEditDeleteCheckBox
+    };
+
+    /** Share to show & edit, received as a parameter in construction time */
+    private OCShare mShare;
+
+    /** File bound to mShare, received as a parameter in construction time */
+    private OCFile mFile;
+
+    /** OC account holding the shared file, received as a parameter in construction time */
+    private Account mAccount;
+
+    /** Listener for changes on privilege checkboxes */
+    private CompoundButton.OnCheckedChangeListener mOnPrivilegeChangeListener;
+
+
+    /**
+     * Public factory method to create new EditShareFragment instances.
+     *
+     * @param shareToEdit   An {@link OCShare} to show and edit in the fragment
+     * @param sharedFile    The {@link OCFile} bound to 'shareToEdit'
+     * @param account       The ownCloud account holding 'sharedFile'
+     * @return A new instance of fragment EditShareFragment.
+     */
+    public static EditShareFragment newInstance(OCShare shareToEdit, OCFile sharedFile, Account account) {
+        EditShareFragment fragment = new EditShareFragment();
+        Bundle args = new Bundle();
+        args.putParcelable(ARG_SHARE, shareToEdit);
+        args.putParcelable(ARG_FILE, sharedFile);
+        args.putParcelable(ARG_ACCOUNT, account);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    /**
+     * Required empty public constructor
+     */
+    public EditShareFragment() {
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Log_OC.d(TAG, "onCreate");
+        if (getArguments() != null) {
+            mShare = getArguments().getParcelable(ARG_SHARE);
+            mFile = getArguments().getParcelable(ARG_FILE);
+            mAccount = getArguments().getParcelable(ARG_ACCOUNT);
+        }
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        Log_OC.d(TAG, "onCreateView");
+
+        // Inflate the layout for this fragment
+        View view = inflater.inflate(R.layout.edit_share_layout, container, false);
+
+        // Setup layout
+        initPrivileges(view);
+
+        return view;
+    }
+
+
+    /**
+     * Binds listener for user actions to enable or disable a privilege on the edited share
+     * to the views receiving the user events.
+     *
+     * @param editShareView     Root view in the fragment.
+     */
+    private void initPrivileges(View editShareView) {
+        mOnPrivilegeChangeListener = new OnPrivilegeChangeListener();
+        int sharePermissions = mShare.getPermissions();
+        CheckBox checkBox;
+
+        checkBox = (CheckBox) editShareView.findViewById(R.id.canShareCheckBox);
+        checkBox.setChecked((sharePermissions & OCShare.SHARE_PERMISSION_FLAG) > 0);
+        checkBox.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
+
+        checkBox = (CheckBox) editShareView.findViewById(R.id.canEditCheckBox);
+        int anyUpdatePermission =
+                OCShare.CREATE_PERMISSION_FLAG |
+                        OCShare.UPDATE_PERMISSION_FLAG |
+                        OCShare.DELETE_PERMISSION_FLAG
+                ;
+        boolean canEdit = (sharePermissions & anyUpdatePermission) > 0;
+        checkBox.setChecked(canEdit);
+        checkBox.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
+
+        if (mFile.isFolder()) {
+            checkBox = (CheckBox) editShareView.findViewById(R.id.canEditCreateCheckBox);
+            if (canEdit) {
+                checkBox.setVisibility(View.VISIBLE);
+                checkBox.setChecked((sharePermissions & OCShare.CREATE_PERMISSION_FLAG) > 0);
+            }
+            checkBox.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
+
+            checkBox = (CheckBox) editShareView.findViewById(R.id.canEditChangeCheckBox);
+            if (canEdit) {
+                checkBox.setVisibility(View.VISIBLE);
+                checkBox.setChecked((sharePermissions & OCShare.UPDATE_PERMISSION_FLAG) > 0);
+            }
+            checkBox.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
+
+            checkBox = (CheckBox) editShareView.findViewById(R.id.canEditDeleteCheckBox);
+            if (canEdit) {
+                checkBox.setVisibility(View.VISIBLE);
+                checkBox.setChecked((sharePermissions & OCShare.DELETE_PERMISSION_FLAG) > 0);
+            }
+            checkBox.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
+
+        }   // else, trust in visibility GONE in R.layout.edit_share_layout
+
+    }
+
+
+    /**
+     * Listener for user actions that enable or disable a privilege
+     */
+    private class OnPrivilegeChangeListener
+            implements CompoundButton.OnCheckedChangeListener {
+
+        /**
+         * Called by R.id.shareViaLinkSectionSwitch to create or delete a public link.
+         *
+         * @param checkBoxView  {@link CheckBox} toggled by the user
+         * @param isChecked     New switch state.
+         */
+        @Override
+        public void onCheckedChanged(CompoundButton checkBoxView, boolean isChecked) {
+            if (!isResumed()) {
+                // very important, setCheched(...) is called automatically during
+                // Fragment recreation on device rotations
+                return;
+            }
+            /// else, getView() cannot be NULL
+
+            CheckBox subordinate;
+            switch(checkBoxView.getId()) {
+                case R.id.canShareCheckBox:
+                    Log_OC.v(TAG, "canShareCheckBox toggled to " + isChecked);
+                    /// TODO?
+                    // option 1: direct update approach
+                    /*
+                    ((FileActivity) getActivity()).getFileOperationsHelper().
+                        setPrivilegeToShare(mFile, mShare, privilege, isChecked);
+                        */
+                    // option 2: nothing?
+                    break;
+
+                case R.id.canEditCheckBox:
+                    Log_OC.v(TAG, "canEditCheckBox toggled to " + isChecked);
+                    /// sync subordinate CheckBoxes
+                    if (mFile.isFolder()) {
+                        if (isChecked) {
+                            for (int i = 0; i < sSubordinateCheckBoxIds.length; i++) {
+                                //noinspection ConstantConditions, prevented in the method beginning
+                                subordinate = (CheckBox) getView().findViewById(sSubordinateCheckBoxIds[i]);
+                                subordinate.setVisibility(View.VISIBLE);
+                                if (!subordinate.isChecked()) {
+                                    toggleDisablingListener(subordinate);
+                                }
+                            }
+                        } else {
+                            for (int i = 0; i < sSubordinateCheckBoxIds.length; i++) {
+                                //noinspection ConstantConditions, prevented in the method beginning
+                                subordinate = (CheckBox) getView().findViewById(sSubordinateCheckBoxIds[i]);
+                                subordinate.setVisibility(View.GONE);
+                                if (subordinate.isChecked()) {
+                                    toggleDisablingListener(subordinate);
+                                }
+                            }
+                        }
+                    }
+                    /// TODO - anything else?; only if modification-on-change approach is taken
+                    break;
+
+                case R.id.canEditCreateCheckBox:
+                    Log_OC.v(TAG, "canEditCreateCheckBox toggled to " + isChecked);
+                    syncCanEditCheckBox(checkBoxView, isChecked);
+                    /// TODO - anything else?; only if modification-on-change approach is taken
+                    break;
+
+                case R.id.canEditChangeCheckBox:
+                    Log_OC.v(TAG, "canEditChangeCheckBox toggled to " + isChecked);
+                    syncCanEditCheckBox(checkBoxView, isChecked);
+                    /// TODO - anything else?; only if modification-on-change approach is taken
+                    break;
+
+                case R.id.canEditDeleteCheckBox:
+                    Log_OC.v(TAG, "canEditDeleteCheckBox toggled to " + isChecked);
+                    syncCanEditCheckBox(checkBoxView, isChecked);
+                    /// TODO - anything else?; only if modification-on-change approach is taken
+                    break;
+            }
+
+            // undo the toggle to grant the view will be correct if any intermediate dialog is cancelled or
+            // the create/delete operation fails
+            // ONLY if direct update approach is followed
+            /*
+            checkBoxView.setOnCheckedChangeListener(null);
+            checkBoxView.toggle();
+            checkBoxView.setOnCheckedChangeListener(mOnShareViaLinkSwitchCheckedChangeListener);
+            */
+        }
+
+        /**
+         * Sync value of "can edit" CheckBox according to a change in one of its subordinate checkboxes.
+         *
+         * If all the subordinates are disabled, "can edit" has to be disabled.
+         *
+         * If any subordinate is enabled, "can edit" has to be enabled.
+         *
+         * @param subordinateCheckBoxView   Subordinate CheckBox that was changed.
+         * @param isChecked                 'true' iif subordinateCheckBoxView was checked.
+         */
+        private void syncCanEditCheckBox(View subordinateCheckBoxView, boolean isChecked) {
+            CheckBox canEditCheckBox = (CheckBox) getView().findViewById(R.id.canEditCheckBox);
+            if (isChecked) {
+                if (!canEditCheckBox.isChecked()) {
+                    toggleDisablingListener(canEditCheckBox);
+                }
+            } else {
+                boolean allDisabled = true;
+                for (int i=0; allDisabled && i<sSubordinateCheckBoxIds.length; i++) {
+                    allDisabled &=
+                            sSubordinateCheckBoxIds[i] == subordinateCheckBoxView.getId() ||
+                                    !((CheckBox) getView().findViewById(sSubordinateCheckBoxIds[i])).isChecked()
+                    ;
+                }
+                if (canEditCheckBox.isChecked() && allDisabled) {
+                    toggleDisablingListener(canEditCheckBox);
+                    for (int i=0; i<sSubordinateCheckBoxIds.length; i++) {
+                        getView().findViewById(sSubordinateCheckBoxIds[i]).setVisibility(View.GONE);
+                    }
+                }
+            }
+        }
+
+
+        /**
+         * Toggle value of received CheckBox granting that its change listener is not called.
+         *
+         * @param checkBoxView      CheckBox to toggle without reporting to the change listener
+         */
+        private void toggleDisablingListener(CheckBox checkBoxView) {
+            checkBoxView.setOnCheckedChangeListener(null);
+            checkBoxView.toggle();
+            checkBoxView.setOnCheckedChangeListener(mOnPrivilegeChangeListener);
+        }
+    }
+
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        Log_OC.d(TAG, "onActivityCreated");
+        getActivity().setTitle(mShare.getSharedWithDisplayName());
+    }
+
+}

src/com/owncloud/android/ui/fragment/SearchShareesFragment.java

@@ -148,6 +148,8 @@ public class SearchShareesFragment extends Fragment implements ShareUserListAdap
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
+        getActivity().setTitle(R.string.share_dialog_title);
+
         // Load data into the list
         refreshUsersOrGroupsListFromDB();
     }
@@ -230,6 +232,14 @@ public class SearchShareesFragment extends Fragment implements ShareUserListAdap
         Log_OC.d(TAG, "Unshare - " + share.getSharedWithDisplayName());
     }
 
+    @Override
+    public void editShare(OCShare share) {
+        // move to fragment to edit share
+        Log_OC.d(TAG, "Editing " + share.getSharedWithDisplayName());
+        mListener.showEditShare(share);
+    }
+
+
     /**
      * This interface must be implemented by activities that contain this
      * fragment to allow an interaction in this fragment to be communicated
@@ -241,6 +251,7 @@ public class SearchShareesFragment extends Fragment implements ShareUserListAdap
      * >Communicating with Other Fragments</a> for more information.
      */
     public interface OnSearchFragmentInteractionListener {
+        void showEditShare(OCShare share);
         void unshareWith(OCShare share);
     }
 

src/com/owncloud/android/ui/fragment/ShareFileFragment.java

@@ -135,8 +135,10 @@ public class ShareFileFragment extends Fragment
         return fragment;
     }
 
+    /**
+     * Required empty public constructor
+     */
     public ShareFileFragment() {
-        // Required empty public constructor
     }
 
     /**
@@ -443,6 +445,8 @@ public class ShareFileFragment extends Fragment
         super.onActivityCreated(savedInstanceState);
         Log_OC.d(TAG, "onActivityCreated");
 
+        getActivity().setTitle(R.string.share_dialog_title);
+
         // Load known capabilities of the server from DB
         refreshCapabilitiesFromDB();
 
@@ -536,10 +540,16 @@ public class ShareFileFragment extends Fragment
     @Override
     public void unshareButtonPressed(OCShare share) {
         // Unshare
+        Log_OC.d(TAG, "Unsharing " + share.getSharedWithDisplayName());
         mListener.unshareWith(share);
-        Log_OC.d(TAG, "Unshare - " + share.getSharedWithDisplayName());
     }
 
+    @Override
+    public void editShare(OCShare share) {
+        // move to fragment to edit share
+        Log_OC.d(TAG, "Editing " + share.getSharedWithDisplayName());
+        mListener.showEditShare(share);
+    }
 
 
     /**
@@ -748,6 +758,7 @@ public class ShareFileFragment extends Fragment
      */
     public interface OnShareFragmentInteractionListener {
         void showSearchUsersAndGroups();
+        void showEditShare(OCShare share);
         void refreshUsersOrGroupsListFromServer();
         void unshareWith(OCShare share);
     }