diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
15 files changed, 288 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png Binary files differindex f5487599b..6b2be4bc3 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png Binary files differindex 7cd482bff..c2b688424 100644 --- a/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png +++ b/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png Binary files differindex 34f1420ac..6bb29efde 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png Binary files differindex 32584f3ff..6188bbed9 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png Binary files differindex b2922309f..765738881 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png Binary files differindex 93ea6b0f5..d85507fef 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable/nfc.png b/OpenKeychain/src/main/res/drawable/nfc.png Binary files differnew file mode 100644 index 000000000..f28b043bc --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/nfc.png diff --git a/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml b/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml new file mode 100644 index 000000000..6a154fa55 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/topLayout" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <com.haibison.android.lockpattern.widget.LockPatternView_v14 + android:id="@+id/lockPattern" + android:layout_width="@dimen/alp_42447968_separator_size" + android:layout_height="@dimen/alp_42447968_separator_size" + android:layout_marginTop="@dimen/alp_42447968_separator_size" + android:layout_marginBottom="@dimen/alp_42447968_separator_size" + android:layout_gravity="center_horizontal" /> +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard.xml new file mode 100644 index 000000000..efc65b7c7 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/passphrase_wizard.xml @@ -0,0 +1,11 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <FrameLayout + android:id="@+id/fragmentContainer" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_nfc.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_nfc.xml new file mode 100644 index 000000000..46d430c4e --- /dev/null +++ b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_nfc.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="16dp"> + + <TextView + android:id="@+id/nfcText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="8dp" + android:text="@string/nfc_text" + android:textAppearance="?android:attr/textAppearanceMedium" + android:lines="2" /> + + + <ImageView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/imageView" + android:padding="16dp" + android:layout_gravity="center" + android:layout_weight="1" + android:src="@drawable/nfc" + android:adjustViewBounds="true" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml new file mode 100644 index 000000000..61bd4572d --- /dev/null +++ b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml @@ -0,0 +1,109 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="16dp" + android:orientation="vertical" + tools:context="pSontag.testopenkeychain.Passphrase"> + + + + <TableLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TableRow + android:layout_marginBottom="10dp"> + <TextView + android:id="@+id/passphraseText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_span="2" + android:padding="8dp" + android:layout_gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/passphrase" + android:layout_weight="1"/> + </TableRow> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + <TableRow> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="8dp" + android:layout_weight="1" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/passphrase"/> + <EditText + android:id="@+id/passphrase" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textPassword" + android:padding="8dp" + android:layout_weight="6"/> + + </TableRow> + + <TableRow + android:layout_marginTop="10dp" + android:layout_marginBottom="10dp"> + <TextView + android:id="@+id/passphraseTextAgain" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="8dp" + android:text="@string/passphrase_again" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_weight="1"/> + <EditText + android:id="@+id/passphraseAgain" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textPassword" + android:imeOptions="actionDone" + android:padding="8dp" + android:layout_weight="6"/> + + </TableRow> + </TableLayout> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Cancel" + android:onClick="cancel" + android:layout_weight="1" + android:textAppearance="?android:attr/textAppearanceMedium" + style="?attr/alp_42447968_button_bar_button_style"/> + <View + android:layout_width="1dip" + android:layout_height="50dip" + android:background="?android:attr/listDivider" /> + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Ok" + android:onClick="savePassphrase" + android:layout_weight="1" + android:textAppearance="?android:attr/textAppearanceMedium" + style="?attr/alp_42447968_button_bar_button_style"/> + + </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml new file mode 100644 index 000000000..42baa6a0d --- /dev/null +++ b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml @@ -0,0 +1,89 @@ +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="16dp" + tools:context="pSontag.testopenkeychain.SelectMethods"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="10dp" + android:padding="8dp" + android:text="@string/title_unlock_method" + android:textAppearance="?android:attr/textAppearanceMedium"/> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + <TextView + android:id="@+id/selectNoPassphrase" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:text="@string/noPassphrase" + android:minHeight="?android:attr/listPreferredItemHeight" + android:padding="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:clickable="true" + android:onClick="noPassphrase" + style="@style/SelectableItem"/> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + <TextView + android:id="@+id/selectPassphrase" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:text="@string/passphrase" + android:minHeight="?android:attr/listPreferredItemHeight" + android:padding="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:clickable="true" + android:onClick="passphrase" + style="@style/SelectableItem"/> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + <TextView + android:id="@+id/selectLockpattern" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:text="@string/lockpattern" + android:minHeight="?android:attr/listPreferredItemHeight" + android:padding="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:clickable="true" + android:onClick="startLockpattern" + style="@style/SelectableItem"/> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + <TextView + android:id="@+id/selectLockpatternNFC" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:text="@string/lockpatternNFC" + android:minHeight="?android:attr/listPreferredItemHeight" + android:padding="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:clickable="true" + android:onClick="NFC" + style="@style/SelectableItem"/> + + </LinearLayout> +</ScrollView> diff --git a/OpenKeychain/src/main/res/raw/help_changelog.html b/OpenKeychain/src/main/res/raw/help_changelog.html index 3a1970565..2cc93bc38 100644 --- a/OpenKeychain/src/main/res/raw/help_changelog.html +++ b/OpenKeychain/src/main/res/raw/help_changelog.html @@ -114,7 +114,7 @@ And don't add newlines before or after p tags because of transifex --> <h2>2.5</h2> <ul> -<li>Fix decryption of symmetric pgp messages/files</li> +<li>Fix decryption of symmetric OpenPGP messages/files</li> <li>Refactored key edit screen (thanks to Ash Hughes)</li> <li>New modern design for encrypt/decrypt screens</li> <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li> diff --git a/OpenKeychain/src/main/res/raw/help_wot.html b/OpenKeychain/src/main/res/raw/help_wot.html index 0ed8e586d..d2ce4a7ae 100644 --- a/OpenKeychain/src/main/res/raw/help_wot.html +++ b/OpenKeychain/src/main/res/raw/help_wot.html @@ -6,7 +6,7 @@ And don't add newlines before or after p tags because of transifex --> </head> <body> <h2>Web of Trust</h2> -<p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p> +<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p> <h2>Support in OpenKeychain</h2> <p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 8dc708f1c..301de0be1 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -697,7 +697,7 @@ <string name="msg_is_subkey_nonexistent">"Subkey %s unavailable in secret key"</string> <string name="msg_is_subkey_ok">"Marked secret subkey %s as available"</string> <string name="msg_is_subkey_empty">"Marked secret subkey %s as available, with empty passphrase"</string> - <string name="msg_is_subkey_pin">"Marked secret subkey %s as available, with pin passphrase"</string> + <string name="msg_is_subkey_pin">"Marked secret subkey %s as available, with PIN"</string> <string name="msg_is_subkey_stripped">"Marked secret subkey %s as stripped"</string> <string name="msg_is_subkey_divert">"Marked secret subkey %s as 'divert to smartcard/NFC'"</string> <string name="msg_is_success_identical">"Keyring contains no new data, nothing to do"</string> @@ -782,7 +782,7 @@ <string name="msg_cr_error_keysize_512">"Key size must be greater or equal 512!"</string> <string name="msg_cr_error_no_curve">"No key size specified! This is a programming error, please file a bug report!"</string> <string name="msg_cr_error_no_keysize">"No elliptic curve specified! This is a programming error, please file a bug report!"</string> - <string name="msg_cr_error_internal_pgp">"Internal PGP error!"</string> + <string name="msg_cr_error_internal_pgp">"Internal OpenPGP error!"</string> <string name="msg_cr_error_unknown_algo">"Unknown algorithm selected! This is a programming error, please file a bug report!"</string> <string name="msg_cr_error_flags_dsa">"Bad key flags selected, DSA cannot be used for encryption!"</string> <string name="msg_cr_error_flags_elgamal">"Bad key flags selected, ElGamal cannot be used for signing!"</string> @@ -801,7 +801,7 @@ <string name="msg_mf_error_revoked_primary">"Revoked user IDs cannot be primary!"</string> <string name="msg_mf_error_null_expiry">"Expiry time cannot be "same as before" on subkey creation. This is a programming error, please file a bug report!"</string> <string name="msg_mf_error_passphrase_master">"Fatal error decrypting master key! This is likely a programming error, please file a bug report!"</string> - <string name="msg_mf_error_pgp">"Internal PGP error!"</string> + <string name="msg_mf_error_pgp">"Internal OpenPGP error!"</string> <string name="msg_mf_error_sig">"Signature exception!"</string> <string name="msg_mf_master">"Modifying master certifications"</string> <string name="msg_mf_notation_empty">"Adding empty notation packet"</string> @@ -895,7 +895,7 @@ <string name="msg_dc_error_io">"Encountered IO Exception during operation!"</string> <string name="msg_dc_error_no_data">"No encrypted data found in stream!"</string> <string name="msg_dc_error_no_key">"No encrypted data with known secret key found in stream!"</string> - <string name="msg_dc_error_pgp_exception">"Encountered PGP Exception during operation!"</string> + <string name="msg_dc_error_pgp_exception">"Encountered OpenPGP Exception during operation!"</string> <string name="msg_dc_integrity_check_ok">"Integrity check OK!"</string> <string name="msg_dc_ok_meta_only">"Only metadata was requested, skipping decryption"</string> <string name="msg_dc_ok">"OK"</string> @@ -922,8 +922,8 @@ <string name="msg_se_error_sign_key">"Error fetching signing key!"</string> <string name="msg_se_error_nfc">"NFC data error!"</string> <string name="msg_se_error_no_passphrase">"No passphrase provided!"</string> - <string name="msg_se_error_pgp">"Internal PGP error!"</string> - <string name="msg_se_error_sig">"Encountered PGP signature exception!"</string> + <string name="msg_se_error_pgp">"Internal OpenPGP error!"</string> + <string name="msg_se_error_sig">"Encountered OpenPGP signature exception!"</string> <string name="msg_se_error_unlock">"Unknown error unlocking key!"</string> <string name="msg_se_key_ok">"Encrypting for key: %s"</string> <string name="msg_se_key_unknown">"Missing key for encryption: %s"</string> @@ -1072,4 +1072,31 @@ <string name="exchange_description">"To start a key exchange, choose the number of participants on the right side, then hit the “Start exchange” button.\n\nYou will be asked two more questions to make sure only the right participants are in the exchange and their fingerprints are correct."</string> <string name="user_id_none"><![CDATA[<none>]]></string> + <!-- Passphrase wizard --> + <!-- TODO: rename all the things! --> + <string name="title_unlock_method">Choose an unlock method</string> + <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>--> + <string name="enter_passphrase">Enter passphrase</string> + <string name="passphrase">Passphrase</string> + <string name="noPassphrase">No passphrase</string> + <string name="no_passphrase_set">No passphrase set</string> + <string name="passphrases_match">Passphrases do match</string> + <string name="passphrase_saved">Passphrase saved</string> + <string name="passphrase_invalid">Passphrase invalid</string> + <string name="missing_passphrase">Missing passphrase</string> + <string name="passphrase_again">Again</string> + <string name="lockpattern">Lockpattern</string> + <string name="lockpatternNFC">NFC + Lockpattern</string> + <string name="unlock_method">Unlock method</string> + <string name="set_passphrase">Set passphrase</string> + <string name="draw_lockpattern">Draw lockpattern</string> + <string name="nfc_title">NFC</string> + <!--<string name="nfc_text">Please place a NFC tag near your device</string>--> + <string name="nfc_wrong_tag">Wrong Tag. Please try again.</string> + <string name="enable_nfc">Please activate NFC in your settings</string> + <string name="no_nfc_support">This device does not support NFC</string> + <string name="nfc_write_succesful">Successfully written on NFC tag</string> + <string name="unlocked">Unlocked</string> + <string name="nfc_settings">Settings</string> + </resources> |
