diff --git a/.gitignore b/.gitignore index 99d82b62..7c7dfa40 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,4 @@ /app/build/ /app/src/main/res/values/secrets.xml /app/src/productionApp/ -/app/StyleMe +/app/fastaccess-key diff --git a/app/build.gradle b/app/build.gradle index 8ecc33d1..593371ba 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { signing { keyAlias ANDROID_KEY_ALIAS keyPassword ANDROID_STORE_PASSWORD - storeFile file('StyleMe') + storeFile file('fastaccess-key') storePassword ANDROID_STORE_PASSWORD } } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 34e26cf9..1a38046b 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,25 +1,82 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/Kosh/Library/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include getPath and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile +-renamesourcefileattribute SourceFile +-keepattributes SourceFile,LineNumberTable +-dontpreverify +-repackageclasses '' +-allowaccessmodification +-optimizations !code/simplification/arithmetic +-keepattributes *Annotation*,Signature +-keepclassmembers class * implements java.io.Serializable { + static final long serialVersionUID; + private static final java.io.ObjectStreamField[] serialPersistentFields; + private void writeObject(java.io.ObjectOutputStream); + private void readObject(java.io.ObjectInputStream); + java.lang.Object writeReplace(); + java.lang.Object readResolve(); +} +-keepclassmembers class **.R$* { + public static ; +} +-keep class * implements android.os.Parcelable { + public static final android.os.Parcelable$Creator *; +} +-keep public class * implements butterknife.Unbinder { public (**, android.view.View); } +-keep class butterknife.* +-keepclasseswithmembernames class * { @butterknife.* ; } +-keepclasseswithmembernames class * { @butterknife.* ; } +-dontwarn retrofit.** +-keep class retrofit.** { *; } +-dontwarn sun.misc.Unsafe +-dontwarn com.octo.android.robospice.retrofit.RetrofitJackson** +-dontwarn retrofit.appengine.UrlFetchClient +-keepattributes Signature +-keepattributes Exceptions +-keepclasseswithmembers class * { + @retrofit.http.* ; +} +-keep class com.google.gson.** { *; } +-keep class com.google.inject.** { *; } +-keep class org.apache.http.** { *; } +-keep class org.apache.james.mime4j.** { *; } +-keep class javax.inject.** { *; } +-keep class retrofit.** { *; } +-keep class com.squareup.okhttp.** { *; } +-keep interface com.squareup.okhttp.** { *; } +-dontwarn java.beans.** +-dontwarn javax.** +-dontwarn lombok.** +-dontwarn java.lang.invoke.* +-dontwarn rx.** +-dontwarn com.squareup.okhttp.** +-dontwarn okio.** +-dontwarn org.apache.http.** +-dontwarn android.net.http.AndroidHttpClient +-dontwarn retrofit.** +-dontwarn retrofit2.adapter.rxjava.CompletableHelper$** +-dontwarn retrofit2.Platform$Java8 +-dontwarn sun.misc.** +-keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* { + long producerIndex; + long consumerIndex; +} +-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef { + long producerNode; + long consumerNode; +} +-keepclasseswithmembernames class * { + native ; +} +-keepclassmembers enum * { *; } +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} +-dontwarn icepick.** +-keep class **$$Icepick { *; } +-keepclasseswithmembernames class * { + @icepick.* ; +} +-keep class com.fastaccess.data.dao.** { *; } +-keepclassmembers class com.prettifier.pretty.callback.MarkDownInterceptorInterface { + public *; +} +#-keep class com.siimkinks.sqlitemagic.** {*;} \ No newline at end of file diff --git a/app/src/debuggingApp/res/values/sectrets.xml b/app/src/debuggingApp/res/values/sectrets.xml index ad91aba6..d29f04ba 100644 --- a/app/src/debuggingApp/res/values/sectrets.xml +++ b/app/src/debuggingApp/res/values/sectrets.xml @@ -1,4 +1,4 @@ - ca-app-pub-3940256099942544/6300978111 + ca-app-pub-3940256099942544/6300978111 \ No newline at end of file