Merge pull request #40 from timoetzold/main

Fix Reinitialization
GoIV-Devs · Dec 5, 2022 · a08841f · a08841f
2 parents ec48f64 + 75d612c
commit a08841f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -60,8 +60,8 @@ android {
     defaultConfig {
         minSdkVersion 24 /*Dont change this unless you know why*/
         targetSdkVersion 33 /*Dont change this unless you know why*/
-        versionCode 78
-        versionName "5.6.0-beta"
+        versionCode 79
+        versionName "5.6.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/app/src/main/java/com/kamron/pogoiv/scanlogic/PokeInfoCalculator.java b/app/src/main/java/com/kamron/pogoiv/scanlogic/PokeInfoCalculator.java
@@ -9,6 +9,7 @@
 import android.content.res.Resources;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.kamron.pogoiv.GoIVSettings;
 import com.kamron.pogoiv.R;
@@ -24,6 +25,8 @@
  */
 public class PokeInfoCalculator {
 
+    public static final String ACTION_REINITIALIZED = "com.kamron.pogoiv.POKEINFO_REINITIALIZED";
+
     private static PokeInfoCalculator instance;
 
     private final GoIVSettings goIVSettings;
@@ -72,6 +75,10 @@ private PokeInfoCalculator(@NonNull Context context) {
             @Override
             public void onReceive(Context context, Intent intent) {
                 init();
+
+                Intent reinitialized = new Intent();
+                reinitialized.setAction(ACTION_REINITIALIZED);
+                LocalBroadcastManager.getInstance(context).sendBroadcast(reinitialized);
             }
         };
 

diff --git a/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonNameCorrector.java b/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonNameCorrector.java
@@ -6,7 +6,9 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
+
 import androidx.annotation.NonNull;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.google.common.base.Optional;
 
@@ -56,7 +58,8 @@ public void onReceive(Context context, Intent intent) {
             }
         };
 
-        context.registerReceiver(localeChangedReceiver, new IntentFilter(Intent.ACTION_LOCALE_CHANGED));
+        LocalBroadcastManager.getInstance(context).registerReceiver(localeChangedReceiver,
+                new IntentFilter(PokeInfoCalculator.ACTION_REINITIALIZED));
     }
 
     public static PokemonNameCorrector getInstance(Context context) {

diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
@@ -3508,9 +3508,9 @@
  <item>-1</item> <!-- Tapu Bulu -->
  <item>-1</item> <!-- Tapu Fini -->
  <item>-1</item> <!-- Cosmog -->
- <item>-1</item> <!-- Cosmoem -->
- <item>-1</item> <!-- Solgaleo -->
- <item>-1</item> <!-- Lunala -->
+ <item>788</item> <!-- Cosmoem -->
+ <item>789</item> <!-- Solgaleo -->
+ <item>789</item> <!-- Lunala -->
  <item>-1</item> <!-- Nihilego -->
  <item>-1</item> <!-- Buzzwole -->
  <item>-1</item> <!-- Pheromosa -->
@@ -4413,8 +4413,8 @@
  <item>-1</item> <!-- Tapu Lele -->
  <item>-1</item> <!-- Tapu Bulu -->
  <item>-1</item> <!-- Tapu Fini -->
- <item>-1</item> <!-- Cosmog -->
- <item>-1</item> <!-- Cosmoem -->
+ <item>25</item> <!-- Cosmog -->
+ <item>100</item> <!-- Cosmoem -->
  <item>-1</item> <!-- Solgaleo -->
  <item>-1</item> <!-- Lunala -->
  <item>-1</item> <!-- Nihilego -->