diff options
author | mar-v-in <github@rvin.mooo.com> | 2014-06-10 21:53:02 +0200 |
---|---|---|
committer | mar-v-in <github@rvin.mooo.com> | 2014-06-10 21:53:02 +0200 |
commit | e106079b90f7d596a254b223b6e8741fc6d94785 (patch) | |
tree | 397f0b394a8b442c5027aafb0dfcaaa94c877349 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java | |
parent | f55bc41682c3cfa06d34d6b9679ba7a720066a3f (diff) | |
download | open-keychain-e106079b90f7d596a254b223b6e8741fc6d94785.tar.gz open-keychain-e106079b90f7d596a254b223b6e8741fc6d94785.tar.bz2 open-keychain-e106079b90f7d596a254b223b6e8741fc6d94785.zip |
Delete using Document API (unsafe)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java | 15 |
1 files changed, 12 insertions, 3 deletions
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))); } |