From 0725c5122c7e4c392dc8fd62a018c7fd42e0d895 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Fri, 29 Jan 2021 20:46:16 +1100
Subject: [PATCH] Show message box if System.loadLibrary fails, drop minSdk
 version to 8 so I don't have to remember to keep readding that in

---
 android/app/src/main/AndroidManifest.xml              |  2 +-
 .../src/main/java/com/classicube/MainActivity.java    | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 3ba98779f..7939562ee 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
-  <uses-sdk android:minSdkVersion="13" android:targetSdkVersion="26"/>
+  <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="26"/>
   
   <application android:icon="@mipmap/ccicon" android:label="ClassiCube">
 
diff --git a/android/app/src/main/java/com/classicube/MainActivity.java b/android/app/src/main/java/com/classicube/MainActivity.java
index 6726485ff..b9062399a 100644
--- a/android/app/src/main/java/com/classicube/MainActivity.java
+++ b/android/app/src/main/java/com/classicube/MainActivity.java
@@ -130,7 +130,15 @@ public class MainActivity extends Activity implements SurfaceHolder.Callback2 {
 
 	void startGameAsync() {
 		Log.i("CC_WIN", "handing off to native..");
-		System.loadLibrary("classicube");
+		try {
+			System.loadLibrary("classicube");
+		} catch (UnsatisfiedLinkError ex) {
+			ex.printStackTrace();
+			showAlert("Failed to start", "Cannot load libclassicube.so: " + ex.getMessage());
+			return;
+		}
+		
+		gameRunning = true;
 		runGameAsync();
 	}
 	
@@ -157,7 +165,6 @@ public class MainActivity extends Activity implements SurfaceHolder.Callback2 {
 		}
 
 		if (!gameRunning) startGameAsync();
-		gameRunning = true;
 		super.onCreate(savedInstanceState);
 	}