From 1fa911202364918a5921d4cd4e38a15320a99d51 Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Sat, 22 Jan 2022 09:34:51 +0900
Subject: [PATCH] Android: Upgrade SDL and SDL_ttf

- SDL 2.0.20
- SDL_ttf 2.0.18
---
 android/app/jni/CMakeLists.txt                      |  9 ++++-----
 .../main/java/org/libsdl/app/HIDDeviceManager.java  |  3 +++
 .../src/main/java/org/libsdl/app/SDLActivity.java   | 13 +++++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/android/app/jni/CMakeLists.txt b/android/app/jni/CMakeLists.txt
index ef11777..71d0783 100644
--- a/android/app/jni/CMakeLists.txt
+++ b/android/app/jni/CMakeLists.txt
@@ -5,14 +5,13 @@ project(GAME)
 include(FetchContent)
 FetchContent_Declare(
   SDL
-  URL https://libsdl.org/release/SDL2-2.0.18.tar.gz
-  URL_HASH SHA1=419c62567d197a52a2136865c158f894939c1adf
+  URL https://libsdl.org/release/SDL2-2.0.20.tar.gz
+  URL_HASH SHA1=18ce006cbf07502f48abfedc088c14404091f3d3
 )
-# TODO: Use SDL2_ttf 2.0.16 once released
 FetchContent_Declare(
   SDL_ttf
-  GIT_REPOSITORY https://github.com/libsdl-org/SDL_ttf.git
-  GIT_TAG 11722a2bb4335d489d724c08cfdbb45f97d07aa7
+  URL https://github.com/libsdl-org/SDL_ttf/archive/refs/tags/release-2.0.18.tar.gz
+  URL_HASH SHA1=6fc5130757b447d46c3da6abd58687e8576de8b8
 )
 
 # Compilation of SDL and companion libraries
diff --git a/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java b/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
index 5ebbb97..802c725 100644
--- a/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
+++ b/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
@@ -141,6 +141,9 @@ public class HIDDeviceManager {
 
     private void initializeUSB() {
         mUsbManager = (UsbManager)mContext.getSystemService(Context.USB_SERVICE);
+        if (mUsbManager == null) {
+            return;
+        }
 
         /*
         // Logging
diff --git a/android/app/src/main/java/org/libsdl/app/SDLActivity.java b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
index 02c64b1..8641ccf 100644
--- a/android/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -1479,6 +1479,19 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         return mLastCursorID;
     }
 
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void destroyCustomCursor(int cursorID) {
+        if (Build.VERSION.SDK_INT >= 24) {
+            try {
+                mCursors.remove(cursorID);
+            } catch (Exception e) {
+            }
+        }
+        return;
+    }
+
     /**
      * This method is called by SDL using JNI.
      */