Merge branch 'QuestCraft' of https://github.com/QuestCraftPlusPlus/Po…

…jlib into Testing
QuestCraftPlusPlus · Sep 7, 2024 · d8e4e79 · d8e4e79
2 parents 462086f + 612c670
commit d8e4e79
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -53,3 +53,9 @@ jobs:
       env:
         QCXR_KEYSTORE_ALIAS: ${{ secrets.QCXR_KEYSTORE_ALIAS }}
         QCXR_KEYSTORE_PASS: ${{ secrets.QCXR_KEYSTORE_PASS }}
+
+    - name: Upload APK
+      uses: actions/upload-artifact@v3
+      with:
+          name: app-debug
+          path: build/outputs/aar/*
diff --git a/src/main/java/pojlib/UnityPlayerActivity.java b/src/main/java/pojlib/UnityPlayerActivity.java
@@ -26,9 +26,18 @@ public class UnityPlayerActivity extends ActivityGroup implements IUnityPlayerLi
     // See https://docs.unity3d.com/Manual/CommandLineArguments.html
     // @param cmdLine the current command line arguments, may be null
     // @return the modified command line string or null
+    private String appendCommandLineArgument(String cmdLine, String arg) {
+        if (arg == null || arg.isEmpty())
+            return cmdLine;
+        else if (cmdLine == null || cmdLine.isEmpty())
+            return arg;
+        else
+            return cmdLine + " " + arg;
+    }
+
     protected String updateUnityCommandLineArguments(String cmdLine)
     {
-        return cmdLine;
+        return appendCommandLineArgument(cmdLine, "-androidChainedSignalHandlerBehavior=disabled");
     }
 
     // Setup activity layout