nextcloud
/
android
mirror of https://github.com/nextcloud/android
0
0
Fork 0
Code Issues Releases Wiki Activity

show send to for sharing link via overflow menu in details screen

This commit is contained in:
AndyScherzinger 2018-09-03 17:23:42 +02:00
parent b9bc9bc84b
commit 6ae79355b5
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
View File

@ -1916,16 +1916,8 @@ public class FileDisplayActivity extends HookActivity
break;
}
}
String fLink = link;
ClipboardUtil.copyToClipboard(this, link, false);
Snackbar snackbar = Snackbar.make(
findViewById(android.R.id.content),
R.string.clipboard_text_copied,
Snackbar.LENGTH_LONG
).setAction(R.string.share, v -> showShareLinkDialog(fLink));
ThemeUtils.colorSnackbar(this, snackbar);
snackbar.show();
copyAndShareFileLink(link);
if (fileDetailFragment != null && fileDetailFragment.getFileDetailSharingFragment() != null) {
fileDetailFragment.getFileDetailSharingFragment().refreshPublicShareFromDB();
@ -1962,7 +1954,18 @@ public class FileDisplayActivity extends HookActivity
}
}
private void showShareLinkDialog(String link) {
private void copyAndShareFileLink(String link) {
ClipboardUtil.copyToClipboard(this, link, false);
Snackbar snackbar = Snackbar.make(
findViewById(android.R.id.content),
R.string.clipboard_text_copied,
Snackbar.LENGTH_LONG
).setAction(R.string.share, v -> showShareLinkDialog(link));
ThemeUtils.colorSnackbar(this, snackbar);
snackbar.show();
}
public void showShareLinkDialog(String link) {
// Create dialog to allow the user choose an app to send the link
Intent intentToShareLink = new Intent(Intent.ACTION_SEND);

38
src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
View File

@ -54,6 +54,7 @@ import com.owncloud.android.lib.resources.shares.SharePermissionsBuilder;
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.activity.FileDisplayActivity;
import com.owncloud.android.ui.adapter.UserListAdapter;
import com.owncloud.android.ui.decoration.SimpleListItemDividerDecoration;
import com.owncloud.android.ui.dialog.ExpirationDatePickerDialogFragment;
@ -235,24 +236,31 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
@OnClick(R.id.share_by_link)
public void toggleShareByLink() {
if (shareByLink.isChecked()) {
if (capabilities != null &&
capabilities.getFilesSharingPublicPasswordEnforced().isTrue()) {
// password enforced by server, request to the user before trying to create
requestPasswordForShareViaLink(true);
} else {
// create without password if not enforced by server or we don't know if enforced;
((FileActivity) getActivity()).getFileOperationsHelper().shareFileViaLink(file, null);
}
createShareLink();
} else {
((FileActivity) getActivity()).getFileOperationsHelper().unshareFileViaLink(file);
}
}
private void createShareLink() {
if (capabilities != null &&
capabilities.getFilesSharingPublicPasswordEnforced().isTrue()) {
// password enforced by server, request to the user before trying to create
requestPasswordForShareViaLink(true);
} else {
// create without password if not enforced by server or we don't know if enforced;
((FileActivity) getActivity()).getFileOperationsHelper().shareFileViaLink(file, null);
}
}
private void showSendLinkTo() {
if (file.isSharedViaLink()) {
((FileActivity) getActivity()).getFileOperationsHelper().getFileWithLink(file);
if (TextUtils.isEmpty(file.getPublicLink())) {
((FileActivity) getActivity()).getFileOperationsHelper().getFileWithLink(file);
} else {
((FileDisplayActivity) getActivity()).showShareLinkDialog(file.getPublicLink());
}
}
}
@ -260,7 +268,7 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
public void copyLinkToClipboard() {
if (file.isSharedViaLink()) {
if (TextUtils.isEmpty(file.getPublicLink())) {
showSendLinkTo();
((FileActivity) getActivity()).getFileOperationsHelper().getFileWithLink(file);
} else {
ClipboardUtil.copyToClipboard(getActivity(), file.getPublicLink());
}
@ -336,7 +344,11 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
return true;
}
case R.id.action_share_send_link: {
showSendLinkTo();
if(shareByLink.isChecked() && file.isSharedViaLink() && !TextUtils.isEmpty(file.getPublicLink())) {
((FileDisplayActivity) getActivity()).showShareLinkDialog(file.getPublicLink());
} else {
showSendLinkTo();
}
return true;
}
default: