fix signature view, cleanup

2 files changed, 14 insertions, 0 deletions

diff --git a/org_apg/src/org/thialfihar/android/apg/service/ApgHandler.java b/org_apg/src/org/thialfihar/android/apg/service/ApgHandler.java
index bb9e94938..d69d3fd4b 100644
--- a/org_apg/src/org/thialfihar/android/apg/service/ApgHandler.java
+++ b/org_apg/src/org/thialfihar/android/apg/service/ApgHandler.java
@@ -31,6 +31,10 @@ public class ApgHandler extends Handler {
     public static final int MESSAGE_OKAY = 1;
     public static final int MESSAGE_EXCEPTION = 2;
     public static final int MESSAGE_UPDATE_PROGRESS = 3;
+    
+    // used in decrypt
+    public static final int MESSAGE_UNKOWN_KEY = 4;
+
 
     // possible data keys for messages
     public static final String DATA_ERROR = "error";
diff --git a/org_apg/src/org/thialfihar/android/apg/service/ApgService.java b/org_apg/src/org/thialfihar/android/apg/service/ApgService.java
index 59b7d038d..5e7daa48c 100644
--- a/org_apg/src/org/thialfihar/android/apg/service/ApgService.java
+++ b/org_apg/src/org/thialfihar/android/apg/service/ApgService.java
@@ -320,6 +320,8 @@ public class ApgService extends IntentService implements ProgressDialogUpdater {
                     break;
                 }
 
+                OtherHelper.logDebugBundle(resultData, "resultData");
+
                 sendMessageToHandler(ApgHandler.MESSAGE_OKAY, resultData);
             } catch (Exception e) {
                 sendErrorToHandler(e);
@@ -448,6 +450,8 @@ public class ApgService extends IntentService implements ProgressDialogUpdater {
                     break;
                 }
 
+                OtherHelper.logDebugBundle(resultData, "resultData");
+
                 sendMessageToHandler(ApgHandler.MESSAGE_OKAY, resultData);
             } catch (Exception e) {
                 sendErrorToHandler(e);
@@ -507,6 +511,9 @@ public class ApgService extends IntentService implements ProgressDialogUpdater {
                 Bundle resultData = new Bundle();
                 resultData.putByteArray(RESULT_NEW_KEY,
                         PGPConversionHelper.PGPSecretKeyRingToBytes(newKeyRing));
+
+                OtherHelper.logDebugBundle(resultData, "resultData");
+
                 sendMessageToHandler(ApgHandler.MESSAGE_OKAY, resultData);
             } catch (Exception e) {
                 sendErrorToHandler(e);
@@ -533,6 +540,9 @@ public class ApgService extends IntentService implements ProgressDialogUpdater {
                         PGPConversionHelper.PGPSecretKeyRingToBytes(masterKeyRing));
                 resultData.putByteArray(RESULT_NEW_KEY2,
                         PGPConversionHelper.PGPSecretKeyRingToBytes(subKeyRing));
+
+                OtherHelper.logDebugBundle(resultData, "resultData");
+
                 sendMessageToHandler(ApgHandler.MESSAGE_OKAY, resultData);
             } catch (Exception e) {
                 sendErrorToHandler(e);