From f0e7272a82b3c731ae4f47a15a010557ae4a2fe1 Mon Sep 17 00:00:00 2001
From: redphx <96280+redphx@users.noreply.github.com>
Date: Fri, 1 Nov 2024 19:57:08 +0700
Subject: [PATCH] Use "brand" instead of "manufacturer"

---
 dist/better-xcloud.lite.user.js          | 6 +++---
 dist/better-xcloud.user.js               | 6 +++---
 src/modules/ui/dialog/settings-dialog.ts | 6 +++---
 src/utils/bx-flags.ts                    | 1 +
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/dist/better-xcloud.lite.user.js b/dist/better-xcloud.lite.user.js
index 961acb4..5777739 100644
--- a/dist/better-xcloud.lite.user.js
+++ b/dist/better-xcloud.lite.user.js
@@ -3944,9 +3944,9 @@ class SettingsNavigationDialog extends NavigationDialog {
    return str.toLowerCase().trim().replaceAll(/\s+/g, "-").replaceAll(/-+/g, "-");
   }
   try {
-   let { manufacturer, board, model } = androidInfo;
-   manufacturer = normalize(manufacturer), board = normalize(board), model = normalize(model);
-   let url = `https://raw.githubusercontent.com/redphx/better-xcloud/gh-pages/devices/${manufacturer}/${board}-${model}.json`, json = await (await NATIVE_FETCH(url)).json(), recommended = {};
+   let { brand, board, model } = androidInfo;
+   brand = normalize(brand), board = normalize(board), model = normalize(model);
+   let url = `https://raw.githubusercontent.com/redphx/better-xcloud/gh-pages/devices/${brand}/${board}-${model}.json`, json = await (await NATIVE_FETCH(url)).json(), recommended = {};
    if (json.schema_version !== 1) return null;
    let scriptSettings = json.settings.script;
    if (scriptSettings._base) {
diff --git a/dist/better-xcloud.user.js b/dist/better-xcloud.user.js
index 0aaf022..75ba8e8 100644
--- a/dist/better-xcloud.user.js
+++ b/dist/better-xcloud.user.js
@@ -5106,9 +5106,9 @@ class SettingsNavigationDialog extends NavigationDialog {
    return str.toLowerCase().trim().replaceAll(/\s+/g, "-").replaceAll(/-+/g, "-");
   }
   try {
-   let { manufacturer, board, model } = androidInfo;
-   manufacturer = normalize(manufacturer), board = normalize(board), model = normalize(model);
-   let url = `https://raw.githubusercontent.com/redphx/better-xcloud/gh-pages/devices/${manufacturer}/${board}-${model}.json`, json = await (await NATIVE_FETCH(url)).json(), recommended = {};
+   let { brand, board, model } = androidInfo;
+   brand = normalize(brand), board = normalize(board), model = normalize(model);
+   let url = `https://raw.githubusercontent.com/redphx/better-xcloud/gh-pages/devices/${brand}/${board}-${model}.json`, json = await (await NATIVE_FETCH(url)).json(), recommended = {};
    if (json.schema_version !== 1) return null;
    let scriptSettings = json.settings.script;
    if (scriptSettings._base) {
diff --git a/src/modules/ui/dialog/settings-dialog.ts b/src/modules/ui/dialog/settings-dialog.ts
index 200a853..fccf39b 100644
--- a/src/modules/ui/dialog/settings-dialog.ts
+++ b/src/modules/ui/dialog/settings-dialog.ts
@@ -693,12 +693,12 @@ export class SettingsNavigationDialog extends NavigationDialog {
 
         // Get recommended settings from GitHub
         try {
-            let {manufacturer, board, model} = androidInfo!;
-            manufacturer = normalize(manufacturer);
+            let {brand, board, model} = androidInfo!;
+            brand = normalize(brand);
             board = normalize(board);
             model = normalize(model);
 
-            const url = `https://raw.githubusercontent.com/redphx/better-xcloud/gh-pages/devices/${manufacturer}/${board}-${model}.json`;
+            const url = `https://raw.githubusercontent.com/redphx/better-xcloud/gh-pages/devices/${brand}/${board}-${model}.json`;
             const response = await NATIVE_FETCH(url);
             const json = (await response.json()) as RecommendedSettings;
             const recommended: PartialRecord<PrefKey, any> = {};
diff --git a/src/utils/bx-flags.ts b/src/utils/bx-flags.ts
index 2d16805..68ea801 100644
--- a/src/utils/bx-flags.ts
+++ b/src/utils/bx-flags.ts
@@ -16,6 +16,7 @@ export type BxFlags = {
 
         androidInfo?: {
             manufacturer: string,
+            brand: string,
             board: string,
             model: string,
         },