Fix proguard for gson. Fix multireddit's info cannot be updated in mi…

…nifiedRelease. Version 4.0.7.
Docile-Alligator · Sep 1, 2020 · 7911f4f · 7911f4f
1 parent ff49660
commit 7911f4f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "ml.docilealligator.infinityforreddit"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 42
-        versionName "4.0.6"
+        versionCode 43
+        versionName "4.0.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -63,6 +63,8 @@
 
 # Application classes that will be serialized/deserialized over Gson
 -keep class ml.docilealligator.infinityforreddit.CustomTheme.CustomTheme { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.MultiReddit.MultiRedditJSONModel { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.MultiReddit.SubredditInMultiReddit { <fields>; }
 
 # Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
 # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/MultiRedditJSONModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/MultiReddit/MultiRedditJSONModel.java
@@ -35,14 +35,4 @@ public String createJSONModel() {
         Gson gson = new Gson();
         return gson.toJson(this);
     }
-
-    class SubredditInMultiReddit {
-        String name;
-
-        SubredditInMultiReddit() {}
-
-        SubredditInMultiReddit(String subredditName) {
-            name = subredditName;
-        }
-    }
 }
diff --git a/...rc/main/java/ml/docilealligator/infinityforreddit/MultiReddit/SubredditInMultiReddit.java b/...rc/main/java/ml/docilealligator/infinityforreddit/MultiReddit/SubredditInMultiReddit.java
@@ -0,0 +1,11 @@
+package ml.docilealligator.infinityforreddit.MultiReddit;
+
+public class SubredditInMultiReddit {
+    String name;
+
+    SubredditInMultiReddit() {}
+
+    SubredditInMultiReddit(String subredditName) {
+        name = subredditName;
+    }
+}