From 2118261c852c6e69c1c6b60208a3029f210021f9 Mon Sep 17 00:00:00 2001
From: xtaodada <xtao@xtaolink.cn>
Date: Thu, 15 Feb 2024 19:41:48 +0800
Subject: [PATCH] fix: settings cannot get right key

---
 .../settings/NekoChatSettingsActivity.java    | 29 +++++++++----------
 .../settings/NekoGeneralSettingsActivity.java | 13 +++++++--
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java
index cdd0e0f65e..c9883f229d 100644
--- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java
@@ -206,6 +206,20 @@ public class NekoChatSettingsActivity extends BaseNekoXSettingsActivity implemen
     private UndoView tooltip;
 
     public NekoChatSettingsActivity() {
+        if (!NekoXConfig.isDeveloper()) {
+            cellGroup.rows.remove(disableChatActionRow);
+            cellGroup.rows.remove(disableChoosingStickerRow);
+            cellGroup.rows.remove(ignoreBlockedRow);
+            cellGroup.rows.remove(dividerEnd);
+            NekoConfig.disableChatAction.setConfigBool(false);
+            NekoConfig.disableChoosingSticker.setConfigBool(false);
+            NekoConfig.ignoreBlocked.setConfigBool(false);
+        }
+        if (!NekoConfig.showRepeat.Bool() || NaConfig.INSTANCE.getShowRepeatAsCopy().Bool()){
+            cellGroup.rows.remove(autoReplaceRepeatRow);
+            NaConfig.INSTANCE.getAutoReplaceRepeat().setConfigBool(false);
+        }
+
         addRowsToMap(cellGroup);
     }
 
@@ -251,21 +265,6 @@ public void onItemClick(int id) {
             }
         });
 
-        // Before listAdapter
-        if (!NekoXConfig.isDeveloper()) {
-            cellGroup.rows.remove(disableChatActionRow);
-            cellGroup.rows.remove(disableChoosingStickerRow);
-            cellGroup.rows.remove(ignoreBlockedRow);
-            cellGroup.rows.remove(dividerEnd);
-            NekoConfig.disableChatAction.setConfigBool(false);
-            NekoConfig.disableChoosingSticker.setConfigBool(false);
-            NekoConfig.ignoreBlocked.setConfigBool(false);
-        }
-        if (!NekoConfig.showRepeat.Bool() || NaConfig.INSTANCE.getShowRepeatAsCopy().Bool()){
-            cellGroup.rows.remove(autoReplaceRepeatRow);
-            NaConfig.INSTANCE.getAutoReplaceRepeat().setConfigBool(false);
-        }
-
         listAdapter = new ListAdapter(context);
 
         fragmentView = new FrameLayout(context);
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java
index f59f5fcc82..a3aa9755a3 100644
--- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java
@@ -245,6 +245,13 @@ public class NekoGeneralSettingsActivity extends BaseNekoXSettingsActivity {
     private UndoView restartTooltip;
 
     public NekoGeneralSettingsActivity() {
+        if (!NekoXConfig.isDeveloper()) {
+            cellGroup.rows.remove(hideSponsoredMessageRow);
+        }
+        if (!BuildVars.isGServicesCompiled) {
+            cellGroup.rows.remove(mapDriftingFixForGoogleMapsRow);
+        }
+
         addRowsToMap(cellGroup);
     }
 
@@ -854,13 +861,13 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType
     }
 
     private void setCanNotChange() {
-        if (!NekoXConfig.isDeveloper())
-            cellGroup.rows.remove(hideSponsoredMessageRow);
+//        if (!NekoXConfig.isDeveloper())
+//            cellGroup.rows.remove(hideSponsoredMessageRow);
 
         if (!BuildVars.isGServicesCompiled) {
             NekoConfig.useOSMDroidMap.setConfigBool(true);
             ((ConfigCellTextCheck) useOSMDroidMapRow).setEnabled(false);
-            cellGroup.rows.remove(mapDriftingFixForGoogleMapsRow);
+//            cellGroup.rows.remove(mapDriftingFixForGoogleMapsRow);
         } else {
             if (NekoConfig.useOSMDroidMap.Bool())
                 ((ConfigCellTextCheck) mapDriftingFixForGoogleMapsRow).setEnabled(false);