fix chest issue

Author: FireMario211

.gitignore

@@ -1,6 +1,5 @@
 build-linux/
-build-android/
-build-armv8/
+build-android*/
 test/build-linux
 test/compile_commands.json
 .cache/

changelog.md

@@ -1,10 +1,14 @@
 # Changelog
+## <cj>v1.6.0-beta.2</c> <cb>(2026-03-08)</c>
+* <cy>Fixed</c> chests crashing upon opening for Android.
+
 ## <cj>v1.6.0-beta.1</c> <cb>(2026-03-08)</c>
 * <cp>GDUtils ported to Geode 5.0.0 (GD 2.2081)</c>
-* <cy>Changed</c> logic for chest notifications
+* <cy>Changed</c> logic for chest notifications.
+* <cy>Changed</c> locations for where GDUtils stores files.
 * <cy>Temporarily removed</c> leaderboards due to not being rewritten yet.
 * <cy>Fixed</c> Spotify feature not unmuting when playtesting in Editor.
-* <cy>Fixed</c> notification being clickable
+* <cy>Fixed</c> notification being clickable.
 
 ## <cj>v1.5.4</c> <cb>(2025-09-09)</c>
 * <cg>Added</c> coloured container animation when searching a friend on the friend list.

mod.json

@@ -1,6 +1,6 @@
 {
     "geode": "5.0.0",
-    "version": "v1.6.0-beta.1",
+    "version": "v1.6.0-beta.2",
     "gd": {
         "win": "2.2081",
         "mac": "2.2081",

src/modules/events/DailyChest.cpp

@@ -46,7 +46,6 @@ static GJRewardItem* time1 = nullptr;
 static GJRewardItem* time2 = nullptr;
 static std::optional<arc::mpsc::Sender<ChestMsg>> g_chestTx;
 
-
 void DailyChest::getRewards() {
     auto glm = GameLevelManager::sharedState();
     if (glm) {
@@ -121,8 +120,40 @@ void giveChestNotify(bool large) {
     });
 }
 
+#include <Geode/modify/RewardUnlockLayer.hpp>
+class $modify(RULHook, RewardUnlockLayer) {
+    void step2() {
+        int tag = m_chestType;
+        if (g_chestTx) {
+            if (tag == 1) {
+                (void)g_chestTx->trySend({
+                    .type = ChestMsg::Type::Opened,
+                    .opened = ChestKind::Small
+                });
+            } else if (tag == 2) {
+                (void)g_chestTx->trySend({
+                    .type = ChestMsg::Type::Opened,
+                    .opened = ChestKind::Large
+                });
+            }
+        }
+        refreshRewards();
+        RewardUnlockLayer::step2();
+    }
+};
+
+static void toggleHook(bool value) {
+    for (auto& hook : geode::Mod::get()->getHooks()) {
+        if (hook->getDisplayName() == "RewardUnlockLayer::step2") {
+            (void)(value ? hook->enable() : hook->disable());
+        }
+    }
+}
 $on_game(Loaded) {
-    if (!Mod::get()->getSettingValue<bool>("largeChest") && !Mod::get()->getSettingValue<bool>("smallChest")) return;
+    if (!Mod::get()->getSettingValue<bool>("largeChest") && !Mod::get()->getSettingValue<bool>("smallChest")) {
+        toggleHook(false);
+        return;
+    }
     auto [tx, rx] = arc::mpsc::channel<ChestMsg>();
     g_chestTx = std::move(tx);
     // wait 5 seconds before
@@ -233,38 +264,19 @@ void giveChestNotify(bool large) {
     });
     listenForSettingChanges<bool>("smallChest", [](bool value) {
         if (!value && !Mod::get()->getSettingValue<bool>("largeChest")) {
-            if (g_chestTx) {    
+            if (g_chestTx) {
+                toggleHook(false);
                 (void)g_chestTx->trySend({ ChestMsg::Type::Stop });
             }
         }
     });
     listenForSettingChanges<bool>("largeChest", [](bool value) {
         if (!value && !Mod::get()->getSettingValue<bool>("smallChest")) {
             if (g_chestTx) {
+                toggleHook(false);
                 (void)g_chestTx->trySend({ ChestMsg::Type::Stop });
             }
         }
     });
     refreshRewards();
 }
-#include <Geode/modify/RewardUnlockLayer.hpp>
-class $modify(RULHook, RewardUnlockLayer) {
-    void step3() {
-        int tag = m_chestType;
-        if (g_chestTx) {
-            if (tag == 1) {
-                (void)g_chestTx->trySend({
-                    .type = ChestMsg::Type::Opened,
-                    .opened = ChestKind::Small
-                });
-            } else if (tag == 2) {
-                (void)g_chestTx->trySend({
-                    .type = ChestMsg::Type::Opened,
-                    .opened = ChestKind::Large
-                });
-            }
-        }
-        refreshRewards();
-        RewardUnlockLayer::step3();
-    }
-};