diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 9462144..d35f23a 100755 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -30,16 +30,22 @@ -keep class sun.misc.Unsafe { *; } -dontwarn java.nio.file.* -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement --dontwarn okio.** # RetroLambda -dontwarn java.lang.invoke.* -dontwarn **$$Lambda$* +# okhttp3 +-dontwarn okhttp3.** +-dontwarn okio.** +-dontwarn javax.annotation.** +-dontwarn org.conscrypt.** +# A resource is loaded with a relative path so the package of this class must be preserved. +-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase + # Basic proguard configuration to support all the devices -keep class android.support.v4.** { *; } -keep interface android.support.v7.** { *; } - -keep class android.support.v7.** { *; } -keep interface android.support.v7.** { *; } diff --git a/app/release/output.json b/app/release/output.json index e46677c..b86b6ae 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":14},"path":"app-release.apk","properties":{"packageId":"com.instify.android","split":"","minSdkVersion":"16"}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":15},"path":"app-release.apk","properties":{"packageId":"com.instify.android","split":"","minSdkVersion":"16"}}] \ No newline at end of file diff --git a/app/src/main/java/com/instify/android/ux/TestPerformanceActivity.java b/app/src/main/java/com/instify/android/ux/TestPerformanceActivity.java index 3b6ac21..0bd59c0 100755 --- a/app/src/main/java/com/instify/android/ux/TestPerformanceActivity.java +++ b/app/src/main/java/com/instify/android/ux/TestPerformanceActivity.java @@ -35,7 +35,6 @@ public class TestPerformanceActivity extends AppCompatActivity { private SQLiteHandler db = new SQLiteHandler(this); // [START add_lifecycle_methods] - /** * Called when leaving the activity */