Skip to content

Allow edit on link share on a file #3923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 1 commit into from
Apr 29, 2019
Merged

Allow edit on link share on a file #3923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/com/owncloud/android/operations/UpdateShareViaLinkOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
@Getter private String path;
@Getter @Setter private String password;
/** Enable upload permissions to update in Share resource. */
@Setter private Boolean publicUpload;
@Setter private Boolean publicUploadOnFolder;
@Setter private Boolean publicUploadOnFile;
@Setter private Boolean hideFileDownload;
@Setter private long expirationDateInMillis;

Expand All @@ -69,7 +70,8 @@ protected RemoteOperationResult run(OwnCloudClient client) {
UpdateRemoteShareOperation updateOp = new UpdateRemoteShareOperation(publicShare.getRemoteId());
updateOp.setPassword(password);
updateOp.setExpirationDate(expirationDateInMillis);
updateOp.setPublicUpload(publicUpload);
updateOp.setPublicUploadOnFolder(publicUploadOnFolder);
updateOp.setPublicUploadOnFile(publicUploadOnFile);
updateOp.setHideFileDownload(hideFileDownload);
RemoteOperationResult result = updateOp.execute(client);

Expand Down
7 changes: 6 additions & 1 deletion src/main/java/com/owncloud/android/services/OperationsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,8 +581,13 @@ private Pair<Target, RemoteOperation> newOperation(Intent operationIntent) {
updateLinkOperation.setHideFileDownload(hideFileDownload);

if (operationIntent.hasExtra(EXTRA_SHARE_PUBLIC_UPLOAD)) {
updateLinkOperation.setPublicUpload(
if (remotePath.endsWith("/")) {
updateLinkOperation.setPublicUploadOnFolder(
operationIntent.getBooleanExtra(EXTRA_SHARE_PUBLIC_UPLOAD, false));
} else {
updateLinkOperation.setPublicUploadOnFile(
operationIntent.getBooleanExtra(EXTRA_SHARE_PUBLIC_UPLOAD, false));
}
}
operation = updateLinkOperation;
} else if (shareId > 0) {
Expand Down
28 changes: 13 additions & 15 deletions src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,7 @@
import android.widget.LinearLayout;
import android.widget.PopupMenu;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatCheckBox;
import androidx.appcompat.widget.SearchView;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.Unbinder;

import com.google.android.material.snackbar.Snackbar;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
Expand All @@ -74,6 +64,18 @@

import java.util.List;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatCheckBox;
import androidx.appcompat.widget.SearchView;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.Unbinder;

public class FileDetailSharingFragment extends Fragment implements UserListAdapter.ShareeListAdapterListener,
DisplayUtils.AvatarGenerationListener {

Expand Down Expand Up @@ -246,11 +248,7 @@ public void setShareByLinkInfo(boolean isShareByLink) {

private void setLinkDetailVisible(boolean visible) {
if (visible) {
if (file.isFolder()) {
shareByLinkAllowEditing.setVisibility(View.VISIBLE);
} else {
shareByLinkAllowEditing.setVisibility(View.INVISIBLE);
}
overflowMenuShareLink.setVisibility(View.VISIBLE);
} else {
shareByLinkAllowEditing.setVisibility(View.INVISIBLE);
Expand Down
6 changes: 3 additions & 3 deletions src/main/res/layout/file_details_sharing_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/share_via_link_section_title"/>
android:text="@string/share_via_link_section_title" />

<ImageView
android:id="@+id/share_link_copy_icon"
Expand All @@ -125,7 +125,7 @@
android:paddingRight="@dimen/standard_eighth_margin"
android:paddingBottom="@dimen/standard_quarter_margin"
android:scaleType="fitStart"
android:src="@drawable/ic_content_copy"/>
android:src="@drawable/ic_content_copy" />

<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/share_by_link_allow_editing"
Expand All @@ -134,7 +134,7 @@
android:layout_gravity="center_vertical"
android:ellipsize="middle"
android:text="@string/edit_permission_label"
android:textSize="16sp"/>
android:textSize="16sp" />
</com.google.android.flexbox.FlexboxLayout>

<ImageView
Expand Down