Add connection check, add callback. doesn't work on PICO

Author: thejudge156

Assets/Scripts/InstanceButton.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using UnityEngine;
@@ -44,6 +45,12 @@ public void LaunchCurrentInstance()
         if (JNIStorage.GetInstance(currInstName) == null)
         {
             Debug.Log("Instance is null!");
+
+            if (!JNIStorage.CheckConnectionAndThrow())
+            {
+                return;
+            }
+            
             CreateDefaultInstance(currInstName);
             return;
         }
@@ -58,16 +65,23 @@ public void LaunchCurrentInstance()
             JNIStorage.instance.uiHandler.SetAndShowError(currInstName + " is still installing, please wait until the install has finished.");
             return; 
         }
-        
-        async Task FinishAnim()
+
+        if (!OpenXRFeatureSystemInfo.GetHeadsetName().Contains("PICO"))
         {
-            await Task.Delay(200);
-            XRGeneralSettings.Instance.Manager.activeLoader.Stop();
-            XRGeneralSettings.Instance.Manager.activeLoader.Deinitialize();
-            
-            Application.Quit();
-            JNIStorage.apiClass.CallStatic("launchInstance", JNIStorage.activity, JNIStorage.accountObj, instance.raw);
+            Task.Run(() =>
+            {
+                AndroidJNI.AttachCurrentThread();
+                JNIStorage.apiClass.CallStatic("launchInstance", JNIStorage.activity, JNIStorage.accountObj,
+                    instance.raw);
+            });
+        }
+        else
+        {
+            Application.Unload();
+            JNIStorage.apiClass.CallStatic("launchInstance", JNIStorage.activity, JNIStorage.accountObj,
+                instance.raw);
         }
-        LeanTween.value(ScreenFade.gameObject,0, 1, 1).setOnUpdate(alpha => ScreenFade.alpha = alpha).setOnComplete(() => FinishAnim());
+
+        JNIStorage.instance.uiHandler.SetAndShowError("Instance is now launching, please wait... (Game will switch automatically when ready)");
     }
 }

Assets/Scripts/JNIStorage.cs

@@ -1,17 +1,21 @@
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Serialization;
 using UnityEngine.UI;
 using UnityEngine.CrashReportHandler;
 using UnityEngine.EventSystems;
+using UnityEngine.Networking;
+using UnityEngine.XR.Management;
 
 public class JNIStorage : MonoBehaviour
 {
     public static AndroidJavaClass apiClass;
     public static AndroidJavaObject accountObj;
     public static AndroidJavaObject activity;
     public static AndroidJavaObject instancesObj;
+    public static ConnectionStatus connectionStatus = ConnectionStatus.Checking;
     public APIHandler apiHandler;
     public static JNIStorage instance;
     public List<string> supportedVersions;
@@ -21,6 +25,41 @@ public class JNIStorage : MonoBehaviour
     public GameObject instancePrefab;
     public GameObject instanceArray;
 
+    public enum ConnectionStatus
+    {
+        Checking,
+        Connected,
+        Disconnected
+    }
+
+    public static bool CheckConnectionAndThrow()
+    {
+        switch (connectionStatus)
+        {
+            case ConnectionStatus.Checking:
+                instance.uiHandler.SetAndShowError("Have not finished checked Microsoft connection, please wait a moment.");
+                return false;
+            case ConnectionStatus.Disconnected:
+                instance.uiHandler.SetAndShowError("No internet connection. Can't complete operation.");
+                return false;
+            case ConnectionStatus.Connected:
+            default:
+                return true;
+        }
+    }
+
+    static void CloseXR()
+    {
+        XRGeneralSettings.Instance.Manager.activeLoader.Stop();
+        XRGeneralSettings.Instance.Manager.activeLoader.Deinitialize();
+    }
+    
+    [RuntimeInitializeOnLoadMethod]
+    static void RunOnStart()
+    {
+        Application.unloading += CloseXR;
+    }
+
     private void Start()
     {
 		CrashReportHandler.enableCaptureExceptions = false;
@@ -37,6 +76,8 @@ private void Start()
         configHandler.LoadConfig();
         UpdateInstances();
 	    apiClass.SetStatic("model", OpenXRFeatureSystemInfo.GetHeadsetName());
+        
+        CheckConnection();
     }
 
     private void FillSupportedVersions(string[] supportedVersionsArray)
@@ -81,4 +122,21 @@ public void UpdateInstances()
         FillSupportedVersions(supportedVersionsArray);
         uiHandler.UpdateDropdowns(true, supportedVersions);
     }
+    
+    public static async void CheckConnection()
+    {
+        UnityWebRequest request = UnityWebRequest.Get("https://piston-meta.mojang.com/mc/game/version_manifest_v2.json");
+        request.SendWebRequest();
+        
+        while (!request.isDone)
+            await Task.Delay(16);
+        
+        if (request.result != UnityWebRequest.Result.Success)
+        {
+            Debug.Log("Unable to contact Mojang servers" + request.error);
+            connectionStatus = ConnectionStatus.Disconnected;
+        }
+
+        connectionStatus = ConnectionStatus.Connected;
+    }
 }

Assets/Scripts/UIHandler.cs

@@ -25,6 +25,7 @@ public class UIHandler : MonoBehaviour
     public static int selectedInstance;
     static string pfpUrl;
     static string profileName;
+    private bool erroredConnection;
 
     public LoginHandler loginHandler;
     public ModManager modManager;