r: Cleanup

Author: marc-n-dream

Assets/AirConsole/scripts/Editor/BuildAutomation/AndroidGradleProcessor.cs

@@ -64,7 +64,7 @@ Regex versionExtractor
             for (int i = 0; i < lines.Length; i++) {
                 // regex to check the used gradle version
                 Match match = versionExtractor.Match(lines[i]);
-                if (lines[i].StartsWith("distributionUrl=")
+                if (lines[i].StartsWith("distributionUrl=") && match.Success
                     && (int.Parse(match.Groups["Major"].Value) < 8
                         || int.Parse(match.Groups["Minor"].Value) < 1
                         || int.Parse(match.Groups["Build"].Value) < 1)) {

Assets/AirConsole/scripts/Runtime/AirConsole.cs

@@ -3,17 +3,17 @@
 #endif
 
 namespace NDream.AirConsole {
-    using UnityEngine;
+    using NDream.AirConsole.Android.Plugin;
+    using Newtonsoft.Json.Linq;
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
-    using System;
     using System.Diagnostics;
-    using Android.Plugin;
-    using WebSocketSharp.Server;
-    using Newtonsoft.Json.Linq;
-    using UnityEngine.Serialization;
-    using UnityEngine.SceneManagement;
     using System.Threading;
+    using System;
+    using UnityEngine.SceneManagement;
+    using UnityEngine.Serialization;
+    using UnityEngine;
+    using WebSocketSharp.Server;
 
     public enum StartMode {
         VirtualControllers,
@@ -1487,7 +1487,7 @@ private void OnReady(JObject msg) {
                     UnityEditor.EditorApplication.isPlaying = false;
                     throw new Exception("No listeners registered to OnGameAudioFocusChanged. Editor playback stopped.");
 #else
-                    throw new System.Exception("No listeners registered to OnGameAudioFocusChanged.");
+                    throw new Exception("No listeners registered to OnGameAudioFocusChanged.");
 #endif
                 }
 
@@ -2284,7 +2284,7 @@ private void OnLaunchApp(JObject msg) {
 
             if (gameId != Application.identifier || gameVersion != instance.androidGameVersion) {
                 // Marshal to main thread since this is called from WebSocket background thread
-                HandleLaunchAppTransition(msg, gameId, gameVersion);
+                eventQueue.Enqueue(() => HandleLaunchAppTransition(msg, gameId, gameVersion));
             }
         }
 

Assets/AirConsole/scripts/Runtime/Plugin/Android/PluginManager.cs

@@ -23,8 +23,6 @@ public class PluginManager {
         internal event Action<string> OnAudioFocusChange;
 
         internal PluginManager(AirConsole airConsole) {
-            AirConsoleLogger.LogDevelopment(() => $"{nameof(PluginManager)} created.");
-
             GenericUnityPluginCallback<bool> pauseCallback = new(HandlePlatformPauseEvent);
 
             UnityPluginStringCallback callback = new(