292 files changed, 4 insertions, 4 deletions

diff --git a/org_apg/.gitignore b/APG-API-Demo/.gitignore
index 2e423e1a3..2e423e1a3 100644
--- a/org_apg/.gitignore
+++ b/APG-API-Demo/.gitignore
diff --git a/org_apg_integration_demo/AndroidManifest.xml b/APG-API-Demo/AndroidManifest.xml
index 8d7a9e970..8d7a9e970 100644
--- a/org_apg_integration_demo/AndroidManifest.xml
+++ b/APG-API-Demo/AndroidManifest.xml
diff --git a/org_apg_integration_demo/build.xml b/APG-API-Demo/build.xml
index e72865c84..e72865c84 100644
--- a/org_apg_integration_demo/build.xml
+++ b/APG-API-Demo/build.xml
diff --git a/org_apg/proguard-project.txt b/APG-API-Demo/proguard-project.txt
index f2fe1559a..f2fe1559a 100644
--- a/org_apg/proguard-project.txt
+++ b/APG-API-Demo/proguard-project.txt
diff --git a/org_apg_integration_demo/project.properties b/APG-API-Demo/project.properties
index 8abe35df9..8abe35df9 100644
--- a/org_apg_integration_demo/project.properties
+++ b/APG-API-Demo/project.properties
diff --git a/org_apg/res/drawable-hdpi/icon.png b/APG-API-Demo/res/drawable-hdpi/icon.png
index 6b8cc3d73..6b8cc3d73 100644
--- a/org_apg/res/drawable-hdpi/icon.png
+++ b/APG-API-Demo/res/drawable-hdpi/icon.png
diff --git a/org_apg/res/drawable-ldpi/icon.png b/APG-API-Demo/res/drawable-ldpi/icon.png
index a1adf6bcb..a1adf6bcb 100644
--- a/org_apg/res/drawable-ldpi/icon.png
+++ b/APG-API-Demo/res/drawable-ldpi/icon.png
diff --git a/org_apg/res/drawable-mdpi/icon.png b/APG-API-Demo/res/drawable-mdpi/icon.png
index 6b10a2ad3..6b10a2ad3 100644
--- a/org_apg/res/drawable-mdpi/icon.png
+++ b/APG-API-Demo/res/drawable-mdpi/icon.png
diff --git a/org_apg/res/drawable-xhdpi/icon.png b/APG-API-Demo/res/drawable-xhdpi/icon.png
index 03ee31bbd..03ee31bbd 100644
--- a/org_apg/res/drawable-xhdpi/icon.png
+++ b/APG-API-Demo/res/drawable-xhdpi/icon.png
diff --git a/org_apg_integration_demo/res/layout/aidl_demo.xml b/APG-API-Demo/res/layout/aidl_demo.xml
index 59977869d..59977869d 100644
--- a/org_apg_integration_demo/res/layout/aidl_demo.xml
+++ b/APG-API-Demo/res/layout/aidl_demo.xml
diff --git a/org_apg_integration_demo/res/layout/intent_demo.xml b/APG-API-Demo/res/layout/intent_demo.xml
index a765343f9..a765343f9 100644
--- a/org_apg_integration_demo/res/layout/intent_demo.xml
+++ b/APG-API-Demo/res/layout/intent_demo.xml
diff --git a/org_apg_integration_demo/res/xml/base_preference.xml b/APG-API-Demo/res/xml/base_preference.xml
index c56e54746..c56e54746 100644
--- a/org_apg_integration_demo/res/xml/base_preference.xml
+++ b/APG-API-Demo/res/xml/base_preference.xml
diff --git a/org_apg_integration_demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java b/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java
index f066e0957..f066e0957 100644
--- a/org_apg_integration_demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java
+++ b/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java
diff --git a/org_apg_integration_demo/src/org/thialfihar/android/apg/demo/BaseActivity.java b/APG-API-Demo/src/org/thialfihar/android/apg/demo/BaseActivity.java
index 3f46b2e4d..3f46b2e4d 100644
--- a/org_apg_integration_demo/src/org/thialfihar/android/apg/demo/BaseActivity.java
+++ b/APG-API-Demo/src/org/thialfihar/android/apg/demo/BaseActivity.java
diff --git a/org_apg_integration_demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java b/APG-API-Demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java
index b707e48a8..b707e48a8 100644
--- a/org_apg_integration_demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java
+++ b/APG-API-Demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java
diff --git a/org_apg_integration_demo/.gitignore b/APG-API-Lib/.gitignore
index 2e423e1a3..2e423e1a3 100644
--- a/org_apg_integration_demo/.gitignore
+++ b/APG-API-Lib/.gitignore
diff --git a/org_apg_integration_lib/AndroidManifest.xml b/APG-API-Lib/AndroidManifest.xml
index 3d99ae603..3d99ae603 100644
--- a/org_apg_integration_lib/AndroidManifest.xml
+++ b/APG-API-Lib/AndroidManifest.xml
diff --git a/org_apg_integration_lib/build.xml b/APG-API-Lib/build.xml
index 895594080..895594080 100644
--- a/org_apg_integration_lib/build.xml
+++ b/APG-API-Lib/build.xml
diff --git a/org_apg_integration_demo/proguard-project.txt b/APG-API-Lib/proguard-project.txt
index f2fe1559a..f2fe1559a 100644
--- a/org_apg_integration_demo/proguard-project.txt
+++ b/APG-API-Lib/proguard-project.txt
diff --git a/org_apg_integration_lib/project.properties b/APG-API-Lib/project.properties
index 36f15941e..36f15941e 100644
--- a/org_apg_integration_lib/project.properties
+++ b/APG-API-Lib/project.properties
diff --git a/org_apg_integration_lib/res/.readme b/APG-API-Lib/res/.readme
index 97473e05c..97473e05c 100644
--- a/org_apg_integration_lib/res/.readme
+++ b/APG-API-Lib/res/.readme
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgData.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgData.java
index 5ef20bfbb..5ef20bfbb 100644
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgData.java
+++ b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgData.java
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java
index 77d1ebd42..77d1ebd42 100644
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java
+++ b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java
index 3f71f9647..3f71f9647 100644
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java
+++ b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Constants.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/Constants.java
index 7745f92d3..7745f92d3 100644
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Constants.java
+++ b/APG-API-Lib/src/org/thialfihar/android/apg/integration/Constants.java
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ContentProviderHelper.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ContentProviderHelper.java
index 7b725fe06..7b725fe06 100644
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ContentProviderHelper.java
+++ b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ContentProviderHelper.java
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Util.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/Util.java
index 01c6bb699..01c6bb699 100644
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Util.java
+++ b/APG-API-Lib/src/org/thialfihar/android/apg/integration/Util.java
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl b/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl
index ff6b7254c..ff6b7254c 100644
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl
+++ b/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl b/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl
index bb405329a..bb405329a 100644
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl
+++ b/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgService.aidl b/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgService.aidl
index 71c6a9e42..71c6a9e42 100644
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgService.aidl
+++ b/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgService.aidl
diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl b/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl
index 1375d1548..1375d1548 100644
--- a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl
+++ b/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl
diff --git a/org_apg_integration_lib/.gitignore b/APG/.gitignore
index 2e423e1a3..2e423e1a3 100644
--- a/org_apg_integration_lib/.gitignore
+++ b/APG/.gitignore
diff --git a/org_apg/AndroidManifest.xml b/APG/AndroidManifest.xml
index 1361d3318..1361d3318 100644
--- a/org_apg/AndroidManifest.xml
+++ b/APG/AndroidManifest.xml
diff --git a/org_apg/build.xml b/APG/build.xml
index eb9b68df7..eb9b68df7 100644
--- a/org_apg/build.xml
+++ b/APG/build.xml
diff --git a/org_apg/libs/barcodescanner-android-integration-supportv4.jar b/APG/libs/barcodescanner-android-integration-supportv4.jar
index 4a7f1a39c..4a7f1a39c 100644
--- a/org_apg/libs/barcodescanner-android-integration-supportv4.jar
+++ b/APG/libs/barcodescanner-android-integration-supportv4.jar
diff --git a/org_apg/libs/htmlcleaner-2.2.jar b/APG/libs/htmlcleaner-2.2.jar
index cc922d06b..cc922d06b 100644
--- a/org_apg/libs/htmlcleaner-2.2.jar
+++ b/APG/libs/htmlcleaner-2.2.jar
diff --git a/org_apg/libs/htmlspanner-0.2-fork.jar b/APG/libs/htmlspanner-0.2-fork.jar
index 76223ccc6..76223ccc6 100644
--- a/org_apg/libs/htmlspanner-0.2-fork.jar
+++ b/APG/libs/htmlspanner-0.2-fork.jar
diff --git a/org_apg/libs/sc-bzip2-1.47.0.2.jar b/APG/libs/sc-bzip2-1.47.0.2.jar
index 3bc42f30e..3bc42f30e 100644
--- a/org_apg/libs/sc-bzip2-1.47.0.2.jar
+++ b/APG/libs/sc-bzip2-1.47.0.2.jar
diff --git a/org_apg/libs/sc-light-jdk15on-1.47.0.2.jar b/APG/libs/sc-light-jdk15on-1.47.0.2.jar
index 7cdbf856e..7cdbf856e 100644
--- a/org_apg/libs/sc-light-jdk15on-1.47.0.2.jar
+++ b/APG/libs/sc-light-jdk15on-1.47.0.2.jar
diff --git a/org_apg/libs/scpg-jdk15on-1.47.0.2.jar b/APG/libs/scpg-jdk15on-1.47.0.2.jar
index f290334d8..f290334d8 100644
--- a/org_apg/libs/scpg-jdk15on-1.47.0.2.jar
+++ b/APG/libs/scpg-jdk15on-1.47.0.2.jar
diff --git a/org_apg/libs/scprov-jdk15on-1.47.0.2.jar b/APG/libs/scprov-jdk15on-1.47.0.2.jar
index 221a36b29..221a36b29 100644
--- a/org_apg/libs/scprov-jdk15on-1.47.0.2.jar
+++ b/APG/libs/scprov-jdk15on-1.47.0.2.jar
diff --git a/org_apg/pom.xml b/APG/pom.xml
index cadb2a38d..cadb2a38d 100644
--- a/org_apg/pom.xml
+++ b/APG/pom.xml
diff --git a/org_apg_integration_lib/proguard-project.txt b/APG/proguard-project.txt
index f2fe1559a..f2fe1559a 100644
--- a/org_apg_integration_lib/proguard-project.txt
+++ b/APG/proguard-project.txt
diff --git a/org_apg/project.properties b/APG/project.properties
index f353c649e..f353c649e 100644
--- a/org_apg/project.properties
+++ b/APG/project.properties
diff --git a/org_apg/res/anim/push_left_in.xml b/APG/res/anim/push_left_in.xml
index 45fb4875a..45fb4875a 100644
--- a/org_apg/res/anim/push_left_in.xml
+++ b/APG/res/anim/push_left_in.xml
diff --git a/org_apg/res/anim/push_left_out.xml b/APG/res/anim/push_left_out.xml
index 845679f16..845679f16 100644
--- a/org_apg/res/anim/push_left_out.xml
+++ b/APG/res/anim/push_left_out.xml
diff --git a/org_apg/res/anim/push_right_in.xml b/APG/res/anim/push_right_in.xml
index 09a244406..09a244406 100644
--- a/org_apg/res/anim/push_right_in.xml
+++ b/APG/res/anim/push_right_in.xml
diff --git a/org_apg/res/anim/push_right_out.xml b/APG/res/anim/push_right_out.xml
index e8893a69a..e8893a69a 100644
--- a/org_apg/res/anim/push_right_out.xml
+++ b/APG/res/anim/push_right_out.xml
diff --git a/org_apg/res/drawable-finger/btn_circle.xml b/APG/res/drawable-finger/btn_circle.xml
index 6c3c7fc1a..6c3c7fc1a 100644
--- a/org_apg/res/drawable-finger/btn_circle.xml
+++ b/APG/res/drawable-finger/btn_circle.xml
diff --git a/org_apg/res/drawable-hdpi-finger/btn_circle_disable.png b/APG/res/drawable-hdpi-finger/btn_circle_disable.png
index ae063b545..ae063b545 100644
--- a/org_apg/res/drawable-hdpi-finger/btn_circle_disable.png
+++ b/APG/res/drawable-hdpi-finger/btn_circle_disable.png
diff --git a/org_apg/res/drawable-hdpi-finger/btn_circle_disable_focused.png b/APG/res/drawable-hdpi-finger/btn_circle_disable_focused.png
index 7a5d4fe4e..7a5d4fe4e 100644
--- a/org_apg/res/drawable-hdpi-finger/btn_circle_disable_focused.png
+++ b/APG/res/drawable-hdpi-finger/btn_circle_disable_focused.png
diff --git a/org_apg/res/drawable-hdpi-finger/btn_circle_normal.png b/APG/res/drawable-hdpi-finger/btn_circle_normal.png
index 5eda66883..5eda66883 100644
--- a/org_apg/res/drawable-hdpi-finger/btn_circle_normal.png
+++ b/APG/res/drawable-hdpi-finger/btn_circle_normal.png
diff --git a/org_apg/res/drawable-hdpi-finger/btn_circle_pressed.png b/APG/res/drawable-hdpi-finger/btn_circle_pressed.png
index 88848bac2..88848bac2 100644
--- a/org_apg/res/drawable-hdpi-finger/btn_circle_pressed.png
+++ b/APG/res/drawable-hdpi-finger/btn_circle_pressed.png
diff --git a/org_apg/res/drawable-hdpi-finger/btn_circle_selected.png b/APG/res/drawable-hdpi-finger/btn_circle_selected.png
index 74690705f..74690705f 100644
--- a/org_apg/res/drawable-hdpi-finger/btn_circle_selected.png
+++ b/APG/res/drawable-hdpi-finger/btn_circle_selected.png
diff --git a/org_apg/res/drawable-hdpi-finger/ic_btn_round_minus.png b/APG/res/drawable-hdpi-finger/ic_btn_round_minus.png
index 27af3faf4..27af3faf4 100644
--- a/org_apg/res/drawable-hdpi-finger/ic_btn_round_minus.png
+++ b/APG/res/drawable-hdpi-finger/ic_btn_round_minus.png
diff --git a/org_apg/res/drawable-hdpi-finger/ic_btn_round_plus.png b/APG/res/drawable-hdpi-finger/ic_btn_round_plus.png
index b24168c32..b24168c32 100644
--- a/org_apg/res/drawable-hdpi-finger/ic_btn_round_plus.png
+++ b/APG/res/drawable-hdpi-finger/ic_btn_round_plus.png
diff --git a/org_apg/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png b/APG/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
index 73050476e..73050476e 100644
--- a/org_apg/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/APG/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/org_apg/res/drawable-hdpi/dashboard_decrypt_default.png b/APG/res/drawable-hdpi/dashboard_decrypt_default.png
index 0d51bcb68..0d51bcb68 100644
--- a/org_apg/res/drawable-hdpi/dashboard_decrypt_default.png
+++ b/APG/res/drawable-hdpi/dashboard_decrypt_default.png
diff --git a/org_apg/res/drawable-hdpi/dashboard_decrypt_pressed.png b/APG/res/drawable-hdpi/dashboard_decrypt_pressed.png
index d4cc0f8ea..d4cc0f8ea 100644
--- a/org_apg/res/drawable-hdpi/dashboard_decrypt_pressed.png
+++ b/APG/res/drawable-hdpi/dashboard_decrypt_pressed.png
diff --git a/org_apg/res/drawable-hdpi/dashboard_encrypt_default.png b/APG/res/drawable-hdpi/dashboard_encrypt_default.png
index 07617bb9d..07617bb9d 100644
--- a/org_apg/res/drawable-hdpi/dashboard_encrypt_default.png
+++ b/APG/res/drawable-hdpi/dashboard_encrypt_default.png
diff --git a/org_apg/res/drawable-hdpi/dashboard_encrypt_pressed.png b/APG/res/drawable-hdpi/dashboard_encrypt_pressed.png
index b8fe6e1d6..b8fe6e1d6 100644
--- a/org_apg/res/drawable-hdpi/dashboard_encrypt_pressed.png
+++ b/APG/res/drawable-hdpi/dashboard_encrypt_pressed.png
diff --git a/org_apg/res/drawable-hdpi/dashboard_help_default.png b/APG/res/drawable-hdpi/dashboard_help_default.png
index 233fddffc..233fddffc 100644
--- a/org_apg/res/drawable-hdpi/dashboard_help_default.png
+++ b/APG/res/drawable-hdpi/dashboard_help_default.png
diff --git a/org_apg/res/drawable-hdpi/dashboard_help_pressed.png b/APG/res/drawable-hdpi/dashboard_help_pressed.png
index dad8694f8..dad8694f8 100644
--- a/org_apg/res/drawable-hdpi/dashboard_help_pressed.png
+++ b/APG/res/drawable-hdpi/dashboard_help_pressed.png
diff --git a/org_apg/res/drawable-hdpi/dashboard_manage_keys_default.png b/APG/res/drawable-hdpi/dashboard_manage_keys_default.png
index de83398c2..de83398c2 100644
--- a/org_apg/res/drawable-hdpi/dashboard_manage_keys_default.png
+++ b/APG/res/drawable-hdpi/dashboard_manage_keys_default.png
diff --git a/org_apg/res/drawable-hdpi/dashboard_manage_keys_pressed.png b/APG/res/drawable-hdpi/dashboard_manage_keys_pressed.png
index a86bc1bf9..a86bc1bf9 100644
--- a/org_apg/res/drawable-hdpi/dashboard_manage_keys_pressed.png
+++ b/APG/res/drawable-hdpi/dashboard_manage_keys_pressed.png
diff --git a/org_apg/res/drawable-hdpi/dashboard_my_keys_default.png b/APG/res/drawable-hdpi/dashboard_my_keys_default.png
index f8b54961e..f8b54961e 100644
--- a/org_apg/res/drawable-hdpi/dashboard_my_keys_default.png
+++ b/APG/res/drawable-hdpi/dashboard_my_keys_default.png
diff --git a/org_apg/res/drawable-hdpi/dashboard_my_keys_pressed.png b/APG/res/drawable-hdpi/dashboard_my_keys_pressed.png
index 6a5c92138..6a5c92138 100644
--- a/org_apg/res/drawable-hdpi/dashboard_my_keys_pressed.png
+++ b/APG/res/drawable-hdpi/dashboard_my_keys_pressed.png
diff --git a/org_apg/res/drawable-hdpi/dashboard_scan_qrcode_default.png b/APG/res/drawable-hdpi/dashboard_scan_qrcode_default.png
index 632a8ce62..632a8ce62 100644
--- a/org_apg/res/drawable-hdpi/dashboard_scan_qrcode_default.png
+++ b/APG/res/drawable-hdpi/dashboard_scan_qrcode_default.png
diff --git a/org_apg/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png b/APG/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png
index 62a7a05ab..62a7a05ab 100644
--- a/org_apg/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png
+++ b/APG/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png
diff --git a/org_apg/res/drawable-hdpi/encrypted.png b/APG/res/drawable-hdpi/encrypted.png
index 541781cd1..541781cd1 100644
--- a/org_apg/res/drawable-hdpi/encrypted.png
+++ b/APG/res/drawable-hdpi/encrypted.png
diff --git a/org_apg/res/drawable-hdpi/encrypted_large.png b/APG/res/drawable-hdpi/encrypted_large.png
index 209278377..209278377 100644
--- a/org_apg/res/drawable-hdpi/encrypted_large.png
+++ b/APG/res/drawable-hdpi/encrypted_large.png
diff --git a/org_apg/res/drawable-hdpi/encrypted_small.png b/APG/res/drawable-hdpi/encrypted_small.png
index 3ff8e9b97..3ff8e9b97 100644
--- a/org_apg/res/drawable-hdpi/encrypted_small.png
+++ b/APG/res/drawable-hdpi/encrypted_small.png
diff --git a/org_apg/res/drawable-hdpi/ic_menu_about.png b/APG/res/drawable-hdpi/ic_menu_about.png
index 8f39c428a..8f39c428a 100644
--- a/org_apg/res/drawable-hdpi/ic_menu_about.png
+++ b/APG/res/drawable-hdpi/ic_menu_about.png
diff --git a/org_apg/res/drawable-hdpi/ic_menu_decrypt.png b/APG/res/drawable-hdpi/ic_menu_decrypt.png
index 6b98ad50c..6b98ad50c 100644
--- a/org_apg/res/drawable-hdpi/ic_menu_decrypt.png
+++ b/APG/res/drawable-hdpi/ic_menu_decrypt.png
diff --git a/org_apg/res/drawable-hdpi/ic_menu_encrypt.png b/APG/res/drawable-hdpi/ic_menu_encrypt.png
index 58689b43a..58689b43a 100644
--- a/org_apg/res/drawable-hdpi/ic_menu_encrypt.png
+++ b/APG/res/drawable-hdpi/ic_menu_encrypt.png
diff --git a/org_apg/res/drawable-hdpi/ic_menu_filebrowser.png b/APG/res/drawable-hdpi/ic_menu_filebrowser.png
index 3db304fa8..3db304fa8 100644
--- a/org_apg/res/drawable-hdpi/ic_menu_filebrowser.png
+++ b/APG/res/drawable-hdpi/ic_menu_filebrowser.png
diff --git a/org_apg/res/drawable-hdpi/ic_menu_scan_qrcode.png b/APG/res/drawable-hdpi/ic_menu_scan_qrcode.png
index b119b1999..b119b1999 100644
--- a/org_apg/res/drawable-hdpi/ic_menu_scan_qrcode.png
+++ b/APG/res/drawable-hdpi/ic_menu_scan_qrcode.png
diff --git a/org_apg/res/drawable-hdpi/ic_menu_search.png b/APG/res/drawable-hdpi/ic_menu_search.png
index 1cb61faf4..1cb61faf4 100644
--- a/org_apg/res/drawable-hdpi/ic_menu_search.png
+++ b/APG/res/drawable-hdpi/ic_menu_search.png
diff --git a/org_apg/res/drawable-hdpi/ic_menu_search_list.png b/APG/res/drawable-hdpi/ic_menu_search_list.png
index efee6dfd2..efee6dfd2 100644
--- a/org_apg/res/drawable-hdpi/ic_menu_search_list.png
+++ b/APG/res/drawable-hdpi/ic_menu_search_list.png
diff --git a/org_apg/res/drawable-hdpi/ic_menu_settings.png b/APG/res/drawable-hdpi/ic_menu_settings.png
index 577e05587..577e05587 100644
--- a/org_apg/res/drawable-hdpi/ic_menu_settings.png
+++ b/APG/res/drawable-hdpi/ic_menu_settings.png
diff --git a/org_apg/res/drawable-hdpi/ic_next.png b/APG/res/drawable-hdpi/ic_next.png
index d71058055..d71058055 100644
--- a/org_apg/res/drawable-hdpi/ic_next.png
+++ b/APG/res/drawable-hdpi/ic_next.png
diff --git a/org_apg/res/drawable-hdpi/ic_previous.png b/APG/res/drawable-hdpi/ic_previous.png
index d610e4667..d610e4667 100644
--- a/org_apg/res/drawable-hdpi/ic_previous.png
+++ b/APG/res/drawable-hdpi/ic_previous.png
diff --git a/org_apg_integration_demo/res/drawable-hdpi/icon.png b/APG/res/drawable-hdpi/icon.png
index 6b8cc3d73..6b8cc3d73 100644
--- a/org_apg_integration_demo/res/drawable-hdpi/icon.png
+++ b/APG/res/drawable-hdpi/icon.png
diff --git a/org_apg/res/drawable-hdpi/key.png b/APG/res/drawable-hdpi/key.png
index af4742ec0..af4742ec0 100644
--- a/org_apg/res/drawable-hdpi/key.png
+++ b/APG/res/drawable-hdpi/key.png
diff --git a/org_apg/res/drawable-hdpi/key_large.png b/APG/res/drawable-hdpi/key_large.png
index 590f7d5a4..590f7d5a4 100644
--- a/org_apg/res/drawable-hdpi/key_large.png
+++ b/APG/res/drawable-hdpi/key_large.png
diff --git a/org_apg/res/drawable-hdpi/key_small.png b/APG/res/drawable-hdpi/key_small.png
index 6966048a1..6966048a1 100644
--- a/org_apg/res/drawable-hdpi/key_small.png
+++ b/APG/res/drawable-hdpi/key_small.png
diff --git a/org_apg/res/drawable-hdpi/overlay_error.png b/APG/res/drawable-hdpi/overlay_error.png
index e6d7e60ba..e6d7e60ba 100644
--- a/org_apg/res/drawable-hdpi/overlay_error.png
+++ b/APG/res/drawable-hdpi/overlay_error.png
diff --git a/org_apg/res/drawable-hdpi/overlay_ok.png b/APG/res/drawable-hdpi/overlay_ok.png
index 0672f869d..0672f869d 100644
--- a/org_apg/res/drawable-hdpi/overlay_ok.png
+++ b/APG/res/drawable-hdpi/overlay_ok.png
diff --git a/org_apg/res/drawable-hdpi/signed.png b/APG/res/drawable-hdpi/signed.png
index ab9495e7b..ab9495e7b 100644
--- a/org_apg/res/drawable-hdpi/signed.png
+++ b/APG/res/drawable-hdpi/signed.png
diff --git a/org_apg/res/drawable-hdpi/signed_large.png b/APG/res/drawable-hdpi/signed_large.png
index c209f4167..c209f4167 100644
--- a/org_apg/res/drawable-hdpi/signed_large.png
+++ b/APG/res/drawable-hdpi/signed_large.png
diff --git a/org_apg/res/drawable-hdpi/signed_small.png b/APG/res/drawable-hdpi/signed_small.png
index 54c4906e8..54c4906e8 100644
--- a/org_apg/res/drawable-hdpi/signed_small.png
+++ b/APG/res/drawable-hdpi/signed_small.png
diff --git a/org_apg/res/drawable-ldpi/encrypted.png b/APG/res/drawable-ldpi/encrypted.png
index bcd8cfc8e..bcd8cfc8e 100644
--- a/org_apg/res/drawable-ldpi/encrypted.png
+++ b/APG/res/drawable-ldpi/encrypted.png
diff --git a/org_apg/res/drawable-ldpi/encrypted_large.png b/APG/res/drawable-ldpi/encrypted_large.png
index 34c3d3f97..34c3d3f97 100644
--- a/org_apg/res/drawable-ldpi/encrypted_large.png
+++ b/APG/res/drawable-ldpi/encrypted_large.png
diff --git a/org_apg/res/drawable-ldpi/encrypted_small.png b/APG/res/drawable-ldpi/encrypted_small.png
index 5e7294a4b..5e7294a4b 100644
--- a/org_apg/res/drawable-ldpi/encrypted_small.png
+++ b/APG/res/drawable-ldpi/encrypted_small.png
diff --git a/org_apg/res/drawable-ldpi/ic_next.png b/APG/res/drawable-ldpi/ic_next.png
index 474ed8faa..474ed8faa 100644
--- a/org_apg/res/drawable-ldpi/ic_next.png
+++ b/APG/res/drawable-ldpi/ic_next.png
diff --git a/org_apg/res/drawable-ldpi/ic_previous.png b/APG/res/drawable-ldpi/ic_previous.png
index 6fd885e6b..6fd885e6b 100644
--- a/org_apg/res/drawable-ldpi/ic_previous.png
+++ b/APG/res/drawable-ldpi/ic_previous.png
diff --git a/org_apg_integration_demo/res/drawable-ldpi/icon.png b/APG/res/drawable-ldpi/icon.png
index a1adf6bcb..a1adf6bcb 100644
--- a/org_apg_integration_demo/res/drawable-ldpi/icon.png
+++ b/APG/res/drawable-ldpi/icon.png
diff --git a/org_apg/res/drawable-ldpi/key.png b/APG/res/drawable-ldpi/key.png
index c806b6041..c806b6041 100644
--- a/org_apg/res/drawable-ldpi/key.png
+++ b/APG/res/drawable-ldpi/key.png
diff --git a/org_apg/res/drawable-ldpi/key_large.png b/APG/res/drawable-ldpi/key_large.png
index aa499a5e1..aa499a5e1 100644
--- a/org_apg/res/drawable-ldpi/key_large.png
+++ b/APG/res/drawable-ldpi/key_large.png
diff --git a/org_apg/res/drawable-ldpi/key_small.png b/APG/res/drawable-ldpi/key_small.png
index 073b95029..073b95029 100644
--- a/org_apg/res/drawable-ldpi/key_small.png
+++ b/APG/res/drawable-ldpi/key_small.png
diff --git a/org_apg/res/drawable-ldpi/overlay_error.png b/APG/res/drawable-ldpi/overlay_error.png
index e5a88e18f..e5a88e18f 100644
--- a/org_apg/res/drawable-ldpi/overlay_error.png
+++ b/APG/res/drawable-ldpi/overlay_error.png
diff --git a/org_apg/res/drawable-ldpi/overlay_ok.png b/APG/res/drawable-ldpi/overlay_ok.png
index 63374d47f..63374d47f 100644
--- a/org_apg/res/drawable-ldpi/overlay_ok.png
+++ b/APG/res/drawable-ldpi/overlay_ok.png
diff --git a/org_apg/res/drawable-ldpi/signed.png b/APG/res/drawable-ldpi/signed.png
index 4202c3f97..4202c3f97 100644
--- a/org_apg/res/drawable-ldpi/signed.png
+++ b/APG/res/drawable-ldpi/signed.png
diff --git a/org_apg/res/drawable-ldpi/signed_large.png b/APG/res/drawable-ldpi/signed_large.png
index d2917644c..d2917644c 100644
--- a/org_apg/res/drawable-ldpi/signed_large.png
+++ b/APG/res/drawable-ldpi/signed_large.png
diff --git a/org_apg/res/drawable-ldpi/signed_small.png b/APG/res/drawable-ldpi/signed_small.png
index 19d45f8da..19d45f8da 100644
--- a/org_apg/res/drawable-ldpi/signed_small.png
+++ b/APG/res/drawable-ldpi/signed_small.png
diff --git a/org_apg/res/drawable-mdpi-finger/btn_circle_disable.png b/APG/res/drawable-mdpi-finger/btn_circle_disable.png
index 33b74a66c..33b74a66c 100644
--- a/org_apg/res/drawable-mdpi-finger/btn_circle_disable.png
+++ b/APG/res/drawable-mdpi-finger/btn_circle_disable.png
diff --git a/org_apg/res/drawable-mdpi-finger/btn_circle_disable_focused.png b/APG/res/drawable-mdpi-finger/btn_circle_disable_focused.png
index 005ad8dca..005ad8dca 100644
--- a/org_apg/res/drawable-mdpi-finger/btn_circle_disable_focused.png
+++ b/APG/res/drawable-mdpi-finger/btn_circle_disable_focused.png
diff --git a/org_apg/res/drawable-mdpi-finger/btn_circle_normal.png b/APG/res/drawable-mdpi-finger/btn_circle_normal.png
index fc5af1c9f..fc5af1c9f 100644
--- a/org_apg/res/drawable-mdpi-finger/btn_circle_normal.png
+++ b/APG/res/drawable-mdpi-finger/btn_circle_normal.png
diff --git a/org_apg/res/drawable-mdpi-finger/btn_circle_pressed.png b/APG/res/drawable-mdpi-finger/btn_circle_pressed.png
index 8f40afdfc..8f40afdfc 100644
--- a/org_apg/res/drawable-mdpi-finger/btn_circle_pressed.png
+++ b/APG/res/drawable-mdpi-finger/btn_circle_pressed.png
diff --git a/org_apg/res/drawable-mdpi-finger/btn_circle_selected.png b/APG/res/drawable-mdpi-finger/btn_circle_selected.png
index c74fac227..c74fac227 100644
--- a/org_apg/res/drawable-mdpi-finger/btn_circle_selected.png
+++ b/APG/res/drawable-mdpi-finger/btn_circle_selected.png
diff --git a/org_apg/res/drawable-mdpi-finger/ic_btn_round_minus.png b/APG/res/drawable-mdpi-finger/ic_btn_round_minus.png
index 96dbb17d2..96dbb17d2 100644
--- a/org_apg/res/drawable-mdpi-finger/ic_btn_round_minus.png
+++ b/APG/res/drawable-mdpi-finger/ic_btn_round_minus.png
diff --git a/org_apg/res/drawable-mdpi-finger/ic_btn_round_plus.png b/APG/res/drawable-mdpi-finger/ic_btn_round_plus.png
index 1ec8a956a..1ec8a956a 100644
--- a/org_apg/res/drawable-mdpi-finger/ic_btn_round_plus.png
+++ b/APG/res/drawable-mdpi-finger/ic_btn_round_plus.png
diff --git a/org_apg/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png b/APG/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
index 0706c8af6..0706c8af6 100644
--- a/org_apg/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/APG/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/org_apg/res/drawable-mdpi/encrypted.png b/APG/res/drawable-mdpi/encrypted.png
index 34c3d3f97..34c3d3f97 100644
--- a/org_apg/res/drawable-mdpi/encrypted.png
+++ b/APG/res/drawable-mdpi/encrypted.png
diff --git a/org_apg/res/drawable-mdpi/encrypted_large.png b/APG/res/drawable-mdpi/encrypted_large.png
index 541781cd1..541781cd1 100644
--- a/org_apg/res/drawable-mdpi/encrypted_large.png
+++ b/APG/res/drawable-mdpi/encrypted_large.png
diff --git a/org_apg/res/drawable-mdpi/encrypted_small.png b/APG/res/drawable-mdpi/encrypted_small.png
index bcd8cfc8e..bcd8cfc8e 100644
--- a/org_apg/res/drawable-mdpi/encrypted_small.png
+++ b/APG/res/drawable-mdpi/encrypted_small.png
diff --git a/org_apg/res/drawable-mdpi/ic_menu_about.png b/APG/res/drawable-mdpi/ic_menu_about.png
index 7c57436fc..7c57436fc 100644
--- a/org_apg/res/drawable-mdpi/ic_menu_about.png
+++ b/APG/res/drawable-mdpi/ic_menu_about.png
diff --git a/org_apg/res/drawable-mdpi/ic_menu_decrypt.png b/APG/res/drawable-mdpi/ic_menu_decrypt.png
index 84557bbee..84557bbee 100644
--- a/org_apg/res/drawable-mdpi/ic_menu_decrypt.png
+++ b/APG/res/drawable-mdpi/ic_menu_decrypt.png
diff --git a/org_apg/res/drawable-mdpi/ic_menu_encrypt.png b/APG/res/drawable-mdpi/ic_menu_encrypt.png
index 4ee0de4af..4ee0de4af 100644
--- a/org_apg/res/drawable-mdpi/ic_menu_encrypt.png
+++ b/APG/res/drawable-mdpi/ic_menu_encrypt.png
diff --git a/org_apg/res/drawable-mdpi/ic_menu_filebrowser.png b/APG/res/drawable-mdpi/ic_menu_filebrowser.png
index fda13f1be..fda13f1be 100644
--- a/org_apg/res/drawable-mdpi/ic_menu_filebrowser.png
+++ b/APG/res/drawable-mdpi/ic_menu_filebrowser.png
diff --git a/org_apg/res/drawable-mdpi/ic_menu_scan_qrcode.png b/APG/res/drawable-mdpi/ic_menu_scan_qrcode.png
index 08fb51400..08fb51400 100644
--- a/org_apg/res/drawable-mdpi/ic_menu_scan_qrcode.png
+++ b/APG/res/drawable-mdpi/ic_menu_scan_qrcode.png
diff --git a/org_apg/res/drawable-mdpi/ic_menu_search.png b/APG/res/drawable-mdpi/ic_menu_search.png
index 2369d03f3..2369d03f3 100644
--- a/org_apg/res/drawable-mdpi/ic_menu_search.png
+++ b/APG/res/drawable-mdpi/ic_menu_search.png
diff --git a/org_apg/res/drawable-mdpi/ic_menu_search_list.png b/APG/res/drawable-mdpi/ic_menu_search_list.png
index 9033f1ec2..9033f1ec2 100644
--- a/org_apg/res/drawable-mdpi/ic_menu_search_list.png
+++ b/APG/res/drawable-mdpi/ic_menu_search_list.png
diff --git a/org_apg/res/drawable-mdpi/ic_menu_settings.png b/APG/res/drawable-mdpi/ic_menu_settings.png
index f32a37e44..f32a37e44 100644
--- a/org_apg/res/drawable-mdpi/ic_menu_settings.png
+++ b/APG/res/drawable-mdpi/ic_menu_settings.png
diff --git a/org_apg/res/drawable-mdpi/ic_next.png b/APG/res/drawable-mdpi/ic_next.png
index 8271c1380..8271c1380 100644
--- a/org_apg/res/drawable-mdpi/ic_next.png
+++ b/APG/res/drawable-mdpi/ic_next.png
diff --git a/org_apg/res/drawable-mdpi/ic_previous.png b/APG/res/drawable-mdpi/ic_previous.png
index ef90db972..ef90db972 100644
--- a/org_apg/res/drawable-mdpi/ic_previous.png
+++ b/APG/res/drawable-mdpi/ic_previous.png
diff --git a/org_apg_integration_demo/res/drawable-mdpi/icon.png b/APG/res/drawable-mdpi/icon.png
index 6b10a2ad3..6b10a2ad3 100644
--- a/org_apg_integration_demo/res/drawable-mdpi/icon.png
+++ b/APG/res/drawable-mdpi/icon.png
diff --git a/org_apg/res/drawable-mdpi/key.png b/APG/res/drawable-mdpi/key.png
index aa499a5e1..aa499a5e1 100644
--- a/org_apg/res/drawable-mdpi/key.png
+++ b/APG/res/drawable-mdpi/key.png
diff --git a/org_apg/res/drawable-mdpi/key_large.png b/APG/res/drawable-mdpi/key_large.png
index af4742ec0..af4742ec0 100644
--- a/org_apg/res/drawable-mdpi/key_large.png
+++ b/APG/res/drawable-mdpi/key_large.png
diff --git a/org_apg/res/drawable-mdpi/key_small.png b/APG/res/drawable-mdpi/key_small.png
index c806b6041..c806b6041 100644
--- a/org_apg/res/drawable-mdpi/key_small.png
+++ b/APG/res/drawable-mdpi/key_small.png
diff --git a/org_apg/res/drawable-mdpi/overlay_error.png b/APG/res/drawable-mdpi/overlay_error.png
index 5fe017433..5fe017433 100644
--- a/org_apg/res/drawable-mdpi/overlay_error.png
+++ b/APG/res/drawable-mdpi/overlay_error.png
diff --git a/org_apg/res/drawable-mdpi/overlay_ok.png b/APG/res/drawable-mdpi/overlay_ok.png
index b4f332260..b4f332260 100644
--- a/org_apg/res/drawable-mdpi/overlay_ok.png
+++ b/APG/res/drawable-mdpi/overlay_ok.png
diff --git a/org_apg/res/drawable-mdpi/signed.png b/APG/res/drawable-mdpi/signed.png
index d2917644c..d2917644c 100644
--- a/org_apg/res/drawable-mdpi/signed.png
+++ b/APG/res/drawable-mdpi/signed.png
diff --git a/org_apg/res/drawable-mdpi/signed_large.png b/APG/res/drawable-mdpi/signed_large.png
index ab9495e7b..ab9495e7b 100644
--- a/org_apg/res/drawable-mdpi/signed_large.png
+++ b/APG/res/drawable-mdpi/signed_large.png
diff --git a/org_apg/res/drawable-mdpi/signed_small.png b/APG/res/drawable-mdpi/signed_small.png
index 4202c3f97..4202c3f97 100644
--- a/org_apg/res/drawable-mdpi/signed_small.png
+++ b/APG/res/drawable-mdpi/signed_small.png
diff --git a/org_apg/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png b/APG/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
index 8155fe840..8155fe840 100644
--- a/org_apg/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/APG/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/org_apg/res/drawable-xhdpi/ic_menu_about.png b/APG/res/drawable-xhdpi/ic_menu_about.png
index 2641f142a..2641f142a 100644
--- a/org_apg/res/drawable-xhdpi/ic_menu_about.png
+++ b/APG/res/drawable-xhdpi/ic_menu_about.png
diff --git a/org_apg/res/drawable-xhdpi/ic_menu_decrypt.png b/APG/res/drawable-xhdpi/ic_menu_decrypt.png
index 23ee08bee..23ee08bee 100644
--- a/org_apg/res/drawable-xhdpi/ic_menu_decrypt.png
+++ b/APG/res/drawable-xhdpi/ic_menu_decrypt.png
diff --git a/org_apg/res/drawable-xhdpi/ic_menu_encrypt.png b/APG/res/drawable-xhdpi/ic_menu_encrypt.png
index 04562f33a..04562f33a 100644
--- a/org_apg/res/drawable-xhdpi/ic_menu_encrypt.png
+++ b/APG/res/drawable-xhdpi/ic_menu_encrypt.png
diff --git a/org_apg/res/drawable-xhdpi/ic_menu_filebrowser.png b/APG/res/drawable-xhdpi/ic_menu_filebrowser.png
index d1324014d..d1324014d 100644
--- a/org_apg/res/drawable-xhdpi/ic_menu_filebrowser.png
+++ b/APG/res/drawable-xhdpi/ic_menu_filebrowser.png
diff --git a/org_apg/res/drawable-xhdpi/ic_menu_scan_qrcode.png b/APG/res/drawable-xhdpi/ic_menu_scan_qrcode.png
index 015e6c6a1..015e6c6a1 100644
--- a/org_apg/res/drawable-xhdpi/ic_menu_scan_qrcode.png
+++ b/APG/res/drawable-xhdpi/ic_menu_scan_qrcode.png
diff --git a/org_apg/res/drawable-xhdpi/ic_menu_search.png b/APG/res/drawable-xhdpi/ic_menu_search.png
index 578cb24eb..578cb24eb 100644
--- a/org_apg/res/drawable-xhdpi/ic_menu_search.png
+++ b/APG/res/drawable-xhdpi/ic_menu_search.png
diff --git a/org_apg/res/drawable-xhdpi/ic_menu_search_list.png b/APG/res/drawable-xhdpi/ic_menu_search_list.png
index de20fa0e7..de20fa0e7 100644
--- a/org_apg/res/drawable-xhdpi/ic_menu_search_list.png
+++ b/APG/res/drawable-xhdpi/ic_menu_search_list.png
diff --git a/org_apg/res/drawable-xhdpi/ic_menu_settings.png b/APG/res/drawable-xhdpi/ic_menu_settings.png
index aa33c3880..aa33c3880 100644
--- a/org_apg/res/drawable-xhdpi/ic_menu_settings.png
+++ b/APG/res/drawable-xhdpi/ic_menu_settings.png
diff --git a/org_apg_integration_demo/res/drawable-xhdpi/icon.png b/APG/res/drawable-xhdpi/icon.png
index 03ee31bbd..03ee31bbd 100644
--- a/org_apg_integration_demo/res/drawable-xhdpi/icon.png
+++ b/APG/res/drawable-xhdpi/icon.png
diff --git a/org_apg/res/drawable/btn_circle_disable.png b/APG/res/drawable/btn_circle_disable.png
index 33b74a66c..33b74a66c 100644
--- a/org_apg/res/drawable/btn_circle_disable.png
+++ b/APG/res/drawable/btn_circle_disable.png
diff --git a/org_apg/res/drawable/btn_circle_disable_focused.png b/APG/res/drawable/btn_circle_disable_focused.png
index 005ad8dca..005ad8dca 100644
--- a/org_apg/res/drawable/btn_circle_disable_focused.png
+++ b/APG/res/drawable/btn_circle_disable_focused.png
diff --git a/org_apg/res/drawable/btn_circle_normal.png b/APG/res/drawable/btn_circle_normal.png
index fc5af1c9f..fc5af1c9f 100644
--- a/org_apg/res/drawable/btn_circle_normal.png
+++ b/APG/res/drawable/btn_circle_normal.png
diff --git a/org_apg/res/drawable/btn_circle_pressed.png b/APG/res/drawable/btn_circle_pressed.png
index 8f40afdfc..8f40afdfc 100644
--- a/org_apg/res/drawable/btn_circle_pressed.png
+++ b/APG/res/drawable/btn_circle_pressed.png
diff --git a/org_apg/res/drawable/btn_circle_selected.png b/APG/res/drawable/btn_circle_selected.png
index c74fac227..c74fac227 100644
--- a/org_apg/res/drawable/btn_circle_selected.png
+++ b/APG/res/drawable/btn_circle_selected.png
diff --git a/org_apg/res/drawable/dashboard_decrypt.xml b/APG/res/drawable/dashboard_decrypt.xml
index 981e38a0b..981e38a0b 100644
--- a/org_apg/res/drawable/dashboard_decrypt.xml
+++ b/APG/res/drawable/dashboard_decrypt.xml
diff --git a/org_apg/res/drawable/dashboard_encrypt.xml b/APG/res/drawable/dashboard_encrypt.xml
index af812dc51..af812dc51 100644
--- a/org_apg/res/drawable/dashboard_encrypt.xml
+++ b/APG/res/drawable/dashboard_encrypt.xml
diff --git a/org_apg/res/drawable/dashboard_help.xml b/APG/res/drawable/dashboard_help.xml
index e121ea0d1..e121ea0d1 100644
--- a/org_apg/res/drawable/dashboard_help.xml
+++ b/APG/res/drawable/dashboard_help.xml
diff --git a/org_apg/res/drawable/dashboard_manage_keys.xml b/APG/res/drawable/dashboard_manage_keys.xml
index ebc519253..ebc519253 100644
--- a/org_apg/res/drawable/dashboard_manage_keys.xml
+++ b/APG/res/drawable/dashboard_manage_keys.xml
diff --git a/org_apg/res/drawable/dashboard_my_keys.xml b/APG/res/drawable/dashboard_my_keys.xml
index d4045db45..d4045db45 100644
--- a/org_apg/res/drawable/dashboard_my_keys.xml
+++ b/APG/res/drawable/dashboard_my_keys.xml
diff --git a/org_apg/res/drawable/dashboard_scan_qrcode.xml b/APG/res/drawable/dashboard_scan_qrcode.xml
index 400994820..400994820 100644
--- a/org_apg/res/drawable/dashboard_scan_qrcode.xml
+++ b/APG/res/drawable/dashboard_scan_qrcode.xml
diff --git a/org_apg/res/drawable/encrypted.png b/APG/res/drawable/encrypted.png
index 2783804bc..2783804bc 100644
--- a/org_apg/res/drawable/encrypted.png
+++ b/APG/res/drawable/encrypted.png
diff --git a/org_apg/res/drawable/encrypted_large.png b/APG/res/drawable/encrypted_large.png
index 6d7c616a4..6d7c616a4 100644
--- a/org_apg/res/drawable/encrypted_large.png
+++ b/APG/res/drawable/encrypted_large.png
diff --git a/org_apg/res/drawable/encrypted_small.png b/APG/res/drawable/encrypted_small.png
index 7f4ab803f..7f4ab803f 100644
--- a/org_apg/res/drawable/encrypted_small.png
+++ b/APG/res/drawable/encrypted_small.png
diff --git a/org_apg/res/drawable/ic_btn_round_minus.png b/APG/res/drawable/ic_btn_round_minus.png
index 96dbb17d2..96dbb17d2 100644
--- a/org_apg/res/drawable/ic_btn_round_minus.png
+++ b/APG/res/drawable/ic_btn_round_minus.png
diff --git a/org_apg/res/drawable/ic_btn_round_plus.png b/APG/res/drawable/ic_btn_round_plus.png
index 1ec8a956a..1ec8a956a 100644
--- a/org_apg/res/drawable/ic_btn_round_plus.png
+++ b/APG/res/drawable/ic_btn_round_plus.png
diff --git a/org_apg/res/drawable/ic_launcher_folder.png b/APG/res/drawable/ic_launcher_folder.png
index ed31ba580..ed31ba580 100644
--- a/org_apg/res/drawable/ic_launcher_folder.png
+++ b/APG/res/drawable/ic_launcher_folder.png
diff --git a/org_apg/res/drawable/ic_launcher_folder_small.png b/APG/res/drawable/ic_launcher_folder_small.png
index 5df8d60f0..5df8d60f0 100644
--- a/org_apg/res/drawable/ic_launcher_folder_small.png
+++ b/APG/res/drawable/ic_launcher_folder_small.png
diff --git a/org_apg/res/drawable/ic_next.png b/APG/res/drawable/ic_next.png
index 8271c1380..8271c1380 100644
--- a/org_apg/res/drawable/ic_next.png
+++ b/APG/res/drawable/ic_next.png
diff --git a/org_apg/res/drawable/ic_previous.png b/APG/res/drawable/ic_previous.png
index ef90db972..ef90db972 100644
--- a/org_apg/res/drawable/ic_previous.png
+++ b/APG/res/drawable/ic_previous.png
diff --git a/org_apg/res/drawable/key.png b/APG/res/drawable/key.png
index de7e72524..de7e72524 100644
--- a/org_apg/res/drawable/key.png
+++ b/APG/res/drawable/key.png
diff --git a/org_apg/res/drawable/key_large.png b/APG/res/drawable/key_large.png
index 6f18c0240..6f18c0240 100644
--- a/org_apg/res/drawable/key_large.png
+++ b/APG/res/drawable/key_large.png
diff --git a/org_apg/res/drawable/key_small.png b/APG/res/drawable/key_small.png
index 121803508..121803508 100644
--- a/org_apg/res/drawable/key_small.png
+++ b/APG/res/drawable/key_small.png
diff --git a/org_apg/res/drawable/overlay_error.png b/APG/res/drawable/overlay_error.png
index 2372de59e..2372de59e 100644
--- a/org_apg/res/drawable/overlay_error.png
+++ b/APG/res/drawable/overlay_error.png
diff --git a/org_apg/res/drawable/overlay_ok.png b/APG/res/drawable/overlay_ok.png
index 2f0005898..2f0005898 100644
--- a/org_apg/res/drawable/overlay_ok.png
+++ b/APG/res/drawable/overlay_ok.png
diff --git a/org_apg/res/drawable/section_header.xml b/APG/res/drawable/section_header.xml
index a4468484e..a4468484e 100644
--- a/org_apg/res/drawable/section_header.xml
+++ b/APG/res/drawable/section_header.xml
diff --git a/org_apg/res/drawable/signed.png b/APG/res/drawable/signed.png
index 490e94fbd..490e94fbd 100644
--- a/org_apg/res/drawable/signed.png
+++ b/APG/res/drawable/signed.png
diff --git a/org_apg/res/drawable/signed_large.png b/APG/res/drawable/signed_large.png
index 92e64dc51..92e64dc51 100644
--- a/org_apg/res/drawable/signed_large.png
+++ b/APG/res/drawable/signed_large.png
diff --git a/org_apg/res/drawable/signed_small.png b/APG/res/drawable/signed_small.png
index 590220281..590220281 100644
--- a/org_apg/res/drawable/signed_small.png
+++ b/APG/res/drawable/signed_small.png
diff --git a/org_apg/res/layout/account_item.xml b/APG/res/layout/account_item.xml
index 0aa76719a..0aa76719a 100644
--- a/org_apg/res/layout/account_item.xml
+++ b/APG/res/layout/account_item.xml
diff --git a/org_apg/res/layout/create_key.xml b/APG/res/layout/create_key.xml
index 235d33f88..235d33f88 100644
--- a/org_apg/res/layout/create_key.xml
+++ b/APG/res/layout/create_key.xml
diff --git a/org_apg/res/layout/decrypt.xml b/APG/res/layout/decrypt.xml
index 055436abd..055436abd 100644
--- a/org_apg/res/layout/decrypt.xml
+++ b/APG/res/layout/decrypt.xml
diff --git a/org_apg/res/layout/edit_key.xml b/APG/res/layout/edit_key.xml
index 3ab5f1c52..3ab5f1c52 100644
--- a/org_apg/res/layout/edit_key.xml
+++ b/APG/res/layout/edit_key.xml
diff --git a/org_apg/res/layout/edit_key_key_item.xml b/APG/res/layout/edit_key_key_item.xml
index 5556ec22e..5556ec22e 100644
--- a/org_apg/res/layout/edit_key_key_item.xml
+++ b/APG/res/layout/edit_key_key_item.xml
diff --git a/org_apg/res/layout/edit_key_section.xml b/APG/res/layout/edit_key_section.xml
index e8f788f6d..e8f788f6d 100644
--- a/org_apg/res/layout/edit_key_section.xml
+++ b/APG/res/layout/edit_key_section.xml
diff --git a/org_apg/res/layout/edit_key_user_id_item.xml b/APG/res/layout/edit_key_user_id_item.xml
index 26a7304e0..26a7304e0 100644
--- a/org_apg/res/layout/edit_key_user_id_item.xml
+++ b/APG/res/layout/edit_key_user_id_item.xml
diff --git a/org_apg/res/layout/encrypt.xml b/APG/res/layout/encrypt.xml
index ebf7e8b05..ebf7e8b05 100644
--- a/org_apg/res/layout/encrypt.xml
+++ b/APG/res/layout/encrypt.xml
diff --git a/org_apg/res/layout/file_dialog.xml b/APG/res/layout/file_dialog.xml
index c95f874a5..c95f874a5 100644
--- a/org_apg/res/layout/file_dialog.xml
+++ b/APG/res/layout/file_dialog.xml
diff --git a/org_apg/res/layout/filter_info.xml b/APG/res/layout/filter_info.xml
index 9fef6548e..9fef6548e 100644
--- a/org_apg/res/layout/filter_info.xml
+++ b/APG/res/layout/filter_info.xml
diff --git a/org_apg/res/layout/general.xml b/APG/res/layout/general.xml
index c6702efac..c6702efac 100644
--- a/org_apg/res/layout/general.xml
+++ b/APG/res/layout/general.xml
diff --git a/org_apg/res/layout/help_activity.xml b/APG/res/layout/help_activity.xml
index fa233ac2c..fa233ac2c 100644
--- a/org_apg/res/layout/help_activity.xml
+++ b/APG/res/layout/help_activity.xml
diff --git a/org_apg/res/layout/help_fragment_about.xml b/APG/res/layout/help_fragment_about.xml
index 82cb0a89f..82cb0a89f 100644
--- a/org_apg/res/layout/help_fragment_about.xml
+++ b/APG/res/layout/help_fragment_about.xml
diff --git a/org_apg/res/layout/import_from_qr_code.xml b/APG/res/layout/import_from_qr_code.xml
index f20dbbb68..f20dbbb68 100644
--- a/org_apg/res/layout/import_from_qr_code.xml
+++ b/APG/res/layout/import_from_qr_code.xml
diff --git a/org_apg/res/layout/key_list_child_item.xml b/APG/res/layout/key_list_child_item.xml
index 868989cf6..868989cf6 100644
--- a/org_apg/res/layout/key_list_child_item.xml
+++ b/APG/res/layout/key_list_child_item.xml
diff --git a/org_apg/res/layout/key_list_group_item.xml b/APG/res/layout/key_list_group_item.xml
index 240be54b0..240be54b0 100644
--- a/org_apg/res/layout/key_list_group_item.xml
+++ b/APG/res/layout/key_list_group_item.xml
diff --git a/org_apg/res/layout/key_list_public_activity.xml b/APG/res/layout/key_list_public_activity.xml
index 9872c3e1b..9872c3e1b 100644
--- a/org_apg/res/layout/key_list_public_activity.xml
+++ b/APG/res/layout/key_list_public_activity.xml
diff --git a/org_apg/res/layout/key_list_secret_activity.xml b/APG/res/layout/key_list_secret_activity.xml
index c813a5d7d..c813a5d7d 100644
--- a/org_apg/res/layout/key_list_secret_activity.xml
+++ b/APG/res/layout/key_list_secret_activity.xml
diff --git a/org_apg/res/layout/key_server_editor.xml b/APG/res/layout/key_server_editor.xml
index e4c25b316..e4c25b316 100644
--- a/org_apg/res/layout/key_server_editor.xml
+++ b/APG/res/layout/key_server_editor.xml
diff --git a/org_apg/res/layout/key_server_export_layout.xml b/APG/res/layout/key_server_export_layout.xml
index 257f087ee..257f087ee 100644
--- a/org_apg/res/layout/key_server_export_layout.xml
+++ b/APG/res/layout/key_server_export_layout.xml
diff --git a/org_apg/res/layout/key_server_preference.xml b/APG/res/layout/key_server_preference.xml
index e9b1d5a95..e9b1d5a95 100644
--- a/org_apg/res/layout/key_server_preference.xml
+++ b/APG/res/layout/key_server_preference.xml
diff --git a/org_apg/res/layout/key_server_query_layout.xml b/APG/res/layout/key_server_query_layout.xml
index 6af4f3644..6af4f3644 100644
--- a/org_apg/res/layout/key_server_query_layout.xml
+++ b/APG/res/layout/key_server_query_layout.xml
diff --git a/org_apg/res/layout/key_server_query_result_item.xml b/APG/res/layout/key_server_query_result_item.xml
index 29c8b88f4..29c8b88f4 100644
--- a/org_apg/res/layout/key_server_query_result_item.xml
+++ b/APG/res/layout/key_server_query_result_item.xml
diff --git a/org_apg/res/layout/key_server_query_result_user_id.xml b/APG/res/layout/key_server_query_result_user_id.xml
index 9d3a4a1ab..9d3a4a1ab 100644
--- a/org_apg/res/layout/key_server_query_result_user_id.xml
+++ b/APG/res/layout/key_server_query_result_user_id.xml
diff --git a/org_apg/res/layout/main.xml b/APG/res/layout/main.xml
index e4c509c70..e4c509c70 100644
--- a/org_apg/res/layout/main.xml
+++ b/APG/res/layout/main.xml
diff --git a/org_apg/res/layout/passphrase.xml b/APG/res/layout/passphrase.xml
index fc9cb1710..fc9cb1710 100644
--- a/org_apg/res/layout/passphrase.xml
+++ b/APG/res/layout/passphrase.xml
diff --git a/org_apg/res/layout/passphrase_repeat.xml b/APG/res/layout/passphrase_repeat.xml
index 8f1d42aac..8f1d42aac 100644
--- a/org_apg/res/layout/passphrase_repeat.xml
+++ b/APG/res/layout/passphrase_repeat.xml
diff --git a/org_apg/res/layout/select_key_item.xml b/APG/res/layout/select_key_item.xml
index 5eed7c268..5eed7c268 100644
--- a/org_apg/res/layout/select_key_item.xml
+++ b/APG/res/layout/select_key_item.xml
diff --git a/org_apg/res/layout/select_public_key_activity.xml b/APG/res/layout/select_public_key_activity.xml
index 7e70d26a2..7e70d26a2 100644
--- a/org_apg/res/layout/select_public_key_activity.xml
+++ b/APG/res/layout/select_public_key_activity.xml
diff --git a/org_apg/res/layout/select_secret_key_activity.xml b/APG/res/layout/select_secret_key_activity.xml
index 2a645ce19..2a645ce19 100644
--- a/org_apg/res/layout/select_secret_key_activity.xml
+++ b/APG/res/layout/select_secret_key_activity.xml
diff --git a/org_apg/res/layout/sign_key_layout.xml b/APG/res/layout/sign_key_layout.xml
index 17be03b21..17be03b21 100644
--- a/org_apg/res/layout/sign_key_layout.xml
+++ b/APG/res/layout/sign_key_layout.xml
diff --git a/org_apg/res/raw/help_about.html b/APG/res/raw/help_about.html
index 7781ca85a..1b1f0b52e 100644
--- a/org_apg/res/raw/help_about.html
+++ b/APG/res/raw/help_about.html
@@ -11,11 +11,11 @@ And don't add newlines before or after p tags because of transifex -->
 
 <h2>Developer</h2>
 <ul>
-<li>Thialfihar (Main developer v1.x)</li>
-<li>Senecaso (QRCode, sign key, upload key)</li>
-<li>Markus Doits (AIDL)</li>
-<li>Oliver Runge</li>
 <li>Dominik Schürmann (Developer v2.x)</li>
+<li>Oliver Runge</li>
+<li>Markus Doits</li>
+<li>Senecaso (QRCode, sign key, upload key)</li>
+<li>Thialfihar (Main developer v1.x)</li>
 </ul>
 
 <h2>Libraries</h2>
diff --git a/org_apg/res/raw/help_changelog.html b/APG/res/raw/help_changelog.html
index bf013342b..bf013342b 100644
--- a/org_apg/res/raw/help_changelog.html
+++ b/APG/res/raw/help_changelog.html
diff --git a/org_apg/res/raw/help_start.html b/APG/res/raw/help_start.html
index db7559632..db7559632 100644
--- a/org_apg/res/raw/help_start.html
+++ b/APG/res/raw/help_start.html
diff --git a/org_apg/res/values/arrays.xml b/APG/res/values/arrays.xml
index 05320c609..05320c609 100644
--- a/org_apg/res/values/arrays.xml
+++ b/APG/res/values/arrays.xml
diff --git a/org_apg/res/values/colors.xml b/APG/res/values/colors.xml
index d1dc6c1f4..d1dc6c1f4 100644
--- a/org_apg/res/values/colors.xml
+++ b/APG/res/values/colors.xml
diff --git a/org_apg/res/values/static_strings.xml b/APG/res/values/static_strings.xml
index c69cf8adf..c69cf8adf 100644
--- a/org_apg/res/values/static_strings.xml
+++ b/APG/res/values/static_strings.xml
diff --git a/org_apg/res/values/strings.xml b/APG/res/values/strings.xml
index d2858559d..d2858559d 100644
--- a/org_apg/res/values/strings.xml
+++ b/APG/res/values/strings.xml
diff --git a/org_apg/res/values/styles.xml b/APG/res/values/styles.xml
index ef3ff63f6..ef3ff63f6 100644
--- a/org_apg/res/values/styles.xml
+++ b/APG/res/values/styles.xml
diff --git a/org_apg/res/xml/apg_preferences.xml b/APG/res/xml/apg_preferences.xml
index 778f51375..778f51375 100644
--- a/org_apg/res/xml/apg_preferences.xml
+++ b/APG/res/xml/apg_preferences.xml
diff --git a/org_apg/res/xml/searchable_public_keys.xml b/APG/res/xml/searchable_public_keys.xml
index e9602b121..e9602b121 100644
--- a/org_apg/res/xml/searchable_public_keys.xml
+++ b/APG/res/xml/searchable_public_keys.xml
diff --git a/org_apg/res/xml/searchable_secret_keys.xml b/APG/res/xml/searchable_secret_keys.xml
index a7e8873d6..a7e8873d6 100644
--- a/org_apg/res/xml/searchable_secret_keys.xml
+++ b/APG/res/xml/searchable_secret_keys.xml
diff --git a/org_apg/src/org/thialfihar/android/apg/ApgApplication.java b/APG/src/org/thialfihar/android/apg/ApgApplication.java
index f89375079..f89375079 100644
--- a/org_apg/src/org/thialfihar/android/apg/ApgApplication.java
+++ b/APG/src/org/thialfihar/android/apg/ApgApplication.java
diff --git a/org_apg/src/org/thialfihar/android/apg/Constants.java b/APG/src/org/thialfihar/android/apg/Constants.java
index 95ab8158d..95ab8158d 100644
--- a/org_apg/src/org/thialfihar/android/apg/Constants.java
+++ b/APG/src/org/thialfihar/android/apg/Constants.java
diff --git a/org_apg/src/org/thialfihar/android/apg/Id.java b/APG/src/org/thialfihar/android/apg/Id.java
index e683f43b4..e683f43b4 100644
--- a/org_apg/src/org/thialfihar/android/apg/Id.java
+++ b/APG/src/org/thialfihar/android/apg/Id.java
diff --git a/org_apg/src/org/thialfihar/android/apg/helper/FileHelper.java b/APG/src/org/thialfihar/android/apg/helper/FileHelper.java
index 6efee19c0..6efee19c0 100644
--- a/org_apg/src/org/thialfihar/android/apg/helper/FileHelper.java
+++ b/APG/src/org/thialfihar/android/apg/helper/FileHelper.java
diff --git a/org_apg/src/org/thialfihar/android/apg/helper/OtherHelper.java b/APG/src/org/thialfihar/android/apg/helper/OtherHelper.java
index bd5db2410..bd5db2410 100644
--- a/org_apg/src/org/thialfihar/android/apg/helper/OtherHelper.java
+++ b/APG/src/org/thialfihar/android/apg/helper/OtherHelper.java
diff --git a/org_apg/src/org/thialfihar/android/apg/helper/PGPConversionHelper.java b/APG/src/org/thialfihar/android/apg/helper/PGPConversionHelper.java
index 040ff2a9e..040ff2a9e 100644
--- a/org_apg/src/org/thialfihar/android/apg/helper/PGPConversionHelper.java
+++ b/APG/src/org/thialfihar/android/apg/helper/PGPConversionHelper.java
diff --git a/org_apg/src/org/thialfihar/android/apg/helper/PGPHelper.java b/APG/src/org/thialfihar/android/apg/helper/PGPHelper.java
index b566cffa0..b566cffa0 100644
--- a/org_apg/src/org/thialfihar/android/apg/helper/PGPHelper.java
+++ b/APG/src/org/thialfihar/android/apg/helper/PGPHelper.java
diff --git a/org_apg/src/org/thialfihar/android/apg/helper/PGPMain.java b/APG/src/org/thialfihar/android/apg/helper/PGPMain.java
index 0cde19ae5..0cde19ae5 100644
--- a/org_apg/src/org/thialfihar/android/apg/helper/PGPMain.java
+++ b/APG/src/org/thialfihar/android/apg/helper/PGPMain.java
diff --git a/org_apg/src/org/thialfihar/android/apg/helper/Preferences.java b/APG/src/org/thialfihar/android/apg/helper/Preferences.java
index 14adf357a..14adf357a 100644
--- a/org_apg/src/org/thialfihar/android/apg/helper/Preferences.java
+++ b/APG/src/org/thialfihar/android/apg/helper/Preferences.java
diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgContract.java b/APG/src/org/thialfihar/android/apg/provider/ApgContract.java
index c68eec750..c68eec750 100644
--- a/org_apg/src/org/thialfihar/android/apg/provider/ApgContract.java
+++ b/APG/src/org/thialfihar/android/apg/provider/ApgContract.java
diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgDatabase.java b/APG/src/org/thialfihar/android/apg/provider/ApgDatabase.java
index e25fce3f0..e25fce3f0 100644
--- a/org_apg/src/org/thialfihar/android/apg/provider/ApgDatabase.java
+++ b/APG/src/org/thialfihar/android/apg/provider/ApgDatabase.java
diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgProvider.java b/APG/src/org/thialfihar/android/apg/provider/ApgProvider.java
index a7ec253a3..a7ec253a3 100644
--- a/org_apg/src/org/thialfihar/android/apg/provider/ApgProvider.java
+++ b/APG/src/org/thialfihar/android/apg/provider/ApgProvider.java
diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgProviderExternal.java b/APG/src/org/thialfihar/android/apg/provider/ApgProviderExternal.java
index 61cca8bed..61cca8bed 100644
--- a/org_apg/src/org/thialfihar/android/apg/provider/ApgProviderExternal.java
+++ b/APG/src/org/thialfihar/android/apg/provider/ApgProviderExternal.java
diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java b/APG/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java
index e2226a0fa..e2226a0fa 100644
--- a/org_apg/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java
+++ b/APG/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java
diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobContract.java b/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobContract.java
index 5bf1dd329..5bf1dd329 100644
--- a/org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobContract.java
+++ b/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobContract.java
diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobDatabase.java b/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobDatabase.java
index 417486e33..417486e33 100644
--- a/org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobDatabase.java
+++ b/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobDatabase.java
diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobProvider.java b/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobProvider.java
index 8053aecbf..8053aecbf 100644
--- a/org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobProvider.java
+++ b/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobProvider.java
diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ProviderHelper.java b/APG/src/org/thialfihar/android/apg/provider/ProviderHelper.java
index 915c0aea5..915c0aea5 100644
--- a/org_apg/src/org/thialfihar/android/apg/provider/ProviderHelper.java
+++ b/APG/src/org/thialfihar/android/apg/provider/ProviderHelper.java
diff --git a/org_apg/src/org/thialfihar/android/apg/service/ApgIntentService.java b/APG/src/org/thialfihar/android/apg/service/ApgIntentService.java
index 8a6ca6b4c..8a6ca6b4c 100644
--- a/org_apg/src/org/thialfihar/android/apg/service/ApgIntentService.java
+++ b/APG/src/org/thialfihar/android/apg/service/ApgIntentService.java
diff --git a/org_apg/src/org/thialfihar/android/apg/service/ApgIntentServiceHandler.java b/APG/src/org/thialfihar/android/apg/service/ApgIntentServiceHandler.java
index 8494cf035..8494cf035 100644
--- a/org_apg/src/org/thialfihar/android/apg/service/ApgIntentServiceHandler.java
+++ b/APG/src/org/thialfihar/android/apg/service/ApgIntentServiceHandler.java
diff --git a/org_apg/src/org/thialfihar/android/apg/service/ApgService.java b/APG/src/org/thialfihar/android/apg/service/ApgService.java
index 9e618b545..9e618b545 100644
--- a/org_apg/src/org/thialfihar/android/apg/service/ApgService.java
+++ b/APG/src/org/thialfihar/android/apg/service/ApgService.java
diff --git a/org_apg/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl b/APG/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl
index 318e5f344..318e5f344 100644
--- a/org_apg/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl
+++ b/APG/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl
diff --git a/org_apg/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl b/APG/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl
index 29ff2dd3e..29ff2dd3e 100644
--- a/org_apg/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl
+++ b/APG/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl
diff --git a/org_apg/src/org/thialfihar/android/apg/service/IApgService.aidl b/APG/src/org/thialfihar/android/apg/service/IApgService.aidl
index 7753d1e3d..7753d1e3d 100644
--- a/org_apg/src/org/thialfihar/android/apg/service/IApgService.aidl
+++ b/APG/src/org/thialfihar/android/apg/service/IApgService.aidl
diff --git a/org_apg/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl b/APG/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl
index cc854e540..cc854e540 100644
--- a/org_apg/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl
+++ b/APG/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl
diff --git a/org_apg/src/org/thialfihar/android/apg/service/PassphraseCacheService.java b/APG/src/org/thialfihar/android/apg/service/PassphraseCacheService.java
index c2bc48aa7..c2bc48aa7 100644
--- a/org_apg/src/org/thialfihar/android/apg/service/PassphraseCacheService.java
+++ b/APG/src/org/thialfihar/android/apg/service/PassphraseCacheService.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java b/APG/src/org/thialfihar/android/apg/ui/DecryptActivity.java
index f1de44312..f1de44312 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/DecryptActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java b/APG/src/org/thialfihar/android/apg/ui/EditKeyActivity.java
index 0e480a3ae..0e480a3ae 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/EditKeyActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/EncryptActivity.java b/APG/src/org/thialfihar/android/apg/ui/EncryptActivity.java
index 482372c51..482372c51 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/EncryptActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/EncryptActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/HelpActivity.java b/APG/src/org/thialfihar/android/apg/ui/HelpActivity.java
index bd9d68ce7..bd9d68ce7 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/HelpActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/HelpActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/HelpFragmentAbout.java b/APG/src/org/thialfihar/android/apg/ui/HelpFragmentAbout.java
index 1b80db66b..1b80db66b 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/HelpFragmentAbout.java
+++ b/APG/src/org/thialfihar/android/apg/ui/HelpFragmentAbout.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/HelpFragmentHtml.java b/APG/src/org/thialfihar/android/apg/ui/HelpFragmentHtml.java
index e46e7b112..e46e7b112 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/HelpFragmentHtml.java
+++ b/APG/src/org/thialfihar/android/apg/ui/HelpFragmentHtml.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java b/APG/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java
index aac1fd15b..aac1fd15b 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyListActivity.java b/APG/src/org/thialfihar/android/apg/ui/KeyListActivity.java
index 3adae94a9..3adae94a9 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/KeyListActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/KeyListActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyListFragment.java b/APG/src/org/thialfihar/android/apg/ui/KeyListFragment.java
index 613f32ae9..613f32ae9 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/KeyListFragment.java
+++ b/APG/src/org/thialfihar/android/apg/ui/KeyListFragment.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyListPublicActivity.java b/APG/src/org/thialfihar/android/apg/ui/KeyListPublicActivity.java
index 73bb3790a..73bb3790a 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/KeyListPublicActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/KeyListPublicActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyListPublicFragment.java b/APG/src/org/thialfihar/android/apg/ui/KeyListPublicFragment.java
index e1a93602c..e1a93602c 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/KeyListPublicFragment.java
+++ b/APG/src/org/thialfihar/android/apg/ui/KeyListPublicFragment.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyListSecretActivity.java b/APG/src/org/thialfihar/android/apg/ui/KeyListSecretActivity.java
index 97abd2296..97abd2296 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/KeyListSecretActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/KeyListSecretActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyListSecretFragment.java b/APG/src/org/thialfihar/android/apg/ui/KeyListSecretFragment.java
index 12a0bb131..12a0bb131 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/KeyListSecretFragment.java
+++ b/APG/src/org/thialfihar/android/apg/ui/KeyListSecretFragment.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java b/APG/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java
index 7cd54bf32..7cd54bf32 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyServerUploadActivity.java b/APG/src/org/thialfihar/android/apg/ui/KeyServerUploadActivity.java
index db907ed48..db907ed48 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/KeyServerUploadActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/KeyServerUploadActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java b/APG/src/org/thialfihar/android/apg/ui/MainActivity.java
index 7c25e4533..7c25e4533 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/MainActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/PreferencesActivity.java b/APG/src/org/thialfihar/android/apg/ui/PreferencesActivity.java
index e28b385f2..e28b385f2 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/PreferencesActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/PreferencesActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/PreferencesKeyServerActivity.java b/APG/src/org/thialfihar/android/apg/ui/PreferencesKeyServerActivity.java
index b54cbde71..b54cbde71 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/PreferencesKeyServerActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/PreferencesKeyServerActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyActivity.java b/APG/src/org/thialfihar/android/apg/ui/SelectPublicKeyActivity.java
index 0da9e0ade..0da9e0ade 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/SelectPublicKeyActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyFragment.java b/APG/src/org/thialfihar/android/apg/ui/SelectPublicKeyFragment.java
index 744c3fa81..744c3fa81 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyFragment.java
+++ b/APG/src/org/thialfihar/android/apg/ui/SelectPublicKeyFragment.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyActivity.java b/APG/src/org/thialfihar/android/apg/ui/SelectSecretKeyActivity.java
index 9efadd291..9efadd291 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/SelectSecretKeyActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyFragment.java b/APG/src/org/thialfihar/android/apg/ui/SelectSecretKeyFragment.java
index 1f3fcb816..1f3fcb816 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyFragment.java
+++ b/APG/src/org/thialfihar/android/apg/ui/SelectSecretKeyFragment.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java b/APG/src/org/thialfihar/android/apg/ui/SignKeyActivity.java
index b970cb3d3..b970cb3d3 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/SignKeyActivity.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/DeleteFileDialogFragment.java b/APG/src/org/thialfihar/android/apg/ui/dialog/DeleteFileDialogFragment.java
index 311066389..311066389 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/dialog/DeleteFileDialogFragment.java
+++ b/APG/src/org/thialfihar/android/apg/ui/dialog/DeleteFileDialogFragment.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/DeleteKeyDialogFragment.java b/APG/src/org/thialfihar/android/apg/ui/dialog/DeleteKeyDialogFragment.java
index bb5271ce7..bb5271ce7 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/dialog/DeleteKeyDialogFragment.java
+++ b/APG/src/org/thialfihar/android/apg/ui/dialog/DeleteKeyDialogFragment.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/FileDialogFragment.java b/APG/src/org/thialfihar/android/apg/ui/dialog/FileDialogFragment.java
index 7786d9228..7786d9228 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/dialog/FileDialogFragment.java
+++ b/APG/src/org/thialfihar/android/apg/ui/dialog/FileDialogFragment.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/LookupUnknownKeyDialogFragment.java b/APG/src/org/thialfihar/android/apg/ui/dialog/LookupUnknownKeyDialogFragment.java
index 9797abc2a..9797abc2a 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/dialog/LookupUnknownKeyDialogFragment.java
+++ b/APG/src/org/thialfihar/android/apg/ui/dialog/LookupUnknownKeyDialogFragment.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/PassphraseDialogFragment.java b/APG/src/org/thialfihar/android/apg/ui/dialog/PassphraseDialogFragment.java
index fb8f4b6d1..fb8f4b6d1 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/dialog/PassphraseDialogFragment.java
+++ b/APG/src/org/thialfihar/android/apg/ui/dialog/PassphraseDialogFragment.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/ProgressDialogFragment.java b/APG/src/org/thialfihar/android/apg/ui/dialog/ProgressDialogFragment.java
index 2fb3b3256..2fb3b3256 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/dialog/ProgressDialogFragment.java
+++ b/APG/src/org/thialfihar/android/apg/ui/dialog/ProgressDialogFragment.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/SetPassphraseDialogFragment.java b/APG/src/org/thialfihar/android/apg/ui/dialog/SetPassphraseDialogFragment.java
index b23101a0a..b23101a0a 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/dialog/SetPassphraseDialogFragment.java
+++ b/APG/src/org/thialfihar/android/apg/ui/dialog/SetPassphraseDialogFragment.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/DashboardLayout.java b/APG/src/org/thialfihar/android/apg/ui/widget/DashboardLayout.java
index 8a516ad41..8a516ad41 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/widget/DashboardLayout.java
+++ b/APG/src/org/thialfihar/android/apg/ui/widget/DashboardLayout.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/Editor.java b/APG/src/org/thialfihar/android/apg/ui/widget/Editor.java
index a7200fad0..a7200fad0 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/widget/Editor.java
+++ b/APG/src/org/thialfihar/android/apg/ui/widget/Editor.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/ExpandableListFragment.java b/APG/src/org/thialfihar/android/apg/ui/widget/ExpandableListFragment.java
index 01488909f..01488909f 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/widget/ExpandableListFragment.java
+++ b/APG/src/org/thialfihar/android/apg/ui/widget/ExpandableListFragment.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java b/APG/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java
index 1d5f9e3d7..1d5f9e3d7 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java
+++ b/APG/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java b/APG/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java
index f8adc3b72..f8adc3b72 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java
+++ b/APG/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyListAdapter.java b/APG/src/org/thialfihar/android/apg/ui/widget/KeyListAdapter.java
index 1f5c3a97e..1f5c3a97e 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyListAdapter.java
+++ b/APG/src/org/thialfihar/android/apg/ui/widget/KeyListAdapter.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyServerEditor.java b/APG/src/org/thialfihar/android/apg/ui/widget/KeyServerEditor.java
index cbea7f031..cbea7f031 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyServerEditor.java
+++ b/APG/src/org/thialfihar/android/apg/ui/widget/KeyServerEditor.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/SectionView.java b/APG/src/org/thialfihar/android/apg/ui/widget/SectionView.java
index 45fbbaba1..45fbbaba1 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/widget/SectionView.java
+++ b/APG/src/org/thialfihar/android/apg/ui/widget/SectionView.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/SelectKeyCursorAdapter.java b/APG/src/org/thialfihar/android/apg/ui/widget/SelectKeyCursorAdapter.java
index 0f6bd5f11..0f6bd5f11 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/widget/SelectKeyCursorAdapter.java
+++ b/APG/src/org/thialfihar/android/apg/ui/widget/SelectKeyCursorAdapter.java
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/UserIdEditor.java b/APG/src/org/thialfihar/android/apg/ui/widget/UserIdEditor.java
index 2495a4f9d..2495a4f9d 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/widget/UserIdEditor.java
+++ b/APG/src/org/thialfihar/android/apg/ui/widget/UserIdEditor.java
diff --git a/org_apg/src/org/thialfihar/android/apg/util/Choice.java b/APG/src/org/thialfihar/android/apg/util/Choice.java
index 94cc58f55..94cc58f55 100644
--- a/org_apg/src/org/thialfihar/android/apg/util/Choice.java
+++ b/APG/src/org/thialfihar/android/apg/util/Choice.java
diff --git a/org_apg/src/org/thialfihar/android/apg/util/Compatibility.java b/APG/src/org/thialfihar/android/apg/util/Compatibility.java
index 1597a01f4..1597a01f4 100644
--- a/org_apg/src/org/thialfihar/android/apg/util/Compatibility.java
+++ b/APG/src/org/thialfihar/android/apg/util/Compatibility.java
diff --git a/org_apg/src/org/thialfihar/android/apg/util/HkpKeyServer.java b/APG/src/org/thialfihar/android/apg/util/HkpKeyServer.java
index 492e2e3d0..492e2e3d0 100644
--- a/org_apg/src/org/thialfihar/android/apg/util/HkpKeyServer.java
+++ b/APG/src/org/thialfihar/android/apg/util/HkpKeyServer.java
diff --git a/org_apg/src/org/thialfihar/android/apg/util/InputData.java b/APG/src/org/thialfihar/android/apg/util/InputData.java
index 6b357e6de..6b357e6de 100644
--- a/org_apg/src/org/thialfihar/android/apg/util/InputData.java
+++ b/APG/src/org/thialfihar/android/apg/util/InputData.java
diff --git a/org_apg/src/org/thialfihar/android/apg/util/IterableIterator.java b/APG/src/org/thialfihar/android/apg/util/IterableIterator.java
index 1071cc81c..1071cc81c 100644
--- a/org_apg/src/org/thialfihar/android/apg/util/IterableIterator.java
+++ b/APG/src/org/thialfihar/android/apg/util/IterableIterator.java
diff --git a/org_apg/src/org/thialfihar/android/apg/util/KeyServer.java b/APG/src/org/thialfihar/android/apg/util/KeyServer.java
index 97c6c7636..97c6c7636 100644
--- a/org_apg/src/org/thialfihar/android/apg/util/KeyServer.java
+++ b/APG/src/org/thialfihar/android/apg/util/KeyServer.java
diff --git a/org_apg/src/org/thialfihar/android/apg/util/Log.java b/APG/src/org/thialfihar/android/apg/util/Log.java
index c2e3cc7a5..c2e3cc7a5 100644
--- a/org_apg/src/org/thialfihar/android/apg/util/Log.java
+++ b/APG/src/org/thialfihar/android/apg/util/Log.java
diff --git a/org_apg/src/org/thialfihar/android/apg/util/PositionAwareInputStream.java b/APG/src/org/thialfihar/android/apg/util/PositionAwareInputStream.java
index 7850e2513..7850e2513 100644
--- a/org_apg/src/org/thialfihar/android/apg/util/PositionAwareInputStream.java
+++ b/APG/src/org/thialfihar/android/apg/util/PositionAwareInputStream.java
diff --git a/org_apg/src/org/thialfihar/android/apg/util/Primes.java b/APG/src/org/thialfihar/android/apg/util/Primes.java
index bc52927e8..bc52927e8 100644
--- a/org_apg/src/org/thialfihar/android/apg/util/Primes.java
+++ b/APG/src/org/thialfihar/android/apg/util/Primes.java
diff --git a/org_apg/src/org/thialfihar/android/apg/util/ProgressDialogUpdater.java b/APG/src/org/thialfihar/android/apg/util/ProgressDialogUpdater.java
index 1f76cb071..1f76cb071 100644
--- a/org_apg/src/org/thialfihar/android/apg/util/ProgressDialogUpdater.java
+++ b/APG/src/org/thialfihar/android/apg/util/ProgressDialogUpdater.java