From ea2bc75f8c0b9412a7aa2b48eae4b801ec77f407 Mon Sep 17 00:00:00 2001 From: Dominik Date: Wed, 20 Jun 2012 20:54:31 +0300 Subject: [PATCH] debugging --- .../android/apg/helper/OtherHelper.java | 29 +++++++++++++++++++ .../android/apg/service/ApgService.java | 7 ++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/org_apg/src/org/thialfihar/android/apg/helper/OtherHelper.java b/org_apg/src/org/thialfihar/android/apg/helper/OtherHelper.java index 6833e9060..8192331a4 100644 --- a/org_apg/src/org/thialfihar/android/apg/helper/OtherHelper.java +++ b/org_apg/src/org/thialfihar/android/apg/helper/OtherHelper.java @@ -21,7 +21,14 @@ import java.io.IOException; import java.io.InputStream; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.Iterator; +import java.util.Set; + +import org.thialfihar.android.apg.Constants; +import org.thialfihar.android.apg.util.Log; + import android.content.Context; +import android.os.Bundle; public class OtherHelper { @@ -71,4 +78,26 @@ public class OtherHelper { return numDays; } + /** + * Logs bundle content to debug for inspecting the content + * + * @param bundle + * @param bundleName + */ + public static void logDebugBundle(Bundle bundle, String bundleName) { + if (Constants.DEBUG) { + Set ks = bundle.keySet(); + Iterator iterator = ks.iterator(); + + Log.d(Constants.TAG, "Bundle " + bundleName + ":"); + Log.d(Constants.TAG, "------------------------------"); + while (iterator.hasNext()) { + String key = iterator.next(); + Object value = bundle.get(key); + + Log.d(Constants.TAG, key + " : " + value.toString()); + } + Log.d(Constants.TAG, "------------------------------"); + } + } } 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 8a14df60e..f8b05bad3 100644 --- a/org_apg/src/org/thialfihar/android/apg/service/ApgService.java +++ b/org_apg/src/org/thialfihar/android/apg/service/ApgService.java @@ -33,6 +33,7 @@ import org.thialfihar.android.apg.Constants; import org.thialfihar.android.apg.Id; import org.thialfihar.android.apg.R; import org.thialfihar.android.apg.helper.FileHelper; +import org.thialfihar.android.apg.helper.OtherHelper; import org.thialfihar.android.apg.helper.PGPMain; import org.thialfihar.android.apg.helper.Preferences; import org.thialfihar.android.apg.helper.PGPMain.GeneralException; @@ -168,6 +169,9 @@ public class ApgService extends IntentService implements ProgressDialogUpdater { mMessenger = (Messenger) extras.get(EXTRA_MESSENGER); Bundle data = extras.getBundle(EXTRA_DATA); + + OtherHelper.logDebugBundle(data, "EXTRA_DATA"); + int action = extras.getInt(EXTRA_ACTION); // execute action from extra bundle @@ -606,7 +610,8 @@ public class ApgService extends IntentService implements ProgressDialogUpdater { * Set progress of ProgressDialog by sending message to handler on UI thread */ public void setProgress(String message, int progress, int max) { - Log.d(Constants.TAG, "Send message by setProgress"); + Log.d(Constants.TAG, "Send message by setProgress with progress=" + progress + ", max=" + + max); Bundle data = new Bundle(); if (message != null) {