From e106079b90f7d596a254b223b6e8741fc6d94785 Mon Sep 17 00:00:00 2001 From: mar-v-in Date: Tue, 10 Jun 2014 21:53:02 +0200 Subject: Delete using Document API (unsafe) --- .../keychain/ui/EncryptFileFragment.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java index a3fb8fbd5..2671e0d40 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java @@ -350,8 +350,13 @@ public class EncryptFileFragment extends Fragment { if (mDeleteAfter.isChecked()) { // Create and show dialog to delete original file - DeleteFileDialogFragment deleteFileDialog = DeleteFileDialogFragment - .newInstance(mInputFilename); + DeleteFileDialogFragment deleteFileDialog; + if (mInputUri != null) { + deleteFileDialog = DeleteFileDialogFragment.newInstance(mInputUri); + } else { + deleteFileDialog = DeleteFileDialogFragment + .newInstance(mInputFilename); + } deleteFileDialog.show(getActivity().getSupportFragmentManager(), "deleteDialog"); } @@ -359,7 +364,11 @@ public class EncryptFileFragment extends Fragment { // Share encrypted file Intent sendFileIntent = new Intent(Intent.ACTION_SEND); sendFileIntent.setType("*/*"); - sendFileIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse(mOutputFilename)); + if (mOutputUri != null) { + sendFileIntent.putExtra(Intent.EXTRA_STREAM, mOutputUri); + } else { + sendFileIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse(mOutputFilename)); + } startActivity(Intent.createChooser(sendFileIntent, getString(R.string.title_share_file))); } -- cgit v1.2.3