From adea9df71411f7ea0ab08066c92048b0c2dad1ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 22 Apr 2014 08:15:55 +0200
Subject: Workaround for nullpointer bug in support lib, close #591

---
 .../support/v4/widget/FixedDrawerLayout.java       | 33 ++++++++++++++++++++++
 .../keychain/ui/DrawerActivity.java                |  5 ++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 OpenKeychain/src/main/java/android/support/v4/widget/FixedDrawerLayout.java

(limited to 'OpenKeychain/src/main/java')

diff --git a/OpenKeychain/src/main/java/android/support/v4/widget/FixedDrawerLayout.java b/OpenKeychain/src/main/java/android/support/v4/widget/FixedDrawerLayout.java
new file mode 100644
index 000000000..1151818b6
--- /dev/null
+++ b/OpenKeychain/src/main/java/android/support/v4/widget/FixedDrawerLayout.java
@@ -0,0 +1,33 @@
+package android.support.v4.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+
+/**
+ * Fix for NullPointerException at android.support.v4.widget.DrawerLayout.isContentView(DrawerLayout.java:840)
+ * <p/>
+ * http://stackoverflow.com/a/18107942
+ */
+public class FixedDrawerLayout extends DrawerLayout {
+    public FixedDrawerLayout(Context context) {
+        super(context);
+    }
+
+    public FixedDrawerLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public FixedDrawerLayout(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    boolean isContentView(View child) {
+        if (child == null) {
+            return false;
+        }
+        return ((LayoutParams) child.getLayoutParams()).gravity == Gravity.NO_GRAVITY;
+    }
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
index 088f593d4..9a5050eba 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
@@ -26,6 +26,7 @@ import android.os.Bundle;
 import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
+import android.support.v4.widget.FixedDrawerLayout;
 import android.support.v7.app.ActionBarActivity;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -43,7 +44,7 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 
 public class DrawerActivity extends ActionBarActivity {
-    private DrawerLayout mDrawerLayout;
+    private FixedDrawerLayout mDrawerLayout;
     private ListView mDrawerList;
     private ActionBarDrawerToggle mDrawerToggle;
 
@@ -58,7 +59,7 @@ public class DrawerActivity extends ActionBarActivity {
 
     protected void setupDrawerNavigation(Bundle savedInstanceState) {
         mDrawerTitle = getString(R.string.app_name);
-        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+        mDrawerLayout = (FixedDrawerLayout) findViewById(R.id.drawer_layout);
         mDrawerList = (ListView) findViewById(R.id.left_drawer);
         ViewGroup viewGroup = (ViewGroup) findViewById(R.id.content_frame);
         int leftMarginLoaded = ((ViewGroup.MarginLayoutParams) viewGroup.getLayoutParams()).leftMargin;
-- 
cgit v1.2.3