moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-26 00:48:51 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain

Browse Source
This commit is contained in:
Dominik Schürmann 2014-03-07 19:50:50 +01:00
commit 0a0bdad5b5
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
View File

@ -108,6 +108,7 @@ public class EncryptActivity extends DrawerActivity {
private EditText mFilename = null; private EditText mFilename = null;
private CheckBox mDeleteAfter = null; private CheckBox mDeleteAfter = null;
private CheckBox mShareAfter = null;
private BootstrapButton mBrowse = null; private BootstrapButton mBrowse = null;
private String mInputFilename = null; private String mInputFilename = null;
@ -650,6 +651,15 @@ public class EncryptActivity extends DrawerActivity {
.newInstance(mInputFilename); .newInstance(mInputFilename);
deleteFileDialog.show(getSupportFragmentManager(), "deleteDialog"); 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; break;
default: default:
@ -809,6 +819,7 @@ public class EncryptActivity extends DrawerActivity {
} }
mDeleteAfter = (CheckBox) findViewById(R.id.deleteAfterEncryption); mDeleteAfter = (CheckBox) findViewById(R.id.deleteAfterEncryption);
mShareAfter = (CheckBox) findViewById(R.id.shareAfterEncryption);
mAsciiArmor = (CheckBox) findViewById(R.id.asciiArmour); mAsciiArmor = (CheckBox) findViewById(R.id.asciiArmour);
mAsciiArmor.setChecked(Preferences.getPreferences(this).getDefaultAsciiArmour()); mAsciiArmor.setChecked(Preferences.getPreferences(this).getDefaultAsciiArmour());

13
OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
View File

@ -285,6 +285,19 @@
android:text="@string/label_delete_after_encryption" /> android:text="@string/label_delete_after_encryption" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
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 <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
OpenPGP-Keychain/src/main/res/values/strings.xml
View File

@ -17,6 +17,7 @@
<string name="title_change_passphrase">Change Passphrase</string> <string name="title_change_passphrase">Change Passphrase</string>
<string name="title_set_passphrase">Set Passphrase</string> <string name="title_set_passphrase">Set Passphrase</string>
<string name="title_send_email">"Send Mail…"</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_encrypt_to_file">Encrypt To File</string>
<string name="title_decrypt_to_file">Decrypt To File</string> <string name="title_decrypt_to_file">Decrypt To File</string>
<string name="title_import_keys">Import Keys</string> <string name="title_import_keys">Import Keys</string>
@ -110,6 +111,7 @@
<string name="label_select_public_keys">Recipients</string> <string name="label_select_public_keys">Recipients</string>
<string name="label_delete_after_encryption">Delete After Encryption</string> <string name="label_delete_after_encryption">Delete After Encryption</string>
<string name="label_delete_after_decryption">Delete After Decryption</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_encryption_algorithm">Encryption Algorithm</string>
<string name="label_hash_algorithm">Hash Algorithm</string> <string name="label_hash_algorithm">Hash Algorithm</string>
<string name="label_asymmetric">Public Key</string> <string name="label_asymmetric">Public Key</string>