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

a lot of renaming of IDs, following a strict naming scheme again, moved most strings into string.xml in preparation for internationalization, APG.java still has to be changed to allow that, as it isn't Context aware in most methods

Browse Source
This commit is contained in:
Thialfihar
2010-05-13 20:41:32 +00:00
parent 5f6a098914
commit b527ae8b6d
34 changed files with 493 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/account_item.xml
View File

@@ -25,7 +25,7 @@
android:layout_height="?android:attr/listPreferredItemHeight">
<TextView
android:id="@+id/account_name"
android:id="@+id/accountName"
android:text="someone@gmail.com"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_width="fill_parent"

22
res/layout/decrypt.xml
View File

@@ -39,13 +39,13 @@
android:orientation="horizontal">
<ImageView
android:id="@+id/source_previous"
android:id="@+id/sourcePrevious"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_previous"/>
<TextView
android:id="@+id/source_label"
android:id="@+id/sourceLabel"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_weight="1"
@@ -55,7 +55,7 @@
android:textColor="#ffffffff"/>
<ImageView
android:id="@+id/source_next"
android:id="@+id/sourceNext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_next"/>
@@ -69,7 +69,7 @@
android:layout_weight="1">
<LinearLayout
android:id="@+id/source_message"
android:id="@+id/sourceMessage"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
@@ -84,7 +84,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/source_file"
android:id="@+id/sourceFile"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
@@ -114,8 +114,8 @@
android:orientation="horizontal">
<TextView
android:id="@+id/label_delete_after_decryption"
android:text="@string/label_delete_after_decryption"
android:id="@+id/label_deleteAfterDecryption"
android:text="@string/label_deleteAfterDecryption"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
@@ -124,7 +124,7 @@
android:layout_weight="1"/>
<CheckBox
android:id="@+id/delete_after_decryption"
android:id="@+id/deleteAfterDecryption"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"/>
@@ -140,7 +140,7 @@
</ScrollView>
<LinearLayout
android:id="@+id/layout_signature"
android:id="@+id/signature"
android:orientation="horizontal"
android:layout_height="wrap_content"
android:layout_width="fill_parent">
@@ -170,7 +170,7 @@
android:paddingLeft="5dip">
<TextView
android:id="@+id/main_user_id"
android:id="@+id/mainUserId"
android:text="Main User Id"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
@@ -178,7 +178,7 @@
android:layout_gravity="left"/>
<TextView
android:id="@+id/main_user_id_rest"
android:id="@+id/mainUserIdRest"
android:text="Main User Id Rest"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"

6
res/layout/edit_key_key_item.xml
View File

@@ -42,7 +42,7 @@
<TableRow>
<TextView
android:id="@+id/label_key_id"
android:id="@+id/label_keyId"
android:text="Key ID"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -50,7 +50,7 @@
android:paddingRight="10dip"/>
<TextView
android:id="@+id/key_id"
android:id="@+id/keyId"
android:text="00000000 00000000"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -132,7 +132,7 @@
</TableLayout>
<ImageButton
android:id="@+id/edit_delete"
android:id="@+id/delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/MinusButton"

10
res/layout/edit_key_user_id_item.xml
View File

@@ -28,7 +28,7 @@
android:background="?android:attr/listDivider"/>
<RadioButton
android:id="@+id/is_main_user_id"
android:id="@+id/isMainUserId"
android:text="Main User ID"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -48,7 +48,7 @@
<TableRow>
<TextView
android:id="@+id/name_label"
android:id="@+id/label_name"
android:text="Name"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
@@ -66,7 +66,7 @@
<TableRow>
<TextView
android:id="@+id/email_label"
android:id="@+id/label_email"
android:text="Email"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
<TableRow>
<TextView
android:id="@+id/comment_label"
android:id="@+id/label_comment"
android:text="Comment"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
@@ -102,7 +102,7 @@
</TableLayout>
<ImageButton
android:id="@+id/edit_delete"
android:id="@+id/delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/MinusButton"

56
res/layout/encrypt.xml
View File

@@ -39,13 +39,13 @@
android:orientation="horizontal">
<ImageView
android:id="@+id/source_previous"
android:id="@+id/sourcePrevious"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_previous"/>
<TextView
android:id="@+id/source_label"
android:id="@+id/sourceLabel"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_weight="1"
@@ -55,7 +55,7 @@
android:textColor="#ffffffff"/>
<ImageView
android:id="@+id/source_next"
android:id="@+id/sourceNext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_next"/>
@@ -69,7 +69,7 @@
android:layout_weight="1">
<LinearLayout
android:id="@+id/source_message"
android:id="@+id/sourceMessage"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
@@ -84,7 +84,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/source_file"
android:id="@+id/sourceFile"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
@@ -114,8 +114,8 @@
android:orientation="horizontal">
<TextView
android:id="@+id/label_delete_after_encryption"
android:text="@string/label_delete_after_encryption"
android:id="@+id/label_deleteAfterEncryption"
android:text="@string/label_deleteAfterEncryption"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
@@ -124,7 +124,7 @@
android:layout_weight="1"/>
<CheckBox
android:id="@+id/delete_after_encryption"
android:id="@+id/deleteAfterEncryption"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"/>
@@ -137,8 +137,8 @@
android:orientation="horizontal">
<TextView
android:id="@+id/label_ascii_armour"
android:text="@string/label_ascii_armour"
android:id="@+id/label_asciiArmour"
android:text="@string/label_asciiArmour"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
@@ -147,7 +147,7 @@
android:layout_weight="1"/>
<CheckBox
android:id="@+id/ascii_armour"
android:id="@+id/asciiArmour"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"/>
@@ -170,13 +170,13 @@
android:orientation="horizontal">
<ImageView
android:id="@+id/mode_previous"
android:id="@+id/modePrevious"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_previous"/>
<TextView
android:id="@+id/mode_label"
android:id="@+id/modeLabel"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_weight="1"
@@ -186,7 +186,7 @@
android:textColor="#ffffffff"/>
<ImageView
android:id="@+id/mode_next"
android:id="@+id/modeNext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_next"/>
@@ -199,7 +199,7 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/mode_asymmetric"
android:id="@+id/modeAsymmetric"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -226,7 +226,7 @@
android:paddingRight="5dip">
<TextView
android:id="@+id/main_user_id"
android:id="@+id/mainUserId"
android:text="Main User Id"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
@@ -234,7 +234,7 @@
android:layout_gravity="right"/>
<TextView
android:id="@+id/main_user_id_rest"
android:id="@+id/mainUserIdRest"
android:text="Main User Id Rest"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
@@ -258,8 +258,8 @@
android:orientation="horizontal">
<TextView
android:id="@+id/label_select_public_keys"
android:text="@string/label_select_public_keys"
android:id="@+id/label_selectPublicKeys"
android:text="@string/label_selectPublicKeys"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_height="wrap_content"
android:layout_width="0dip"
@@ -277,7 +277,7 @@
</LinearLayout>
<TableLayout
android:id="@+id/mode_symmetric"
android:id="@+id/modeSymmetric"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:stretchColumns="1">
@@ -285,8 +285,8 @@
<TableRow>
<TextView
android:id="@+id/label_pass_phrase"
android:text="@string/label_pass_phrase"
android:id="@+id/label_passPhrase"
android:text="@string/label_passPhrase"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -294,7 +294,7 @@
android:paddingRight="10dip"/>
<EditText
android:id="@+id/pass_phrase"
android:id="@+id/passPhrase"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:inputType="textPassword"/>
@@ -304,8 +304,8 @@
<TableRow>
<TextView
android:id="@+id/label_pass_phrase_again"
android:text="@string/label_pass_phrase_again"
android:id="@+id/label_passPhraseAgain"
android:text="@string/label_passPhraseAgain"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -313,7 +313,7 @@
android:paddingRight="10dip"/>
<EditText
android:id="@+id/pass_phrase_again"
android:id="@+id/passPhraseAgain"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:inputType="textPassword"/>
@@ -341,8 +341,8 @@
style="@android:style/ButtonBar">
<Button
android:id="@+id/btn_encrypt_to_clipboard"
android:text="@string/btn_encrypt_to_clipboard"
android:id="@+id/btn_encryptToClipboard"
android:text="@string/btn_encryptToClipboard"
android:layout_weight="1"
android:layout_width="0dip"
android:layout_height="wrap_content"/>

10
res/layout/key_list_child_item_master_key.xml
View File

@@ -29,7 +29,7 @@
android:paddingRight="3dip">
<ImageView
android:id="@+id/ic_master_key"
android:id="@+id/ic_masterKey"
android:src="@drawable/key_small"
android:paddingRight="6dip"
android:layout_width="wrap_content"
@@ -37,7 +37,7 @@
android:layout_gravity="center_vertical"/>
<TextView
android:id="@+id/key_id"
android:id="@+id/keyId"
android:text="Key ID"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
@@ -46,7 +46,7 @@
android:typeface="monospace"/>
<TextView
android:id="@+id/key_details"
android:id="@+id/keyDetails"
android:text="(RSA, 1024bit)"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
@@ -62,13 +62,13 @@
android:layout_gravity="center_vertical">
<ImageView
android:id="@+id/ic_encrypt_key"
android:id="@+id/ic_encryptKey"
android:src="@drawable/encrypted_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<ImageView
android:id="@+id/ic_sign_key"
android:id="@+id/ic_signKey"
android:src="@drawable/signed_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

8
res/layout/key_list_child_item_sub_key.xml
View File

@@ -29,7 +29,7 @@
android:paddingRight="3dip">
<TextView
android:id="@+id/key_id"
android:id="@+id/keyId"
android:text="Key ID"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
@@ -38,7 +38,7 @@
android:typeface="monospace"/>
<TextView
android:id="@+id/key_details"
android:id="@+id/keyDetails"
android:text="(RSA, 1024bit)"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
@@ -54,13 +54,13 @@
android:layout_gravity="center_vertical">
<ImageView
android:id="@+id/ic_encrypt_key"
android:id="@+id/ic_encryptKey"
android:src="@drawable/encrypted_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<ImageView
android:id="@+id/ic_sign_key"
android:id="@+id/ic_signKey"
android:src="@drawable/signed_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

2
res/layout/key_list_child_item_user_id.xml
View File

@@ -23,7 +23,7 @@
android:layout_height="?android:attr/listPreferredItemHeight">
<TextView
android:id="@+id/user_id"
android:id="@+id/userId"
android:text="User ID"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"

4
res/layout/key_list_group_item.xml
View File

@@ -28,14 +28,14 @@
android:paddingLeft="36dip">
<TextView
android:id="@+id/main_user_id"
android:id="@+id/mainUserId"
android:text="Main User ID"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/main_user_id_rest"
android:id="@+id/mainUserIdRest"
android:text="&lt;user@somewhere.com&gt;"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"

2
res/layout/mailbox_message_item.xml
View File

@@ -46,7 +46,7 @@
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/email_address"
android:id="@+id/emailAddress"
android:text="user@somewhere.com"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"

2
res/layout/main.xml
View File

@@ -30,7 +30,7 @@
android:fillViewport="true">
<ListView
android:id="@+id/account_list"
android:id="@+id/accounts"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>

4
res/layout/pass_phrase.xml
View File

@@ -8,13 +8,13 @@
android:paddingRight="5dip">
<EditText
android:id="@+id/pass_phrase"
android:id="@+id/passPhrase"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"/>
<EditText
android:id="@+id/pass_phrase_again"
android:id="@+id/passPhraseAgain"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"/>

18
res/layout/preferences.xml
View File

@@ -46,8 +46,8 @@
android:orientation="horizontal">
<TextView
android:id="@+id/label_encryption_algorithm"
android:text="@string/label_encryption_algorithm"
android:id="@+id/label_encryptionAlgorithm"
android:text="@string/label_encryptionAlgorithm"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_height="wrap_content"
android:layout_width="0dip"
@@ -56,7 +56,7 @@
android:paddingRight="10dip"/>
<Spinner
android:id="@+id/encryption_algorithm"
android:id="@+id/encryptionAlgorithm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/>
@@ -69,8 +69,8 @@
android:orientation="horizontal">
<TextView
android:id="@+id/label_hash_algorithm"
android:text="@string/label_hash_algorithm"
android:id="@+id/label_hashAlgorithm"
android:text="@string/label_hashAlgorithm"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_height="wrap_content"
android:layout_width="0dip"
@@ -79,7 +79,7 @@
android:paddingRight="10dip"/>
<Spinner
android:id="@+id/hash_algorithm"
android:id="@+id/hashAlgorithm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/>
@@ -92,8 +92,8 @@
android:orientation="horizontal">
<TextView
android:id="@+id/label_ascii_armour"
android:text="@string/label_ascii_armour"
android:id="@+id/label_asciiArmour"
android:text="@string/label_asciiArmour"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
@@ -102,7 +102,7 @@
android:layout_weight="1"/>
<CheckBox
android:id="@+id/ascii_armour"
android:id="@+id/asciiArmour"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"/>

7
res/layout/select_public_key_item.xml
View File

@@ -38,14 +38,14 @@
android:layout_weight="1">
<TextView
android:id="@+id/main_user_id"
android:id="@+id/mainUserId"
android:text="Main User ID"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/main_user_id_rest"
android:id="@+id/mainUserIdRest"
android:text="&lt;user@somewhere.com&gt;"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
@@ -54,7 +54,6 @@
</LinearLayout>
<LinearLayout
android:id="@+id/right_column"
android:orientation="vertical"
android:minWidth="90dip"
android:paddingLeft="3dip"
@@ -63,7 +62,7 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/key_id"
android:id="@+id/keyId"
android:text="BBBBBBBB"
android:textAppearance="?android:attr/textAppearanceSmall"
android:typeface="monospace"

6
res/layout/select_secret_key_item.xml
View File

@@ -31,14 +31,14 @@
android:layout_weight="1">
<TextView
android:id="@+id/main_user_id"
android:id="@+id/mainUserId"
android:text="Main User ID"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/main_user_id_rest"
android:id="@+id/mainUserIdRest"
android:text="&lt;user@somewhere.com&gt;"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
@@ -55,7 +55,7 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/key_id"
android:id="@+id/keyId"
android:text="BBBBBBBB"
android:textAppearance="?android:attr/textAppearanceSmall"
android:typeface="monospace"