Disable d8 and some optimizations.

pr0gramm-com · Aug 21, 2017 · 87be23a · 87be23a
1 parent 4df723f
commit 87be23a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -53,7 +53,7 @@ android {
     aaptOptions {
         // See https://www.reddit.com/r/androiddev/comments/47ni7v/if_you_support_older_versions_of_android_there_is/
         additionalParameters "--no-version-vectors"
-        cruncherEnabled = false
+        cruncherEnabled = true
     }
 
     sourceSets.main {

diff --git a/app/proguard-rules-debug.pro b/app/proguard-rules-debug.pro
@@ -2,5 +2,6 @@
 
 -dontobfuscate
 -dontoptimize
+-dontpreverify
 
 -keep class com.pr0gramm.app.** { *; }
diff --git a/app/proguard-rules-release.pro b/app/proguard-rules-release.pro
@@ -6,7 +6,7 @@
 -dontskipnonpubliclibraryclassmembers
 
 -optimizationpasses 10
--optimizations field/marking/private,!method/removal/parameter,method/marking/static,method/inlining/*,!field/*,code/simplification/*,class/merging/vertical,!class/merging/horizontal
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,method/inlining/*,code/simplification/*,class/merging/vertical,!class/merging/horizontal,!method/removal/parameter
 
 
 # remove all not so important logging
@@ -21,4 +21,4 @@
 
 -keepclassmembers class **$WhenMappings {
     <fields>;
-}
+}
diff --git a/app/src/main/java/com/pr0gramm/app/util/ErrorFormatting.kt b/app/src/main/java/com/pr0gramm/app/util/ErrorFormatting.kt
@@ -8,6 +8,7 @@ import com.pr0gramm.app.R
 import com.pr0gramm.app.api.pr0gramm.HttpErrorException
 import com.pr0gramm.app.api.pr0gramm.LoginCookieHandler
 import com.pr0gramm.app.ui.PermissionHelper
+import org.slf4j.LoggerFactory
 import java.io.EOFException
 import java.io.FileNotFoundException
 import java.io.IOException
@@ -38,7 +39,11 @@ object ErrorFormatting {
          * Gets the message for the given exception. You must only call this,
          * if [.handles] returned true before.
          */
-        fun getMessage(context: Context, thr: Throwable): String = message(thr, context)
+        fun getMessage(context: Context, thr: Throwable): String {
+            LoggerFactory.getLogger("ErrorFormatting").info("Formatting error:", thr)
+
+            return message(thr, context)
+        }
 
         /**
          * Returns true, if this exception should be logged

diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,5 @@
 org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx1536m -XX:+UseG1GC -XX:+UseStringDeduplication
-android.enableD8=true
+
+# android.enableD8=true