From 284cfffef41e74d2bde75d95d0a13eb8f1cf97ba Mon Sep 17 00:00:00 2001
From: cuj1559 <cuj1559@gmail.com>
Date: Sun, 14 Jul 2024 13:55:57 +0900
Subject: [PATCH] Resolved proguard-related serializable instance issue

---
 .idea/deploymentTargetSelector.xml                          | 6 +++---
 app/proguard-rules.pro                                      | 2 ++
 .../java/com/noti/main/service/backend/ResultPacket.java    | 3 ++-
 .../noti/main/service/livenoti/LiveNotificationData.java    | 3 ++-
 app/src/main/res/xml/other_preferences.xml                  | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 5c9c0a5..d443720 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -3,11 +3,11 @@
   <component name="deploymentTargetSelector">
     <selectionStates>
       <SelectionState runConfigName="app">
-        <option name="selectionMode" value="DIALOG" />
-        <DropdownSelection timestamp="2024-07-05T17:07:36.155498376Z">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2024-07-14T03:37:20.877405297Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=HA1PCVMW" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=/home/cuj1559/.android/avd/Pixel_5_API_32.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 5086ece..d23b846 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -21,6 +21,8 @@
 #-renamesourcefileattribute SourceFile
 -keepattributes SourceFile,LineNumberTable        # Keep file names and line numbers.
 -keep public class * extends java.lang.Exception  # Optional: Keep custom exceptions.
+-keep class com.noti.** implements java.io.Serializable { *; }
+-keep class com.noti.** implements android.os.Parcelable { *; }
 
 -keep public class com.google.firebase.** { *; }
 -keep class com.google.auth.** { *; }
diff --git a/app/src/main/java/com/noti/main/service/backend/ResultPacket.java b/app/src/main/java/com/noti/main/service/backend/ResultPacket.java
index b2654ed..37e261b 100644
--- a/app/src/main/java/com/noti/main/service/backend/ResultPacket.java
+++ b/app/src/main/java/com/noti/main/service/backend/ResultPacket.java
@@ -1,13 +1,14 @@
 package com.noti.main.service.backend;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.Objects;
 
 import me.pushy.sdk.lib.jackson.annotation.JsonProperty;
 import me.pushy.sdk.lib.jackson.databind.ObjectMapper;
 
 @SuppressWarnings("unused")
-public class ResultPacket {
+public class ResultPacket implements Serializable {
     @JsonProperty
     private String status;
     @JsonProperty
diff --git a/app/src/main/java/com/noti/main/service/livenoti/LiveNotificationData.java b/app/src/main/java/com/noti/main/service/livenoti/LiveNotificationData.java
index ec6f4ba..593bc8f 100644
--- a/app/src/main/java/com/noti/main/service/livenoti/LiveNotificationData.java
+++ b/app/src/main/java/com/noti/main/service/livenoti/LiveNotificationData.java
@@ -18,12 +18,13 @@
 import com.noti.main.utils.network.CompressStringUtil;
 
 import java.io.IOException;
+import java.io.Serializable;
 
 import me.pushy.sdk.lib.jackson.annotation.JsonProperty;
 import me.pushy.sdk.lib.jackson.core.JsonProcessingException;
 import me.pushy.sdk.lib.jackson.databind.ObjectMapper;
 
-public class LiveNotificationData {
+public class LiveNotificationData implements Serializable {
     @JsonProperty
     public long postTime;
     @JsonProperty
diff --git a/app/src/main/res/xml/other_preferences.xml b/app/src/main/res/xml/other_preferences.xml
index 817bbc0..c9c9dc9 100644
--- a/app/src/main/res/xml/other_preferences.xml
+++ b/app/src/main/res/xml/other_preferences.xml
@@ -50,7 +50,7 @@
             android:summary="Communication may fail depending on the server's configuration" />
         <Preference
             android:icon="@drawable/ic_info_outline_black_24dp"
-            android:key="EncryptionInfo"
+            android:key="backendOptionWarning"
             android:summary="Changing options on these backend servers does not guarantee availability or reliability." />
         <Preference
             android:key="PingTestBackend"