cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
This commit is contained in:
Daniel Albert
2014-07-16 18:49:16 +02:00
parent e375cde7e1 82af9672fd
commit d63534d655
68 changed files with 3346 additions and 1097 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
OpenKeychain/src/main/res/drawable/first_time_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 43 KiB

13
OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml → OpenKeychain/src/main/res/layout/create_key_activity.xml
View File

@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:orientation="vertical">
<TextView
@@ -38,4 +39,16 @@
android:layout_gravity="center_horizontal" />
<Button
android:id="@+id/create_key_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
android:layout_margin="8dp"
android:text="@string/first_time_create_key"
android:background="@drawable/button_edgy"
android:drawableLeft="@drawable/ic_action_new_account" />
</LinearLayout>

89
OpenKeychain/src/main/res/layout/first_time_activity.xml Normal file
View File

@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingBottom="8dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/app_name"
android:drawableLeft="@drawable/ic_launcher"
android:drawablePadding="16dp"
android:gravity="center"
android:layout_gravity="center_horizontal" />
<ImageView
android:layout_width="wrap_content"
android:layout_marginLeft="64dp"
android:layout_marginRight="64dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:layout_height="256dp"
android:src="@drawable/first_time_1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="64dp"
android:layout_marginRight="64dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/first_time_text1"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" />
</LinearLayout>
<Button
android:id="@+id/first_time_cancel"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:text="@string/first_time_skip"
android:background="@drawable/button_edgy" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@id/first_time_cancel"
android:orientation="horizontal">
<Button
android:id="@+id/first_time_create_key"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:text="@string/first_time_create_key"
android:background="@drawable/button_edgy"
android:drawableLeft="@drawable/ic_action_new_account" />
<Button
android:id="@+id/first_time_import_key"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:text="@string/first_time_import_key"
android:background="@drawable/button_edgy"
android:drawableLeft="@drawable/ic_action_download" />
</LinearLayout>
</RelativeLayout>

98
OpenKeychain/src/main/res/layout/wizard_activity.xml
View File

@@ -1,98 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/wizard_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<Button
android:id="@+id/wizard_back"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:onClick="backOnClick"
android:text="cancel"
style="@style/SelectableItem" />
<View
android:layout_width="1dip"
android:layout_height="match_parent"
android:layout_marginBottom="4dip"
android:layout_marginTop="4dip"
android:background="?android:attr/listDivider" />
<Button
android:id="@+id/wizard_next"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:onClick="nextOnClick"
android:text="next"
style="@style/SelectableItem" />
</LinearLayout>
<View
android:id="@+id/wizard_progress_line"
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_above="@+id/wizard_buttons"
android:layout_marginLeft="4dip"
android:layout_marginRight="4dip"
android:background="?android:attr/listDivider"
android:visibility="gone" />
<LinearLayout
android:id="@+id/wizard_progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/wizard_progress_line"
android:visibility="gone">
<ProgressBar
android:id="@+id/wizard_progress_progressbar"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageView
android:id="@+id/wizard_progress_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_light_refresh" />
<TextView
android:id="@+id/wizard_progress_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="asd"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<View
android:id="@+id/wizard_line2"
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_above="@+id/wizard_progress"
android:layout_marginLeft="4dip"
android:layout_marginRight="4dip"
android:background="?android:attr/listDivider" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/wizard_line2">
<LinearLayout
android:id="@+id/wizard_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp" />
</ScrollView>
</RelativeLayout>

43
OpenKeychain/src/main/res/layout/wizard_k9_fragment.xml
View File

@@ -1,43 +0,0 @@
<?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" >
<org.sufficientlysecure.htmltextview.HtmlTextView
android:id="@+id/wizard_k9_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="4dp"
android:text="Text..."
android:textAppearance="?android:attr/textAppearanceMedium" />
<RadioGroup
android:id="@+id/wizard_k9_radio_group"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RadioButton
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:checked="true"
android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/SelectableItem"
android:text="install K9"
android:id="@+id/wizard_k9_install" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<RadioButton
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/SelectableItem"
android:text="skip install"
android:id="@+id/wizard_k9_skip" />
</RadioGroup>
</LinearLayout>

63
OpenKeychain/src/main/res/layout/wizard_start_fragment.xml
View File

@@ -1,63 +0,0 @@
<?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">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="4dp"
android:text="Welcome to OpenKeychain"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="14dp"
android:text="What you wanna do today?"
android:layout_weight="1" />
<RadioGroup
android:id="@+id/wizard_start_radio_group"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RadioButton
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:checked="true"
android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/SelectableItem"
android:text="new key"
android:id="@+id/wizard_start_new_key" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<RadioButton
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/SelectableItem"
android:text="import existing key"
android:id="@+id/wizard_start_import" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<RadioButton
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/SelectableItem"
android:text="skip wizard"
android:id="@+id/wizard_start_skip" />
</RadioGroup>
</LinearLayout>

11
OpenKeychain/src/main/res/menu/key_list.xml
View File

@@ -26,11 +26,6 @@
app:showAsAction="never"
android:title="@string/menu_create_key" />
<item
android:id="@+id/menu_key_list_create_expert"
app:showAsAction="never"
android:title="@string/menu_create_key_expert" />
<item
android:id="@+id/menu_key_list_debug_read"
app:showAsAction="never"
@@ -43,4 +38,10 @@
android:title="Debug / DB backup"
android:visible="false" />
<item
android:id="@+id/menu_key_list_debug_first_time"
app:showAsAction="never"
android:title="Debug / Show first time screen"
android:visible="false" />
</menu>

25
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -9,7 +9,6 @@
<string name="title_authentication">Passphrase</string>
<string name="title_create_key">Create Key</string>
<string name="title_edit_key">Edit Key</string>
<string name="title_wizard">Welcome to OpenKeychain</string>
<string name="title_preferences">Preferences</string>
<string name="title_api_registered_apps">Apps</string>
<string name="title_key_server_preference">Keyserver Preference</string>
@@ -511,7 +510,7 @@
<string name="cert_casual">casual</string>
<string name="cert_positive">positive</string>
<string name="cert_revoke">revoked</string>
<string name="cert_verify_ok">ok</string>
<string name="cert_verify_ok">OK</string>
<string name="cert_verify_failed">failed!</string>
<string name="cert_verify_error">error!</string>
<string name="cert_verify_unavailable">key unavailable</string>
@@ -556,7 +555,7 @@
<string name="msg_ip_reinsert_secret">Re-inserting secret key</string>
<string name="msg_ip_uid_cert_bad">Encountered bad certificate!</string>
<string name="msg_ip_uid_cert_error">Error processing certificate!</string>
<string name="msg_ip_uid_cert_good">User id is certified by %1$s (%2$s)</string>
<string name="msg_ip_uid_cert_good">User id is certified by %1$s</string>
<plurals name="msg_ip_uid_certs_unknown">
<item quantity="one">Ignoring one certificate issued by an unknown public key</item>
<item quantity="other">Ignoring %s certificates issued by unknown public keys</item>
@@ -637,6 +636,17 @@
<string name="msg_mg_heterogeneous">Tried to consolidate heterogeneous keyrings</string>
<string name="msg_mg_new_subkey">Adding new subkey %s</string>
<string name="msg_mg_found_new">Found %s new certificates in keyring</string>
<string name="msg_mg_unchanged">No new certificates</string>
<!-- createSecretKeyRing -->
<string name="msg_cr">Generating new master key</string>
<string name="msg_cr_error_no_master">No master key options specified!</string>
<string name="msg_cr_error_no_user_id">Keyrings must be created with at least one user id!</string>
<string name="msg_cr_error_no_certify">Master key must have certify flag!</string>
<string name="msg_cr_error_keysize_512">Key size must be greater or equal 512!</string>
<string name="msg_cr_error_internal_pgp">Internal PGP error!</string>
<string name="msg_cr_error_unknown_algo">Bad algorithm choice!</string>
<string name="msg_cr_error_master_elgamal">Master key must not be of type ElGamal!</string>
<!-- modifySecretKeyRing -->
<string name="msg_mr">Modifying keyring %s</string>
@@ -644,10 +654,13 @@
<string name="msg_mf_error_fingerprint">Actual key fingerprint does not match the expected one!</string>
<string name="msg_mf_error_keyid">No key ID. This is an internal error, please file a bug report!</string>
<string name="msg_mf_error_integrity">Internal error, integrity check failed!</string>
<string name="msg_mf_error_noexist_primary">Bad primary user id specified!</string>
<string name="msg_mf_error_revoked_primary">Revoked user ids cannot be primary!</string>
<string name="msg_mf_error_pgp">PGP internal exception!</string>
<string name="msg_mf_error_sig">Signature exception!</string>
<string name="msg_mf_passphrase">Changing passphrase</string>
<string name="msg_mf_primary_replace_old">Replacing certificate of previous primary user id</string>
<string name="msg_mf_primary_new">Generating new certificate for new primary user id</string>
<string name="msg_mf_subkey_change">Modifying subkey %s</string>
<string name="msg_mf_subkey_missing">Tried to operate on missing subkey %s!</string>
<string name="msg_mf_subkey_new">Generating new %1$s bit %2$s subkey</string>
@@ -691,4 +704,10 @@
<string name="info_no_manual_account_creation">Do not create OpenKeychain-Accounts manually.\nFor more information, see Help.</string>
<string name="contact_show_key">Show key (%s)</string>
<!-- First Time -->
<string name="first_time_text1">Take back your privacy with OpenKeychain!</string>
<string name="first_time_create_key">Create Key</string>
<string name="first_time_import_key">Import Key</string>
<string name="first_time_skip">Skip Setup</string>
</resources>