Log wrapper and actionbarsherlock update

36 files changed, 404 insertions, 180 deletions

diff --git a/com_actionbarsherlock/AndroidManifest.xml b/com_actionbarsherlock/AndroidManifest.xml
index 36ad79440..c4a75f32c 100644
--- a/com_actionbarsherlock/AndroidManifest.xml
+++ b/com_actionbarsherlock/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="60" android:versionName="4.0.2" package="com.actionbarsherlock">
-	
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="90" android:versionName="4.1.0" package="com.actionbarsherlock">
+
     <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="15"/>
 
 </manifest>
diff --git a/com_actionbarsherlock/pom.xml b/com_actionbarsherlock/pom.xml
index ba4d427d0..5373fb012 100644
--- a/com_actionbarsherlock/pom.xml
+++ b/com_actionbarsherlock/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.actionbarsherlock</groupId>
 		<artifactId>parent</artifactId>
-		<version>4.0.2</version>
+		<version>4.1.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/com_actionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java b/com_actionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
new file mode 100644
index 000000000..3e3db62b7
--- /dev/null
+++ b/com_actionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
@@ -0,0 +1,144 @@
+package android.support.v4.app;
+
+import android.util.Log;
+import android.view.View;
+import android.view.Window;
+import com.actionbarsherlock.ActionBarSherlock.OnCreatePanelMenuListener;
+import com.actionbarsherlock.ActionBarSherlock.OnMenuItemSelectedListener;
+import com.actionbarsherlock.ActionBarSherlock.OnPreparePanelListener;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+
+import java.util.ArrayList;
+
+/** I'm in ur package. Stealing ur variables. */
+public abstract class _ActionBarSherlockTrojanHorse extends FragmentActivity implements OnCreatePanelMenuListener, OnPreparePanelListener, OnMenuItemSelectedListener {
+    private static final boolean DEBUG = false;
+    private static final String TAG = "_ActionBarSherlockTrojanHorse";
+
+    /** Fragment interface for menu creation callback. */
+    public interface OnCreateOptionsMenuListener {
+        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater);
+    }
+    /** Fragment interface for menu preparation callback. */
+    public interface OnPrepareOptionsMenuListener {
+        public void onPrepareOptionsMenu(Menu menu);
+    }
+    /** Fragment interface for menu item selection callback. */
+    public interface OnOptionsItemSelectedListener {
+      public boolean onOptionsItemSelected(MenuItem item);
+    }
+
+    private ArrayList<Fragment> mCreatedMenus;
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Sherlock menu handling
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public boolean onCreatePanelMenu(int featureId, Menu menu) {
+        if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] featureId: " + featureId + ", menu: " + menu);
+
+        if (featureId == Window.FEATURE_OPTIONS_PANEL) {
+            boolean result = onCreateOptionsMenu(menu);
+            if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] activity create result: " + result);
+
+            MenuInflater inflater = getSupportMenuInflater();
+            boolean show = false;
+            ArrayList<Fragment> newMenus = null;
+            if (mFragments.mActive != null) {
+                for (int i = 0; i < mFragments.mAdded.size(); i++) {
+                    Fragment f = mFragments.mAdded.get(i);
+                    if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible && f instanceof OnCreateOptionsMenuListener) {
+                        show = true;
+                        ((OnCreateOptionsMenuListener)f).onCreateOptionsMenu(menu, inflater);
+                        if (newMenus == null) {
+                            newMenus = new ArrayList<Fragment>();
+                        }
+                        newMenus.add(f);
+                    }
+                }
+            }
+
+            if (mCreatedMenus != null) {
+                for (int i = 0; i < mCreatedMenus.size(); i++) {
+                    Fragment f = mCreatedMenus.get(i);
+                    if (newMenus == null || !newMenus.contains(f)) {
+                        f.onDestroyOptionsMenu();
+                    }
+                }
+            }
+
+            mCreatedMenus = newMenus;
+
+            if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] fragments create result: " + show);
+            result |= show;
+
+            if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] returning " + result);
+            return result;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onPreparePanel(int featureId, View view, Menu menu) {
+        if (DEBUG) Log.d(TAG, "[onPreparePanel] featureId: " + featureId + ", view: " + view + " menu: " + menu);
+
+        if (featureId == Window.FEATURE_OPTIONS_PANEL) {
+            boolean result = onPrepareOptionsMenu(menu);
+            if (DEBUG) Log.d(TAG, "[onPreparePanel] activity prepare result: " + result);
+
+            boolean show = false;
+            if (mFragments.mActive != null) {
+                for (int i = 0; i < mFragments.mAdded.size(); i++) {
+                    Fragment f = mFragments.mAdded.get(i);
+                    if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible && f instanceof OnPrepareOptionsMenuListener) {
+                        show = true;
+                        ((OnPrepareOptionsMenuListener)f).onPrepareOptionsMenu(menu);
+                    }
+                }
+            }
+
+            if (DEBUG) Log.d(TAG, "[onPreparePanel] fragments prepare result: " + show);
+            result |= show;
+
+            result &= menu.hasVisibleItems();
+            if (DEBUG) Log.d(TAG, "[onPreparePanel] returning " + result);
+            return result;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onMenuItemSelected(int featureId, MenuItem item) {
+        if (DEBUG) Log.d(TAG, "[onMenuItemSelected] featureId: " + featureId + ", item: " + item);
+
+        if (featureId == Window.FEATURE_OPTIONS_PANEL) {
+            if (onOptionsItemSelected(item)) {
+                return true;
+            }
+
+            if (mFragments.mActive != null) {
+                for (int i = 0; i < mFragments.mAdded.size(); i++) {
+                    Fragment f = mFragments.mAdded.get(i);
+                    if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible && f instanceof OnOptionsItemSelectedListener) {
+                        if (((OnOptionsItemSelectedListener)f).onOptionsItemSelected(item)) {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    public abstract boolean onCreateOptionsMenu(Menu menu);
+
+    public abstract boolean onPrepareOptionsMenu(Menu menu);
+
+    public abstract boolean onOptionsItemSelected(MenuItem item);
+
+    public abstract MenuInflater getSupportMenuInflater();
+}
diff --git a/com_actionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java b/com_actionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
index a7cc25d3e..8340fb591 100644
--- a/com_actionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
+++ b/com_actionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
@@ -523,6 +523,20 @@ public abstract class ActionBarSherlock {
      */

     public void dispatchPanelClosed(int featureId, android.view.Menu menu) {}

 

+    /**

+     * Notify the action bar that the activity has been destroyed. This method

+     * should be called before the superclass implementation.

+     *

+     * <blockquote><p>

+     * @Override

+     * public void onDestroy() {

+     *     mSherlock.dispatchDestroy();

+     *     super.onDestroy();

+     * }

+     * </p></blockquote>

+     */

+    public void dispatchDestroy() {}

+

 

     ///////////////////////////////////////////////////////////////////////////

     ///////////////////////////////////////////////////////////////////////////

diff --git a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
index d0a6d8128..9cb57e95a 100644
--- a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
+++ b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
@@ -77,6 +77,12 @@ public abstract class SherlockActivity extends Activity implements OnCreatePanel
     }

 

     @Override

+    protected void onDestroy() {

+        getSherlock().dispatchDestroy();

+        super.onDestroy();

+    }

+

+    @Override

     protected void onPostCreate(Bundle savedInstanceState) {

         getSherlock().dispatchPostCreate(savedInstanceState);

         super.onPostCreate(savedInstanceState);

diff --git a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
index 4172888cc..a7c856bf0 100644
--- a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
+++ b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
@@ -1,18 +1,18 @@
 package com.actionbarsherlock.app;
 
-import static com.actionbarsherlock.app.SherlockFragmentActivity.DEBUG;
 import android.app.Activity;
 import android.support.v4.app.DialogFragment;
-import android.util.Log;
-import com.actionbarsherlock.internal.view.menu.MenuItemMule;
-import com.actionbarsherlock.internal.view.menu.MenuMule;
+import com.actionbarsherlock.internal.view.menu.MenuItemWrapper;
+import com.actionbarsherlock.internal.view.menu.MenuWrapper;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-public class SherlockDialogFragment extends DialogFragment {
-    private static final String TAG = "SherlockDialogFragment";
+import static com.actionbarsherlock.app.SherlockFragmentActivity.OnCreateOptionsMenuListener;
+import static com.actionbarsherlock.app.SherlockFragmentActivity.OnOptionsItemSelectedListener;
+import static com.actionbarsherlock.app.SherlockFragmentActivity.OnPrepareOptionsMenuListener;
 
+public class SherlockDialogFragment extends DialogFragment implements OnCreateOptionsMenuListener, OnPrepareOptionsMenuListener, OnOptionsItemSelectedListener {
     private SherlockFragmentActivity mActivity;
 
     public SherlockFragmentActivity getSherlockActivity() {
@@ -22,7 +22,7 @@ public class SherlockDialogFragment extends DialogFragment {
     @Override
     public void onAttach(Activity activity) {
         if (!(activity instanceof SherlockFragmentActivity)) {
-            throw new IllegalStateException(TAG + " must be attached to a SherlockFragmentActivity.");
+            throw new IllegalStateException(getClass().getSimpleName() + " must be attached to a SherlockFragmentActivity.");
         }
         mActivity = (SherlockFragmentActivity)activity;
 
@@ -30,45 +30,37 @@ public class SherlockDialogFragment extends DialogFragment {
     }
 
     @Override
-    public final void onCreateOptionsMenu(android.view.Menu menu, android.view.MenuInflater inflater) {
-        if (DEBUG) Log.d(TAG, "[onCreateOptionsMenu] menu: " + menu + ", inflater: " + inflater);
+    public void onDetach() {
+        mActivity = null;
+        super.onDetach();
+    }
 
-        if (menu instanceof MenuMule) {
-            MenuMule mule = (MenuMule)menu;
-            mule.mDispatchShow = true;
-            onCreateOptionsMenu(mule.unwrap(), mActivity.getSupportMenuInflater());
-        }
+    @Override
+    public final void onCreateOptionsMenu(android.view.Menu menu, android.view.MenuInflater inflater) {
+        onCreateOptionsMenu(new MenuWrapper(menu), mActivity.getSupportMenuInflater());
     }
 
+    @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         //Nothing to see here.
     }
 
     @Override
     public final void onPrepareOptionsMenu(android.view.Menu menu) {
-        if (DEBUG) Log.d(TAG, "[onPrepareOptionsMenu] menu: " + menu);
-
-        if (menu instanceof MenuMule) {
-            MenuMule mule = (MenuMule)menu;
-            mule.mDispatchShow = true;
-            onPrepareOptionsMenu(mule.unwrap());
-        }
+        onPrepareOptionsMenu(new MenuWrapper(menu));
     }
 
+    @Override
     public void onPrepareOptionsMenu(Menu menu) {
         //Nothing to see here.
     }
 
     @Override
     public final boolean onOptionsItemSelected(android.view.MenuItem item) {
-        if (DEBUG) Log.d(TAG, "[onOptionsItemSelected] item: " + item);
-
-        if (item instanceof MenuItemMule) {
-            return onOptionsItemSelected(((MenuItemMule)item).unwrap());
-        }
-        return false;
+        return onOptionsItemSelected(new MenuItemWrapper(item));
     }
 
+    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         //Nothing to see here.
         return false;
diff --git a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
index 3247c987c..078f9b0ca 100644
--- a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
+++ b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
@@ -77,6 +77,12 @@ public abstract class SherlockExpandableListActivity extends ExpandableListActiv
     }

 

     @Override

+    protected void onDestroy() {

+        getSherlock().dispatchDestroy();

+        super.onDestroy();

+    }

+

+    @Override

     protected void onPostCreate(Bundle savedInstanceState) {

         getSherlock().dispatchPostCreate(savedInstanceState);

         super.onPostCreate(savedInstanceState);

diff --git a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
index 10d673f9f..0f24e9c85 100644
--- a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
+++ b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
@@ -1,18 +1,18 @@
 package com.actionbarsherlock.app;
 
-import static com.actionbarsherlock.app.SherlockFragmentActivity.DEBUG;
 import android.app.Activity;
 import android.support.v4.app.Fragment;
-import android.util.Log;
-import com.actionbarsherlock.internal.view.menu.MenuItemMule;
-import com.actionbarsherlock.internal.view.menu.MenuMule;
+import com.actionbarsherlock.internal.view.menu.MenuItemWrapper;
+import com.actionbarsherlock.internal.view.menu.MenuWrapper;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-public class SherlockFragment extends Fragment {
-    private static final String TAG = "SherlockFragment";
+import static com.actionbarsherlock.app.SherlockFragmentActivity.OnCreateOptionsMenuListener;
+import static com.actionbarsherlock.app.SherlockFragmentActivity.OnOptionsItemSelectedListener;
+import static com.actionbarsherlock.app.SherlockFragmentActivity.OnPrepareOptionsMenuListener;
 
+public class SherlockFragment extends Fragment implements OnCreateOptionsMenuListener, OnPrepareOptionsMenuListener, OnOptionsItemSelectedListener {
     private SherlockFragmentActivity mActivity;
 
     public SherlockFragmentActivity getSherlockActivity() {
@@ -22,7 +22,7 @@ public class SherlockFragment extends Fragment {
     @Override
     public void onAttach(Activity activity) {
         if (!(activity instanceof SherlockFragmentActivity)) {
-            throw new IllegalStateException(TAG + " must be attached to a SherlockFragmentActivity.");
+            throw new IllegalStateException(getClass().getSimpleName() + " must be attached to a SherlockFragmentActivity.");
         }
         mActivity = (SherlockFragmentActivity)activity;
 
@@ -30,45 +30,37 @@ public class SherlockFragment extends Fragment {
     }
 
     @Override
-    public final void onCreateOptionsMenu(android.view.Menu menu, android.view.MenuInflater inflater) {
-        if (DEBUG) Log.d(TAG, "[onCreateOptionsMenu] menu: " + menu + ", inflater: " + inflater);
+    public void onDetach() {
+        mActivity = null;
+        super.onDetach();
+    }
 
-        if (menu instanceof MenuMule) {
-            MenuMule mule = (MenuMule)menu;
-            mule.mDispatchShow = true;
-            onCreateOptionsMenu(mule.unwrap(), mActivity.getSupportMenuInflater());
-        }
+    @Override
+    public final void onCreateOptionsMenu(android.view.Menu menu, android.view.MenuInflater inflater) {
+        onCreateOptionsMenu(new MenuWrapper(menu), mActivity.getSupportMenuInflater());
     }
 
+    @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         //Nothing to see here.
     }
 
     @Override
     public final void onPrepareOptionsMenu(android.view.Menu menu) {
-        if (DEBUG) Log.d(TAG, "[onPrepareOptionsMenu] menu: " + menu);
-
-        if (menu instanceof MenuMule) {
-            MenuMule mule = (MenuMule)menu;
-            mule.mDispatchShow = true;
-            onPrepareOptionsMenu(mule.unwrap());
-        }
+        onPrepareOptionsMenu(new MenuWrapper(menu));
     }
 
+    @Override
     public void onPrepareOptionsMenu(Menu menu) {
         //Nothing to see here.
     }
 
     @Override
     public final boolean onOptionsItemSelected(android.view.MenuItem item) {
-        if (DEBUG) Log.d(TAG, "[onOptionsItemSelected] item: " + item);
-
-        if (item instanceof MenuItemMule) {
-            return onOptionsItemSelected(((MenuItemMule)item).unwrap());
-        }
-        return false;
+        return onOptionsItemSelected(new MenuItemWrapper(item));
     }
 
+    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         //Nothing to see here.
         return false;
diff --git a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
index 49a5c6ca9..5cd13ba7c 100644
--- a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
+++ b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
@@ -2,27 +2,24 @@ package com.actionbarsherlock.app;
 
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import android.support.v4.app._ActionBarSherlockTrojanHorse;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
 import com.actionbarsherlock.ActionBarSherlock;
-import com.actionbarsherlock.ActionBarSherlock.OnActionModeFinishedListener;
-import com.actionbarsherlock.ActionBarSherlock.OnActionModeStartedListener;
-import com.actionbarsherlock.ActionBarSherlock.OnCreatePanelMenuListener;
-import com.actionbarsherlock.ActionBarSherlock.OnMenuItemSelectedListener;
-import com.actionbarsherlock.ActionBarSherlock.OnPreparePanelListener;
-import com.actionbarsherlock.internal.view.menu.MenuItemMule;
-import com.actionbarsherlock.internal.view.menu.MenuMule;
 import com.actionbarsherlock.view.ActionMode;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-public abstract class SherlockFragmentActivity extends FragmentActivity implements OnCreatePanelMenuListener, OnPreparePanelListener, OnMenuItemSelectedListener, OnActionModeStartedListener, OnActionModeFinishedListener {
-    static final boolean DEBUG = false;
+import static com.actionbarsherlock.ActionBarSherlock.OnActionModeFinishedListener;
+import static com.actionbarsherlock.ActionBarSherlock.OnActionModeStartedListener;
+
+/** @see {@link _ActionBarSherlockTrojanHorse} */
+public class SherlockFragmentActivity extends _ActionBarSherlockTrojanHorse implements OnActionModeStartedListener, OnActionModeFinishedListener {
+    private static final boolean DEBUG = false;
     private static final String TAG = "SherlockFragmentActivity";
 
     private ActionBarSherlock mSherlock;
@@ -86,6 +83,12 @@ public abstract class SherlockFragmentActivity extends FragmentActivity implemen
     }
 
     @Override
+    protected void onDestroy() {
+        getSherlock().dispatchDestroy();
+        super.onDestroy();
+    }
+
+    @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         getSherlock().dispatchPostCreate(savedInstanceState);
         super.onPostCreate(savedInstanceState);
@@ -221,75 +224,14 @@ public abstract class SherlockFragmentActivity extends FragmentActivity implemen
     // Sherlock menu handling
     ///////////////////////////////////////////////////////////////////////////
 
-    @Override
-    public boolean onCreatePanelMenu(int featureId, Menu menu) {
-        if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] featureId: " + featureId + ", menu: " + menu);
-
-        if (featureId == Window.FEATURE_OPTIONS_PANEL) {
-            boolean result = onCreateOptionsMenu(menu);
-            if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] activity create result: " + result);
-
-            //Dispatch to parent panel creation for fragment dispatching
-            if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] dispatching to native with mule");
-            MenuMule mule = new MenuMule(menu);
-            super.onCreatePanelMenu(featureId, mule);
-
-            if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] fragments create result: " + mule.mDispatchShow);
-            result |= mule.mDispatchShow;
-
-            if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] returning " + result);
-            return result;
-        }
-        return false;
-    }
-
     public boolean onCreateOptionsMenu(Menu menu) {
         return true;
     }
 
-    @Override
-    public boolean onPreparePanel(int featureId, View view, Menu menu) {
-        if (DEBUG) Log.d(TAG, "[onPreparePanel] featureId: " + featureId + ", view: " + view + " menu: " + menu);
-
-        if (featureId == Window.FEATURE_OPTIONS_PANEL) {
-            boolean result = onPrepareOptionsMenu(menu);
-            if (DEBUG) Log.d(TAG, "[onPreparePanel] activity prepare result: " + result);
-
-            //Dispatch to parent panel preparation for fragment dispatching
-            if (DEBUG) Log.d(TAG, "[onPreparePanel] dispatching to native with mule");
-            MenuMule mule = new MenuMule(menu);
-            super.onPreparePanel(featureId, view, mule);
-
-            if (DEBUG) Log.d(TAG, "[onPreparePanel] fragments prepare result: " + mule.mDispatchShow);
-            result |= mule.mDispatchShow;
-
-            result &= menu.hasVisibleItems();
-            if (DEBUG) Log.d(TAG, "[onPreparePanel] returning " + result);
-            return result;
-        }
-        return false;
-    }
-
     public boolean onPrepareOptionsMenu(Menu menu) {
         return true;
     }
 
-    @Override
-    public boolean onMenuItemSelected(int featureId, MenuItem item) {
-        if (DEBUG) Log.d(TAG, "[onMenuItemSelected] featureId: " + featureId + ", item: " + item);
-
-        if (featureId == Window.FEATURE_OPTIONS_PANEL) {
-            if (onOptionsItemSelected(item)) {
-                return true;
-            }
-
-            //Dispatch to parent panel selection for fragment dispatching
-            if (DEBUG) Log.d(TAG, "[onMenuItemSelected] dispatching to native with mule");
-            return super.onMenuItemSelected(featureId, new MenuItemMule(item));
-        }
-        return false;
-    }
-
     public boolean onOptionsItemSelected(MenuItem item) {
         return false;
     }
diff --git a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
index 83114c3aa..00c00fee5 100644
--- a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
+++ b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
@@ -77,6 +77,12 @@ public abstract class SherlockListActivity extends ListActivity implements OnCre
     }

 

     @Override

+    protected void onDestroy() {

+        getSherlock().dispatchDestroy();

+        super.onDestroy();

+    }

+

+    @Override

     protected void onPostCreate(Bundle savedInstanceState) {

         getSherlock().dispatchPostCreate(savedInstanceState);

         super.onPostCreate(savedInstanceState);

diff --git a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
index 03a312b35..13ca3c49f 100644
--- a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
+++ b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
@@ -1,18 +1,18 @@
 package com.actionbarsherlock.app;
 
-import static com.actionbarsherlock.app.SherlockFragmentActivity.DEBUG;
 import android.app.Activity;
 import android.support.v4.app.ListFragment;
-import android.util.Log;
-import com.actionbarsherlock.internal.view.menu.MenuItemMule;
-import com.actionbarsherlock.internal.view.menu.MenuMule;
+import com.actionbarsherlock.internal.view.menu.MenuItemWrapper;
+import com.actionbarsherlock.internal.view.menu.MenuWrapper;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-public class SherlockListFragment extends ListFragment {
-    private static final String TAG = "SherlockListFragment";
+import static com.actionbarsherlock.app.SherlockFragmentActivity.OnCreateOptionsMenuListener;
+import static com.actionbarsherlock.app.SherlockFragmentActivity.OnOptionsItemSelectedListener;
+import static com.actionbarsherlock.app.SherlockFragmentActivity.OnPrepareOptionsMenuListener;
 
+public class SherlockListFragment extends ListFragment implements OnCreateOptionsMenuListener, OnPrepareOptionsMenuListener, OnOptionsItemSelectedListener {
     private SherlockFragmentActivity mActivity;
 
     public SherlockFragmentActivity getSherlockActivity() {
@@ -22,7 +22,7 @@ public class SherlockListFragment extends ListFragment {
     @Override
     public void onAttach(Activity activity) {
         if (!(activity instanceof SherlockFragmentActivity)) {
-            throw new IllegalStateException(TAG + " must be attached to a SherlockFragmentActivity.");
+            throw new IllegalStateException(getClass().getSimpleName() + " must be attached to a SherlockFragmentActivity.");
         }
         mActivity = (SherlockFragmentActivity)activity;
 
@@ -30,45 +30,37 @@ public class SherlockListFragment extends ListFragment {
     }
 
     @Override
-    public final void onCreateOptionsMenu(android.view.Menu menu, android.view.MenuInflater inflater) {
-        if (DEBUG) Log.d(TAG, "[onCreateOptionsMenu] menu: " + menu + ", inflater: " + inflater);
+    public void onDetach() {
+        mActivity = null;
+        super.onDetach();
+    }
 
-        if (menu instanceof MenuMule) {
-            MenuMule mule = (MenuMule)menu;
-            mule.mDispatchShow = true;
-            onCreateOptionsMenu(mule.unwrap(), mActivity.getSupportMenuInflater());
-        }
+    @Override
+    public final void onCreateOptionsMenu(android.view.Menu menu, android.view.MenuInflater inflater) {
+        onCreateOptionsMenu(new MenuWrapper(menu), mActivity.getSupportMenuInflater());
     }
 
+    @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         //Nothing to see here.
     }
 
     @Override
     public final void onPrepareOptionsMenu(android.view.Menu menu) {
-        if (DEBUG) Log.d(TAG, "[onPrepareOptionsMenu] menu: " + menu);
-
-        if (menu instanceof MenuMule) {
-            MenuMule mule = (MenuMule)menu;
-            mule.mDispatchShow = true;
-            onPrepareOptionsMenu(mule.unwrap());
-        }
+        onPrepareOptionsMenu(new MenuWrapper(menu));
     }
 
+    @Override
     public void onPrepareOptionsMenu(Menu menu) {
         //Nothing to see here.
     }
 
     @Override
     public final boolean onOptionsItemSelected(android.view.MenuItem item) {
-        if (DEBUG) Log.d(TAG, "[onOptionsItemSelected] item: " + item);
-
-        if (item instanceof MenuItemMule) {
-            return onOptionsItemSelected(((MenuItemMule)item).unwrap());
-        }
-        return false;
+        return onOptionsItemSelected(new MenuItemWrapper(item));
     }
 
+    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         //Nothing to see here.
         return false;
diff --git a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
index 71e40300a..4f80be515 100644
--- a/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
+++ b/com_actionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
@@ -77,6 +77,12 @@ public abstract class SherlockPreferenceActivity extends PreferenceActivity impl
     }

 

     @Override

+    protected void onDestroy() {

+        getSherlock().dispatchDestroy();

+        super.onDestroy();

+    }

+

+    @Override

     protected void onPostCreate(Bundle savedInstanceState) {

         getSherlock().dispatchPostCreate(savedInstanceState);

         super.onPostCreate(savedInstanceState);

diff --git a/com_actionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java b/com_actionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
index f080bfe95..05353d28c 100644
--- a/com_actionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
+++ b/com_actionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
@@ -81,6 +81,8 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     /** Whether or not the title is stable and can be displayed. */
     private boolean mIsTitleReady = false;
+    /** Whether or not the parent activity has been destroyed. */
+    private boolean mIsDestroyed = false;
 
     /* Emulate PanelFeatureState */
     private boolean mClosingActionMenu;
@@ -413,7 +415,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
             }
 
             // Next collapse any expanded action views.
-            if (aActionBar != null && wActionBar.hasExpandedActionView()) {
+            if (wActionBar != null && wActionBar.hasExpandedActionView()) {
                 if (action == KeyEvent.ACTION_UP) {
                     wActionBar.collapseActionView();
                 }
@@ -428,7 +430,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
                 mMenuKeyIsLongPress = true;
             } else if (event.getAction() == KeyEvent.ACTION_UP) {
                 if (!mMenuKeyIsLongPress) {
-                    if (mActionMode == null) {
+                    if (mActionMode == null && wActionBar != null) {
                         if (wActionBar.isOverflowMenuShowing()) {
                             wActionBar.hideOverflowMenu();
                         } else {
@@ -445,6 +447,11 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
         return result;
     }
 
+    @Override
+    public void dispatchDestroy() {
+        mIsDestroyed = true;
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////
     // Menu callback lifecycle and creation
@@ -977,7 +984,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
                         @Override
                         public void run() {
                             //Invalidate if the panel menu hasn't been created before this.
-                            if (!mActivity.isFinishing() && mMenu == null) {
+                            if (!mIsDestroyed && !mActivity.isFinishing() && mMenu == null) {
                                 dispatchInvalidateOptionsMenu();
                             }
                         }
diff --git a/com_actionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java b/com_actionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
index 1bd0eaccb..e390ea428 100644
--- a/com_actionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
+++ b/com_actionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
@@ -217,7 +217,6 @@ public class ActionBarWrapper extends ActionBar implements android.app.ActionBar
         public TabWrapper(android.app.ActionBar.Tab nativeTab) {
             mNativeTab = nativeTab;
             mNativeTab.setTag(this);
-            mNativeTab.setTabListener(this);
         }
 
         @Override
@@ -289,6 +288,7 @@ public class ActionBarWrapper extends ActionBar implements android.app.ActionBar
 
         @Override
         public Tab setTabListener(TabListener listener) {
+            mNativeTab.setTabListener(listener != null ? this : null);
             mListener = listener;
             return this;
         }
diff --git a/com_actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java b/com_actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
index e284604bb..067d0494e 100644
--- a/com_actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
+++ b/com_actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
@@ -140,6 +140,8 @@ public final class AnimatorProxy extends Animation {
             return;
         }
 
+        view.setAnimation(this);
+
         final RectF after = mAfter;
         computeRect(after, view);
         after.union(mBefore);
@@ -202,4 +204,9 @@ public final class AnimatorProxy extends Animation {
             transformMatrix(t.getMatrix(), view);
         }
     }
+
+    @Override
+    public void reset() {
+        /* Do nothing. */
+    }
 }
diff --git a/org_apg/src/org/thialfihar/android/apg/Constants.java b/org_apg/src/org/thialfihar/android/apg/Constants.java
index 881153106..16d3ddf90 100644
--- a/org_apg/src/org/thialfihar/android/apg/Constants.java
+++ b/org_apg/src/org/thialfihar/android/apg/Constants.java
@@ -24,6 +24,8 @@ public final class Constants {
 
     public static final String PACKAGE_NAME = "org.thialfihar.android.apg";
 
+    public static final boolean DEBUG = true;
+
     /*
      * TODO:
      * 
diff --git a/org_apg/src/org/thialfihar/android/apg/deprecated/ApgCon.java b/org_apg/src/org/thialfihar/android/apg/deprecated/ApgCon.java
index d4d8d9a9c..36b8fa971 100644
--- a/org_apg/src/org/thialfihar/android/apg/deprecated/ApgCon.java
+++ b/org_apg/src/org/thialfihar/android/apg/deprecated/ApgCon.java
@@ -31,7 +31,7 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/org_apg/src/org/thialfihar/android/apg/deprecated/ApgService2.java b/org_apg/src/org/thialfihar/android/apg/deprecated/ApgService2.java
index b13110f50..e8e0b0f23 100644
--- a/org_apg/src/org/thialfihar/android/apg/deprecated/ApgService2.java
+++ b/org_apg/src/org/thialfihar/android/apg/deprecated/ApgService2.java
@@ -47,7 +47,7 @@ import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 
 /**
  * ATTENTION:
diff --git a/org_apg/src/org/thialfihar/android/apg/deprecated/ApgServiceBlobDatabase.java b/org_apg/src/org/thialfihar/android/apg/deprecated/ApgServiceBlobDatabase.java
index cb06ee9ae..d58fb3305 100644
--- a/org_apg/src/org/thialfihar/android/apg/deprecated/ApgServiceBlobDatabase.java
+++ b/org_apg/src/org/thialfihar/android/apg/deprecated/ApgServiceBlobDatabase.java
@@ -22,7 +22,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.net.Uri;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 
 public class ApgServiceBlobDatabase extends SQLiteOpenHelper {
 
diff --git a/org_apg/src/org/thialfihar/android/apg/deprecated/ApgServiceBlobProvider.java b/org_apg/src/org/thialfihar/android/apg/deprecated/ApgServiceBlobProvider.java
index 823aac989..51ba32e38 100644
--- a/org_apg/src/org/thialfihar/android/apg/deprecated/ApgServiceBlobProvider.java
+++ b/org_apg/src/org/thialfihar/android/apg/deprecated/ApgServiceBlobProvider.java
@@ -21,7 +21,7 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/org_apg/src/org/thialfihar/android/apg/helper/PGPConversionHelper.java b/org_apg/src/org/thialfihar/android/apg/helper/PGPConversionHelper.java
index f1bd530a8..72294e8ce 100644
--- a/org_apg/src/org/thialfihar/android/apg/helper/PGPConversionHelper.java
+++ b/org_apg/src/org/thialfihar/android/apg/helper/PGPConversionHelper.java
@@ -28,11 +28,11 @@ import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.thialfihar.android.apg.Constants;
 
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 
 public class PGPConversionHelper {
     /**
-     * Converts Vector<PGPSecretKey> to a byte[] array to send it by intent to service
+     * Converts Vector<PGPSecretKey> to a byte[]
      * 
      * @param keys
      * @return
@@ -73,7 +73,7 @@ public class PGPConversionHelper {
 
         return keyRing;
     }
-    
+
     /**
      * Convert from byte[] to PGPPublicKeyRing
      * 
@@ -94,10 +94,17 @@ public class PGPConversionHelper {
         return keyRing;
     }
 
+    /**
+     * Convert from byte[] to ArrayList<PGPSecretKey>
+     * 
+     * @param keysBytes
+     * @return
+     */
     public static ArrayList<PGPSecretKey> BytesToPGPSecretKeyList(byte[] keysBytes) {
         PGPSecretKeyRing keyRing = BytesToPGPSecretKeyRing(keysBytes);
         ArrayList<PGPSecretKey> keys = new ArrayList<PGPSecretKey>();
 
+        @SuppressWarnings("unchecked")
         Iterator<PGPSecretKey> itr = keyRing.getSecretKeys();
         while (itr.hasNext()) {
             keys.add(itr.next());
@@ -106,12 +113,24 @@ public class PGPConversionHelper {
         return keys;
     }
 
+    /**
+     * Convert from byte[] to PGPSecretKey
+     * 
+     * @param keysBytes
+     * @return
+     */
     public static PGPSecretKey BytesToPGPSecretKey(byte[] keyBytes) {
         PGPSecretKey key = BytesToPGPSecretKeyList(keyBytes).get(0);
 
         return key;
     }
 
+    /**
+     * Convert from PGPSecretKey to byte[]
+     * 
+     * @param keysBytes
+     * @return
+     */
     public static byte[] PGPSecretKeyToBytes(PGPSecretKey key) {
         try {
             return key.getEncoded();
@@ -122,6 +141,12 @@ public class PGPConversionHelper {
         }
     }
 
+    /**
+     * Convert from PGPSecretKeyRing to byte[]
+     * 
+     * @param keysBytes
+     * @return
+     */
     public static byte[] PGPSecretKeyRingToBytes(PGPSecretKeyRing keyRing) {
         try {
             return keyRing.getEncoded();
diff --git a/org_apg/src/org/thialfihar/android/apg/helper/PGPMain.java b/org_apg/src/org/thialfihar/android/apg/helper/PGPMain.java
index 7f8b96f40..7dde78342 100644
--- a/org_apg/src/org/thialfihar/android/apg/helper/PGPMain.java
+++ b/org_apg/src/org/thialfihar/android/apg/helper/PGPMain.java
@@ -97,7 +97,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
diff --git a/org_apg/src/org/thialfihar/android/apg/passphrase/AskForPassphrase.java b/org_apg/src/org/thialfihar/android/apg/passphrase/AskForPassphrase.java
index 4e7bdd70f..b24c39a86 100644
--- a/org_apg/src/org/thialfihar/android/apg/passphrase/AskForPassphrase.java
+++ b/org_apg/src/org/thialfihar/android/apg/passphrase/AskForPassphrase.java
@@ -31,7 +31,7 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
diff --git a/org_apg/src/org/thialfihar/android/apg/provider/Database.java b/org_apg/src/org/thialfihar/android/apg/provider/Database.java
index 40e2b9203..db68e74e4 100644
--- a/org_apg/src/org/thialfihar/android/apg/provider/Database.java
+++ b/org_apg/src/org/thialfihar/android/apg/provider/Database.java
@@ -28,7 +28,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 
 import java.io.IOException;
 import java.util.Date;
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 7f5ee1272..152944fa8 100644
--- a/org_apg/src/org/thialfihar/android/apg/service/ApgService.java
+++ b/org_apg/src/org/thialfihar/android/apg/service/ApgService.java
@@ -48,7 +48,7 @@ import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 
 /**
  * This Service contains all important long lasting operations for APG. It receives Intents with
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java
index b65aabd71..8a87a77ab 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java
+++ b/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java
@@ -46,7 +46,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.animation.AnimationUtils;
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java
index 855be57c5..17ce7d5c9 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java
+++ b/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java
@@ -48,7 +48,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/EncryptActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/EncryptActivity.java
index b0013f588..80d135c6c 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/EncryptActivity.java
+++ b/org_apg/src/org/thialfihar/android/apg/ui/EncryptActivity.java
@@ -49,7 +49,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.animation.AnimationUtils;
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/HelpFragmentAbout.java b/org_apg/src/org/thialfihar/android/apg/ui/HelpFragmentAbout.java
index bb42aa20c..c41c7a266 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/HelpFragmentAbout.java
+++ b/org_apg/src/org/thialfihar/android/apg/ui/HelpFragmentAbout.java
@@ -26,7 +26,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java
index 854427b02..5d70e6924 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java
+++ b/org_apg/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java
@@ -32,7 +32,7 @@ import org.thialfihar.android.apg.R;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 import android.widget.Toast;
 
 import com.google.zxing.integration.android.IntentIntegrator;
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyListActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/KeyListActivity.java
index 9c378cba1..97449d316 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/KeyListActivity.java
+++ b/org_apg/src/org/thialfihar/android/apg/ui/KeyListActivity.java
@@ -46,7 +46,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java
index d4985fdb5..c62462c40 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java
+++ b/org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java
@@ -43,7 +43,7 @@ import com.actionbarsherlock.view.MenuItem;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/FileDialogFragment.java b/org_apg/src/org/thialfihar/android/apg/ui/dialog/FileDialogFragment.java
index 2a83febc2..7786d9228 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/dialog/FileDialogFragment.java
+++ b/org_apg/src/org/thialfihar/android/apg/ui/dialog/FileDialogFragment.java
@@ -30,7 +30,7 @@ import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
 import android.support.v4.app.DialogFragment;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CheckBox;
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/PassphraseDialogFragment.java b/org_apg/src/org/thialfihar/android/apg/ui/dialog/PassphraseDialogFragment.java
index 21dcc1b09..3e4898a2b 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/dialog/PassphraseDialogFragment.java
+++ b/org_apg/src/org/thialfihar/android/apg/ui/dialog/PassphraseDialogFragment.java
@@ -38,7 +38,7 @@ import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
 import android.support.v4.app.DialogFragment;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
diff --git a/org_apg/src/org/thialfihar/android/apg/util/Compatibility.java b/org_apg/src/org/thialfihar/android/apg/util/Compatibility.java
index 9daa7f73e..e984362c3 100644
--- a/org_apg/src/org/thialfihar/android/apg/util/Compatibility.java
+++ b/org_apg/src/org/thialfihar/android/apg/util/Compatibility.java
@@ -19,7 +19,7 @@ package org.thialfihar.android.apg.util;
 import java.lang.reflect.Method;
 
 import android.content.Context;
-import android.util.Log;
+import org.thialfihar.android.apg.util.Log;
 
 public class Compatibility {
 
diff --git a/org_apg/src/org/thialfihar/android/apg/util/Log.java b/org_apg/src/org/thialfihar/android/apg/util/Log.java
new file mode 100644
index 000000000..c2e3cc7a5
--- /dev/null
+++ b/org_apg/src/org/thialfihar/android/apg/util/Log.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.thialfihar.android.apg.util;
+
+import org.thialfihar.android.apg.Constants;
+
+/**
+ * Wraps Android Logging to enable or disable debug output using Constants
+ * 
+ */
+public final class Log {
+
+    public static void v(String tag, String msg) {
+        if (Constants.DEBUG) {
+            android.util.Log.v(tag, msg);
+        }
+    }
+
+    public static void v(String tag, String msg, Throwable tr) {
+        if (Constants.DEBUG) {
+            android.util.Log.v(tag, msg, tr);
+        }
+    }
+
+    public static void d(String tag, String msg) {
+        if (Constants.DEBUG) {
+            android.util.Log.d(tag, msg);
+        }
+    }
+
+    public static void d(String tag, String msg, Throwable tr) {
+        if (Constants.DEBUG) {
+            android.util.Log.d(tag, msg, tr);
+        }
+    }
+
+    public static void i(String tag, String msg) {
+        if (Constants.DEBUG) {
+            android.util.Log.i(tag, msg);
+        }
+    }
+
+    public static void i(String tag, String msg, Throwable tr) {
+        if (Constants.DEBUG) {
+            android.util.Log.i(tag, msg, tr);
+        }
+    }
+
+    public static void w(String tag, String msg) {
+        android.util.Log.w(tag, msg);
+    }
+
+    public static void w(String tag, String msg, Throwable tr) {
+        android.util.Log.w(tag, msg, tr);
+    }
+
+    public static void w(String tag, Throwable tr) {
+        android.util.Log.w(tag, tr);
+    }
+
+    public static void e(String tag, String msg) {
+        android.util.Log.e(tag, msg);
+    }
+
+    public static void e(String tag, String msg, Throwable tr) {
+        android.util.Log.e(tag, msg, tr);
+    }
+
+}