Dynamically check if the app requires resource patching/merging integ…

…rations
inotia00 · Sep 22, 2022 · f60e5e1 · f60e5e1
1 parent c18c2be
commit f60e5e1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/utils/PatchesParser.js b/utils/PatchesParser.js
@@ -39,6 +39,16 @@ module.exports = async function parsePatch(packageName, hasRoot) {
 
     if (!isCompatible || (isRooted && !hasRoot)) continue;
 
+    for (const dependencyName of patch.dependencies) {
+      if (dependencyName.includes('resource')) {
+        global.jarNames.patch.resources = true;
+      } else global.jarNames.patch.resources = false;
+
+      if (dependencyName.includes('integrations')) {
+        global.jarNames.patch.integrations = true;
+      } else global.jarNames.patch.integrations = false;
+    }
+
     patches.push({
       name: patch.name,
       description: patch.description,

diff --git a/wsEvents/patchApp.js b/wsEvents/patchApp.js
@@ -192,16 +192,15 @@ module.exports = async function patchApp(ws) {
     args.push('revanced/aapt2');
   }
 
-  if (global.jarNames.selectedApp === 'youtube') {
+  if (global.jarNames.patch.integrations) {
     args.push('-m');
     args.push(global.jarNames.integrations);
   }
 
   args.push(...global.jarNames.patches.split(' '));
 
   if (
-    global.jarNames.selectedApp.endsWith('frontpage') ||
-    global.jarNames.selectedApp.endsWith('trill')
+    !global.jarNames.patch.resources
   )
     args.push('-r');
 

diff --git a/wsEvents/updateFiles.js b/wsEvents/updateFiles.js
@@ -13,7 +13,11 @@ global.jarNames = {
   selectedApp: '',
   patches: '',
   isRooted: false,
-  deviceID: ''
+  deviceID: '',
+  patch: {
+    resources: false,
+    integrations: false
+  }
 };
 
 /**