From a5d0c89be663a520c0d0595926fc7614a4bb94ca Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Thu, 18 Nov 2021 09:48:29 +0100
Subject: [PATCH] Make use of the MCOptionListener

---
 .../net/kdt/pojavlaunch/MainActivity.java     | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
index faa57ef0a..d9e9e2641 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
@@ -20,7 +20,7 @@ import static net.kdt.pojavlaunch.utils.MCOptionUtils.getMcScale;
 public class MainActivity extends BaseMainActivity {
     public static ControlLayout mControlLayout;
 
-    private FileObserver fileObserver;
+    private MCOptionUtils.MCOptionListener optionListener;
     
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -53,26 +53,9 @@ public class MainActivity extends BaseMainActivity {
             return true;
         };
 
-
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q){
-            fileObserver = new FileObserver(new File(Tools.DIR_GAME_NEW + "/options.txt"), FileObserver.MODIFY) {
-                @Override
-                public void onEvent(int i, @Nullable String s) {
-                    MCOptionUtils.load();
-                    getMcScale();
-                }
-            };
-        }else{
-            fileObserver = new FileObserver(Tools.DIR_GAME_NEW + "/options.txt", FileObserver.MODIFY) {
-                @Override
-                public void onEvent(int i, @Nullable String s) {
-                    MCOptionUtils.load();
-                    getMcScale();
-                }
-            };
-        }
-
-        fileObserver.startWatching();
+        // Recompute the gui scale when options are changed
+        optionListener = MCOptionUtils::getMcScale;
+        MCOptionUtils.addMCOptionListener(optionListener);
         
         mControlLayout = findViewById(R.id.main_control_layout);
         mControlLayout.setModifiable(false);