From 64ef6656cf248c2e5c72f3aafe6d9c0158d2277b Mon Sep 17 00:00:00 2001
From: Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>
Date: Tue, 4 Jun 2024 23:10:15 -0400
Subject: Fix proguard rules.

---
 app/proguard-rules.pro                                        | 11 +++++++++--
 .../infinityforreddit/activities/SettingsActivity.java        |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 3172179f..7ca0b512 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -9,8 +9,7 @@
 ## Preferences reflection
 -keep class * extends androidx.preference.PreferenceFragmentCompat
 
--keep class ml.docilealligator.infinityforreddit.settings.FontPreviewFragment { *; }
--keep class ml.docilealligator.infinityforreddit.settings.CrashReportsFragment { *; }
+-keep public class ml.docilealligator.infinityforreddit.settings.**
 
 ## EventBus Rules
 -keepattributes *Annotation*
@@ -66,6 +65,14 @@
 -keep class ml.docilealligator.infinityforreddit.customtheme.CustomTheme { <fields>; }
 -keep class ml.docilealligator.infinityforreddit.multireddit.MultiRedditJSONModel { <fields>; }
 -keep class ml.docilealligator.infinityforreddit.multireddit.SubredditInMultiReddit { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserData { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.multireddit.MultiReddit { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.multireddit.AnonymousMultiredditSubreddit { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.postfilter.PostFilter { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.postfilter.PostFilterUsage { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.commentfilter.CommentFilter { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.commentfilter.CommentFilterUsage { <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/activities/SettingsActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SettingsActivity.java
index 602514e0..4a93433a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SettingsActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SettingsActivity.java
@@ -148,7 +148,7 @@ public class SettingsActivity extends BaseActivity implements
     }
 
     @Override
-    public boolean onPreferenceStartFragment(PreferenceFragmentCompat caller, Preference pref) {
+    public boolean onPreferenceStartFragment(@NonNull PreferenceFragmentCompat caller, Preference pref) {
         // Instantiate the new Fragment
         final Bundle args = pref.getExtras();
         final Fragment fragment = getSupportFragmentManager().getFragmentFactory().instantiate(
-- 
cgit v1.2.3