add custom permissions, Update patching and signing code to be async Tasks

Author: ComputerElite

QuestAppVersionSwitcher/APKSigner.cs

@@ -375,7 +375,7 @@ public static async Task<bool> SignApk(string path, string pemData, Dictionary<s
             QAVSWebserver.patchStatus.currentOperation = "Aligning apk";
             QAVSWebserver.BroadcastPatchingStatus();
             Logger.Log("Aligning Apk");
-            if (!ApkAligner.AlignApk(path))
+            if (!await ApkAligner.AlignApk(path))
             {
                 Logger.Log("Aligning failed... Aborting", LoggingType.Warning);
                 return false;
@@ -388,12 +388,12 @@ public static async Task<bool> SignApk(string path, string pemData, Dictionary<s
 
             Logger.Log("Make APK Signature Scheme v2");
             FileStream fs = new FileStream(path, FileMode.Open);
-            using FileMemory memory = new FileMemory(fs);
+            await using FileMemory memory = new FileMemory(fs);
             TempFile t = new TempFile();
-            using FileStream tmp = new FileStream(t.Path, FileMode.Create);
-            using FileMemory outMemory = new FileMemory(tmp);
+            await using FileStream tmp = new FileStream(t.Path, FileMode.Create);
+            await using FileMemory outMemory = new FileMemory(tmp);
             memory.Position = memory.Length() - 22;
-            while(memory.ReadInt() != EndOfCentralDirectory.SIGNATURE)
+            while(await memory.ReadInt() != EndOfCentralDirectory.SIGNATURE)
             {
                 memory.Position -= 4 + 1;
             }
@@ -402,7 +402,8 @@ public static async Task<bool> SignApk(string path, string pemData, Dictionary<s
             EndOfCentralDirectory eocd;
             try
             {
-                 eocd = new EndOfCentralDirectory(memory);
+                 eocd = new EndOfCentralDirectory();
+                 await eocd.Populate(memory);
             }
             catch (Exception e)
             {
@@ -414,8 +415,8 @@ public static async Task<bool> SignApk(string path, string pemData, Dictionary<s
             var cd = eocd.OffsetOfCD;
             memory.Position = cd-16-8;
 
-            var d = memory.ReadULong();
-            var d2 = memory.ReadString(16);
+            var d = await memory.ReadULong();
+            var d2 = await memory.ReadString(16);
             var section1 = await GetSectionDigests(fs, 0, cd);
             var section3 = await GetSectionDigests(fs, cd, eocdPosition);
             var section4 = await GetSectionDigests(fs, eocdPosition, fs.Length);
@@ -444,7 +445,7 @@ public static async Task<bool> SignApk(string path, string pemData, Dictionary<s
 
             signedData.Certificates.Add(cert.GetEncoded());
 
-            signedData.Write(memorySignedData);
+            await signedData.Write(memorySignedData);
             signer.SignedData = signedDataMs.ToArray();
             ISigner signerType = SignerUtilities.GetSigner("SHA256WithRSA");
             signerType.Init(true, privateKey);
@@ -455,18 +456,19 @@ public static async Task<bool> SignApk(string path, string pemData, Dictionary<s
             block.Signers.Add(signer);
 
             APKSigningBlock signingBlock = new APKSigningBlock();
-            signingBlock.Values.Add(block.ToIDValuePair());
+            signingBlock.Values.Add(await block.ToIDValuePair());
 
             fs.Position = 0;
-            outMemory.WriteBytes(memory.ReadBytes(cd));
-            signingBlock.Write(outMemory);
+            await outMemory.WriteBytes(await memory.ReadBytes(cd));
+            await signingBlock.Write(outMemory);
             eocd.OffsetOfCD = (int)tmp.Position;
-            outMemory.WriteBytes(memory.ReadBytes((int) (eocdPosition - cd)));
-            eocd.Write(outMemory);
+            await outMemory.WriteBytes(await memory.ReadBytes((int) (eocdPosition - cd)));
+            await eocd.Write(outMemory);
 
             fs.Close();
             tmp.Close();
             if(File.Exists(path)) File.Delete(path);
+            
             File.Move(t.Path, path);
             return true;
         }

QuestAppVersionSwitcher/Assets/html/index.html

@@ -74,6 +74,26 @@ <h2>Patching options</h2>
                     <br>
                     <div id="other">
                     </div>
+                    <br>
+                    <h4>Features</h4>
+                    <input type="text" id="featureName" placeholder="feature name">
+                    <br>
+                    <br>
+                    <label class="option">
+                        <label class="switch normal">
+                            <input id="requireFeature" type="checkbox" checked>
+                            <span class="slider round"></span>
+                        </label>
+                        Require feature
+                    </label>
+                    <br>
+                    <br>
+                    <div class="button" onclick="AddFeature()">Add Feature</div>
+                    <br>
+                    <div id="otherFeatures">
+                    </div>
+                    <br>
+                    <div class="button" onclick="AddSpecificFeature('com.oculus.feature.PASSTHROUGH', true)">Add Passthrough Feature</div>
                 </div>
 
             </div>

QuestAppVersionSwitcher/Assets/html/script.js

@@ -333,6 +333,7 @@ const handTrackingVersion = document.getElementById("handtrackingversion")
 const debugCheckbox = document.getElementById("debug")
 const otherContainer = document.getElementById("other")
 var otherPermissions = []
+var otherFeatures = []
 
 function UploadMod() {
     var input = document.createElement('input');
@@ -429,6 +430,34 @@ function AddPermission() {
     document.getElementById("otherName").value = ""
     UpdatePermissions()
 }
+function AddSpecificFeature(name, required) {
+    otherFeatures.push({name: name, required: required})
+    UpdateFeatures()
+}
+
+function AddFeature() {
+    otherFeatures.push({name: document.getElementById("featureName").value, required: document.getElementById("requireFeature").checked})
+    document.getElementById("featureName").value = ""
+    UpdateFeatures()
+}
+
+function UpdateFeatures() {
+    var perms = ""
+    for(const p of otherFeatures){
+        perms += `
+        <div style="padding: 10px; margin-right: 20px; border-radius: 5px; border: 1px #242424 solid;">
+            ${p.name} ${p.required ? "(Required)" : "(Not required)"}
+            <div class="button" style="display: inline" onclick="RemoveFeature('${p.name}')">X</div>
+        </div>`
+    }
+    if(perms == "") perms = "No custom features added yet"
+    document.getElementById("otherFeatures").innerHTML = perms
+}
+
+function RemoveFeature(name) {
+    otherFeatures = otherFeatures.filter(a => a.name != name)
+    UpdateFeatures()
+}
 
 function UpdatePermissions() {
     var perms = ""
@@ -439,6 +468,7 @@ function UpdatePermissions() {
             <div class="button" style="display: inline" onclick="RemovePermission('${p}')">X</div>
         </div>`
     }
+    if(perms == "") perms = "No custom permissions added yet"
     otherContainer.innerHTML = perms
 }
 
@@ -453,6 +483,7 @@ function PatchGame() {
     patchInProgress = true
     var patchOptions = {
         otherPermissions: otherPermissions,
+        otherFeatures: otherFeatures,
         debug: debugCheckbox.checked,
         handTracking: handTrackingCheckbox.checked,
         handTrackingVersion: parseInt(handTrackingVersion.value),

QuestAppVersionSwitcher/CoreVars.cs

@@ -65,9 +65,16 @@ public class PatchingPermissions
         public bool handTracking { get; set; } = true;
         public bool debug { get; set; } = true;
         public List<string> otherPermissions { get; set; } = new List<string>();
+        public List<UsesFeature> otherFeatures { get; set; } = new List<UsesFeature>();
         public HandTrackingVersion handTrackingVersion { get; set; }
     }
 
+    public class UsesFeature
+    {
+        public string name { get; set; } = "";
+        public bool required { get; set; } = true;
+    }
+
     public enum HandTrackingVersion
     {
         None,

QuestAppVersionSwitcher/PatchingManager.cs

@@ -21,6 +21,7 @@
 using System.Net;
 using System.Text;
 using System.Text.Json;
+using Org.BouncyCastle.Bcpg.Sig;
 
 namespace QuestAppVersionSwitcher
 {
@@ -340,7 +341,7 @@ public static bool PatchManifest(ZipArchive apkArchive)
 
             // First we add permissions and features to the APK for modding
             List<string> addingPermissions = new List<string>();
-            List<string> addingFeatures = new List<string>();
+            List<UsesFeature> addingFeatures = new List<UsesFeature>();
             PatchingPermissions permissions = CoreService.coreVars.patchingPermissions;
             if (permissions.externalStorage)
             {
@@ -362,7 +363,7 @@ public static bool PatchManifest(ZipArchive apkArchive)
                     "com.oculus.permission.HAND_TRACKING"
                 });
                 // Tell Android (and thus Oculus home) that this app supports hand tracking and we can launch the app with it
-                addingFeatures.Add("oculus.software.handtracking");
+                addingFeatures.Add(new UsesFeature {name = "oculus.software.handtracking", required = false});
             }
             addingPermissions.AddRange(permissions.otherPermissions);
 
@@ -379,16 +380,15 @@ public static bool PatchManifest(ZipArchive apkArchive)
                 manifest.Children.Add(permElement);
             }
 
-            foreach (string feature in addingFeatures)
+            foreach (UsesFeature feature in addingFeatures)
             {
-                if (existingFeatures.Contains(feature)) { continue; } // Do not add existing features
+                if (existingFeatures.Contains(feature.name)) { continue; } // Do not add existing features
 
-                Logger.Log("adding feature " + feature);
+                Logger.Log("adding feature " + feature.name);
                 AxmlElement featureElement = new AxmlElement("uses-feature");
-                AddNameAttribute(featureElement, feature);
+                AddNameAttribute(featureElement, feature.name);
 
-                // TODO: User may want the feature to be required instead of suggested
-                featureElement.Attributes.Add(new AxmlAttribute("required", AndroidNamespaceUri, RequiredAttributeResourceId, false));
+                featureElement.Attributes.Add(new AxmlAttribute("required", AndroidNamespaceUri, RequiredAttributeResourceId, feature.required));
                 manifest.Children.Add(featureElement);
             }
 

QuestAppVersionSwitcher/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.13.10" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="93">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.13.11" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="94">
 	<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="32" />
 	<uses-permission android:name="oculus.permission.handtracking" />
 	<uses-permission android:name="com.oculus.permission.HAND_TRACKING" />

QuestAppVersionSwitcher/Properties/AssemblyInfo.cs

@@ -22,5 +22,5 @@
 //      Minor Version 
 //      Build Number
 //      Revision
-[assembly: AssemblyVersion("1.13.10.0")]
-[assembly: AssemblyFileVersion("1.13.10.0")]
+[assembly: AssemblyVersion("1.13.11.0")]
+[assembly: AssemblyFileVersion("1.13.11.0")]