From 4126f01ef1a50b5da7e6ff20a1a4a6ded92c3c9c Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Tue, 25 Jul 2017 18:09:48 -0400
Subject: [PATCH] Reactivate proguard

---
 uhabits-android/build.gradle       |  2 +-
 uhabits-android/proguard-rules.txt | 58 ++++++++++++------------------
 2 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/uhabits-android/build.gradle b/uhabits-android/build.gradle
index c6641792a..5235ba762 100644
--- a/uhabits-android/build.gradle
+++ b/uhabits-android/build.gradle
@@ -33,7 +33,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
 
diff --git a/uhabits-android/proguard-rules.txt b/uhabits-android/proguard-rules.txt
index f30a55588..4a16fb74c 100644
--- a/uhabits-android/proguard-rules.txt
+++ b/uhabits-android/proguard-rules.txt
@@ -1,43 +1,31 @@
+-dontobfuscate
+
 -dontwarn java.**
 -dontwarn javax.**
--dontwarn com.google.auto.**
--dontwarn com.google.errorprone.annotations.**
--dontwarn com.google.j2objc.annotations.**
--dontwarn okio.**
--dontwarn okhttp3.**
--dontwarn sun.misc.**
--dontwarn org.codehaus.mojo.**
--dontwarn com.google.gson.internal.*
--dontwarn com.google.common.util.concurrent.*
--dontwarn com.google.auto.common.*
 -dontwarn org.apache.commons.beanutils.*
--dontwarn org.isoron.uhabits.HabitsApplication
+-dontwarn org.codehaus.mojo.**
 
--dontobfuscate
+-dontnote com.android.**
+-dontnote com.google.gson.internal.**
+-dontnote dagger.*
+-dontnote dalvik.system.**
+-dontnote javax.inject.**
+-dontnote org.apache.harmony.xnet.**
+-dontnote org.isoron.**
+-dontnote sun.misc.**
+-dontnote sun.security.**
 
--keep class sun.misc.Unsafe { *; }
+-keep class com.getpebble.** { *; }
+-keep class com.github.paolorotolo.** { *; }
+-keep class io.socket.** { *; }
+-keep class okhttp3.** { *; }
+-keep class okio.** { *; }
 -keep class org.isoron.** { *; }
+-keep class sun.misc.Unsafe { *; }
+-keep class android.support.test.** { *; }
+-keep class org.mockito.** { *; }
+-keep class org.junit.** { *; }
+-keep class kotlin.** { *; }
+
 
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.preference.Preference
--keep public class * extends android.view.View {
-    public <init>(android.content.Context);
-    public <init>(android.content.Context, android.util.AttributeSet);
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
--keepclassmembers class * extends android.content.Context {
-    public void *(android.view.View);
-    public void *(android.view.MenuItem);
-}
--keep public class * extends android.app.Activity
 -dontskipnonpubliclibraryclassmembers
\ No newline at end of file