diff options
Diffstat (limited to 'OpenPGP-Keychain/res')
| -rw-r--r-- | OpenPGP-Keychain/res/drawable-xhdpi/icon.png | bin | 8165 -> 8165 bytes | |||
| -rw-r--r-- | OpenPGP-Keychain/res/drawable-xxhdpi/icon.png | bin | 0 -> 14633 bytes | |||
| -rw-r--r-- | OpenPGP-Keychain/res/drawable-xxxhdpi/icon.png | bin | 0 -> 21592 bytes | |||
| -rw-r--r-- | OpenPGP-Keychain/res/layout/api_app_error_message.xml | 17 | ||||
| -rw-r--r-- | OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml | 219 | ||||
| -rw-r--r-- | OpenPGP-Keychain/res/values/strings.xml | 5 |
6 files changed, 146 insertions, 95 deletions
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/icon.png b/OpenPGP-Keychain/res/drawable-xhdpi/icon.png Binary files differindex 03ee31bbd..ec8e9fc6d 100644 --- a/OpenPGP-Keychain/res/drawable-xhdpi/icon.png +++ b/OpenPGP-Keychain/res/drawable-xhdpi/icon.png diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/icon.png b/OpenPGP-Keychain/res/drawable-xxhdpi/icon.png Binary files differnew file mode 100644 index 000000000..a55413501 --- /dev/null +++ b/OpenPGP-Keychain/res/drawable-xxhdpi/icon.png diff --git a/OpenPGP-Keychain/res/drawable-xxxhdpi/icon.png b/OpenPGP-Keychain/res/drawable-xxxhdpi/icon.png Binary files differnew file mode 100644 index 000000000..d4c77573e --- /dev/null +++ b/OpenPGP-Keychain/res/drawable-xxxhdpi/icon.png diff --git a/OpenPGP-Keychain/res/layout/api_app_error_message.xml b/OpenPGP-Keychain/res/layout/api_app_error_message.xml new file mode 100644 index 000000000..5927dbf43 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/api_app_error_message.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <org.sufficientlysecure.htmltextview.HtmlTextView + android:id="@+id/api_app_error_message_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="8dp" + android:paddingBottom="0dip" + android:text="Set in-code!" + android:textAppearance="?android:attr/textAppearanceLarge" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml index 81b48be72..a40444e0f 100644 --- a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml +++ b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml @@ -1,122 +1,153 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" > - <RelativeLayout + <LinearLayout android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:gravity="center_horizontal" - android:orientation="horizontal" - android:paddingBottom="3dip" > - - <ImageView - android:id="@+id/api_app_settings_app_icon" - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_alignParentBottom="true" - android:layout_alignParentTop="true" - android:layout_marginRight="6dp" - android:src="@drawable/icon" /> - - <TextView - android:id="@+id/api_app_settings_app_name" - android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:gravity="center_horizontal" + android:orientation="horizontal" + android:paddingBottom="3dip" > + + <ImageView + android:id="@+id/api_app_settings_app_icon" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_alignParentBottom="true" + android:layout_alignParentTop="true" + android:layout_marginRight="6dp" + android:src="@drawable/icon" /> + + <TextView + android:id="@+id/api_app_settings_app_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toRightOf="@+id/api_app_settings_app_icon" + android:gravity="center_vertical" + android:orientation="vertical" + android:text="Name (set in-code)" + android:textAppearance="?android:attr/textAppearanceMedium" /> + </RelativeLayout> + + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toRightOf="@+id/api_app_settings_app_icon" - android:gravity="center_vertical" - android:orientation="vertical" - android:text="Name (set in-code)" - android:textAppearance="?android:attr/textAppearanceMedium" /> - </RelativeLayout> + android:orientation="horizontal" > - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + <Button + android:id="@+id/api_app_settings_select_key_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/api_settings_select_key" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="16dp" > + + <TextView + android:id="@+id/api_app_settings_user_id" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/api_settings_no_key" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/api_app_settings_user_id_rest" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:ellipsize="end" + android:singleLine="true" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> + </LinearLayout> <Button - android:id="@+id/api_app_settings_select_key_button" - android:layout_width="wrap_content" + android:id="@+id/api_app_settings_advanced_button" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/api_settings_select_key" /> + android:text="@string/api_settings_show_advanced" /> <LinearLayout - android:layout_width="fill_parent" + android:id="@+id/api_app_settings_advanced" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="16dp" > + android:visibility="gone" > <TextView - android:id="@+id/api_app_settings_user_id" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="right" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/api_settings_no_key" + android:text="@string/label_encryption_algorithm" android:textAppearance="?android:attr/textAppearanceMedium" /> + <Spinner + android:id="@+id/api_app_settings_encryption_algorithm" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + <TextView - android:id="@+id/api_app_settings_user_id_rest" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="right" - android:ellipsize="end" - android:singleLine="true" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - </LinearLayout> - - <Button - android:id="@+id/api_app_settings_advanced_button" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/api_settings_show_advanced" /> + android:text="@string/label_hash_algorithm" + android:textAppearance="?android:attr/textAppearanceMedium" /> - <LinearLayout - android:id="@+id/api_app_settings_advanced" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="invisible" > + <Spinner + android:id="@+id/api_app_settings_hash_algorithm" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/label_encryption_algorithm" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/label_message_compression" + android:textAppearance="?android:attr/textAppearanceMedium" /> - <Spinner - android:id="@+id/api_app_settings_encryption_algorithm" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <Spinner + android:id="@+id/api_app_settings_compression" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/label_hash_algorithm" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/api_settings_package_name" + android:textAppearance="?android:attr/textAppearanceMedium" /> - <Spinner - android:id="@+id/api_app_settings_hash_algorithm" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <TextView + android:id="@+id/api_app_settings_package_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="com.example" + android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/label_message_compression" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/api_settings_package_signature" + android:textAppearance="?android:attr/textAppearanceMedium" /> - <Spinner - android:id="@+id/api_app_settings_compression" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <TextView + android:id="@+id/api_app_settings_package_signature" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Base64 encoded signature" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</ScrollView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index 02e1e5bd1..c3736815c 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -317,7 +317,7 @@ <string name="import_qr_code_missing">Missing QR Codes: %1$s</string> <string name="import_qr_code_wrong">QR Code malformed! Please try again!</string> <string name="import_qr_code_finished">QR Code scanning finished!</string> - + <!-- Intent labels --> <string name="intent_decrypt_file">OpenPGP: Decrypt File</string> <string name="intent_import_key">OpenPGP: Import Key</string> @@ -333,6 +333,8 @@ <string name="api_settings_save">Save</string> <string name="api_settings_cancel">Cancel</string> <string name="api_settings_revoke">Revoke access</string> + <string name="api_settings_package_name">Package Name</string> + <string name="api_settings_package_signature">SHA-256 of Package Signature</string> <string name="api_register_text">The following application requests access to OpenPGP Keychain\'s API.\n\nAllow permanent access?</string> <string name="api_register_allow">Allow access</string> <string name="api_register_disallow">Disallow access</string> @@ -340,6 +342,7 @@ <string name="api_select_pub_keys_missing_text">No public keys were found for these user ids:</string> <string name="api_select_pub_keys_dublicates_text">More than one public key exist for these user ids:</string> <string name="api_select_pub_keys_text">Please review the list of recipients!</string> + <string name="api_error_wrong_signature">Signature check failed! Have you installed this app from a different source? If you are sure that this is not an attack, revoke this app\'s registration in OpenPGP Keychain and then register the app again.</string> <!-- Share --> <string name="share_qr_code_dialog_start">Go through all QR Codes using \'Next\', and scan them one by one.</string> |
