From ab0f9aa382305415c70e528d64c39411e60aa300 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Tue, 11 Jul 2017 15:01:43 +0300 Subject: [PATCH] Proguard init --- app/build.gradle | 4 ++-- app/proguard-rules.pro | 17 +++++++++++++++++ .../activities/main/forum/ForumAdapter.java | 2 -- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5dd89bee..06bf2efb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,7 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } /*debug { @@ -45,7 +45,7 @@ dependencies { } compile 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar' compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.7' - compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' + compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' //Deprecated! compile 'me.zhanghai.android.materialprogressbar:library:1.4.1' compile 'com.jakewharton.timber:timber:4.5.1' } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index ff7615bd..3b0e65f5 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -15,3 +15,20 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} + +# OkHttp +-dontwarn okio.** +-dontwarn javax.annotation.Nullable +-dontwarn javax.annotation.ParametersAreNonnullByDefault + +# Picasso +-dontwarn com.squareup.okhttp.** + +# Android-Iconics (fontawesome-typeface) +-keep class .R +-keep class **.R$* { + ; +} + +# android-gif-drawable +-keep public class pl.droidsonroids.gif.GifIOException{(int, java.lang.String);} \ No newline at end of file diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumAdapter.java index 9f896b29..821c83a5 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumAdapter.java +++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumAdapter.java @@ -26,7 +26,6 @@ import gr.thmmy.mthmmy.model.TopicSummary; * specified {@link ForumFragment.ForumFragmentInteractionListener}. */ class ForumAdapter extends ExpandableRecyclerAdapter { - private final Context context; private final LayoutInflater layoutInflater; private final List categories; @@ -34,7 +33,6 @@ class ForumAdapter extends ExpandableRecyclerAdapter categories, BaseFragment.FragmentInteractionListener listener) { super(categories); - this.context = context; this.categories = categories; mListener = (ForumFragment.ForumFragmentInteractionListener) listener; layoutInflater = LayoutInflater.from(context);