Merge branch 'main' of https://github.com/Lauriethefish/QuestPatcher

Author: Lauriethefish

QuestPatcher.Core/Models/PatchingOptions.cs

@@ -23,6 +23,8 @@ public bool HandTracking
 
         public bool Microphone { get; set; }
 
+        public bool OpenXR { get; set; }
+        
         public bool FlatScreenSupport { get; set; }
 
         public HandTrackingVersion HandTrackingType { get; set; }

QuestPatcher.Core/Patching/PatchingManager.cs

@@ -35,6 +35,7 @@ public class PatchingManager : INotifyPropertyChanged
         private const int DebuggableAttributeResourceId = 16842767;
         private const int LegacyStorageAttributeResourceId = 16844291;
         private const int ValueAttributeResourceId = 16842788;
+        private const int AuthoritiesAttributeResourceId = 16842776;
 
         /// <summary>
         /// Compression level to use when adding files to the APK during patching.
@@ -191,6 +192,41 @@ private async Task PatchManifest(ApkZip apk)
                 addingFeatures.Add("oculus.software.handtracking");
             }
 
+            if (permissions.OpenXR)
+            {
+                Log.Information("Adding OpenXR permission . . .");
+
+                addingPermissions.AddRange(new[] {
+                    "org.khronos.openxr.permission.OPENXR",
+                    "org.khronos.openxr.permission.OPENXR_SYSTEM",
+                });
+
+                AxmlElement providerElement = new("provider") {
+                    Attributes = {new("authorities", AndroidNamespaceUri, AuthoritiesAttributeResourceId, "org.khronos.openxr.runtime_broker;org.khronos.openxr.system_runtime_broker")},
+                };
+                AxmlElement runtimeIntent = new("intent") {
+                    Children = {
+                        new("action") {
+                            Attributes = {new("name", AndroidNamespaceUri, NameAttributeResourceId, "org.khronos.openxr.OpenXRRuntimeService")},
+                        },
+                    },
+                };
+                AxmlElement layerIntent = new("intent") {
+                    Children = {
+                        new("action") {
+                            Attributes = {new("name", AndroidNamespaceUri, NameAttributeResourceId, "org.khronos.openxr.OpenXRApiLayerService")},
+                        },
+                    },
+                };
+                manifest.Children.Add(new("queries") {
+                    Children = {
+                        providerElement,
+                        runtimeIntent,
+                        layerIntent,
+                    },
+                });
+            }
+
             // Find which features and permissions already exist to avoid adding existing ones
             var existingPermissions = GetExistingChildren(manifest, "uses-permission");
             var existingFeatures = GetExistingChildren(manifest, "uses-feature");

QuestPatcher/Views/PatchingView.axaml

@@ -19,6 +19,7 @@
                   <ToggleSwitch IsChecked="{Binding Config.PatchingOptions.Debuggable}">Allow Debugging</ToggleSwitch>
                   <ToggleSwitch IsChecked="{Binding Config.PatchingOptions.FlatScreenSupport}">Disable VR Requirement</ToggleSwitch>
                   <ToggleSwitch IsChecked="{Binding Config.PatchingOptions.Microphone}">Enable Microphone</ToggleSwitch>
+                  <ToggleSwitch IsChecked="{Binding Config.PatchingOptions.OpenXR}">Enable OpenXR</ToggleSwitch>
 
                   <StackPanel Orientation="Vertical" Spacing="10">
                       <TextBlock>Hand Tracking Type</TextBlock>