fix: loader config not restoring correctly in some cases

revenge-mod · Mar 19, 2024 · 1ef9fa4 · 1ef9fa4
1 parent ec63ce0
commit 1ef9fa4
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 17 deletions.
diff --git a/src/def.d.ts b/src/def.d.ts
@@ -197,7 +197,7 @@ interface Settings {
 
 interface ExtendedVeryPrivateSoonToBeMovedSettings extends Settings {
   developmentBuildEnabled: boolean;
-  __previousCustomLoadUrlConfig?: LoaderConfig['customLoadUrl']
+  __previousCustomLoadUrlConfig?: LoaderConfig["customLoadUrl"];
 }
 
 interface ApplicationCommand {

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
@@ -5,7 +5,8 @@ export const THEMES_CHANNEL_ID = "1091880434939482202";
 export const GITHUB = "https://github.com/revenge-mod";
 export const PROXY_PREFIX = "https://vd-plugins.github.io/proxy";
 export const PROXY_PREFIXES = ["https://vd-plugins.github.io/proxy"];
-export const DEVELOPMENT_DISTRIBUTION_URL = "https://raw.githubusercontent.com/revenge-mod/builds/dev/revenge.js"
+export const DEVELOPMENT_DISTRIBUTION_URL =
+  "https://raw.githubusercontent.com/revenge-mod/builds/dev/revenge.js";
 export const HTTP_REGEX =
   /^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_+.~#?&/=]*)$/;
 export const HTTP_REGEX_MULTI =

diff --git a/src/lib/debug.ts b/src/lib/debug.ts
@@ -1,12 +1,16 @@
 import { DEVELOPMENT_DISTRIBUTION_URL } from "@lib/constants";
 import logger from "@lib/logger";
-import { BundleUpdaterManager, ClientInfoManager, DeviceManager } from "@lib/native";
+import {
+  BundleUpdaterManager,
+  ClientInfoManager,
+  DeviceManager
+} from "@lib/native";
 import { after } from "@lib/patcher";
 import settings, { loaderConfig } from "@lib/settings";
 import { getCurrentTheme, selectTheme } from "@lib/themes";
 import { ReactNative as RN } from "@metro/common";
 import { ButtonColors, type RNConstants } from "@types";
-import { showConfirmationAlert } from '@ui/alerts'
+import { showConfirmationAlert } from "@ui/alerts";
 import { getAssetIDByName } from "@ui/assets";
 import { showToast } from "@ui/toasts";
 import { removeCachedScript } from "./storage";
@@ -91,7 +95,7 @@ export function getDebugInfo() {
     vendetta: {
       version: versionHash,
       loader: window.__vendetta_loader?.name ?? "Unknown",
-      branch,
+      branch
     },
     discord: {
       version: ClientInfoManager.Version,
@@ -144,7 +148,10 @@ export function getDebugInfo() {
   };
 }
 
-export async function setDevelopmentBuildEnabled(enabled: boolean, showReloadPopup = true) {
+export async function setDevelopmentBuildEnabled(
+  enabled: boolean,
+  showReloadPopup = true
+) {
   if (enabled) {
     settings.__previousCustomLoadUrlConfig = loaderConfig.customLoadUrl;
     loaderConfig.customLoadUrl = {
@@ -166,13 +173,13 @@ export async function setDevelopmentBuildEnabled(enabled: boolean, showReloadPop
 
   await removeCachedScript();
 
-  if (showReloadPopup) showConfirmationAlert({
-    title: "Reload required",
-    content:
-      "Changes will only apply next time the app launches or reloads.",
-    confirmText: "Reload now",
-    cancelText: "Later",
-    confirmColor: ButtonColors.PRIMARY,
-    onConfirm: BundleUpdaterManager.reload
-  });
+  if (showReloadPopup)
+    showConfirmationAlert({
+      title: "Reload required",
+      content: "Changes will only apply next time the app launches or reloads.",
+      confirmText: "Reload now",
+      cancelText: "Later",
+      confirmColor: ButtonColors.PRIMARY,
+      onConfirm: BundleUpdaterManager.reload
+    });
 }
diff --git a/src/lib/settings.ts b/src/lib/settings.ts
@@ -4,10 +4,15 @@ import {
   createStorage,
   wrapSync
 } from "@lib/storage";
-import type { LoaderConfig, ExtendedVeryPrivateSoonToBeMovedSettings } from "@types";
+import type {
+  ExtendedVeryPrivateSoonToBeMovedSettings,
+  LoaderConfig
+} from "@types";
 
 export default wrapSync(
-  createStorage<ExtendedVeryPrivateSoonToBeMovedSettings>(createMMKVBackend("VENDETTA_SETTINGS"))
+  createStorage<ExtendedVeryPrivateSoonToBeMovedSettings>(
+    createMMKVBackend("VENDETTA_SETTINGS")
+  )
 );
 export const loaderConfig = wrapSync(
   createStorage<LoaderConfig>(createFileBackend("vendetta_loader.json"))

diff --git a/src/ui/settings/pages/General.tsx b/src/ui/settings/pages/General.tsx
@@ -91,6 +91,9 @@ export default function General() {
     }
   ];
 
+  // Workaround so it restores the config correctly even when the dev build option is turned off
+  settings.__previousCustomLoadUrlConfig ??= loaderConfig.customLoadUrl;
+
   return (
     <ErrorBoundary>
       <RN.ScrollView