diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-07 18:37:22 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-07 18:37:22 +0100 |
commit | e4736736b03d38f7e39b73f927cc68ddadd04a42 (patch) | |
tree | 2ea195c985befba1d461496cc311f3043cc88828 /OpenPGP-Keychain/src/main/java/org | |
parent | 59067f9f8b0a12f875ba928b30f8f35fc284356c (diff) | |
parent | 2e2a9bc967399b6adc353b1b34d3c7ed981e68f4 (diff) | |
download | open-keychain-e4736736b03d38f7e39b73f927cc68ddadd04a42.tar.gz open-keychain-e4736736b03d38f7e39b73f927cc68ddadd04a42.tar.bz2 open-keychain-e4736736b03d38f7e39b73f927cc68ddadd04a42.zip |
Merge pull request #361 from mb-14/file
Add option for sharing encrypted file.
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java index faac9b157..88a29cee9 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java @@ -108,6 +108,7 @@ public class EncryptActivity extends DrawerActivity { private EditText mFilename = null; private CheckBox mDeleteAfter = null; + private CheckBox mShareAfter = null; private BootstrapButton mBrowse = null; private String mInputFilename = null; @@ -650,6 +651,15 @@ public class EncryptActivity extends DrawerActivity { .newInstance(mInputFilename); deleteFileDialog.show(getSupportFragmentManager(), "deleteDialog"); } + + if (mShareAfter.isChecked()) { + // Share encrypted file + Intent sendFileIntent = new Intent(Intent.ACTION_SEND); + sendFileIntent.setType("*/*"); + sendFileIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse(mOutputFilename)); + startActivity(Intent.createChooser(sendFileIntent, + getString(R.string.title_send_file))); + } break; default: @@ -809,6 +819,7 @@ public class EncryptActivity extends DrawerActivity { } mDeleteAfter = (CheckBox) findViewById(R.id.deleteAfterEncryption); + mShareAfter = (CheckBox) findViewById(R.id.shareAfterEncryption); mAsciiArmor = (CheckBox) findViewById(R.id.asciiArmour); mAsciiArmor.setChecked(Preferences.getPreferences(this).getDefaultAsciiArmour()); |