From b0f1a93fd31c540c8be3f5eecd45069c9e2ff782 Mon Sep 17 00:00:00 2001
From: Katie M <mckeanke@msu.edu>
Date: Tue, 19 Mar 2024 14:16:59 -0400
Subject: [PATCH 1/4] Changing the window flags of the SDL window to fix a
 "tiny screen" issue on Android

---
 src/sdltiles.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp
index 62acd2f7df7b0..c5d398b1e8fc3 100644
--- a/src/sdltiles.cpp
+++ b/src/sdltiles.cpp
@@ -269,6 +269,10 @@ static void WinCreate()
     // Without this, the game only displays in the top-left 1/4 of the window.
     window_flags &= ~SDL_WINDOW_ALLOW_HIGHDPI;
 #endif
+#if defined(__ANDROID__)
+    // Without this, the game only displays in the top-left 1/4 of the window.
+    window_flags = SDL_WINDOW_ALLOW_HIGHDPI | SDL_WINDOW_MAXIMIZED;
+#endif
 
     int display = std::stoi( get_option<std::string>( "DISPLAY" ) );
     if( display < 0 || display >= SDL_GetNumVideoDisplays() ) {

From 0b8d128a56c2a5018f973c55b0351f8f3f9c07f8 Mon Sep 17 00:00:00 2001
From: Katie M <mckeanke@msu.edu>
Date: Mon, 4 Mar 2024 10:18:18 -0500
Subject: [PATCH 2/4] Modified release workflow for my master branch to allow
 triggering android builds

---
 .github/workflows/release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5d5865d98ca2d..4cc6bab22e4bb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,6 +1,7 @@
 name: "Experimental Release"
 concurrency: release
 on:
+  workflow_dispatch:
   push:
     branches:
       - master

From 4bca0fc9fa5e1614ef47364dde2357cffd62b554 Mon Sep 17 00:00:00 2001
From: Antti Riikonen <harakka@myrskynkantaja.org>
Date: Wed, 22 Nov 2023 17:28:27 +0000
Subject: [PATCH 3/4] generate temp keystore instead of using secrets

---
 .github/workflows/release.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4cc6bab22e4bb..e7f256ffd90da 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -362,10 +362,8 @@ jobs:
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
         working-directory: ./android
         run: |
-          echo "${{ secrets.KEYSTORE }}" > release.keystore.asc   
-          gpg -d --passphrase "${{ secrets.KEYSTORE_PASSWORD }}" --batch release.keystore.asc > app/release.keystore 
-          echo "${{ secrets.KEYSTORE_PROPERTIES }}" > keystore.properties.asc   
-          gpg -d --passphrase "${{ secrets.KEYSTORE_PASSWORD }}" --batch keystore.properties.asc > keystore.properties
+          keytool -genkey -keystore /tmp/a.keystore -keyalg RSA -keysize 2048 -validity 10000 -alias a -dname "cn=a, ou=a, o=a, c=a" -storepass 123456 -keypass 123456
+          echo -e "keyPassword=123456\nkeyAlias=a\nstorePassword=123456\nstoreFile=/tmp/a.keystore" > keystore.properties
           export UPSTREAM_BUILD_NUMBER="$((11581 + ${{ github.run_number }}))"
           chmod +x gradlew
           if [ ${{ matrix.android }} = arm64 ]

From dda4acc4f250cdb47bd693a9e81c79cfd22034b3 Mon Sep 17 00:00:00 2001
From: Antti Riikonen <harakka@myrskynkantaja.org>
Date: Wed, 22 Nov 2023 17:34:14 +0000
Subject: [PATCH 4/4] remove storeFile null check

---
 android/app/build.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 437f983e94243..ad0a20a877b5d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -309,7 +309,6 @@ android {
     }
 
     signingConfigs {
-        if (keystoreProperties.getProperty('storeFile') != null) {
             if (file(keystoreProperties.getProperty('storeFile')).exists()) {
                 release {
                     storeFile file(keystoreProperties.getProperty("storeFile"))
@@ -320,7 +319,6 @@ android {
             } else {
                 throw new GradleException("Keystore file " + keystoreProperties.getProperty("storeFile") + " was not found.\n")
             }
-        }
         if (keystoreProperties.getProperty('debug_storeFile') != null) {
             if (file(keystoreProperties.getProperty('debug_storeFile')).exists()) {
                 debug {