diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-07 19:50:50 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-07 19:50:50 +0100 |
| commit | 0a0bdad5b5b067ff8b091c4d184b7cc1ee1c46d1 (patch) | |
| tree | 49ef219e6cbf1dfd0a12287ea865e41a843c5e91 | |
| parent | ba61e69a7dcc4e11778931eaf8f3b2c9e269d624 (diff) | |
| parent | e4736736b03d38f7e39b73f927cc68ddadd04a42 (diff) | |
| download | open-keychain-0a0bdad5b5b067ff8b091c4d184b7cc1ee1c46d1.tar.gz open-keychain-0a0bdad5b5b067ff8b091c4d184b7cc1ee1c46d1.tar.bz2 open-keychain-0a0bdad5b5b067ff8b091c4d184b7cc1ee1c46d1.zip | |
Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain
3 files changed, 26 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()); diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml index 27e29eddb..419a8f2ad 100644 --- a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml @@ -291,6 +291,19 @@ android:orientation="horizontal"> <CheckBox + android:id="@+id/shareAfterEncryption" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_share_after_encryption" /> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <CheckBox android:id="@+id/asciiArmour" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index fef83c936..d5123b79c 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -17,6 +17,7 @@ <string name="title_change_passphrase">Change Passphrase</string> <string name="title_set_passphrase">Set Passphrase</string> <string name="title_send_email">"Send Mail…"</string> + <string name="title_send_file">"Send File…"</string> <string name="title_encrypt_to_file">Encrypt To File</string> <string name="title_decrypt_to_file">Decrypt To File</string> <string name="title_import_keys">Import Keys</string> @@ -110,6 +111,7 @@ <string name="label_select_public_keys">Recipients</string> <string name="label_delete_after_encryption">Delete After Encryption</string> <string name="label_delete_after_decryption">Delete After Decryption</string> + <string name="label_share_after_encryption">Share After Encryption</string> <string name="label_encryption_algorithm">Encryption Algorithm</string> <string name="label_hash_algorithm">Hash Algorithm</string> <string name="label_asymmetric">Public Key</string> |