From 578c156d2e22bcef2fb36941fed6655fe741b59c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= <nem@nem.x0.to>
Date: Thu, 13 Jun 2024 15:11:25 +0900
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E3=82=8A=E5=87=BA=E3=81=97=EF=BC=8C?=
 =?UTF-8?q?=E5=85=A8=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../one/nem/kidshift/utils/impl/FeatureFlagImpl.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/utils/src/main/java/one/nem/kidshift/utils/impl/FeatureFlagImpl.java b/utils/src/main/java/one/nem/kidshift/utils/impl/FeatureFlagImpl.java
index eebd66f..4d70cc5 100644
--- a/utils/src/main/java/one/nem/kidshift/utils/impl/FeatureFlagImpl.java
+++ b/utils/src/main/java/one/nem/kidshift/utils/impl/FeatureFlagImpl.java
@@ -42,7 +42,10 @@ public class FeatureFlagImpl implements FeatureFlag {
     public FeatureFlagImpl(@ApplicationContext Context applicationContext) {
         this.applicationContext = applicationContext;
         this.sharedPreferences = applicationContext.getSharedPreferences("feat_flg", Context.MODE_PRIVATE);
+        init();
+    }
 
+    private void init() {
         initBase();
         switch (currentProfile) {
             case DEVELOP:
@@ -54,6 +57,7 @@ public class FeatureFlagImpl implements FeatureFlag {
             case PRODUCTION:
                 break;
         }
+        restoreOverride();
     }
 
     private HashMap<String, FeatureFlagItemModel> featureFlagMap = new HashMap<>();
@@ -129,9 +133,7 @@ public class FeatureFlagImpl implements FeatureFlag {
 
     @Override
     public void resetAllOverrides() {
-        for (String key : featureFlagMap.keySet()) {
-            Objects.requireNonNull(featureFlagMap.get(key)).setValue(Objects.requireNonNull(featureFlagMap.get(key)).getDefaultValue());
-            sharedPreferences.edit().putBoolean(key, Objects.requireNonNull(featureFlagMap.get(key)).getDefaultValue()).apply();
-        }
+        sharedPreferences.edit().clear().apply();
+        init();
     }
 }