Fixed state names

.github/workflows/build.yml

@@ -48,17 +48,17 @@ jobs:
           cache: 'gradle'
 
       - name: Build APK
-        run: ./gradlew assemble
-
-      # - name: Upload APK
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: app.apk
-      #     path: app/build/outputs/apk/release/app-release.apk
+        run: ./gradlew assembleSignedRelease
 
       - name: Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
-            app/build/outputs/apk/release/app-release.apk   
+            app/build/outputs/apk/signedRelease/app-signedRelease.apk
+          prerelease: |
+            if [[ ${{ github.ref }} =~ ^refs/tags/[0-9]+\.[0-9]+[a-z]+$ ]]; then
+              echo "false"
+            else
+              echo "true"
+            fi

app/build.gradle

@@ -5,9 +5,6 @@ plugins {
     id 'com.mikepenz.aboutlibraries.plugin' version '11.1.1'
 }
 
-def keystorePropertiesFile = rootProject.file("app/keystore.properties")
-def keystoreProperties = new Properties()
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
     namespace 'net.helcel.beans'
@@ -20,22 +17,37 @@ android {
         versionCode 1
         versionName "0.1a"
     }
-
     signingConfigs {
         create("release") {
+            try {
+                def keystorePropertiesFile = rootProject.file("app/keystore.properties")
+                def keystoreProperties = new Properties()
+                keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
                 keyAlias keystoreProperties['keyAlias']
                 keyPassword keystoreProperties['keyPassword']
                 storeFile file(keystoreProperties['storeFile'])
                 storePassword keystoreProperties['storePassword']
+            } catch (FileNotFoundException e) {
+                println("File not found: ${e.message}")
+            }
         }
     }
 
 
     buildTypes {
+        debug {
+            debuggable true
+        }
         release {
             minifyEnabled true
             shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        signedRelease {
+            minifyEnabled true
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig = signingConfigs.getByName("release")
         }
     }

app/src/main/assets/geoloc_state.txt

@@ -3532,4 +3532,4 @@ Z05_UT|IND|Uttarakhand|259
 Z09_UT|IND|Uttarakhand|987
 Z06_JK|PAK|Azad Kashmir|13931
 Z06_NA|PAK|Gilgit-Baltistan|68053
-GBR_EN|GBR|England|417
+GBR_NA|GBR|England|417