diff options
7 files changed, 59 insertions, 56 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index de559fe16..df5eaa69e 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -50,6 +50,7 @@ android:required="false" /> <permission android:name="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" /> + <uses-permission android:name="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" /> <uses-permission android:name="android.permission.INTERNET" /> @@ -155,8 +156,9 @@ <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT" /> <category android:name="android.intent.category.DEFAULT" /> + <data android:scheme="file" /> - <data android:scheme="content"/> + <data android:scheme="content" /> </intent-filter> <!-- Android's Send Action --> <intent-filter android:label="@string/intent_send_encrypt"> @@ -174,26 +176,16 @@ android:label="@string/title_decrypt" android:windowSoftInputMode="stateHidden"> - <!--<!– VIEW with mimeType: TODO (from email app) –>--> - <!--<intent-filter android:label="@string/intent_import_key">--> - <!--<action android:name="android.intent.action.VIEW" />--> - - <!--<category android:name="android.intent.category.BROWSABLE" />--> - <!--<category android:name="android.intent.category.DEFAULT" />--> - - <!--<!– mime type as defined in http://tools.ietf.org/html/rfc3156 –>--> - <!--<data android:mimeType="application/pgp-signature" />--> - <!--</intent-filter>--> - <!--<!– VIEW with mimeType: TODO (from email app) –>--> - <!--<intent-filter android:label="@string/intent_import_key">--> - <!--<action android:name="android.intent.action.VIEW" />--> + <!-- VIEW with mimeType application/pgp-encrypted --> + <intent-filter android:label="@string/intent_import_key"> + <action android:name="android.intent.action.VIEW" /> - <!--<category android:name="android.intent.category.BROWSABLE" />--> - <!--<category android:name="android.intent.category.DEFAULT" />--> + <category android:name="android.intent.category.BROWSABLE" /> + <category android:name="android.intent.category.DEFAULT" /> - <!--<!– mime type as defined in http://tools.ietf.org/html/rfc3156 –>--> - <!--<data android:mimeType="application/pgp-encrypted" />--> - <!--</intent-filter>--> + <!-- mime type as defined in http://tools.ietf.org/html/rfc3156 --> + <data android:mimeType="application/pgp-encrypted" /> + </intent-filter> <!-- Keychain's own Actions --> <!-- DECRYPT with text as extra --> <intent-filter> @@ -206,8 +198,9 @@ <action android:name="org.sufficientlysecure.keychain.action.DECRYPT" /> <category android:name="android.intent.category.DEFAULT" /> + <data android:scheme="file" /> - <data android:scheme="content"/> + <data android:scheme="content" /> </intent-filter> <!-- Android's Send Action --> <intent-filter android:label="@string/intent_send_decrypt"> @@ -227,7 +220,7 @@ <data android:host="*" /> <data android:scheme="file" /> <data android:scheme="content" /> - + <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data --> <data android:pathPattern=".*\\.asc" /> <data android:pathPattern=".*\\..*\\.asc" /> @@ -649,10 +642,10 @@ </service> <provider - android:name=".provider.TemporaryStorageProvider" - android:authorities="org.sufficientlysecure.keychain.tempstorage" - android:writePermission="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" - android:exported="true" /> + android:name=".provider.TemporaryStorageProvider" + android:authorities="org.sufficientlysecure.keychain.tempstorage" + android:writePermission="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" + android:exported="true" /> </application> diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java index 303db60ed..211802717 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java @@ -489,7 +489,7 @@ public class EncryptActivity extends DrawerActivity implements EncryptActivityIn * Android's Action */ if (Intent.ACTION_SEND.equals(action) && type != null) { - // When sending to APG Encrypt via share menu + // When sending to OpenKeychain Encrypt via share menu if ("text/plain".equals(type)) { // Plain text String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java index ed3be0e7f..3de617ca0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java @@ -115,6 +115,7 @@ public class EncryptAsymmetricFragment extends Fragment implements EncryptActivi } }); mEncryptKeyView = (EncryptKeyCompletionView) view.findViewById(R.id.recipient_list); + mEncryptKeyView.setThreshold(1); // Start working from first character return view; } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java index d5264ae10..226bdf51e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java @@ -149,6 +149,14 @@ public class AddUserIdDialogFragment extends DialogFragment implements OnEditorA } }); + mName.setThreshold(1); // Start working from first character + mName.setAdapter( + new ArrayAdapter<String> + (getActivity(), android.R.layout.simple_spinner_dropdown_item, + ContactHelper.getPossibleUserNames(getActivity()) + ) + ); + alert.setNegativeButton(android.R.string.cancel, new OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index e9e439d65..4d82477bc 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -1,39 +1,39 @@ <?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:paddingRight="16dp" + android:paddingLeft="16dp"> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingTop="4dp" - android:paddingBottom="4dp" - android:paddingRight="16dp" - android:paddingLeft="16dp"> + android:padding="0dp" + android:layout_margin="0dp" + style="@android:style/Widget.EditText"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="0dp" - android:layout_margin="0dp" - style="@android:style/Widget.EditText"> <TextView - android:paddingLeft="12dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/label_asymmetric_from"/> + android:paddingLeft="12dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/label_asymmetric_from" /> + <Spinner - android:id="@+id/sign" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical"/> + android:id="@+id/sign" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" /> </LinearLayout> <org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView - android:id="@+id/recipient_list" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:id="@+id/recipient_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/menu/encrypt_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_activity.xml index c852fbb5c..05d85ee2a 100644 --- a/OpenKeychain/src/main/res/menu/encrypt_activity.xml +++ b/OpenKeychain/src/main/res/menu/encrypt_activity.xml @@ -2,6 +2,6 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/check_use_symmetric" android:title="@string/label_symmetric" android:checkable="true"/> - <item android:id="@+id/check_use_armor" android:title="@string/label_ascii_armor" android:checkable="true" /> + <item android:id="@+id/check_use_armor" android:title="@string/label_file_ascii_armor" android:checkable="true" /> <item android:id="@+id/check_delete_after_encrypt" android:title="@string/label_delete_after_encryption" android:checkable="true" /> </menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index fca17f837..6abca0548 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -113,12 +113,13 @@ <string name="label_passphrase_again">Repeat Passphrase</string> <string name="label_algorithm">Algorithm</string> <string name="label_ascii_armor">ASCII Armor</string> + <string name="label_file_ascii_armor">Files: ASCII Armor</string> <string name="label_conceal_pgp_application">Let others know that you\'re using OpenKeychain</string> <string name="label_conceal_pgp_application_summary">Writes \'OpenKeychain v2.7\' to OpenPGP signatures, ciphertext, and exported keys</string> <string name="label_select_public_keys">Recipients</string> <string name="label_asymmetric_from">From:</string> <string name="label_to">To</string> - <string name="label_delete_after_encryption">Delete After Encryption</string> + <string name="label_delete_after_encryption">Files: 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> @@ -538,7 +539,7 @@ <string name="my_keys">My Keys</string> <!-- hints --> - <string name="encrypt_content_edit_text_hint">Write message here to encrypt and/or sign…</string> + <string name="encrypt_content_edit_text_hint">The message entered here will be signed using the key selected in \'From\' and encrypted for all recipients selected in \'To\'.</string> <string name="decrypt_content_edit_text_hint">Enter ciphertext here to decrypt and/or verify…</string> <!-- certs --> |