From 4a8d9694c495d445a824696e95ded3337bc7beea Mon Sep 17 00:00:00 2001 From: Dominik Date: Fri, 9 Mar 2012 18:43:10 +0100 Subject: new icon, new about dialog, some refactorings --- AndroidManifest.xml | 7 +- LICENSE | 16 + Resources/icon.svg | 739 +++++++++++++++++++++ Resources/icon_sizes.txt | 21 + res/drawable-hdpi-finger-v4/btn_circle_disable.png | Bin 2631 -> 0 bytes .../btn_circle_disable_focused.png | Bin 3001 -> 0 bytes res/drawable-hdpi-finger-v4/btn_circle_normal.png | Bin 1974 -> 0 bytes res/drawable-hdpi-finger-v4/btn_circle_pressed.png | Bin 2624 -> 0 bytes .../btn_circle_selected.png | Bin 2554 -> 0 bytes res/drawable-hdpi-finger-v4/ic_btn_round_minus.png | Bin 536 -> 0 bytes res/drawable-hdpi-finger-v4/ic_btn_round_plus.png | Bin 1316 -> 0 bytes res/drawable-hdpi-finger/btn_circle_disable.png | Bin 0 -> 2631 bytes .../btn_circle_disable_focused.png | Bin 0 -> 3001 bytes res/drawable-hdpi-finger/btn_circle_normal.png | Bin 0 -> 1974 bytes res/drawable-hdpi-finger/btn_circle_pressed.png | Bin 0 -> 2624 bytes res/drawable-hdpi-finger/btn_circle_selected.png | Bin 0 -> 2554 bytes res/drawable-hdpi-finger/ic_btn_round_minus.png | Bin 0 -> 536 bytes res/drawable-hdpi-finger/ic_btn_round_plus.png | Bin 0 -> 1316 bytes res/drawable-hdpi-v4/encrypted.png | Bin 3561 -> 0 bytes res/drawable-hdpi-v4/encrypted_large.png | Bin 5244 -> 0 bytes res/drawable-hdpi-v4/encrypted_small.png | Bin 2187 -> 0 bytes res/drawable-hdpi-v4/ic_next.png | Bin 1722 -> 0 bytes res/drawable-hdpi-v4/ic_previous.png | Bin 1712 -> 0 bytes res/drawable-hdpi-v4/icon.png | Bin 6505 -> 0 bytes res/drawable-hdpi-v4/key.png | Bin 3675 -> 0 bytes res/drawable-hdpi-v4/key_large.png | Bin 5550 -> 0 bytes res/drawable-hdpi-v4/key_small.png | Bin 2088 -> 0 bytes res/drawable-hdpi-v4/overlay_error.png | Bin 1986 -> 0 bytes res/drawable-hdpi-v4/overlay_ok.png | Bin 1702 -> 0 bytes res/drawable-hdpi-v4/signed.png | Bin 3858 -> 0 bytes res/drawable-hdpi-v4/signed_large.png | Bin 5928 -> 0 bytes res/drawable-hdpi-v4/signed_small.png | Bin 2219 -> 0 bytes res/drawable-hdpi/encrypted.png | Bin 0 -> 3561 bytes res/drawable-hdpi/encrypted_large.png | Bin 0 -> 5244 bytes res/drawable-hdpi/encrypted_small.png | Bin 0 -> 2187 bytes res/drawable-hdpi/ic_next.png | Bin 0 -> 1722 bytes res/drawable-hdpi/ic_previous.png | Bin 0 -> 1712 bytes res/drawable-hdpi/icon.png | Bin 0 -> 3949 bytes res/drawable-hdpi/key.png | Bin 0 -> 3675 bytes res/drawable-hdpi/key_large.png | Bin 0 -> 5550 bytes res/drawable-hdpi/key_small.png | Bin 0 -> 2088 bytes res/drawable-hdpi/overlay_error.png | Bin 0 -> 1986 bytes res/drawable-hdpi/overlay_ok.png | Bin 0 -> 1702 bytes res/drawable-hdpi/signed.png | Bin 0 -> 3858 bytes res/drawable-hdpi/signed_large.png | Bin 0 -> 5928 bytes res/drawable-hdpi/signed_small.png | Bin 0 -> 2219 bytes res/drawable-ldpi-v4/encrypted.png | Bin 1513 -> 0 bytes res/drawable-ldpi-v4/encrypted_large.png | Bin 2486 -> 0 bytes res/drawable-ldpi-v4/encrypted_small.png | Bin 1176 -> 0 bytes res/drawable-ldpi-v4/ic_next.png | Bin 916 -> 0 bytes res/drawable-ldpi-v4/ic_previous.png | Bin 922 -> 0 bytes res/drawable-ldpi-v4/icon.png | Bin 2426 -> 0 bytes res/drawable-ldpi-v4/key.png | Bin 1484 -> 0 bytes res/drawable-ldpi-v4/key_large.png | Bin 2462 -> 0 bytes res/drawable-ldpi-v4/key_small.png | Bin 1074 -> 0 bytes res/drawable-ldpi-v4/overlay_error.png | Bin 1192 -> 0 bytes res/drawable-ldpi-v4/overlay_ok.png | Bin 1038 -> 0 bytes res/drawable-ldpi-v4/signed.png | Bin 1576 -> 0 bytes res/drawable-ldpi-v4/signed_large.png | Bin 2611 -> 0 bytes res/drawable-ldpi-v4/signed_small.png | Bin 1149 -> 0 bytes res/drawable-ldpi/encrypted.png | Bin 0 -> 1513 bytes res/drawable-ldpi/encrypted_large.png | Bin 0 -> 2486 bytes res/drawable-ldpi/encrypted_small.png | Bin 0 -> 1176 bytes res/drawable-ldpi/ic_next.png | Bin 0 -> 916 bytes res/drawable-ldpi/ic_previous.png | Bin 0 -> 922 bytes res/drawable-ldpi/icon.png | Bin 0 -> 1795 bytes res/drawable-ldpi/key.png | Bin 0 -> 1484 bytes res/drawable-ldpi/key_large.png | Bin 0 -> 2462 bytes res/drawable-ldpi/key_small.png | Bin 0 -> 1074 bytes res/drawable-ldpi/overlay_error.png | Bin 0 -> 1192 bytes res/drawable-ldpi/overlay_ok.png | Bin 0 -> 1038 bytes res/drawable-ldpi/signed.png | Bin 0 -> 1576 bytes res/drawable-ldpi/signed_large.png | Bin 0 -> 2611 bytes res/drawable-ldpi/signed_small.png | Bin 0 -> 1149 bytes res/drawable-mdpi-finger-v4/btn_circle_disable.png | Bin 938 -> 0 bytes .../btn_circle_disable_focused.png | Bin 1436 -> 0 bytes res/drawable-mdpi-finger-v4/btn_circle_normal.png | Bin 1249 -> 0 bytes res/drawable-mdpi-finger-v4/btn_circle_pressed.png | Bin 1613 -> 0 bytes .../btn_circle_selected.png | Bin 1645 -> 0 bytes res/drawable-mdpi-finger-v4/ic_btn_round_minus.png | Bin 288 -> 0 bytes res/drawable-mdpi-finger-v4/ic_btn_round_plus.png | Bin 526 -> 0 bytes res/drawable-mdpi-finger/btn_circle_disable.png | Bin 0 -> 938 bytes .../btn_circle_disable_focused.png | Bin 0 -> 1436 bytes res/drawable-mdpi-finger/btn_circle_normal.png | Bin 0 -> 1249 bytes res/drawable-mdpi-finger/btn_circle_pressed.png | Bin 0 -> 1613 bytes res/drawable-mdpi-finger/btn_circle_selected.png | Bin 0 -> 1645 bytes res/drawable-mdpi-finger/ic_btn_round_minus.png | Bin 0 -> 288 bytes res/drawable-mdpi-finger/ic_btn_round_plus.png | Bin 0 -> 526 bytes res/drawable-mdpi-v4/encrypted.png | Bin 2486 -> 0 bytes res/drawable-mdpi-v4/encrypted_large.png | Bin 3561 -> 0 bytes res/drawable-mdpi-v4/encrypted_small.png | Bin 1513 -> 0 bytes res/drawable-mdpi-v4/ic_next.png | Bin 1360 -> 0 bytes res/drawable-mdpi-v4/ic_previous.png | Bin 1352 -> 0 bytes res/drawable-mdpi-v4/icon.png | Bin 3582 -> 0 bytes res/drawable-mdpi-v4/key.png | Bin 2462 -> 0 bytes res/drawable-mdpi-v4/key_large.png | Bin 3675 -> 0 bytes res/drawable-mdpi-v4/key_small.png | Bin 1484 -> 0 bytes res/drawable-mdpi-v4/overlay_error.png | Bin 1539 -> 0 bytes res/drawable-mdpi-v4/overlay_ok.png | Bin 1305 -> 0 bytes res/drawable-mdpi-v4/signed.png | Bin 2611 -> 0 bytes res/drawable-mdpi-v4/signed_large.png | Bin 3858 -> 0 bytes res/drawable-mdpi-v4/signed_small.png | Bin 1576 -> 0 bytes res/drawable-mdpi/encrypted.png | Bin 0 -> 2486 bytes res/drawable-mdpi/encrypted_large.png | Bin 0 -> 3561 bytes res/drawable-mdpi/encrypted_small.png | Bin 0 -> 1513 bytes res/drawable-mdpi/ic_next.png | Bin 0 -> 1360 bytes res/drawable-mdpi/ic_previous.png | Bin 0 -> 1352 bytes res/drawable-mdpi/icon.png | Bin 0 -> 2516 bytes res/drawable-mdpi/key.png | Bin 0 -> 2462 bytes res/drawable-mdpi/key_large.png | Bin 0 -> 3675 bytes res/drawable-mdpi/key_small.png | Bin 0 -> 1484 bytes res/drawable-mdpi/overlay_error.png | Bin 0 -> 1539 bytes res/drawable-mdpi/overlay_ok.png | Bin 0 -> 1305 bytes res/drawable-mdpi/signed.png | Bin 0 -> 2611 bytes res/drawable-mdpi/signed_large.png | Bin 0 -> 3858 bytes res/drawable-mdpi/signed_small.png | Bin 0 -> 1576 bytes res/drawable-xhdpi/icon.png | Bin 0 -> 5909 bytes res/drawable/icon.png | Bin 2947 -> 0 bytes res/layout/about_activity.xml | 97 +++ res/values/static_strings.xml | 3 +- res/values/strings.xml | 11 +- src/org/apg/Apg.java | 4 +- src/org/apg/Constants.java | 38 +- src/org/apg/Id.java | 2 +- src/org/apg/Preferences.java | 46 +- src/org/apg/provider/ApgServiceBlobProvider.java | 2 +- src/org/apg/ui/AboutActivity.java | 51 ++ src/org/apg/ui/BaseActivity.java | 53 +- src/org/apg/ui/DecryptActivity.java | 26 +- src/org/apg/ui/EditKeyActivity.java | 2 +- src/org/apg/ui/EncryptActivity.java | 4 +- src/org/apg/ui/ImportFromQRCodeActivity.java | 6 +- src/org/apg/ui/KeyListActivity.java | 10 +- src/org/apg/ui/KeyServerQueryActivity.java | 2 +- src/org/apg/ui/PreferencesActivity.java | 18 +- src/org/apg/ui/PublicKeyListActivity.java | 2 +- src/org/apg/ui/SecretKeyListActivity.java | 2 +- src/org/apg/ui/SendKeyActivity.java | 2 +- src/org/apg/ui/SignKeyActivity.java | 12 +- 139 files changed, 1044 insertions(+), 132 deletions(-) create mode 100644 LICENSE create mode 100644 Resources/icon.svg create mode 100644 Resources/icon_sizes.txt delete mode 100644 res/drawable-hdpi-finger-v4/btn_circle_disable.png delete mode 100644 res/drawable-hdpi-finger-v4/btn_circle_disable_focused.png delete mode 100644 res/drawable-hdpi-finger-v4/btn_circle_normal.png delete mode 100644 res/drawable-hdpi-finger-v4/btn_circle_pressed.png delete mode 100644 res/drawable-hdpi-finger-v4/btn_circle_selected.png delete mode 100644 res/drawable-hdpi-finger-v4/ic_btn_round_minus.png delete mode 100644 res/drawable-hdpi-finger-v4/ic_btn_round_plus.png create mode 100644 res/drawable-hdpi-finger/btn_circle_disable.png create mode 100644 res/drawable-hdpi-finger/btn_circle_disable_focused.png create mode 100644 res/drawable-hdpi-finger/btn_circle_normal.png create mode 100644 res/drawable-hdpi-finger/btn_circle_pressed.png create mode 100644 res/drawable-hdpi-finger/btn_circle_selected.png create mode 100644 res/drawable-hdpi-finger/ic_btn_round_minus.png create mode 100644 res/drawable-hdpi-finger/ic_btn_round_plus.png delete mode 100644 res/drawable-hdpi-v4/encrypted.png delete mode 100644 res/drawable-hdpi-v4/encrypted_large.png delete mode 100644 res/drawable-hdpi-v4/encrypted_small.png delete mode 100644 res/drawable-hdpi-v4/ic_next.png delete mode 100644 res/drawable-hdpi-v4/ic_previous.png delete mode 100644 res/drawable-hdpi-v4/icon.png delete mode 100644 res/drawable-hdpi-v4/key.png delete mode 100644 res/drawable-hdpi-v4/key_large.png delete mode 100644 res/drawable-hdpi-v4/key_small.png delete mode 100644 res/drawable-hdpi-v4/overlay_error.png delete mode 100644 res/drawable-hdpi-v4/overlay_ok.png delete mode 100644 res/drawable-hdpi-v4/signed.png delete mode 100644 res/drawable-hdpi-v4/signed_large.png delete mode 100644 res/drawable-hdpi-v4/signed_small.png create mode 100644 res/drawable-hdpi/encrypted.png create mode 100644 res/drawable-hdpi/encrypted_large.png create mode 100644 res/drawable-hdpi/encrypted_small.png create mode 100644 res/drawable-hdpi/ic_next.png create mode 100644 res/drawable-hdpi/ic_previous.png create mode 100644 res/drawable-hdpi/icon.png create mode 100644 res/drawable-hdpi/key.png create mode 100644 res/drawable-hdpi/key_large.png create mode 100644 res/drawable-hdpi/key_small.png create mode 100644 res/drawable-hdpi/overlay_error.png create mode 100644 res/drawable-hdpi/overlay_ok.png create mode 100644 res/drawable-hdpi/signed.png create mode 100644 res/drawable-hdpi/signed_large.png create mode 100644 res/drawable-hdpi/signed_small.png delete mode 100644 res/drawable-ldpi-v4/encrypted.png delete mode 100644 res/drawable-ldpi-v4/encrypted_large.png delete mode 100644 res/drawable-ldpi-v4/encrypted_small.png delete mode 100644 res/drawable-ldpi-v4/ic_next.png delete mode 100644 res/drawable-ldpi-v4/ic_previous.png delete mode 100644 res/drawable-ldpi-v4/icon.png delete mode 100644 res/drawable-ldpi-v4/key.png delete mode 100644 res/drawable-ldpi-v4/key_large.png delete mode 100644 res/drawable-ldpi-v4/key_small.png delete mode 100644 res/drawable-ldpi-v4/overlay_error.png delete mode 100644 res/drawable-ldpi-v4/overlay_ok.png delete mode 100644 res/drawable-ldpi-v4/signed.png delete mode 100644 res/drawable-ldpi-v4/signed_large.png delete mode 100644 res/drawable-ldpi-v4/signed_small.png create mode 100644 res/drawable-ldpi/encrypted.png create mode 100644 res/drawable-ldpi/encrypted_large.png create mode 100644 res/drawable-ldpi/encrypted_small.png create mode 100644 res/drawable-ldpi/ic_next.png create mode 100644 res/drawable-ldpi/ic_previous.png create mode 100644 res/drawable-ldpi/icon.png create mode 100644 res/drawable-ldpi/key.png create mode 100644 res/drawable-ldpi/key_large.png create mode 100644 res/drawable-ldpi/key_small.png create mode 100644 res/drawable-ldpi/overlay_error.png create mode 100644 res/drawable-ldpi/overlay_ok.png create mode 100644 res/drawable-ldpi/signed.png create mode 100644 res/drawable-ldpi/signed_large.png create mode 100644 res/drawable-ldpi/signed_small.png delete mode 100644 res/drawable-mdpi-finger-v4/btn_circle_disable.png delete mode 100644 res/drawable-mdpi-finger-v4/btn_circle_disable_focused.png delete mode 100644 res/drawable-mdpi-finger-v4/btn_circle_normal.png delete mode 100644 res/drawable-mdpi-finger-v4/btn_circle_pressed.png delete mode 100644 res/drawable-mdpi-finger-v4/btn_circle_selected.png delete mode 100644 res/drawable-mdpi-finger-v4/ic_btn_round_minus.png delete mode 100644 res/drawable-mdpi-finger-v4/ic_btn_round_plus.png create mode 100644 res/drawable-mdpi-finger/btn_circle_disable.png create mode 100644 res/drawable-mdpi-finger/btn_circle_disable_focused.png create mode 100644 res/drawable-mdpi-finger/btn_circle_normal.png create mode 100644 res/drawable-mdpi-finger/btn_circle_pressed.png create mode 100644 res/drawable-mdpi-finger/btn_circle_selected.png create mode 100644 res/drawable-mdpi-finger/ic_btn_round_minus.png create mode 100644 res/drawable-mdpi-finger/ic_btn_round_plus.png delete mode 100644 res/drawable-mdpi-v4/encrypted.png delete mode 100644 res/drawable-mdpi-v4/encrypted_large.png delete mode 100644 res/drawable-mdpi-v4/encrypted_small.png delete mode 100644 res/drawable-mdpi-v4/ic_next.png delete mode 100644 res/drawable-mdpi-v4/ic_previous.png delete mode 100644 res/drawable-mdpi-v4/icon.png delete mode 100644 res/drawable-mdpi-v4/key.png delete mode 100644 res/drawable-mdpi-v4/key_large.png delete mode 100644 res/drawable-mdpi-v4/key_small.png delete mode 100644 res/drawable-mdpi-v4/overlay_error.png delete mode 100644 res/drawable-mdpi-v4/overlay_ok.png delete mode 100644 res/drawable-mdpi-v4/signed.png delete mode 100644 res/drawable-mdpi-v4/signed_large.png delete mode 100644 res/drawable-mdpi-v4/signed_small.png create mode 100644 res/drawable-mdpi/encrypted.png create mode 100644 res/drawable-mdpi/encrypted_large.png create mode 100644 res/drawable-mdpi/encrypted_small.png create mode 100644 res/drawable-mdpi/ic_next.png create mode 100644 res/drawable-mdpi/ic_previous.png create mode 100644 res/drawable-mdpi/icon.png create mode 100644 res/drawable-mdpi/key.png create mode 100644 res/drawable-mdpi/key_large.png create mode 100644 res/drawable-mdpi/key_small.png create mode 100644 res/drawable-mdpi/overlay_error.png create mode 100644 res/drawable-mdpi/overlay_ok.png create mode 100644 res/drawable-mdpi/signed.png create mode 100644 res/drawable-mdpi/signed_large.png create mode 100644 res/drawable-mdpi/signed_small.png create mode 100644 res/drawable-xhdpi/icon.png delete mode 100644 res/drawable/icon.png create mode 100644 res/layout/about_activity.xml create mode 100644 src/org/apg/ui/AboutActivity.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b3f818239..4ab346b7d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -8,7 +8,7 @@ android:versionName="1.1" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/Resources/icon_sizes.txt b/Resources/icon_sizes.txt new file mode 100644 index 000000000..b6d698752 --- /dev/null +++ b/Resources/icon_sizes.txt @@ -0,0 +1,21 @@ +Launcher Icon: +----------------------- +ldpi: 36x36 +mdpi: 48x48 +hdpi: 72x72 +xhdpi: 96x96 +google code: 55x55 +android market: 512x512 + +Status Bar Icon: +----------------------- +Android < 3.0 +ldpi: 12x19 +mdpi: 16x25 +hdpi: 24x38 + +Android > 3.0 +ldpi: 18x18 +mdpi: 24x24 +hdpi: 36x36 +xhdpi: 48x48 diff --git a/res/drawable-hdpi-finger-v4/btn_circle_disable.png b/res/drawable-hdpi-finger-v4/btn_circle_disable.png deleted file mode 100644 index ae063b545..000000000 Binary files a/res/drawable-hdpi-finger-v4/btn_circle_disable.png and /dev/null differ diff --git a/res/drawable-hdpi-finger-v4/btn_circle_disable_focused.png b/res/drawable-hdpi-finger-v4/btn_circle_disable_focused.png deleted file mode 100644 index 7a5d4fe4e..000000000 Binary files a/res/drawable-hdpi-finger-v4/btn_circle_disable_focused.png and /dev/null differ diff --git a/res/drawable-hdpi-finger-v4/btn_circle_normal.png b/res/drawable-hdpi-finger-v4/btn_circle_normal.png deleted file mode 100644 index 5eda66883..000000000 Binary files a/res/drawable-hdpi-finger-v4/btn_circle_normal.png and /dev/null differ diff --git a/res/drawable-hdpi-finger-v4/btn_circle_pressed.png b/res/drawable-hdpi-finger-v4/btn_circle_pressed.png deleted file mode 100644 index 88848bac2..000000000 Binary files a/res/drawable-hdpi-finger-v4/btn_circle_pressed.png and /dev/null differ diff --git a/res/drawable-hdpi-finger-v4/btn_circle_selected.png b/res/drawable-hdpi-finger-v4/btn_circle_selected.png deleted file mode 100644 index 74690705f..000000000 Binary files a/res/drawable-hdpi-finger-v4/btn_circle_selected.png and /dev/null differ diff --git a/res/drawable-hdpi-finger-v4/ic_btn_round_minus.png b/res/drawable-hdpi-finger-v4/ic_btn_round_minus.png deleted file mode 100644 index 27af3faf4..000000000 Binary files a/res/drawable-hdpi-finger-v4/ic_btn_round_minus.png and /dev/null differ diff --git a/res/drawable-hdpi-finger-v4/ic_btn_round_plus.png b/res/drawable-hdpi-finger-v4/ic_btn_round_plus.png deleted file mode 100644 index b24168c32..000000000 Binary files a/res/drawable-hdpi-finger-v4/ic_btn_round_plus.png and /dev/null differ diff --git a/res/drawable-hdpi-finger/btn_circle_disable.png b/res/drawable-hdpi-finger/btn_circle_disable.png new file mode 100644 index 000000000..ae063b545 Binary files /dev/null and b/res/drawable-hdpi-finger/btn_circle_disable.png differ diff --git a/res/drawable-hdpi-finger/btn_circle_disable_focused.png b/res/drawable-hdpi-finger/btn_circle_disable_focused.png new file mode 100644 index 000000000..7a5d4fe4e Binary files /dev/null and b/res/drawable-hdpi-finger/btn_circle_disable_focused.png differ diff --git a/res/drawable-hdpi-finger/btn_circle_normal.png b/res/drawable-hdpi-finger/btn_circle_normal.png new file mode 100644 index 000000000..5eda66883 Binary files /dev/null and b/res/drawable-hdpi-finger/btn_circle_normal.png differ diff --git a/res/drawable-hdpi-finger/btn_circle_pressed.png b/res/drawable-hdpi-finger/btn_circle_pressed.png new file mode 100644 index 000000000..88848bac2 Binary files /dev/null and b/res/drawable-hdpi-finger/btn_circle_pressed.png differ diff --git a/res/drawable-hdpi-finger/btn_circle_selected.png b/res/drawable-hdpi-finger/btn_circle_selected.png new file mode 100644 index 000000000..74690705f Binary files /dev/null and b/res/drawable-hdpi-finger/btn_circle_selected.png differ diff --git a/res/drawable-hdpi-finger/ic_btn_round_minus.png b/res/drawable-hdpi-finger/ic_btn_round_minus.png new file mode 100644 index 000000000..27af3faf4 Binary files /dev/null and b/res/drawable-hdpi-finger/ic_btn_round_minus.png differ diff --git a/res/drawable-hdpi-finger/ic_btn_round_plus.png b/res/drawable-hdpi-finger/ic_btn_round_plus.png new file mode 100644 index 000000000..b24168c32 Binary files /dev/null and b/res/drawable-hdpi-finger/ic_btn_round_plus.png differ diff --git a/res/drawable-hdpi-v4/encrypted.png b/res/drawable-hdpi-v4/encrypted.png deleted file mode 100644 index 541781cd1..000000000 Binary files a/res/drawable-hdpi-v4/encrypted.png and /dev/null differ diff --git a/res/drawable-hdpi-v4/encrypted_large.png b/res/drawable-hdpi-v4/encrypted_large.png deleted file mode 100644 index 209278377..000000000 Binary files a/res/drawable-hdpi-v4/encrypted_large.png and /dev/null differ diff --git a/res/drawable-hdpi-v4/encrypted_small.png b/res/drawable-hdpi-v4/encrypted_small.png deleted file mode 100644 index 3ff8e9b97..000000000 Binary files a/res/drawable-hdpi-v4/encrypted_small.png and /dev/null differ diff --git a/res/drawable-hdpi-v4/ic_next.png b/res/drawable-hdpi-v4/ic_next.png deleted file mode 100644 index d71058055..000000000 Binary files a/res/drawable-hdpi-v4/ic_next.png and /dev/null differ diff --git a/res/drawable-hdpi-v4/ic_previous.png b/res/drawable-hdpi-v4/ic_previous.png deleted file mode 100644 index d610e4667..000000000 Binary files a/res/drawable-hdpi-v4/ic_previous.png and /dev/null differ diff --git a/res/drawable-hdpi-v4/icon.png b/res/drawable-hdpi-v4/icon.png deleted file mode 100644 index 072f0a089..000000000 Binary files a/res/drawable-hdpi-v4/icon.png and /dev/null differ diff --git a/res/drawable-hdpi-v4/key.png b/res/drawable-hdpi-v4/key.png deleted file mode 100644 index af4742ec0..000000000 Binary files a/res/drawable-hdpi-v4/key.png and /dev/null differ diff --git a/res/drawable-hdpi-v4/key_large.png b/res/drawable-hdpi-v4/key_large.png deleted file mode 100644 index 590f7d5a4..000000000 Binary files a/res/drawable-hdpi-v4/key_large.png and /dev/null differ diff --git a/res/drawable-hdpi-v4/key_small.png b/res/drawable-hdpi-v4/key_small.png deleted file mode 100644 index 6966048a1..000000000 Binary files a/res/drawable-hdpi-v4/key_small.png and /dev/null differ diff --git a/res/drawable-hdpi-v4/overlay_error.png b/res/drawable-hdpi-v4/overlay_error.png deleted file mode 100644 index e6d7e60ba..000000000 Binary files a/res/drawable-hdpi-v4/overlay_error.png and /dev/null differ diff --git a/res/drawable-hdpi-v4/overlay_ok.png b/res/drawable-hdpi-v4/overlay_ok.png deleted file mode 100644 index 0672f869d..000000000 Binary files a/res/drawable-hdpi-v4/overlay_ok.png and /dev/null differ diff --git a/res/drawable-hdpi-v4/signed.png b/res/drawable-hdpi-v4/signed.png deleted file mode 100644 index ab9495e7b..000000000 Binary files a/res/drawable-hdpi-v4/signed.png and /dev/null differ diff --git a/res/drawable-hdpi-v4/signed_large.png b/res/drawable-hdpi-v4/signed_large.png deleted file mode 100644 index c209f4167..000000000 Binary files a/res/drawable-hdpi-v4/signed_large.png and /dev/null differ diff --git a/res/drawable-hdpi-v4/signed_small.png b/res/drawable-hdpi-v4/signed_small.png deleted file mode 100644 index 54c4906e8..000000000 Binary files a/res/drawable-hdpi-v4/signed_small.png and /dev/null differ diff --git a/res/drawable-hdpi/encrypted.png b/res/drawable-hdpi/encrypted.png new file mode 100644 index 000000000..541781cd1 Binary files /dev/null and b/res/drawable-hdpi/encrypted.png differ diff --git a/res/drawable-hdpi/encrypted_large.png b/res/drawable-hdpi/encrypted_large.png new file mode 100644 index 000000000..209278377 Binary files /dev/null and b/res/drawable-hdpi/encrypted_large.png differ diff --git a/res/drawable-hdpi/encrypted_small.png b/res/drawable-hdpi/encrypted_small.png new file mode 100644 index 000000000..3ff8e9b97 Binary files /dev/null and b/res/drawable-hdpi/encrypted_small.png differ diff --git a/res/drawable-hdpi/ic_next.png b/res/drawable-hdpi/ic_next.png new file mode 100644 index 000000000..d71058055 Binary files /dev/null and b/res/drawable-hdpi/ic_next.png differ diff --git a/res/drawable-hdpi/ic_previous.png b/res/drawable-hdpi/ic_previous.png new file mode 100644 index 000000000..d610e4667 Binary files /dev/null and b/res/drawable-hdpi/ic_previous.png differ diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png new file mode 100644 index 000000000..d36080251 Binary files /dev/null and b/res/drawable-hdpi/icon.png differ diff --git a/res/drawable-hdpi/key.png b/res/drawable-hdpi/key.png new file mode 100644 index 000000000..af4742ec0 Binary files /dev/null and b/res/drawable-hdpi/key.png differ diff --git a/res/drawable-hdpi/key_large.png b/res/drawable-hdpi/key_large.png new file mode 100644 index 000000000..590f7d5a4 Binary files /dev/null and b/res/drawable-hdpi/key_large.png differ diff --git a/res/drawable-hdpi/key_small.png b/res/drawable-hdpi/key_small.png new file mode 100644 index 000000000..6966048a1 Binary files /dev/null and b/res/drawable-hdpi/key_small.png differ diff --git a/res/drawable-hdpi/overlay_error.png b/res/drawable-hdpi/overlay_error.png new file mode 100644 index 000000000..e6d7e60ba Binary files /dev/null and b/res/drawable-hdpi/overlay_error.png differ diff --git a/res/drawable-hdpi/overlay_ok.png b/res/drawable-hdpi/overlay_ok.png new file mode 100644 index 000000000..0672f869d Binary files /dev/null and b/res/drawable-hdpi/overlay_ok.png differ diff --git a/res/drawable-hdpi/signed.png b/res/drawable-hdpi/signed.png new file mode 100644 index 000000000..ab9495e7b Binary files /dev/null and b/res/drawable-hdpi/signed.png differ diff --git a/res/drawable-hdpi/signed_large.png b/res/drawable-hdpi/signed_large.png new file mode 100644 index 000000000..c209f4167 Binary files /dev/null and b/res/drawable-hdpi/signed_large.png differ diff --git a/res/drawable-hdpi/signed_small.png b/res/drawable-hdpi/signed_small.png new file mode 100644 index 000000000..54c4906e8 Binary files /dev/null and b/res/drawable-hdpi/signed_small.png differ diff --git a/res/drawable-ldpi-v4/encrypted.png b/res/drawable-ldpi-v4/encrypted.png deleted file mode 100644 index bcd8cfc8e..000000000 Binary files a/res/drawable-ldpi-v4/encrypted.png and /dev/null differ diff --git a/res/drawable-ldpi-v4/encrypted_large.png b/res/drawable-ldpi-v4/encrypted_large.png deleted file mode 100644 index 34c3d3f97..000000000 Binary files a/res/drawable-ldpi-v4/encrypted_large.png and /dev/null differ diff --git a/res/drawable-ldpi-v4/encrypted_small.png b/res/drawable-ldpi-v4/encrypted_small.png deleted file mode 100644 index 5e7294a4b..000000000 Binary files a/res/drawable-ldpi-v4/encrypted_small.png and /dev/null differ diff --git a/res/drawable-ldpi-v4/ic_next.png b/res/drawable-ldpi-v4/ic_next.png deleted file mode 100644 index 474ed8faa..000000000 Binary files a/res/drawable-ldpi-v4/ic_next.png and /dev/null differ diff --git a/res/drawable-ldpi-v4/ic_previous.png b/res/drawable-ldpi-v4/ic_previous.png deleted file mode 100644 index 6fd885e6b..000000000 Binary files a/res/drawable-ldpi-v4/ic_previous.png and /dev/null differ diff --git a/res/drawable-ldpi-v4/icon.png b/res/drawable-ldpi-v4/icon.png deleted file mode 100644 index e310c42e8..000000000 Binary files a/res/drawable-ldpi-v4/icon.png and /dev/null differ diff --git a/res/drawable-ldpi-v4/key.png b/res/drawable-ldpi-v4/key.png deleted file mode 100644 index c806b6041..000000000 Binary files a/res/drawable-ldpi-v4/key.png and /dev/null differ diff --git a/res/drawable-ldpi-v4/key_large.png b/res/drawable-ldpi-v4/key_large.png deleted file mode 100644 index aa499a5e1..000000000 Binary files a/res/drawable-ldpi-v4/key_large.png and /dev/null differ diff --git a/res/drawable-ldpi-v4/key_small.png b/res/drawable-ldpi-v4/key_small.png deleted file mode 100644 index 073b95029..000000000 Binary files a/res/drawable-ldpi-v4/key_small.png and /dev/null differ diff --git a/res/drawable-ldpi-v4/overlay_error.png b/res/drawable-ldpi-v4/overlay_error.png deleted file mode 100644 index e5a88e18f..000000000 Binary files a/res/drawable-ldpi-v4/overlay_error.png and /dev/null differ diff --git a/res/drawable-ldpi-v4/overlay_ok.png b/res/drawable-ldpi-v4/overlay_ok.png deleted file mode 100644 index 63374d47f..000000000 Binary files a/res/drawable-ldpi-v4/overlay_ok.png and /dev/null differ diff --git a/res/drawable-ldpi-v4/signed.png b/res/drawable-ldpi-v4/signed.png deleted file mode 100644 index 4202c3f97..000000000 Binary files a/res/drawable-ldpi-v4/signed.png and /dev/null differ diff --git a/res/drawable-ldpi-v4/signed_large.png b/res/drawable-ldpi-v4/signed_large.png deleted file mode 100644 index d2917644c..000000000 Binary files a/res/drawable-ldpi-v4/signed_large.png and /dev/null differ diff --git a/res/drawable-ldpi-v4/signed_small.png b/res/drawable-ldpi-v4/signed_small.png deleted file mode 100644 index 19d45f8da..000000000 Binary files a/res/drawable-ldpi-v4/signed_small.png and /dev/null differ diff --git a/res/drawable-ldpi/encrypted.png b/res/drawable-ldpi/encrypted.png new file mode 100644 index 000000000..bcd8cfc8e Binary files /dev/null and b/res/drawable-ldpi/encrypted.png differ diff --git a/res/drawable-ldpi/encrypted_large.png b/res/drawable-ldpi/encrypted_large.png new file mode 100644 index 000000000..34c3d3f97 Binary files /dev/null and b/res/drawable-ldpi/encrypted_large.png differ diff --git a/res/drawable-ldpi/encrypted_small.png b/res/drawable-ldpi/encrypted_small.png new file mode 100644 index 000000000..5e7294a4b Binary files /dev/null and b/res/drawable-ldpi/encrypted_small.png differ diff --git a/res/drawable-ldpi/ic_next.png b/res/drawable-ldpi/ic_next.png new file mode 100644 index 000000000..474ed8faa Binary files /dev/null and b/res/drawable-ldpi/ic_next.png differ diff --git a/res/drawable-ldpi/ic_previous.png b/res/drawable-ldpi/ic_previous.png new file mode 100644 index 000000000..6fd885e6b Binary files /dev/null and b/res/drawable-ldpi/ic_previous.png differ diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png new file mode 100644 index 000000000..5b9c33f0c Binary files /dev/null and b/res/drawable-ldpi/icon.png differ diff --git a/res/drawable-ldpi/key.png b/res/drawable-ldpi/key.png new file mode 100644 index 000000000..c806b6041 Binary files /dev/null and b/res/drawable-ldpi/key.png differ diff --git a/res/drawable-ldpi/key_large.png b/res/drawable-ldpi/key_large.png new file mode 100644 index 000000000..aa499a5e1 Binary files /dev/null and b/res/drawable-ldpi/key_large.png differ diff --git a/res/drawable-ldpi/key_small.png b/res/drawable-ldpi/key_small.png new file mode 100644 index 000000000..073b95029 Binary files /dev/null and b/res/drawable-ldpi/key_small.png differ diff --git a/res/drawable-ldpi/overlay_error.png b/res/drawable-ldpi/overlay_error.png new file mode 100644 index 000000000..e5a88e18f Binary files /dev/null and b/res/drawable-ldpi/overlay_error.png differ diff --git a/res/drawable-ldpi/overlay_ok.png b/res/drawable-ldpi/overlay_ok.png new file mode 100644 index 000000000..63374d47f Binary files /dev/null and b/res/drawable-ldpi/overlay_ok.png differ diff --git a/res/drawable-ldpi/signed.png b/res/drawable-ldpi/signed.png new file mode 100644 index 000000000..4202c3f97 Binary files /dev/null and b/res/drawable-ldpi/signed.png differ diff --git a/res/drawable-ldpi/signed_large.png b/res/drawable-ldpi/signed_large.png new file mode 100644 index 000000000..d2917644c Binary files /dev/null and b/res/drawable-ldpi/signed_large.png differ diff --git a/res/drawable-ldpi/signed_small.png b/res/drawable-ldpi/signed_small.png new file mode 100644 index 000000000..19d45f8da Binary files /dev/null and b/res/drawable-ldpi/signed_small.png differ diff --git a/res/drawable-mdpi-finger-v4/btn_circle_disable.png b/res/drawable-mdpi-finger-v4/btn_circle_disable.png deleted file mode 100644 index 33b74a66c..000000000 Binary files a/res/drawable-mdpi-finger-v4/btn_circle_disable.png and /dev/null differ diff --git a/res/drawable-mdpi-finger-v4/btn_circle_disable_focused.png b/res/drawable-mdpi-finger-v4/btn_circle_disable_focused.png deleted file mode 100644 index 005ad8dca..000000000 Binary files a/res/drawable-mdpi-finger-v4/btn_circle_disable_focused.png and /dev/null differ diff --git a/res/drawable-mdpi-finger-v4/btn_circle_normal.png b/res/drawable-mdpi-finger-v4/btn_circle_normal.png deleted file mode 100644 index fc5af1c9f..000000000 Binary files a/res/drawable-mdpi-finger-v4/btn_circle_normal.png and /dev/null differ diff --git a/res/drawable-mdpi-finger-v4/btn_circle_pressed.png b/res/drawable-mdpi-finger-v4/btn_circle_pressed.png deleted file mode 100644 index 8f40afdfc..000000000 Binary files a/res/drawable-mdpi-finger-v4/btn_circle_pressed.png and /dev/null differ diff --git a/res/drawable-mdpi-finger-v4/btn_circle_selected.png b/res/drawable-mdpi-finger-v4/btn_circle_selected.png deleted file mode 100644 index c74fac227..000000000 Binary files a/res/drawable-mdpi-finger-v4/btn_circle_selected.png and /dev/null differ diff --git a/res/drawable-mdpi-finger-v4/ic_btn_round_minus.png b/res/drawable-mdpi-finger-v4/ic_btn_round_minus.png deleted file mode 100644 index 96dbb17d2..000000000 Binary files a/res/drawable-mdpi-finger-v4/ic_btn_round_minus.png and /dev/null differ diff --git a/res/drawable-mdpi-finger-v4/ic_btn_round_plus.png b/res/drawable-mdpi-finger-v4/ic_btn_round_plus.png deleted file mode 100644 index 1ec8a956a..000000000 Binary files a/res/drawable-mdpi-finger-v4/ic_btn_round_plus.png and /dev/null differ diff --git a/res/drawable-mdpi-finger/btn_circle_disable.png b/res/drawable-mdpi-finger/btn_circle_disable.png new file mode 100644 index 000000000..33b74a66c Binary files /dev/null and b/res/drawable-mdpi-finger/btn_circle_disable.png differ diff --git a/res/drawable-mdpi-finger/btn_circle_disable_focused.png b/res/drawable-mdpi-finger/btn_circle_disable_focused.png new file mode 100644 index 000000000..005ad8dca Binary files /dev/null and b/res/drawable-mdpi-finger/btn_circle_disable_focused.png differ diff --git a/res/drawable-mdpi-finger/btn_circle_normal.png b/res/drawable-mdpi-finger/btn_circle_normal.png new file mode 100644 index 000000000..fc5af1c9f Binary files /dev/null and b/res/drawable-mdpi-finger/btn_circle_normal.png differ diff --git a/res/drawable-mdpi-finger/btn_circle_pressed.png b/res/drawable-mdpi-finger/btn_circle_pressed.png new file mode 100644 index 000000000..8f40afdfc Binary files /dev/null and b/res/drawable-mdpi-finger/btn_circle_pressed.png differ diff --git a/res/drawable-mdpi-finger/btn_circle_selected.png b/res/drawable-mdpi-finger/btn_circle_selected.png new file mode 100644 index 000000000..c74fac227 Binary files /dev/null and b/res/drawable-mdpi-finger/btn_circle_selected.png differ diff --git a/res/drawable-mdpi-finger/ic_btn_round_minus.png b/res/drawable-mdpi-finger/ic_btn_round_minus.png new file mode 100644 index 000000000..96dbb17d2 Binary files /dev/null and b/res/drawable-mdpi-finger/ic_btn_round_minus.png differ diff --git a/res/drawable-mdpi-finger/ic_btn_round_plus.png b/res/drawable-mdpi-finger/ic_btn_round_plus.png new file mode 100644 index 000000000..1ec8a956a Binary files /dev/null and b/res/drawable-mdpi-finger/ic_btn_round_plus.png differ diff --git a/res/drawable-mdpi-v4/encrypted.png b/res/drawable-mdpi-v4/encrypted.png deleted file mode 100644 index 34c3d3f97..000000000 Binary files a/res/drawable-mdpi-v4/encrypted.png and /dev/null differ diff --git a/res/drawable-mdpi-v4/encrypted_large.png b/res/drawable-mdpi-v4/encrypted_large.png deleted file mode 100644 index 541781cd1..000000000 Binary files a/res/drawable-mdpi-v4/encrypted_large.png and /dev/null differ diff --git a/res/drawable-mdpi-v4/encrypted_small.png b/res/drawable-mdpi-v4/encrypted_small.png deleted file mode 100644 index bcd8cfc8e..000000000 Binary files a/res/drawable-mdpi-v4/encrypted_small.png and /dev/null differ diff --git a/res/drawable-mdpi-v4/ic_next.png b/res/drawable-mdpi-v4/ic_next.png deleted file mode 100644 index 8271c1380..000000000 Binary files a/res/drawable-mdpi-v4/ic_next.png and /dev/null differ diff --git a/res/drawable-mdpi-v4/ic_previous.png b/res/drawable-mdpi-v4/ic_previous.png deleted file mode 100644 index ef90db972..000000000 Binary files a/res/drawable-mdpi-v4/ic_previous.png and /dev/null differ diff --git a/res/drawable-mdpi-v4/icon.png b/res/drawable-mdpi-v4/icon.png deleted file mode 100644 index 3c165f9bd..000000000 Binary files a/res/drawable-mdpi-v4/icon.png and /dev/null differ diff --git a/res/drawable-mdpi-v4/key.png b/res/drawable-mdpi-v4/key.png deleted file mode 100644 index aa499a5e1..000000000 Binary files a/res/drawable-mdpi-v4/key.png and /dev/null differ diff --git a/res/drawable-mdpi-v4/key_large.png b/res/drawable-mdpi-v4/key_large.png deleted file mode 100644 index af4742ec0..000000000 Binary files a/res/drawable-mdpi-v4/key_large.png and /dev/null differ diff --git a/res/drawable-mdpi-v4/key_small.png b/res/drawable-mdpi-v4/key_small.png deleted file mode 100644 index c806b6041..000000000 Binary files a/res/drawable-mdpi-v4/key_small.png and /dev/null differ diff --git a/res/drawable-mdpi-v4/overlay_error.png b/res/drawable-mdpi-v4/overlay_error.png deleted file mode 100644 index 5fe017433..000000000 Binary files a/res/drawable-mdpi-v4/overlay_error.png and /dev/null differ diff --git a/res/drawable-mdpi-v4/overlay_ok.png b/res/drawable-mdpi-v4/overlay_ok.png deleted file mode 100644 index b4f332260..000000000 Binary files a/res/drawable-mdpi-v4/overlay_ok.png and /dev/null differ diff --git a/res/drawable-mdpi-v4/signed.png b/res/drawable-mdpi-v4/signed.png deleted file mode 100644 index d2917644c..000000000 Binary files a/res/drawable-mdpi-v4/signed.png and /dev/null differ diff --git a/res/drawable-mdpi-v4/signed_large.png b/res/drawable-mdpi-v4/signed_large.png deleted file mode 100644 index ab9495e7b..000000000 Binary files a/res/drawable-mdpi-v4/signed_large.png and /dev/null differ diff --git a/res/drawable-mdpi-v4/signed_small.png b/res/drawable-mdpi-v4/signed_small.png deleted file mode 100644 index 4202c3f97..000000000 Binary files a/res/drawable-mdpi-v4/signed_small.png and /dev/null differ diff --git a/res/drawable-mdpi/encrypted.png b/res/drawable-mdpi/encrypted.png new file mode 100644 index 000000000..34c3d3f97 Binary files /dev/null and b/res/drawable-mdpi/encrypted.png differ diff --git a/res/drawable-mdpi/encrypted_large.png b/res/drawable-mdpi/encrypted_large.png new file mode 100644 index 000000000..541781cd1 Binary files /dev/null and b/res/drawable-mdpi/encrypted_large.png differ diff --git a/res/drawable-mdpi/encrypted_small.png b/res/drawable-mdpi/encrypted_small.png new file mode 100644 index 000000000..bcd8cfc8e Binary files /dev/null and b/res/drawable-mdpi/encrypted_small.png differ diff --git a/res/drawable-mdpi/ic_next.png b/res/drawable-mdpi/ic_next.png new file mode 100644 index 000000000..8271c1380 Binary files /dev/null and b/res/drawable-mdpi/ic_next.png differ diff --git a/res/drawable-mdpi/ic_previous.png b/res/drawable-mdpi/ic_previous.png new file mode 100644 index 000000000..ef90db972 Binary files /dev/null and b/res/drawable-mdpi/ic_previous.png differ diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png new file mode 100644 index 000000000..fec2d62ce Binary files /dev/null and b/res/drawable-mdpi/icon.png differ diff --git a/res/drawable-mdpi/key.png b/res/drawable-mdpi/key.png new file mode 100644 index 000000000..aa499a5e1 Binary files /dev/null and b/res/drawable-mdpi/key.png differ diff --git a/res/drawable-mdpi/key_large.png b/res/drawable-mdpi/key_large.png new file mode 100644 index 000000000..af4742ec0 Binary files /dev/null and b/res/drawable-mdpi/key_large.png differ diff --git a/res/drawable-mdpi/key_small.png b/res/drawable-mdpi/key_small.png new file mode 100644 index 000000000..c806b6041 Binary files /dev/null and b/res/drawable-mdpi/key_small.png differ diff --git a/res/drawable-mdpi/overlay_error.png b/res/drawable-mdpi/overlay_error.png new file mode 100644 index 000000000..5fe017433 Binary files /dev/null and b/res/drawable-mdpi/overlay_error.png differ diff --git a/res/drawable-mdpi/overlay_ok.png b/res/drawable-mdpi/overlay_ok.png new file mode 100644 index 000000000..b4f332260 Binary files /dev/null and b/res/drawable-mdpi/overlay_ok.png differ diff --git a/res/drawable-mdpi/signed.png b/res/drawable-mdpi/signed.png new file mode 100644 index 000000000..d2917644c Binary files /dev/null and b/res/drawable-mdpi/signed.png differ diff --git a/res/drawable-mdpi/signed_large.png b/res/drawable-mdpi/signed_large.png new file mode 100644 index 000000000..ab9495e7b Binary files /dev/null and b/res/drawable-mdpi/signed_large.png differ diff --git a/res/drawable-mdpi/signed_small.png b/res/drawable-mdpi/signed_small.png new file mode 100644 index 000000000..4202c3f97 Binary files /dev/null and b/res/drawable-mdpi/signed_small.png differ diff --git a/res/drawable-xhdpi/icon.png b/res/drawable-xhdpi/icon.png new file mode 100644 index 000000000..ffeb8cdf3 Binary files /dev/null and b/res/drawable-xhdpi/icon.png differ diff --git a/res/drawable/icon.png b/res/drawable/icon.png deleted file mode 100644 index b4e4db40e..000000000 Binary files a/res/drawable/icon.png and /dev/null differ diff --git a/res/layout/about_activity.xml b/res/layout/about_activity.xml new file mode 100644 index 000000000..0388f5c06 --- /dev/null +++ b/res/layout/about_activity.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/values/static_strings.xml b/res/values/static_strings.xml index 41adbfad7..c8a6a5026 100644 --- a/res/values/static_strings.xml +++ b/res/values/static_strings.xml @@ -1,6 +1,7 @@ - APG Plus + APG+ + https://github.com/dschuermann/apg \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 2e6386182..455b97717 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -46,7 +46,8 @@ Unknown Signature Key Import from QR Code Sign Key - + About + User IDs Keys @@ -314,7 +315,13 @@ fast slow very slow - + + + Android Privacy Guard (APG) is a OpenPGP implementation for Android. + License: Apache License 2.0 + Version: + Developer: ... + Install K-9 Mail for the best integration, it supports APG for PGP/INLINE and lets you directly encrypt/decrypt emails. diff --git a/src/org/apg/Apg.java b/src/org/apg/Apg.java index d0e54f4d8..2bfdb31e6 100644 --- a/src/org/apg/Apg.java +++ b/src/org/apg/Apg.java @@ -1966,8 +1966,8 @@ public class Apg { } if (signatureKey == null) { Bundle pauseData = new Bundle(); - pauseData.putInt(Constants.extras.status, Id.message.unknown_signature_key); - pauseData.putLong(Constants.extras.key_id, signatureKeyId); + pauseData.putInt(Constants.extras.STATUS, Id.message.unknown_signature_key); + pauseData.putLong(Constants.extras.KEY_ID, signatureKeyId); Message msg = new Message(); msg.setData(pauseData); context.sendMessage(msg); diff --git a/src/org/apg/Constants.java b/src/org/apg/Constants.java index 90822189a..9669d4b0d 100644 --- a/src/org/apg/Constants.java +++ b/src/org/apg/Constants.java @@ -20,35 +20,35 @@ import android.os.Environment; public final class Constants { - public static final String tag = "APG"; + public static final String TAG = "APG"; public static final class path { - public static final String app_dir = Environment.getExternalStorageDirectory() + "/APG"; + public static final String APP_DIR = Environment.getExternalStorageDirectory() + "/APG"; } public static final class pref { - public static final String has_seen_help = "seenHelp"; - public static final String has_seen_change_log = "seenChangeLogDialog"; - public static final String default_encryption_algorithm = "defaultEncryptionAlgorithm"; - public static final String default_hash_algorithm = "defaultHashAlgorithm"; - public static final String default_ascii_armour = "defaultAsciiArmour"; - public static final String default_message_compression = "defaultMessageCompression"; - public static final String default_file_compression = "defaultFileCompression"; - public static final String pass_phrase_cache_ttl = "passPhraseCacheTtl"; - public static final String language = "language"; - public static final String force_v3_signatures = "forceV3Signatures"; - public static final String key_servers = "keyServers"; + public static final String HAS_SEEN_HELP = "seenHelp"; + public static final String HAS_SEEN_CHANGE_LOG = "seenChangeLogDialog"; + public static final String DEFAULT_ENCRYPTION_ALGORITHM = "defaultEncryptionAlgorithm"; + public static final String DEFAULT_HASH_ALGORITHM = "defaultHashAlgorithm"; + public static final String DEFAULT_ASCII_ARMOUR = "defaultAsciiArmour"; + public static final String DEFAULT_MESSAGE_COMPRESSION = "defaultMessageCompression"; + public static final String DEFAULT_FILE_COMPRESSION = "defaultFileCompression"; + public static final String PASS_PHRASE_CACHE_TTL = "passPhraseCacheTtl"; + public static final String LANGUAGE = "language"; + public static final String FORCE_V3_SIGNATURES = "forceV3Signatures"; + public static final String KEY_SERVERS = "keyServers"; } public static final class defaults { - public static final String key_servers = "pool.sks-keyservers.net, subkeys.pgp.net, pgp.mit.edu"; + public static final String KEY_SERVERS = "pool.sks-keyservers.net, subkeys.pgp.net, pgp.mit.edu"; } public static final class extras { - public static final String progress = "progress"; - public static final String progress_max = "max"; - public static final String status = "status"; - public static final String message = "message"; - public static final String key_id = "keyId"; + public static final String PROGRESS = "progress"; + public static final String PROGRESS_MAX = "max"; + public static final String STATUS = "status"; + public static final String MESSAGE = "message"; + public static final String KEY_ID = "keyId"; } } diff --git a/src/org/apg/Id.java b/src/org/apg/Id.java index e0ffa95cd..adcad0534 100644 --- a/src/org/apg/Id.java +++ b/src/org/apg/Id.java @@ -88,7 +88,7 @@ public final class Id { public static final int export_keys = 0x2107000c; public static final int exporting = 0x2107000d; public static final int new_account = 0x2107000e; - public static final int about = 0x2107000f; +// public static final int about = 0x2107000f; public static final int change_log = 0x21070010; public static final int output_filename = 0x21070011; public static final int delete_file = 0x21070012; diff --git a/src/org/apg/Preferences.java b/src/org/apg/Preferences.java index 0bd79290f..f4800e064 100644 --- a/src/org/apg/Preferences.java +++ b/src/org/apg/Preferences.java @@ -28,17 +28,17 @@ public class Preferences { } public String getLanguage() { - return mSharedPreferences.getString(Constants.pref.language, ""); + return mSharedPreferences.getString(Constants.pref.LANGUAGE, ""); } public void setLanguage(String value) { SharedPreferences.Editor editor = mSharedPreferences.edit(); - editor.putString(Constants.pref.language, value); + editor.putString(Constants.pref.LANGUAGE, value); editor.commit(); } public int getPassPhraseCacheTtl() { - int ttl = mSharedPreferences.getInt(Constants.pref.pass_phrase_cache_ttl, 180); + int ttl = mSharedPreferences.getInt(Constants.pref.PASS_PHRASE_CACHE_TTL, 180); // fix the value if it was set to "never" in previous versions, which currently is not // supported if (ttl == 0) { @@ -49,97 +49,97 @@ public class Preferences { public void setPassPhraseCacheTtl(int value) { SharedPreferences.Editor editor = mSharedPreferences.edit(); - editor.putInt(Constants.pref.pass_phrase_cache_ttl, value); + editor.putInt(Constants.pref.PASS_PHRASE_CACHE_TTL, value); editor.commit(); } public int getDefaultEncryptionAlgorithm() { - return mSharedPreferences.getInt(Constants.pref.default_encryption_algorithm, + return mSharedPreferences.getInt(Constants.pref.DEFAULT_ENCRYPTION_ALGORITHM, PGPEncryptedData.AES_256); } public void setDefaultEncryptionAlgorithm(int value) { SharedPreferences.Editor editor = mSharedPreferences.edit(); - editor.putInt(Constants.pref.default_encryption_algorithm, value); + editor.putInt(Constants.pref.DEFAULT_ENCRYPTION_ALGORITHM, value); editor.commit(); } public int getDefaultHashAlgorithm() { - return mSharedPreferences.getInt(Constants.pref.default_hash_algorithm, + return mSharedPreferences.getInt(Constants.pref.DEFAULT_HASH_ALGORITHM, HashAlgorithmTags.SHA256); } public void setDefaultHashAlgorithm(int value) { SharedPreferences.Editor editor = mSharedPreferences.edit(); - editor.putInt(Constants.pref.default_hash_algorithm, value); + editor.putInt(Constants.pref.DEFAULT_HASH_ALGORITHM, value); editor.commit(); } public int getDefaultMessageCompression() { - return mSharedPreferences.getInt(Constants.pref.default_message_compression, + return mSharedPreferences.getInt(Constants.pref.DEFAULT_MESSAGE_COMPRESSION, Id.choice.compression.zlib); } public void setDefaultMessageCompression(int value) { SharedPreferences.Editor editor = mSharedPreferences.edit(); - editor.putInt(Constants.pref.default_message_compression, value); + editor.putInt(Constants.pref.DEFAULT_MESSAGE_COMPRESSION, value); editor.commit(); } public int getDefaultFileCompression() { - return mSharedPreferences.getInt(Constants.pref.default_file_compression, + return mSharedPreferences.getInt(Constants.pref.DEFAULT_FILE_COMPRESSION, Id.choice.compression.none); } public void setDefaultFileCompression(int value) { SharedPreferences.Editor editor = mSharedPreferences.edit(); - editor.putInt(Constants.pref.default_file_compression, value); + editor.putInt(Constants.pref.DEFAULT_FILE_COMPRESSION, value); editor.commit(); } public boolean getDefaultAsciiArmour() { - return mSharedPreferences.getBoolean(Constants.pref.default_ascii_armour, false); + return mSharedPreferences.getBoolean(Constants.pref.DEFAULT_ASCII_ARMOUR, false); } public void setDefaultAsciiArmour(boolean value) { SharedPreferences.Editor editor = mSharedPreferences.edit(); - editor.putBoolean(Constants.pref.default_ascii_armour, value); + editor.putBoolean(Constants.pref.DEFAULT_ASCII_ARMOUR, value); editor.commit(); } public boolean getForceV3Signatures() { - return mSharedPreferences.getBoolean(Constants.pref.force_v3_signatures, false); + return mSharedPreferences.getBoolean(Constants.pref.FORCE_V3_SIGNATURES, false); } public void setForceV3Signatures(boolean value) { SharedPreferences.Editor editor = mSharedPreferences.edit(); - editor.putBoolean(Constants.pref.force_v3_signatures, value); + editor.putBoolean(Constants.pref.FORCE_V3_SIGNATURES, value); editor.commit(); } public boolean hasSeenChangeLog(String version) { - return mSharedPreferences.getBoolean(Constants.pref.has_seen_change_log + version, false); + return mSharedPreferences.getBoolean(Constants.pref.HAS_SEEN_CHANGE_LOG + version, false); } public void setHasSeenChangeLog(String version, boolean value) { SharedPreferences.Editor editor = mSharedPreferences.edit(); - editor.putBoolean(Constants.pref.has_seen_change_log + version, value); + editor.putBoolean(Constants.pref.HAS_SEEN_CHANGE_LOG + version, value); editor.commit(); } public boolean hasSeenHelp() { - return mSharedPreferences.getBoolean(Constants.pref.has_seen_help, false); + return mSharedPreferences.getBoolean(Constants.pref.HAS_SEEN_HELP, false); } public void setHasSeenHelp(boolean value) { SharedPreferences.Editor editor = mSharedPreferences.edit(); - editor.putBoolean(Constants.pref.has_seen_help, value); + editor.putBoolean(Constants.pref.HAS_SEEN_HELP, value); editor.commit(); } public String[] getKeyServers() { - String rawData = mSharedPreferences.getString(Constants.pref.key_servers, - Constants.defaults.key_servers); + String rawData = mSharedPreferences.getString(Constants.pref.KEY_SERVERS, + Constants.defaults.KEY_SERVERS); Vector servers = new Vector(); String chunks[] = rawData.split(","); for (int i = 0; i < chunks.length; ++i) { @@ -164,7 +164,7 @@ public class Preferences { } rawData += tmp; } - editor.putString(Constants.pref.key_servers, rawData); + editor.putString(Constants.pref.KEY_SERVERS, rawData); editor.commit(); } } diff --git a/src/org/apg/provider/ApgServiceBlobProvider.java b/src/org/apg/provider/ApgServiceBlobProvider.java index 18aa76d5e..f2d5377a4 100644 --- a/src/org/apg/provider/ApgServiceBlobProvider.java +++ b/src/org/apg/provider/ApgServiceBlobProvider.java @@ -24,7 +24,7 @@ public class ApgServiceBlobProvider extends ContentProvider { private static final String COLUMN_KEY = "key"; - private static final String STORE_PATH = Constants.path.app_dir+"/ApgServiceBlobs"; + private static final String STORE_PATH = Constants.path.APP_DIR+"/ApgServiceBlobs"; private ApgServiceBlobDatabase mDb = null; diff --git a/src/org/apg/ui/AboutActivity.java b/src/org/apg/ui/AboutActivity.java new file mode 100644 index 000000000..308a1e06e --- /dev/null +++ b/src/org/apg/ui/AboutActivity.java @@ -0,0 +1,51 @@ +package org.apg.ui; + +import org.apg.Constants; +import org.apg.R; + +import android.app.Activity; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; +import android.os.Bundle; +import android.util.Log; +import android.widget.TextView; + +public class AboutActivity extends Activity { + Activity mActivity; + + /** + * Instantiate View for this Activity + */ + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.about_activity); + + mActivity = this; + + TextView versionText = (TextView) findViewById(R.id.about_version); + versionText.setText(getString(R.string.about_version) + " " + getVersion()); + } + + /** + * Get the current package version. + * + * @return The current version. + */ + private String getVersion() { + String result = ""; + try { + PackageManager manager = mActivity.getPackageManager(); + PackageInfo info = manager.getPackageInfo(mActivity.getPackageName(), 0); + + result = String.format("%s (%s)", info.versionName, info.versionCode); + } catch (NameNotFoundException e) { + Log.w(Constants.TAG, "Unable to get application version: " + e.getMessage()); + result = "Unable to get application version."; + } + + return result; + } +} diff --git a/src/org/apg/ui/BaseActivity.java b/src/org/apg/ui/BaseActivity.java index 6e61b1412..9b5039a5d 100644 --- a/src/org/apg/ui/BaseActivity.java +++ b/src/org/apg/ui/BaseActivity.java @@ -79,7 +79,7 @@ public class BaseActivity extends Activity implements Runnable, ProgressDialogUp Apg.initialize(this); if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { - File dir = new File(Constants.path.app_dir); + File dir = new File(Constants.path.APP_DIR); if (!dir.exists() && !dir.mkdirs()) { // ignore this for now, it's not crucial // that the directory doesn't exist at this point @@ -108,7 +108,7 @@ public class BaseActivity extends Activity implements Runnable, ProgressDialogUp public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case Id.menu.option.about: { - showDialog(Id.dialog.about); + startActivity(new Intent(this, AboutActivity.class)); return true; } @@ -187,31 +187,6 @@ public class BaseActivity extends Activity implements Runnable, ProgressDialogUp mProgressDialog = null; switch (id) { - case Id.dialog.about: { - AlertDialog.Builder alert = new AlertDialog.Builder(this); - - alert.setTitle("About " + Apg.getFullVersion(this)); - - LayoutInflater inflater = (LayoutInflater) this - .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - View layout = inflater.inflate(R.layout.info, null); - TextView message = (TextView) layout.findViewById(R.id.message); - message.setText("This is an attempt to bring OpenPGP to Android. " - + "It is far from complete, but more features are planned (see website).\n\n" - + "Feel free to send bug reports, suggestions, feature requests, feedback, " - + "photographs.\n\n" + "mail: thi@thialfihar.org\n" - + "site: http://apg.thialfihar.org\n\n" - + "This software is provided \"as is\", without warranty of any kind."); - alert.setView(layout); - - alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - BaseActivity.this.removeDialog(Id.dialog.about); - } - }); - - return alert.create(); - } case Id.dialog.pass_phrase: { return AskForSecretKeyPassPhrase.createDialog(this, getSecretKeyId(), this); @@ -266,7 +241,7 @@ public class BaseActivity extends Activity implements Runnable, ProgressDialogUp mDeletingThread = new Thread(new Runnable() { public void run() { Bundle data = new Bundle(); - data.putInt(Constants.extras.status, Id.message.delete_done); + data.putInt(Constants.extras.STATUS, Id.message.delete_done); try { Apg.deleteFileSecurely(BaseActivity.this, file, BaseActivity.this); } catch (FileNotFoundException e) { @@ -330,9 +305,9 @@ public class BaseActivity extends Activity implements Runnable, ProgressDialogUp public void setProgress(int progress, int max) { Message msg = new Message(); Bundle data = new Bundle(); - data.putInt(Constants.extras.status, Id.message.progress_update); - data.putInt(Constants.extras.progress, progress); - data.putInt(Constants.extras.progress_max, max); + data.putInt(Constants.extras.STATUS, Id.message.progress_update); + data.putInt(Constants.extras.PROGRESS, progress); + data.putInt(Constants.extras.PROGRESS_MAX, max); msg.setData(data); mHandler.sendMessage(msg); } @@ -340,10 +315,10 @@ public class BaseActivity extends Activity implements Runnable, ProgressDialogUp public void setProgress(String message, int progress, int max) { Message msg = new Message(); Bundle data = new Bundle(); - data.putInt(Constants.extras.status, Id.message.progress_update); - data.putString(Constants.extras.message, message); - data.putInt(Constants.extras.progress, progress); - data.putInt(Constants.extras.progress_max, max); + data.putInt(Constants.extras.STATUS, Id.message.progress_update); + data.putString(Constants.extras.MESSAGE, message); + data.putInt(Constants.extras.PROGRESS, progress); + data.putInt(Constants.extras.PROGRESS_MAX, max); msg.setData(data); mHandler.sendMessage(msg); } @@ -354,16 +329,16 @@ public class BaseActivity extends Activity implements Runnable, ProgressDialogUp return; } - int type = data.getInt(Constants.extras.status); + int type = data.getInt(Constants.extras.STATUS); switch (type) { case Id.message.progress_update: { - String message = data.getString(Constants.extras.message); + String message = data.getString(Constants.extras.MESSAGE); if (mProgressDialog != null) { if (message != null) { mProgressDialog.setMessage(message); } - mProgressDialog.setMax(data.getInt(Constants.extras.progress_max)); - mProgressDialog.setProgress(data.getInt(Constants.extras.progress)); + mProgressDialog.setMax(data.getInt(Constants.extras.PROGRESS_MAX)); + mProgressDialog.setProgress(data.getInt(Constants.extras.PROGRESS)); } break; } diff --git a/src/org/apg/ui/DecryptActivity.java b/src/org/apg/ui/DecryptActivity.java index 48884cbfc..cb58dfb09 100644 --- a/src/org/apg/ui/DecryptActivity.java +++ b/src/org/apg/ui/DecryptActivity.java @@ -196,28 +196,28 @@ public class DecryptActivity extends BaseActivity { // ignore, then } } else if (Apg.Intent.DECRYPT.equals(mIntent.getAction())) { - Log.d(Constants.tag, "Apg Intent DECRYPT startet"); + Log.d(Constants.TAG, "Apg Intent DECRYPT startet"); Bundle extras = mIntent.getExtras(); if (extras == null) { - Log.d(Constants.tag, "extra bundle was null"); + Log.d(Constants.TAG, "extra bundle was null"); extras = new Bundle(); } else { - Log.d(Constants.tag, "got extras"); + Log.d(Constants.TAG, "got extras"); } mData = extras.getByteArray(Apg.EXTRA_DATA); String textData = null; if (mData == null) { - Log.d(Constants.tag, "EXTRA_DATA was null"); + Log.d(Constants.TAG, "EXTRA_DATA was null"); textData = extras.getString(Apg.EXTRA_TEXT); } else { - Log.d(Constants.tag, "Got data from EXTRA_DATA"); + Log.d(Constants.TAG, "Got data from EXTRA_DATA"); } if (textData != null) { - Log.d(Constants.tag, "textData null, matching text ..."); + Log.d(Constants.TAG, "textData null, matching text ..."); Matcher matcher = Apg.PGP_MESSAGE.matcher(textData); if (matcher.matches()) { - Log.d(Constants.tag, "PGP_MESSAGE matched"); + Log.d(Constants.TAG, "PGP_MESSAGE matched"); textData = matcher.group(1); // replace non breakable spaces textData = textData.replaceAll("\\xa0", " "); @@ -225,14 +225,14 @@ public class DecryptActivity extends BaseActivity { } else { matcher = Apg.PGP_SIGNED_MESSAGE.matcher(textData); if (matcher.matches()) { - Log.d(Constants.tag, "PGP_SIGNED_MESSAGE matched"); + Log.d(Constants.TAG, "PGP_SIGNED_MESSAGE matched"); textData = matcher.group(1); // replace non breakable spaces textData = textData.replaceAll("\\xa0", " "); mMessage.setText(textData); mDecryptButton.setText(R.string.btn_verify); } else { - Log.d(Constants.tag, "Nothing matched!"); + Log.d(Constants.TAG, "Nothing matched!"); } } } @@ -377,7 +377,7 @@ public class DecryptActivity extends BaseActivity { if (filename.endsWith(".asc") || filename.endsWith(".gpg") || filename.endsWith(".pgp")) { filename = filename.substring(0, filename.length() - 4); } - mOutputFilename = Constants.path.app_dir + "/" + filename; + mOutputFilename = Constants.path.APP_DIR + "/" + filename; } private void updateSource() { @@ -564,7 +564,7 @@ public class DecryptActivity extends BaseActivity { error = "" + e; } - data.putInt(Constants.extras.status, Id.message.done); + data.putInt(Constants.extras.STATUS, Id.message.done); if (error != null) { data.putString(Apg.EXTRA_ERROR, error); @@ -581,8 +581,8 @@ public class DecryptActivity extends BaseActivity { return; } - if (data.getInt(Constants.extras.status) == Id.message.unknown_signature_key) { - mUnknownSignatureKeyId = data.getLong(Constants.extras.key_id); + if (data.getInt(Constants.extras.STATUS) == Id.message.unknown_signature_key) { + mUnknownSignatureKeyId = data.getLong(Constants.extras.KEY_ID); showDialog(Id.dialog.lookup_unknown_key); return; } diff --git a/src/org/apg/ui/EditKeyActivity.java b/src/org/apg/ui/EditKeyActivity.java index 6e1eab63e..c3945d4ed 100644 --- a/src/org/apg/ui/EditKeyActivity.java +++ b/src/org/apg/ui/EditKeyActivity.java @@ -257,7 +257,7 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener { error = "" + e; } - data.putInt(Constants.extras.status, Id.message.done); + data.putInt(Constants.extras.STATUS, Id.message.done); if (error != null) { data.putString(Apg.EXTRA_ERROR, error); diff --git a/src/org/apg/ui/EncryptActivity.java b/src/org/apg/ui/EncryptActivity.java index 603d1a04d..e5892a4d5 100644 --- a/src/org/apg/ui/EncryptActivity.java +++ b/src/org/apg/ui/EncryptActivity.java @@ -421,7 +421,7 @@ public class EncryptActivity extends BaseActivity { mInputFilename = mFilename.getText().toString(); File file = new File(mInputFilename); String ending = (mAsciiArmour.isChecked() ? ".asc" : ".gpg"); - mOutputFilename = Constants.path.app_dir + "/" + file.getName() + ending; + mOutputFilename = Constants.path.APP_DIR + "/" + file.getName() + ending; } private void updateSource() { @@ -731,7 +731,7 @@ public class EncryptActivity extends BaseActivity { error = "" + e; } - data.putInt(Constants.extras.status, Id.message.done); + data.putInt(Constants.extras.STATUS, Id.message.done); if (error != null) { data.putString(Apg.EXTRA_ERROR, error); diff --git a/src/org/apg/ui/ImportFromQRCodeActivity.java b/src/org/apg/ui/ImportFromQRCodeActivity.java index 0d9209991..593c841df 100644 --- a/src/org/apg/ui/ImportFromQRCodeActivity.java +++ b/src/org/apg/ui/ImportFromQRCodeActivity.java @@ -69,11 +69,11 @@ public class ImportFromQRCodeActivity extends BaseActivity { } catch (QueryException e) { Log.e(TAG, "Failed to query KeyServer", e); status.putString(Apg.EXTRA_ERROR, "Failed to query KeyServer"); - status.putInt(Constants.extras.status, Id.message.done); + status.putInt(Constants.extras.STATUS, Id.message.done); } catch (IOException e) { Log.e(TAG, "Failed to query KeyServer", e); status.putString(Apg.EXTRA_ERROR, "Failed to query KeyServer"); - status.putInt(Constants.extras.status, Id.message.done); + status.putInt(Constants.extras.STATUS, Id.message.done); } } }; @@ -107,7 +107,7 @@ public class ImportFromQRCodeActivity extends BaseActivity { case Id.request.sign_key: { // signals the end of processing. Signature was either applied, or it wasnt - status.putInt(Constants.extras.status, Id.message.done); + status.putInt(Constants.extras.STATUS, Id.message.done); msg.setData(status); sendMessage(msg); diff --git a/src/org/apg/ui/KeyListActivity.java b/src/org/apg/ui/KeyListActivity.java index 00be0321a..6c76f02bc 100644 --- a/src/org/apg/ui/KeyListActivity.java +++ b/src/org/apg/ui/KeyListActivity.java @@ -74,8 +74,8 @@ public class KeyListActivity extends BaseActivity { protected int mSelectedItem = -1; protected int mTask = 0; - protected String mImportFilename = Constants.path.app_dir + "/"; - protected String mExportFilename = Constants.path.app_dir + "/"; + protected String mImportFilename = Constants.path.APP_DIR + "/"; + protected String mExportFilename = Constants.path.APP_DIR + "/"; protected String mImportData; protected boolean mDeleteAfterImport = false; @@ -352,9 +352,9 @@ public class KeyListActivity extends BaseActivity { mImportData = null; if (mTask == Id.task.import_keys) { - data.putInt(Constants.extras.status, Id.message.import_done); + data.putInt(Constants.extras.STATUS, Id.message.import_done); } else { - data.putInt(Constants.extras.status, Id.message.export_done); + data.putInt(Constants.extras.STATUS, Id.message.export_done); } if (error != null) { @@ -381,7 +381,7 @@ public class KeyListActivity extends BaseActivity { Bundle data = msg.getData(); if (data != null) { - int type = data.getInt(Constants.extras.status); + int type = data.getInt(Constants.extras.STATUS); switch (type) { case Id.message.import_done: { removeDialog(Id.dialog.importing); diff --git a/src/org/apg/ui/KeyServerQueryActivity.java b/src/org/apg/ui/KeyServerQueryActivity.java index f1f6466e3..606acb575 100644 --- a/src/org/apg/ui/KeyServerQueryActivity.java +++ b/src/org/apg/ui/KeyServerQueryActivity.java @@ -144,7 +144,7 @@ public class KeyServerQueryActivity extends BaseActivity { error = "Too many responses."; } - data.putInt(Constants.extras.status, Id.message.done); + data.putInt(Constants.extras.STATUS, Id.message.done); if (error != null) { data.putString(Apg.EXTRA_ERROR, error); diff --git a/src/org/apg/ui/PreferencesActivity.java b/src/org/apg/ui/PreferencesActivity.java index 749f70657..421c9cc39 100644 --- a/src/org/apg/ui/PreferencesActivity.java +++ b/src/org/apg/ui/PreferencesActivity.java @@ -61,7 +61,7 @@ public class PreferencesActivity extends PreferenceActivity { addPreferencesFromResource(R.xml.apg_preferences); - mLanguage = (ListPreference) findPreference(Constants.pref.language); + mLanguage = (ListPreference) findPreference(Constants.pref.LANGUAGE); Vector entryVector = new Vector(Arrays.asList(mLanguage.getEntries())); Vector entryValueVector = new Vector(Arrays.asList(mLanguage.getEntryValues())); String supportedLanguages[] = getResources().getStringArray(R.array.supported_languages); @@ -90,7 +90,7 @@ public class PreferencesActivity extends PreferenceActivity { } }); - mPassPhraseCacheTtl = (IntegerListPreference) findPreference(Constants.pref.pass_phrase_cache_ttl); + mPassPhraseCacheTtl = (IntegerListPreference) findPreference(Constants.pref.PASS_PHRASE_CACHE_TTL); mPassPhraseCacheTtl.setValue("" + mPreferences.getPassPhraseCacheTtl()); mPassPhraseCacheTtl.setSummary(mPassPhraseCacheTtl.getEntry()); mPassPhraseCacheTtl.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() @@ -105,7 +105,7 @@ public class PreferencesActivity extends PreferenceActivity { } }); - mEncryptionAlgorithm = (IntegerListPreference) findPreference(Constants.pref.default_encryption_algorithm); + mEncryptionAlgorithm = (IntegerListPreference) findPreference(Constants.pref.DEFAULT_ENCRYPTION_ALGORITHM); int valueIds[] = { PGPEncryptedData.AES_128, PGPEncryptedData.AES_192, PGPEncryptedData.AES_256, PGPEncryptedData.BLOWFISH, PGPEncryptedData.TWOFISH, PGPEncryptedData.CAST5, @@ -135,7 +135,7 @@ public class PreferencesActivity extends PreferenceActivity { } }); - mHashAlgorithm = (IntegerListPreference) findPreference(Constants.pref.default_hash_algorithm); + mHashAlgorithm = (IntegerListPreference) findPreference(Constants.pref.DEFAULT_HASH_ALGORITHM); valueIds = new int[] { HashAlgorithmTags.MD5, HashAlgorithmTags.RIPEMD160, HashAlgorithmTags.SHA1, HashAlgorithmTags.SHA224, HashAlgorithmTags.SHA256, HashAlgorithmTags.SHA384, @@ -165,7 +165,7 @@ public class PreferencesActivity extends PreferenceActivity { } }); - mMessageCompression = (IntegerListPreference) findPreference(Constants.pref.default_message_compression); + mMessageCompression = (IntegerListPreference) findPreference(Constants.pref.DEFAULT_MESSAGE_COMPRESSION); valueIds = new int[] { Id.choice.compression.none, Id.choice.compression.zip, @@ -197,7 +197,7 @@ public class PreferencesActivity extends PreferenceActivity { } }); - mFileCompression = (IntegerListPreference) findPreference(Constants.pref.default_file_compression); + mFileCompression = (IntegerListPreference) findPreference(Constants.pref.DEFAULT_FILE_COMPRESSION); mFileCompression.setEntries(entries); mFileCompression.setEntryValues(values); mFileCompression.setValue("" + mPreferences.getDefaultFileCompression()); @@ -213,7 +213,7 @@ public class PreferencesActivity extends PreferenceActivity { } }); - mAsciiArmour = (CheckBoxPreference) findPreference(Constants.pref.default_ascii_armour); + mAsciiArmour = (CheckBoxPreference) findPreference(Constants.pref.DEFAULT_ASCII_ARMOUR); mAsciiArmour.setChecked(mPreferences.getDefaultAsciiArmour()); mAsciiArmour.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { @@ -225,7 +225,7 @@ public class PreferencesActivity extends PreferenceActivity { } }); - mForceV3Signatures = (CheckBoxPreference) findPreference(Constants.pref.force_v3_signatures); + mForceV3Signatures = (CheckBoxPreference) findPreference(Constants.pref.FORCE_V3_SIGNATURES); mForceV3Signatures.setChecked(mPreferences.getForceV3Signatures()); mForceV3Signatures.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { @@ -237,7 +237,7 @@ public class PreferencesActivity extends PreferenceActivity { } }); - mKeyServerPreference = (PreferenceScreen) findPreference(Constants.pref.key_servers); + mKeyServerPreference = (PreferenceScreen) findPreference(Constants.pref.KEY_SERVERS); String servers[] = mPreferences.getKeyServers(); mKeyServerPreference.setSummary(getResources().getString(R.string.nKeyServers, servers.length)); mKeyServerPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { diff --git a/src/org/apg/ui/PublicKeyListActivity.java b/src/org/apg/ui/PublicKeyListActivity.java index a9c5dbc15..81a79ce33 100644 --- a/src/org/apg/ui/PublicKeyListActivity.java +++ b/src/org/apg/ui/PublicKeyListActivity.java @@ -40,7 +40,7 @@ import android.widget.ExpandableListView.ExpandableListContextMenuInfo; public class PublicKeyListActivity extends KeyListActivity { @Override public void onCreate(Bundle savedInstanceState) { - mExportFilename = Constants.path.app_dir + "/pubexport.asc"; + mExportFilename = Constants.path.APP_DIR + "/pubexport.asc"; mKeyType = Id.type.public_key; super.onCreate(savedInstanceState); } diff --git a/src/org/apg/ui/SecretKeyListActivity.java b/src/org/apg/ui/SecretKeyListActivity.java index c8a5c9866..a5d351bc6 100644 --- a/src/org/apg/ui/SecretKeyListActivity.java +++ b/src/org/apg/ui/SecretKeyListActivity.java @@ -45,7 +45,7 @@ import com.google.zxing.integration.android.IntentIntegrator; public class SecretKeyListActivity extends KeyListActivity implements OnChildClickListener { @Override public void onCreate(Bundle savedInstanceState) { - mExportFilename = Constants.path.app_dir + "/secexport.asc"; + mExportFilename = Constants.path.APP_DIR + "/secexport.asc"; mKeyType = Id.type.secret_key; super.onCreate(savedInstanceState); mList.setOnChildClickListener(this); diff --git a/src/org/apg/ui/SendKeyActivity.java b/src/org/apg/ui/SendKeyActivity.java index 2dcb08d3d..c44e87469 100644 --- a/src/org/apg/ui/SendKeyActivity.java +++ b/src/org/apg/ui/SendKeyActivity.java @@ -73,7 +73,7 @@ public class SendKeyActivity extends BaseActivity { } } - data.putInt(Constants.extras.status, Id.message.export_done); + data.putInt(Constants.extras.STATUS, Id.message.export_done); if (error != null) { data.putString(Apg.EXTRA_ERROR, error); diff --git a/src/org/apg/ui/SignKeyActivity.java b/src/org/apg/ui/SignKeyActivity.java index 6fad76dff..ab145c921 100644 --- a/src/org/apg/ui/SignKeyActivity.java +++ b/src/org/apg/ui/SignKeyActivity.java @@ -141,7 +141,7 @@ public class SignKeyActivity extends BaseActivity { status.putString(Apg.EXTRA_ERROR, "Key has already been signed"); - status.putInt(Constants.extras.status, Id.message.done); + status.putInt(Constants.extras.STATUS, Id.message.done); msg.setData(status); sendMessage(msg); @@ -221,26 +221,26 @@ public class SignKeyActivity extends BaseActivity { } catch (PGPException e) { Log.e(TAG, "Failed to sign key", e); status.putString(Apg.EXTRA_ERROR, "Failed to sign key"); - status.putInt(Constants.extras.status, Id.message.done); + status.putInt(Constants.extras.STATUS, Id.message.done); return; } catch (NoSuchAlgorithmException e) { Log.e(TAG, "Failed to sign key", e); status.putString(Apg.EXTRA_ERROR, "Failed to sign key"); - status.putInt(Constants.extras.status, Id.message.done); + status.putInt(Constants.extras.STATUS, Id.message.done); return; } catch (NoSuchProviderException e) { Log.e(TAG, "Failed to sign key", e); status.putString(Apg.EXTRA_ERROR, "Failed to sign key"); - status.putInt(Constants.extras.status, Id.message.done); + status.putInt(Constants.extras.STATUS, Id.message.done); return; } catch (SignatureException e) { Log.e(TAG, "Failed to sign key", e); status.putString(Apg.EXTRA_ERROR, "Failed to sign key"); - status.putInt(Constants.extras.status, Id.message.done); + status.putInt(Constants.extras.STATUS, Id.message.done); return; } - status.putInt(Constants.extras.status, Id.message.done); + status.putInt(Constants.extras.STATUS, Id.message.done); msg.setData(status); sendMessage(msg); -- cgit v1.2.3