Merge branch 'Ravbug:main' into main

Author: Ravbug

.github/workflows/update-sample.yml

@@ -0,0 +1,32 @@
+name: Update-Sample
+on:  workflow_dispatch
+
+jobs:
+  update-sample:
+    name: Update Sample
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Announce repo
+        run: echo ${{ github.event.inputs.name }}
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Execute
+        run: |
+           cd to-build/sdl3-sample
+           git config pull.rebase false
+           git pull
+      - name: git config
+        run: |
+          git config user.name github-actions[bot]
+          git config user.email 22283943+github-actions[bot]@users.noreply.github.com
+          git stash
+          git pull
+          git stash pop
+      - name: git commit
+        run: git add . && git commit -m "Update android-project"
+      - name: git push
+        run: git push origin HEAD:main

app/proguard-rules.pro

@@ -35,9 +35,9 @@
     void manualBackButton();
     int messageboxShowMessageBox(int, java.lang.String, java.lang.String, int[], int[], java.lang.String[], int[]);
     void minimizeWindow();
-    int openURL(java.lang.String);
+    boolean openURL(java.lang.String);
     void requestPermission(java.lang.String, int);
-    int showToast(java.lang.String, int, int, int, int);
+    boolean showToast(java.lang.String, int, int, int, int);
     boolean sendMessage(int, int);
     boolean setActivityTitle(java.lang.String);
     boolean setCustomCursor(int);

app/src/main/AndroidManifest.xml

@@ -33,6 +33,7 @@
 
     <!-- Audio recording support -->
     <!-- if you want to record audio, uncomment this. -->
+    <!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->
     <!-- <uses-feature
         android:name="android.hardware.microphone"
         android:required="false" /> -->
@@ -55,8 +56,11 @@
     <!-- Allow access to the vibrator -->
     <uses-permission android:name="android.permission.VIBRATE" />
 
-    <!-- if you want to record audio, uncomment this. -->
-    <!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->
+    <!-- Allow access to Internet -->
+    <!-- if you want to connect to the network or internet, uncomment this. -->
+    <!--
+    <uses-permission android:name="android.permission.INTERNET" />
+    -->
 
     <!-- Create a Java class extending SDLActivity and place it in a
          directory under app/src/main/java matching the package, e.g. app/src/main/java/com/gamemaker/game/MyGame.java
@@ -81,7 +85,7 @@
             android:label="@string/app_name"
             android:alwaysRetainTaskState="true"
             android:launchMode="singleInstance"
-            android:configChanges="layoutDirection|locale|orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
+            android:configChanges="layoutDirection|locale|grammaticalGender|fontScale|fontWeightAdjustment|orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
             android:preferMinimalPostProcessing="true"
             android:exported="true"
             >

app/src/main/java/org/libsdl/app/HIDDeviceUSB.java

@@ -154,6 +154,11 @@ public boolean open() {
 
     @Override
     public int writeReport(byte[] report, boolean feature) {
+        if (mConnection == null) {
+            Log.w(TAG, "writeReport() called with no device connection");
+            return -1;
+        }
+
         if (feature) {
             int res = -1;
             int offset = 0;
@@ -201,6 +206,11 @@ public boolean readReport(byte[] report, boolean feature) {
         boolean skipped_report_id = false;
         byte report_number = report[0];
 
+        if (mConnection == null) {
+            Log.w(TAG, "readReport() called with no device connection");
+            return false;
+        }
+
         if (report_number == 0x0) {
             /* Offset the return buffer by 1, so that the report ID
                will remain in byte 0. */

app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -60,7 +60,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 3;
     private static final int SDL_MINOR_VERSION = 1;
-    private static final int SDL_MICRO_VERSION = 2;
+    private static final int SDL_MICRO_VERSION = 7;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
@@ -88,7 +88,7 @@ public static void debugSource(int sources, String prefix) {
                 | InputDevice.SOURCE_CLASS_POSITION
                 | InputDevice.SOURCE_CLASS_TRACKBALL);
 
-        if (s2 != 0) cls += "Some_Unkown";
+        if (s2 != 0) cls += "Some_Unknown";
 
         s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class;
 
@@ -162,7 +162,7 @@ public static void debugSource(int sources, String prefix) {
         if (s == FLAG_TAINTED) src += " FLAG_TAINTED";
         s2 &= ~FLAG_TAINTED;
 
-        if (s2 != 0) src += " Some_Unkown";
+        if (s2 != 0) src += " Some_Unknown";
 
         Log.v(TAG, prefix + "int=" + s_copy + " CLASS={" + cls + " } source(s):" + src);
     }