From 24436bb77e31c93b08aa60143593699830fe5002 Mon Sep 17 00:00:00 2001
From: Jarrad Hope <me@jarradhope.com>
Date: Sun, 3 May 2015 11:37:30 +0700
Subject: [PATCH] attempt to resolve some samsung issue, no luck

---
 app/build.gradle       | 15 +++++++++++++++
 app/proguard-rules.pro |  4 +++-
 proguard-rules.pro     |  4 +++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4514142d..632b3ccd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,6 +35,21 @@ android {
     dexOptions {
         javaMaxHeapSize "4g"
     }
+    
+    // TODO remove this
+    lintOptions {
+        abortOnError false
+    }
+
+    buildTypes {
+        debug {
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+
+        release {
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
 }
 
 dependencies {
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 7d4fd36f..465057fa 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -15,4 +15,6 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
--dontobfuscate
\ No newline at end of file
+-dontobfuscate
+-keep class !android.support.v7.internal.view.menu.MenuBuilder, !android.support.v7.internal.view.menu.SubMenuBuilder, android.support.v7.** { *; }
+-keep interface android.support.v7.** { *; }
\ No newline at end of file
diff --git a/proguard-rules.pro b/proguard-rules.pro
index 7d4fd36f..465057fa 100644
--- a/proguard-rules.pro
+++ b/proguard-rules.pro
@@ -15,4 +15,6 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
--dontobfuscate
\ No newline at end of file
+-dontobfuscate
+-keep class !android.support.v7.internal.view.menu.MenuBuilder, !android.support.v7.internal.view.menu.SubMenuBuilder, android.support.v7.** { *; }
+-keep interface android.support.v7.** { *; }
\ No newline at end of file