make QAVS not quit on first start after permission grant but instead start normally

Author: ComputerElite

QuestAppVersionSwitcher/CoreService.cs

@@ -18,6 +18,7 @@
 using Android.Media.Audiofx;
 using Android.OS;
 using Android.Provider;
+using AndroidX.Activity.Result;
 using Com.Xamarin.Formsviewgroup;
 using ComputerUtils.Android;
 using Xamarin.Essentials;
@@ -32,7 +33,9 @@ public class CoreService
         public static CoreVars coreVars = new CoreVars();
         public static Version version = Assembly.GetExecutingAssembly().GetName().Version;
         public static string ua = "Mozilla/5.0 (X11; Linux x86_64; Quest) AppleWebKit/537.36 (KHTML, like Gecko) OculusBrowser/23.2.0.4.49.401374055 SamsungBrowser/4.0 Chrome/104.0.5112.111 VR Safari/537.36";
-        public async void Start()
+        public static ActivityResultLauncher launcher;
+
+        public static async void Start()
         {
 			// Accept every ssl certificate, may be a security risk but it's the only way to get the mod list (CoPilot)
 			ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; });
@@ -47,6 +50,7 @@ public async void Start()
                 {
                     if (await Permissions.RequestAsync<Permissions.StorageRead>() != PermissionStatus.Granted) return;
                 }
+                AfterPermissionGrantStart();
             }
             else
             {
@@ -56,15 +60,20 @@ public async void Start()
                     if (Directory.Exists(coreVars.QAVSPermTestDir)) Directory.Delete(coreVars.QAVSPermTestDir, true);
                     Directory.CreateDirectory(coreVars.QAVSPermTestDir);
                     Directory.Delete(coreVars.QAVSPermTestDir, true);
+                    AfterPermissionGrantStart();
                 }
                 catch (Exception e)
                 {
                     // Manage storage permission
                     Android.Net.Uri uri = Android.Net.Uri.Parse("package:com.ComputerElite.questappversionswitcher");
                     Intent i = new Intent(Settings.ActionManageAppAllFilesAccessPermission, uri);
-                    AndroidCore.context.StartActivity(i);
+                    launcher.Launch(i);
                 }
             }
+        }
+
+        public static void AfterPermissionGrantStart()
+        {
 
 
             //Set webbrowser settings
@@ -105,4 +114,12 @@ public async void Start()
             qAVSWebserver.Start();
         }
     }
+    
+    public class ManageStoragePermissionCallback : Java.Lang.Object, IActivityResultCallback
+    {
+        public void OnActivityResult(Java.Lang.Object result)
+        {
+            CoreService.AfterPermissionGrantStart();
+        }
+    }
 }

QuestAppVersionSwitcher/MainActivity.cs

@@ -42,10 +42,12 @@ protected override void OnCreate(Bundle savedInstanceState)
 
             FolderPermission.l = AndroidCore.activity.RegisterForActivityResult(
                 new ActivityResultContracts.StartActivityForResult(), new FolderPermissionCallback());
-
-            // Start all services
-            CoreService core = new CoreService();
-            core.Start();
+            
+            
+            CoreService.launcher = AndroidCore.activity.RegisterForActivityResult(
+                new ActivityResultContracts.StartActivityForResult(), new ManageStoragePermissionCallback());
+            
+            CoreService.Start();
         }
 
         public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults)

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.10.5" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="53">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.10.6" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="54">
 	<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.10.5.0")]
-[assembly: AssemblyFileVersion("1.10.5.0")]
+[assembly: AssemblyVersion("1.10.6.0")]
+[assembly: AssemblyFileVersion("1.10.6.0")]