Merge develop to master for 7.2.4 release (#79)

* Exclude signup route from API token interceptor to prevent multiple authorization tokens from being sent

* Hide progress mask on sign up failure

* Update README.md (#66)

* fix manifest XML syntax error (#38)

* Upgrade to gradle 8.9 and java 21 (#68)

* Fix nullability to avoid null pointer exception

* Code Submitted Covers Mage #1326, Mage #1252, and Mage #1356

* Add Comment for Clarity, revert min version

* Fix Error Created during Merge conflict resolution

* add tools-versions file for java open jdk

* Add Scrollview to allow Profile to Scroll when it no longer fits on the screen.

* [mage-1357] - add missing type adapters to instance of gson being used for geoJson serialization to fix issue with inability to sync lines or polygons to mage server

* Bugfix/mage #1363: errors warning typos (#75)

* down from 43 to 12 errors

* down from 12 to 2 errors

* down from 2 to 0 errors

* undid mistake, fixed a lot more warnings

* duplicate

* undoing attempted fix

* undoing another attempted fix

* undoing AndroidID mistake

* Fixing Conflicts

* Fix Rebase Errors

* Fix When Statement

* Update Error Message

* Feature/#1391: Contact Us button (#77)

* Added *Contact Us* button within main menu settings under *About* button.

* added correct 'TO' email address

* Feature/mage 1398 (#78)

* [mage-1398]
Update github actions upload-artifact to v4
Set JVM target to 17 to resolve build workflow failure
Change workflows to not set version code. Update release workflow to set the correct mime type for apks.

* Update version code and name for 7.2.4 release

---------

Co-authored-by: William Newman <[email protected]>
Co-authored-by: Brad Hards <[email protected]>
Co-authored-by: Josh McCullough <[email protected]>
Co-authored-by: Billy Newman <[email protected]>
Co-authored-by: cwerthomni <[email protected]>
Co-authored-by: Ryan Carpenter <[email protected]>
Co-authored-by: Clinton Werth <[email protected]>
Co-authored-by: Dan Benner <[email protected]>

Author: 8 people

.github/workflows/build.yml

@@ -12,36 +12,30 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - name: Checkout Specified Branch
+      uses: actions/checkout@v4
       with:
-        fetch-depth: 0
+        ref: ${{ github.event.inputs.appBranch }}
     - name: Setup JDK 17
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '17'
-    - name: Checkout App Branch
-      run: git checkout ${{ github.event.inputs.appBranch }}
+        cache: 'gradle'
     - name: Setup Keystore
       run: |
         echo "${{ secrets.KEYSTORE }}" > release.b64
         base64 -d release.b64 > release.keystore
-    - name: Create Version Code
-      id: version_code
-      run: |
-        echo "value=$(git rev-list --count HEAD)" >>$GITHUB_OUTPUT
-        echo "VERSION_CODE $(git rev-list --count HEAD)"
     - name: Build Application
       run: |
         ./gradlew clean assembleRelease \
           -PKEYSTORE=../release.keystore \
           -PKEYSTORE_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }} \
           -PKEY_ALIAS=${{ secrets.KEY_ALIAS }} \
           -PKEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \
-          -PRELEASE_MAPS_API_KEY=${{ secrets.MAPS_API_KEY }} \
-          -PVERSION_CODE=${{ steps.version_code.outputs.value }}
+          -PRELEASE_MAPS_API_KEY=${{ secrets.MAPS_API_KEY }}
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: mage-release.apk
         path: mage/build/outputs/apk/release/mage-release.apk

.github/workflows/release.yml

@@ -9,9 +9,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
+    - name: Checkout
+      uses: actions/checkout@v4
     - name: Setup JDK 17
       uses: actions/setup-java@v3
       with:
@@ -21,21 +20,14 @@ jobs:
       run: |
         echo "${{ secrets.KEYSTORE }}" > release.b64
         base64 -d release.b64 > release.keystore
-    - name: Create Version Code
-      id: version_code
-      run: |
-        git checkout master
-        echo "value=$(git rev-list --count HEAD)" >>$GITHUB_OUTPUT
-        echo "VERSION_CODE $(git rev-list --count HEAD)"
     - name: Build Application
       run: |
         ./gradlew clean assembleRelease \
           -PKEYSTORE=../release.keystore \
           -PKEYSTORE_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }} \
           -PKEY_ALIAS=${{ secrets.KEY_ALIAS }} \
           -PKEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \
-          -PRELEASE_MAPS_API_KEY=${{ secrets.MAPS_API_KEY }} \
-          -PVERSION_CODE=${{ steps.version_code.outputs.value }}
+          -PRELEASE_MAPS_API_KEY=${{ secrets.MAPS_API_KEY }}
     - name: Get Upload URL
       id: url
       run:   |
@@ -49,4 +41,4 @@ jobs:
         upload_url: ${{ steps.url.outputs.upload_url }}
         asset_path: mage/build/outputs/apk/release/mage-release.apk
         asset_name: mage-release.apk
-        asset_content_type: application/octet-stream
+        asset_content_type: application/vnd.android.package-archive

.tool-versions

@@ -0,0 +1 @@
+java openjdk-23

README.md

@@ -8,7 +8,7 @@ The **M**obile **A**wareness **G**EOINT **E**nvironment, or MAGE, provides mobil
 
 The app remains functional if your mobile device loses its network connection, and will upload its local content when a connection is re-established. When disconnected from the network, MAGE will use local data layers to continue to provide relevant GEOINT. Data layers, including map tiles and vector data, can be stored on your mobile device and are available at all times.
 
-MAGE is very customizable and can be tailored for you situation.
+MAGE is very customizable and can be tailored for your situation.
 
 MAGE Android was developed at the National Geospatial-Intelligence Agency (NGA) in collaboration with BIT Systems. The government has "unlimited rights" and is releasing this software to increase the impact of government investments by providing developers with the opportunity to take things in new directions. The software use, modification, and distribution rights are stipulated within the Apache license.
 
@@ -124,14 +124,14 @@ file ./mage/build/outputs/apk/mage-android-defaults-debug.apk
 
 With a device connected to your machine, you can install the MAGE app with the following command:
 ```bash
-./gradlew installDefaultsDebug
+./gradlew installDebug
 ```
 
 ### Test
 
 Run the tests on your device:
 ```bash
-./gradlew connectedDefaultsDebugAndroidTest
+./gradlew connectedDebugAndroidTest
 ```
 
 ## Pull Requests

build.gradle

@@ -1,7 +1,7 @@
 plugins {
-    id 'com.android.application' version '8.3.0' apply false
-    id 'com.android.library' version '8.3.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
+    id 'com.android.application' version '8.7.2' apply false
+    id 'com.android.library' version '8.7.2' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.25' apply false
     id 'com.google.dagger.hilt.android' version '2.51' apply false
 }
 

gradle.properties

@@ -3,7 +3,5 @@ android.enableJetifier=true
 org.gradle.jvmargs=-Xmx4096m
 
 # Application properties
-VERSION_CODE=1
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu May 06 13:38:17 MDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

mage/build.gradle

@@ -2,15 +2,14 @@ import org.ajoberstar.grgit.Grgit
 
 plugins {
     id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
+    id 'kotlin-android'
     id 'kotlin-parcelize'
     id 'kotlin-kapt'
-    id 'org.ajoberstar.grgit' version '4.1.0'
+    id 'org.ajoberstar.grgit' version '5.3.0'
     id 'com.google.dagger.hilt.android'
 }
 
 group 'mil.nga.giat.mage'
-version '7.2.3'
 ext {
     sourceRefspec = Grgit.open(currentDir: project.rootDir).head().id
 
@@ -33,7 +32,13 @@ def googleMapsApiReleaseKey = hasProperty('RELEASE_MAPS_API_KEY') ? RELEASE_MAPS
 def googleMapsApiDebugKey = hasProperty('DEBUG_MAPS_API_KEY') ? DEBUG_MAPS_API_KEY : ''
 
 android {
-    compileSdk 34
+    defaultConfig {
+        compileSdk 34
+    }
+
+    buildFeatures{
+        buildConfig = true
+    }
     namespace 'mil.nga.giat.mage'
 
     dataBinding {
@@ -50,17 +55,17 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
 
-    kotlin {
-        jvmToolchain(11)
-    }
-
     kotlin {
         jvmToolchain(17)
     }
 
     kotlinOptions {
         jvmTarget = "17"
         freeCompilerArgs = ["-Xcontext-receivers"]
+        freeCompilerArgs += [
+                "-P",
+                "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=1.9.25"
+        ]
     }
 
     buildFeatures {
@@ -69,7 +74,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.3"
+        kotlinCompilerExtensionVersion = "1.5.15"
     }
 
     packagingOptions {
@@ -84,10 +89,10 @@ android {
 
     defaultConfig {
         applicationId "mil.nga.giat.mage"
-        versionName project.version
-        versionCode VERSION_CODE as int
+        versionCode 1952
+        versionName '7.2.4'
         minSdkVersion 27
-        targetSdkVersion 33
+        targetSdkVersion 34
         multiDexEnabled true
         resValue "string", "serverURLDefaultValue", serverURL
         resValue "string", "recentMapXYZDefaultValue", "263.0,40.0,3"

mage/proguard-rules.pro

@@ -33,5 +33,6 @@
 }
 
 -assumenosideeffects class java.lang.Exception {
+    #noinspection ShrinkerUnresolvedReference
     public void printStackTrace();
 }

mage/src/main/AndroidManifest.xml

@@ -14,9 +14,11 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
 
     <uses-feature
@@ -77,7 +79,8 @@
             android:configChanges="orientation"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateAlwaysHidden"
-            android:theme="@style/AppTheme3.NoActionBar">
+            android:theme="@style/AppTheme3.NoActionBar"
+            tools:ignore="DiscouragedApi">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -150,7 +153,8 @@
             android:name=".login.ServerUrlActivity"
             android:theme="@style/AppTheme.NoActionBar"
             android:configChanges="orientation"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi" />
         <activity
             android:name=".event.EventsActivity"
             android:theme="@style/AppTheme.NoActionBar" />