Skip to content

Commit 87be23a

Browse files
committed
Disable d8 and some optimizations.
1 parent 4df723f commit 87be23a

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ android {
5353
aaptOptions {
5454
// See https://www.reddit.com/r/androiddev/comments/47ni7v/if_you_support_older_versions_of_android_there_is/
5555
additionalParameters "--no-version-vectors"
56-
cruncherEnabled = false
56+
cruncherEnabled = true
5757
}
5858

5959
sourceSets.main {

app/proguard-rules-debug.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22

33
-dontobfuscate
44
-dontoptimize
5+
-dontpreverify
56

67
-keep class com.pr0gramm.app.** { *; }

app/proguard-rules-release.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-dontskipnonpubliclibraryclassmembers
77

88
-optimizationpasses 10
9-
-optimizations field/marking/private,!method/removal/parameter,method/marking/static,method/inlining/*,!field/*,code/simplification/*,class/merging/vertical,!class/merging/horizontal
9+
-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,method/inlining/*,code/simplification/*,class/merging/vertical,!class/merging/horizontal,!method/removal/parameter
1010

1111

1212
# remove all not so important logging
@@ -21,4 +21,4 @@
2121

2222
-keepclassmembers class **$WhenMappings {
2323
<fields>;
24-
}
24+
}

app/src/main/java/com/pr0gramm/app/util/ErrorFormatting.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import com.pr0gramm.app.R
88
import com.pr0gramm.app.api.pr0gramm.HttpErrorException
99
import com.pr0gramm.app.api.pr0gramm.LoginCookieHandler
1010
import com.pr0gramm.app.ui.PermissionHelper
11+
import org.slf4j.LoggerFactory
1112
import java.io.EOFException
1213
import java.io.FileNotFoundException
1314
import java.io.IOException
@@ -38,7 +39,11 @@ object ErrorFormatting {
3839
* Gets the message for the given exception. You must only call this,
3940
* if [.handles] returned true before.
4041
*/
41-
fun getMessage(context: Context, thr: Throwable): String = message(thr, context)
42+
fun getMessage(context: Context, thr: Throwable): String {
43+
LoggerFactory.getLogger("ErrorFormatting").info("Formatting error:", thr)
44+
45+
return message(thr, context)
46+
}
4247

4348
/**
4449
* Returns true, if this exception should be logged

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@
2020
org.gradle.daemon=true
2121
org.gradle.configureondemand=true
2222
org.gradle.jvmargs=-Xmx1536m -XX:+UseG1GC -XX:+UseStringDeduplication
23-
android.enableD8=true
23+
24+
# android.enableD8=true

0 commit comments

Comments
 (0)