From 653bdbec6951580bedd12e8a29299557e6a9f3ab Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Mon, 11 Feb 2019 16:10:14 -0600 Subject: [PATCH] Fix a proguard rule and enable proguard on debug builds too. --- app/build.gradle | 2 +- app/proguard-rules.pro | 1 + .../bitsybitshareswallet/fragments/ImportBrainkeyFragment.kt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3f4e010..a944177 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,7 +34,7 @@ android { ext.enableCrashlytics = true } debug { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' resValue("string", "PORT_NUMBER", "8082") // disable crashlytics diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 524a63c..133af9e 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -69,6 +69,7 @@ ###### ??? +-keep class org.slf4j.** { *; } -dontwarn org.slf4j.** diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ImportBrainkeyFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ImportBrainkeyFragment.kt index 690e727..9160775 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ImportBrainkeyFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ImportBrainkeyFragment.kt @@ -41,7 +41,7 @@ import java.util.concurrent.TimeUnit class ImportBrainkeyFragment : BaseAccountFragment() { companion object { - private const val TAG = "ImportBrainkeyActivity" + private const val TAG = "ImportBrainkeyFragment" } /** User account associated with the key derived from the brainkey that the user just typed in */