From 9e0af313d5a182773b77ea5f5277cba3eebe41a9 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 25 Oct 2023 11:24:49 -0600 Subject: [PATCH 01/78] Update build.yml Try switching to new app signing action --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8fb1504b..726c622b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - name: Build with Gradle run: ./gradlew assembleRelease -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} - name: Sign APK - uses: r0adkll/sign-android-release@v1 + uses: Tlaster/android-sign@v1 with: releaseDirectory: mapcache/build/outputs/apk/release signingKeyBase64: ${{ secrets.SIGNING_KEY }} From 275014b7fe13f4c551765a4f3085d85af7bac179 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 25 Oct 2023 11:31:42 -0600 Subject: [PATCH 02/78] Update build.yml app signing update --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 726c622b..c724fd2d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,8 @@ jobs: alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} + env: + BUILD_TOOLS_VERSION: "30.0.2" - name: Copy Release Artifacts run: | mkdir mapcache/build/release From ec801fc4270e527bbe5fe34e479f7ac89a83e995 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 25 Oct 2023 11:38:02 -0600 Subject: [PATCH 03/78] Update build.yml updating signing action version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c724fd2d..56f193c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - name: Build with Gradle run: ./gradlew assembleRelease -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} - name: Sign APK - uses: Tlaster/android-sign@v1 + uses: Tlaster/android-sign@v1.2.2 with: releaseDirectory: mapcache/build/outputs/apk/release signingKeyBase64: ${{ secrets.SIGNING_KEY }} From fe7d9e0e98b36e2e380ae9dba12c7438ba2db395 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 25 Oct 2023 12:08:36 -0600 Subject: [PATCH 04/78] Update build.yml back to using r0adkill for signing --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 56f193c4..8fb1504b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,15 +26,13 @@ jobs: - name: Build with Gradle run: ./gradlew assembleRelease -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} - name: Sign APK - uses: Tlaster/android-sign@v1.2.2 + uses: r0adkll/sign-android-release@v1 with: releaseDirectory: mapcache/build/outputs/apk/release signingKeyBase64: ${{ secrets.SIGNING_KEY }} alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - env: - BUILD_TOOLS_VERSION: "30.0.2" - name: Copy Release Artifacts run: | mkdir mapcache/build/release From 4960a8bb2dbcd2e0bd1f7fe1d5e311bac64245e9 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 25 Oct 2023 12:10:28 -0600 Subject: [PATCH 05/78] Use new singing tool Use new singing tool --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8fb1504b..d8acc6af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,10 +26,13 @@ jobs: - name: Build with Gradle run: ./gradlew assembleRelease -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} - name: Sign APK - uses: r0adkll/sign-android-release@v1 + uses: Tlaster/android-sign@v1.2.2 with: - releaseDirectory: mapcache/build/outputs/apk/release + releaseDirectory: | + mapcache/build/outputs/apk/release + mapcache/build/outputs/bundle/release signingKeyBase64: ${{ secrets.SIGNING_KEY }} + output: build/release/signed alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} From 3a1a121bde61ed7462c01f27fb9c3f65f9c46b9e Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 25 Oct 2023 12:18:48 -0600 Subject: [PATCH 06/78] Update build.yml --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8acc6af..31443f1a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,6 @@ jobs: with: releaseDirectory: | mapcache/build/outputs/apk/release - mapcache/build/outputs/bundle/release signingKeyBase64: ${{ secrets.SIGNING_KEY }} output: build/release/signed alias: ${{ secrets.ALIAS }} From 63fd17d263cc3ee1c3cf105ab3381d62a1baef70 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 26 Oct 2023 16:01:54 -0600 Subject: [PATCH 07/78] Update build.yml try fork of r0adkill signing --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31443f1a..55da4f57 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,10 +26,9 @@ jobs: - name: Build with Gradle run: ./gradlew assembleRelease -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} - name: Sign APK - uses: Tlaster/android-sign@v1.2.2 + uses: noriban/sign-android-release@v3 with: - releaseDirectory: | - mapcache/build/outputs/apk/release + releaseDirectory: mapcache/build/outputs/apk/release signingKeyBase64: ${{ secrets.SIGNING_KEY }} output: build/release/signed alias: ${{ secrets.ALIAS }} From 8b454cb8567199806156ffc76a32c7d421e1cf9e Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 26 Oct 2023 16:14:51 -0600 Subject: [PATCH 08/78] Update build.yml remove output --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55da4f57..1a9ac7fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,6 @@ jobs: with: releaseDirectory: mapcache/build/outputs/apk/release signingKeyBase64: ${{ secrets.SIGNING_KEY }} - output: build/release/signed alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} From e8be0dd24f49e69df4a20a21a72a0a8ee00596e4 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Fri, 27 Oct 2023 11:17:27 -0600 Subject: [PATCH 09/78] Update build.yml update to v4 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a9ac7fa..1011f286 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - name: Build with Gradle run: ./gradlew assembleRelease -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} - name: Sign APK - uses: noriban/sign-android-release@v3 + uses: noriban/sign-android-release@v4 with: releaseDirectory: mapcache/build/outputs/apk/release signingKeyBase64: ${{ secrets.SIGNING_KEY }} From 9af5603380e1ce120b3fe482794e983c09697af8 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Fri, 27 Oct 2023 12:12:17 -0600 Subject: [PATCH 10/78] build code and version update --- mapcache/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index bb85176c..b1e7937d 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -23,8 +23,8 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" minSdkVersion 28 targetSdkVersion 33 - versionCode 59 - versionName '2.1.10' + versionCode 60 + versionName '2.1.11' multiDexEnabled true } buildTypes { From db4e3ad2e4b2aa84d26fa2bf961a58ba0b6efd7d Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Fri, 27 Oct 2023 13:53:05 -0600 Subject: [PATCH 11/78] Update build.yml try signing in gradle build --- .github/workflows/build.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1011f286..9ca6d0c3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,15 +24,21 @@ jobs: with: sarif_file: results.sarif - name: Build with Gradle - run: ./gradlew assembleRelease -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} - - name: Sign APK - uses: noriban/sign-android-release@v4 - with: - releaseDirectory: mapcache/build/outputs/apk/release - signingKeyBase64: ${{ secrets.SIGNING_KEY }} - alias: ${{ secrets.ALIAS }} - keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} - keyPassword: ${{ secrets.KEY_PASSWORD }} + run: | + ./gradlew clean assembleRelease \ + -PKEYSTORE=../release.keystore \ + -PKEYSTORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }} \ + -PKEY_ALIAS=${{ secrets.ALIAS }} \ + -PKEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \ + -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} + # - name: Sign APK + # uses: noriban/sign-android-release@v4 + # with: + # releaseDirectory: mapcache/build/outputs/apk/release + # signingKeyBase64: ${{ secrets.SIGNING_KEY }} + # alias: ${{ secrets.ALIAS }} + # keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} + # keyPassword: ${{ secrets.KEY_PASSWORD }} - name: Copy Release Artifacts run: | mkdir mapcache/build/release From 6a811e5a928867cef02d0d66dd329418f66823c1 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Fri, 27 Oct 2023 13:56:03 -0600 Subject: [PATCH 12/78] Update build.yml set up keystore --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ca6d0c3..258dcae8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,6 +15,10 @@ jobs: with: java-version: 16 distribution: 'adopt' + - name: Setup Keystore + run: | + echo "${{ secrets.SIGNING_KEY }}" > release.b64 + base64 -d release.b64 > release.keystore - name: mobsfscan uses: MobSF/mobsfscan@0.2.0 with: From 37163015aeb95c32c138a8fa13543d15786da050 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 12:41:23 -0600 Subject: [PATCH 13/78] Update build.yml update export dir --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 258dcae8..7142a299 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,4 +51,4 @@ jobs: uses: actions/upload-artifact@v1 with: name: mapcache - path: mapcache/build/release + path: mapcache/build/outputs/apk/release/mapcache-release.apk From 33fd33dba517ad0fbb94edac020814d1deb36a9a Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 12:47:15 -0600 Subject: [PATCH 14/78] Update build.yml no need to copy --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7142a299..c0fff760 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,10 +43,10 @@ jobs: # alias: ${{ secrets.ALIAS }} # keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} # keyPassword: ${{ secrets.KEY_PASSWORD }} - - name: Copy Release Artifacts - run: | - mkdir mapcache/build/release - cp mapcache/build/outputs/apk/release/mapcache-*-signed.apk "mapcache/build/release/mapcache-$(./gradlew mapcache:androidAppVersion | grep versionName | sed 's/^.*@//').apk" + # - name: Copy Release Artifacts + # run: | + # mkdir mapcache/build/release + # cp mapcache/build/outputs/apk/release/mapcache-*-signed.apk "mapcache/build/release/mapcache-$(./gradlew mapcache:androidAppVersion | grep versionName | sed 's/^.*@//').apk" - name: Upload Artifacts uses: actions/upload-artifact@v1 with: From 72f43522203a006b78068b2e4b4115ca4495a07b Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 12:58:54 -0600 Subject: [PATCH 15/78] Update build.yml list files --- .github/workflows/build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c0fff760..acc05fb0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,6 +47,14 @@ jobs: # run: | # mkdir mapcache/build/release # cp mapcache/build/outputs/apk/release/mapcache-*-signed.apk "mapcache/build/release/mapcache-$(./gradlew mapcache:androidAppVersion | grep versionName | sed 's/^.*@//').apk" + - name: List Files + id: list-files + uses: mirko-felice/list-files-action@v3.0.5 + with: + repo: ${{ github.repository }} + ref: ${{ github.ref }} + path: "." + ext: ".apk" - name: Upload Artifacts uses: actions/upload-artifact@v1 with: From ce59110e92ade0eec2a3d63888d6a57f301e8120 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 13:07:43 -0600 Subject: [PATCH 16/78] Update build.yml list files --- .github/workflows/build.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index acc05fb0..01955a79 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,14 +47,9 @@ jobs: # run: | # mkdir mapcache/build/release # cp mapcache/build/outputs/apk/release/mapcache-*-signed.apk "mapcache/build/release/mapcache-$(./gradlew mapcache:androidAppVersion | grep versionName | sed 's/^.*@//').apk" - - name: List Files - id: list-files - uses: mirko-felice/list-files-action@v3.0.5 - with: - repo: ${{ github.repository }} - ref: ${{ github.ref }} - path: "." - ext: ".apk" + - name: List files in the repository + run: | + ls ${{ github.workspace }} - name: Upload Artifacts uses: actions/upload-artifact@v1 with: From af54f412048804a1fd1b671abf47f97d29fc915f Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 13:13:15 -0600 Subject: [PATCH 17/78] Update build.yml list files --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01955a79..83c0d18e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,6 +15,9 @@ jobs: with: java-version: 16 distribution: 'adopt' + - name: List files in the repository + run: | + ls "${{ github.workspace }}"/build - name: Setup Keystore run: | echo "${{ secrets.SIGNING_KEY }}" > release.b64 From b193c8fb83f7dc6a6014f6efa6a3ca259d32d3a9 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 13:16:17 -0600 Subject: [PATCH 18/78] Update build.yml list all --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83c0d18e..6a85dbf0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: distribution: 'adopt' - name: List files in the repository run: | - ls "${{ github.workspace }}"/build + ls -R "${{ github.workspace }}"/build - name: Setup Keystore run: | echo "${{ secrets.SIGNING_KEY }}" > release.b64 From 2ca2ec17adc6cce773c71cb5b2b508722888e2cb Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 13:17:24 -0600 Subject: [PATCH 19/78] Update build.yml list all --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a85dbf0..780c86e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: distribution: 'adopt' - name: List files in the repository run: | - ls -R "${{ github.workspace }}"/build + ls -R ${{ github.workspace }} - name: Setup Keystore run: | echo "${{ secrets.SIGNING_KEY }}" > release.b64 From b791db4e5ed5b21bcd95aefe3d9b6c439abb673b Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 13:19:25 -0600 Subject: [PATCH 20/78] Update build.yml list files after --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 780c86e6..c0d9e83b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,9 +15,6 @@ jobs: with: java-version: 16 distribution: 'adopt' - - name: List files in the repository - run: | - ls -R ${{ github.workspace }} - name: Setup Keystore run: | echo "${{ secrets.SIGNING_KEY }}" > release.b64 @@ -52,7 +49,7 @@ jobs: # cp mapcache/build/outputs/apk/release/mapcache-*-signed.apk "mapcache/build/release/mapcache-$(./gradlew mapcache:androidAppVersion | grep versionName | sed 's/^.*@//').apk" - name: List files in the repository run: | - ls ${{ github.workspace }} + ls -R ${{ github.workspace }} - name: Upload Artifacts uses: actions/upload-artifact@v1 with: From ea0e9d27f6fa5a0411fc42d0c5695fe93a1b5371 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 14:11:15 -0600 Subject: [PATCH 21/78] Update build.yml update keystore file --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c0d9e83b..f9632e39 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: - name: Build with Gradle run: | ./gradlew clean assembleRelease \ - -PKEYSTORE=../release.keystore \ + -PRELEASE_STORE_FILE=../release.keystore \ -PKEYSTORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }} \ -PKEY_ALIAS=${{ secrets.ALIAS }} \ -PKEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \ From cad16e960b100bb039e7add3b728a6257bae97de Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 14:18:36 -0600 Subject: [PATCH 22/78] Update build.yml signing params update --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9632e39..32a937db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,9 +31,9 @@ jobs: run: | ./gradlew clean assembleRelease \ -PRELEASE_STORE_FILE=../release.keystore \ - -PKEYSTORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }} \ - -PKEY_ALIAS=${{ secrets.ALIAS }} \ - -PKEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \ + -PRELEASE_STORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }} \ + -PRELEASE_KEY_ALIAS=${{ secrets.ALIAS }} \ + -PRELEASE_KEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \ -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} # - name: Sign APK # uses: noriban/sign-android-release@v4 From 86c593430d9d9824237438fea7f1395d1b438e8b Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 14:26:17 -0600 Subject: [PATCH 23/78] Update build.yml update signing params --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32a937db..c0d9e83b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,10 +30,10 @@ jobs: - name: Build with Gradle run: | ./gradlew clean assembleRelease \ - -PRELEASE_STORE_FILE=../release.keystore \ - -PRELEASE_STORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }} \ - -PRELEASE_KEY_ALIAS=${{ secrets.ALIAS }} \ - -PRELEASE_KEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \ + -PKEYSTORE=../release.keystore \ + -PKEYSTORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }} \ + -PKEY_ALIAS=${{ secrets.ALIAS }} \ + -PKEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \ -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} # - name: Sign APK # uses: noriban/sign-android-release@v4 From 53163a44f0292ed172f02347e536721c23c7a965 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 15:03:36 -0600 Subject: [PATCH 24/78] Update build.gradle add release to build --- mapcache/build.gradle | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index b1e7937d..8a391537 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -27,6 +27,18 @@ android { versionName '2.1.11' multiDexEnabled true } + signingConfigs { + release { + if (project.hasProperty('KEYSTORE')) { + storeFile file(KEYSTORE) + storePassword KEYSTORE_PASSWORD + keyAlias KEY_ALIAS + keyPassword KEY_PASSWORD + } else { + println 'no keystore property configured' + } + } + } buildTypes { release { minifyEnabled false @@ -123,4 +135,4 @@ configurations.all { } } -apply plugin: 'kotlin-android' \ No newline at end of file +apply plugin: 'kotlin-android' From 7755f18bba5ddb873e0bcb791e7be6ba3a767d42 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 15:08:30 -0600 Subject: [PATCH 25/78] Update build.gradle prints --- mapcache/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index 8a391537..322d8ba5 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -30,6 +30,7 @@ android { signingConfigs { release { if (project.hasProperty('KEYSTORE')) { + println 'assigning keystore' storeFile file(KEYSTORE) storePassword KEYSTORE_PASSWORD keyAlias KEY_ALIAS From 8f83e301c62d957fe6999e1ee7e972dc96226a52 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 15:25:00 -0600 Subject: [PATCH 26/78] Update build.yml filename update --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c0d9e83b..43fdef04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,5 +53,5 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v1 with: - name: mapcache + name: mapcache-release.apk path: mapcache/build/outputs/apk/release/mapcache-release.apk From 51adceca884d3494a56c239ab7f2248c32a33192 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 16:28:14 -0600 Subject: [PATCH 27/78] Update build.gradle add signing config --- mapcache/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index 322d8ba5..5256937a 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -43,6 +43,7 @@ android { buildTypes { release { minifyEnabled false + signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' resValue "string", "GOOGLE_MAPS_ANDROID_API_KEY", googleMapsApiReleaseKey } From 617c2798aa8f9bc2886867111a250ced15ca7e8a Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 16:30:47 -0600 Subject: [PATCH 28/78] Update build.gradle add variant output --- mapcache/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index 5256937a..b4937de5 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -42,6 +42,11 @@ android { } buildTypes { release { + applicationVariants.all { variant -> + variant.outputs.all { + outputFileName = "${rootProject.name}_${versionName}.apk" + } + } minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' From 4b04987df18dad9f1ba44a7c24ae85b9fc8948fb Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 16:32:07 -0600 Subject: [PATCH 29/78] Update build.gradle variant update --- mapcache/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index b4937de5..c7006e00 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -44,7 +44,7 @@ android { release { applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "${rootProject.name}_${versionName}.apk" + outputFileName = "mapcache_${versionName}.apk" } } minifyEnabled false From ce060db433ac6a0720e5181a8114f7461d8c710f Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 16:32:20 -0600 Subject: [PATCH 30/78] Update build.yml release apk update --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 43fdef04..ae26f3cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,5 +53,5 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v1 with: - name: mapcache-release.apk - path: mapcache/build/outputs/apk/release/mapcache-release.apk + name: mapcache + path: mapcache/build/outputs/apk/release/mapcache_${{ github.event.inputs.version }}.apk From 66cf6fed535be923f897983bb88bb38ed03fbb19 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 16:43:21 -0600 Subject: [PATCH 31/78] Update build.gradle update release file --- mapcache/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index c7006e00..07ea4777 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -44,7 +44,7 @@ android { release { applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "mapcache_${versionName}.apk" + outputFileName = "mapcache.apk" } } minifyEnabled false From ceb45b9ac845c2144af2a847b911d0b7dc195984 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 16:43:49 -0600 Subject: [PATCH 32/78] Update build.yml update release file --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae26f3cc..8ef164e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,4 +54,4 @@ jobs: uses: actions/upload-artifact@v1 with: name: mapcache - path: mapcache/build/outputs/apk/release/mapcache_${{ github.event.inputs.version }}.apk + path: mapcache/build/outputs/apk/release/mapcache.apk From 3a2ba964045b823a64e7adc08c7c88dc795c41dc Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 16:45:42 -0600 Subject: [PATCH 33/78] Update build.yml verify signing --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ef164e7..297ee7d8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,10 @@ jobs: -PKEY_ALIAS=${{ secrets.ALIAS }} \ -PKEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \ -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} + # Show information about the APK's signing certificates + - name: Verify Signature + run: $ANDROID_SDK_ROOT/build-tools/33.0.1/apksigner verify --print-certs app/build/outputs/apk/release/mapcache.apk + # - name: Sign APK # uses: noriban/sign-android-release@v4 # with: From 3ad49b4f33c605c007063ccdbc35bc7f3273add1 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 30 Oct 2023 16:51:58 -0600 Subject: [PATCH 34/78] Update build.yml update app dir --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 297ee7d8..01b28bd7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} # Show information about the APK's signing certificates - name: Verify Signature - run: $ANDROID_SDK_ROOT/build-tools/33.0.1/apksigner verify --print-certs app/build/outputs/apk/release/mapcache.apk + run: $ANDROID_SDK_ROOT/build-tools/33.0.1/apksigner verify --print-certs mapcache/build/outputs/apk/release/mapcache.apk # - name: Sign APK # uses: noriban/sign-android-release@v4 From c76cf3cd59c4c51de7ec74c673f5e5165f978fa8 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Tue, 31 Oct 2023 13:57:43 -0600 Subject: [PATCH 35/78] Update build.yml cleanup --- .github/workflows/build.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01b28bd7..e87ee855 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,22 +35,8 @@ jobs: -PKEY_ALIAS=${{ secrets.ALIAS }} \ -PKEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \ -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} - # Show information about the APK's signing certificates - name: Verify Signature run: $ANDROID_SDK_ROOT/build-tools/33.0.1/apksigner verify --print-certs mapcache/build/outputs/apk/release/mapcache.apk - - # - name: Sign APK - # uses: noriban/sign-android-release@v4 - # with: - # releaseDirectory: mapcache/build/outputs/apk/release - # signingKeyBase64: ${{ secrets.SIGNING_KEY }} - # alias: ${{ secrets.ALIAS }} - # keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} - # keyPassword: ${{ secrets.KEY_PASSWORD }} - # - name: Copy Release Artifacts - # run: | - # mkdir mapcache/build/release - # cp mapcache/build/outputs/apk/release/mapcache-*-signed.apk "mapcache/build/release/mapcache-$(./gradlew mapcache:androidAppVersion | grep versionName | sed 's/^.*@//').apk" - name: List files in the repository run: | ls -R ${{ github.workspace }} From 8e339e826119034852be3a49172e88795774080f Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Tue, 31 Oct 2023 13:58:28 -0600 Subject: [PATCH 36/78] Update build.gradle remove old signing vars --- mapcache/build.gradle | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index 07ea4777..0323344c 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -110,26 +110,6 @@ dependencies { testImplementation 'androidx.test:rules:1.5.0' } -configure extensions.android, { - if (project.hasProperty('RELEASE_STORE_FILE') && new File((String) project.getProperty('RELEASE_STORE_FILE')).exists()) { - signingConfigs { - release { - storeFile file(RELEASE_STORE_FILE) - storePassword RELEASE_STORE_PASSWORD - keyAlias RELEASE_KEY_ALIAS - keyPassword RELEASE_KEY_PASSWORD - } - } - buildTypes { - release { - setSigningConfig(signingConfigs.release) - } - } - } else { - println 'no keystore configured' - } -} - // This is to fix the errors : java.lang.NoClassDefFoundError: Failed resolution of: Landroid/view/View$OnUnhandledKeyEventListener; configurations.all { resolutionStrategy.eachDependency { details -> From 4b9dc92009a32ae893d182a8b6bd1b7cfad97f2a Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 2 Nov 2023 09:22:36 -0600 Subject: [PATCH 37/78] remove option to modify original gpkg file on import --- .../mil/nga/mapcache/load/ImportTask.java | 23 ++---------- mapcache/src/main/res/layout/import_file.xml | 35 +++++-------------- mapcache/src/main/res/values/strings.xml | 1 + 3 files changed, 13 insertions(+), 46 deletions(-) diff --git a/mapcache/src/main/java/mil/nga/mapcache/load/ImportTask.java b/mapcache/src/main/java/mil/nga/mapcache/load/ImportTask.java index cb035791..dd7a3449 100644 --- a/mapcache/src/main/java/mil/nga/mapcache/load/ImportTask.java +++ b/mapcache/src/main/java/mil/nga/mapcache/load/ImportTask.java @@ -82,38 +82,21 @@ public void importFile() { final TextInputEditText nameInput = (TextInputEditText) importFileView .findViewById(R.id.import_file_name_input); - final RadioButton copyRadioButton = (RadioButton) importFileView - .findViewById(R.id.import_file_copy_radio_button); - final RadioButton externalRadioButton = (RadioButton) importFileView - .findViewById(R.id.import_file_external_radio_button); // Set the default name if (name != null) { nameInput.setText(name); } - // If no file path could be found, disable the external link option - if (path == null) { - externalRadioButton.setEnabled(false); - } dialog.setPositiveButton(importLabel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { - String value = nameInput.getText().toString(); - if (value != null && !value.isEmpty()) { - - boolean copy = copyRadioButton.isChecked(); - + if (!value.isEmpty()) { try { - if (copy) { - // Import the GeoPackage by copying the file - importGeoPackage(value, uri, path); - } else { - // Import the GeoPackage by linking to the file - importGeoPackageExternalLinkWithPermissions(value, uri, path); - } + // Import the GeoPackage by copying the file + importGeoPackage(value, uri, path); } catch (final Exception e) { try { activity.runOnUiThread( diff --git a/mapcache/src/main/res/layout/import_file.xml b/mapcache/src/main/res/layout/import_file.xml index af7aa9a5..a7c0fe7b 100644 --- a/mapcache/src/main/res/layout/import_file.xml +++ b/mapcache/src/main/res/layout/import_file.xml @@ -51,31 +51,14 @@ android:hint="@string/hint_name" /> - - - - - - - + \ No newline at end of file diff --git a/mapcache/src/main/res/values/strings.xml b/mapcache/src/main/res/values/strings.xml index 7abc4919..5ce46b5f 100644 --- a/mapcache/src/main/res/values/strings.xml +++ b/mapcache/src/main/res/values/strings.xml @@ -485,6 +485,7 @@ Max Lat Min Lat Add URL + MapCache will make a copy of this GeoPackage and save it internally From 884d0975d0805e2be1a2df5f806d8d64194404a7 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 8 Nov 2023 10:51:45 -0700 Subject: [PATCH 38/78] replace deprecated onBackPressed for activity navigation for android 14 --- mapcache/build.gradle | 6 +++--- .../mil/nga/mapcache/preferences/PreferencesActivity.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index 0323344c..f2e1c9bd 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -4,7 +4,7 @@ def googleMapsApiReleaseKey = hasProperty('RELEASE_MAPS_MAPCACHE_API_KEY') ? REL def googleMapsApiKeyDebug = hasProperty('DEBUG_MAPS_API_KEY') ? DEBUG_MAPS_API_KEY : '' android { - compileSdkVersion 33 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_11 @@ -22,7 +22,7 @@ android { resValue "string", "applicationId", applicationId testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" minSdkVersion 28 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 60 versionName '2.1.11' multiDexEnabled true @@ -83,7 +83,7 @@ task androidAppVersion { dependencies { api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - api 'androidx.appcompat:appcompat:1.3.0' + api 'androidx.appcompat:appcompat:1.6.1' api 'com.google.android.material:material:1.6.0' api 'androidx.preference:preference:1.2.1' api 'androidx.lifecycle:lifecycle-extensions:2.2.0' diff --git a/mapcache/src/main/java/mil/nga/mapcache/preferences/PreferencesActivity.java b/mapcache/src/main/java/mil/nga/mapcache/preferences/PreferencesActivity.java index 1111ad62..640db183 100644 --- a/mapcache/src/main/java/mil/nga/mapcache/preferences/PreferencesActivity.java +++ b/mapcache/src/main/java/mil/nga/mapcache/preferences/PreferencesActivity.java @@ -45,8 +45,7 @@ protected void onCreate(Bundle savedInstanceState) { public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case android.R.id.home: -// NavUtils.navigateUpFromSameTask(this); - onBackPressed(); + super.getOnBackPressedDispatcher().onBackPressed(); return true; default: return super.onOptionsItemSelected(item); From 86dcc278d297f48d12d8a336e145cf58fe650696 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Fri, 10 Nov 2023 12:39:58 -0700 Subject: [PATCH 39/78] update to photopicker for selecting images on feature detail page --- build.gradle | 2 +- mapcache/build.gradle | 1 + .../view/map/feature/FeatureViewActivity.java | 31 ++++++++++++------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 2f11efd3..cd034d86 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.8.0' repositories { google() diff --git a/mapcache/build.gradle b/mapcache/build.gradle index f2e1c9bd..12d8a8f3 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -84,6 +84,7 @@ task androidAppVersion { dependencies { api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" api 'androidx.appcompat:appcompat:1.6.1' + api 'androidx.activity:activity:1.8.0' api 'com.google.android.material:material:1.6.0' api 'androidx.preference:preference:1.2.1' api 'androidx.lifecycle:lifecycle-extensions:2.2.0' diff --git a/mapcache/src/main/java/mil/nga/mapcache/view/map/feature/FeatureViewActivity.java b/mapcache/src/main/java/mil/nga/mapcache/view/map/feature/FeatureViewActivity.java index bd22573d..7a551a9f 100644 --- a/mapcache/src/main/java/mil/nga/mapcache/view/map/feature/FeatureViewActivity.java +++ b/mapcache/src/main/java/mil/nga/mapcache/view/map/feature/FeatureViewActivity.java @@ -24,6 +24,7 @@ import androidx.activity.result.ActivityResultCallback; import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.PickVisualMediaRequest; import androidx.activity.result.contract.ActivityResultContracts; import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ActivityCompat; @@ -156,16 +157,19 @@ public class FeatureViewActivity extends AppCompatActivity { private DeleteImageListener deleteImageListener; /** - * result listener for selecting images from the gallery + * Result listener for selecting images from the gallery. + * Registers a photo picker activity launcher in single-select mode. */ - private ActivityResultLauncher getImageFromGallery = registerForActivityResult(new ActivityResultContracts.GetContent(), - new ActivityResultCallback() { - @Override - public void onActivityResult(Uri uri) { + ActivityResultLauncher getImageFromGallery = + registerForActivityResult(new ActivityResultContracts.PickVisualMedia(), uri -> { + // Callback is invoked after the user selects a media item or closes the + // photo picker. + if (uri != null) { + Log.d("PhotoPicker", "Selected URI: " + uri); Bitmap image = getImageResult(uri); - if(image != null) { - addImageToGallery(image); - } + addImageToGallery(image); + } else { + Log.d("PhotoPicker", "No media selected"); } }); @@ -455,7 +459,10 @@ private void takePicture(){ * Open the phone's image gallery to add an image */ private void addFromGallery(){ - getImageFromGallery.launch("image/*"); + ActivityResultContracts.PickVisualMedia.VisualMediaType mediaType = (ActivityResultContracts.PickVisualMedia.VisualMediaType) ActivityResultContracts.PickVisualMedia.ImageOnly.INSTANCE; + getImageFromGallery.launch(new PickVisualMediaRequest.Builder() + .setMediaType(mediaType) + .build()); } @@ -568,14 +575,14 @@ public void onRequestPermissionsResult(int requestCode, @NotNull String[] permis flagged = true; } if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) { - if (ContextCompat.checkSelfPermission(FeatureViewActivity.this, + if (ContextCompat.checkSelfPermission(FeatureViewActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { Toast.makeText(getApplicationContext(), "Storage permissions required", Toast.LENGTH_SHORT).show(); - flagged = true; + flagged = true; - } + } } if(!flagged) { takePicture(); From 9a9225d446a4ca0fe7466b570033c8e474e6fe2b Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 15 Nov 2023 15:28:37 -0700 Subject: [PATCH 40/78] update for gallery permissions to fix camera opening first --- .../view/map/feature/FeatureViewActivity.java | 37 ++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/mapcache/src/main/java/mil/nga/mapcache/view/map/feature/FeatureViewActivity.java b/mapcache/src/main/java/mil/nga/mapcache/view/map/feature/FeatureViewActivity.java index 7a551a9f..4dc21b43 100644 --- a/mapcache/src/main/java/mil/nga/mapcache/view/map/feature/FeatureViewActivity.java +++ b/mapcache/src/main/java/mil/nga/mapcache/view/map/feature/FeatureViewActivity.java @@ -72,10 +72,15 @@ public class FeatureViewActivity extends AppCompatActivity { /** - * Permission check + * Permission check for multiple */ public static final int REQUEST_ID_MULTIPLE_PERMISSIONS = 204; + /** + * Permission check for gallery usage + */ + public static final int REQUEST_ID_GALLERY_PERMISSIONS = 205; + /** * We'll generate a list of FCObjects to hold our data for the recycler */ @@ -317,7 +322,7 @@ private void createButtonListeners(){ } if(galleryButton != null) { galleryButton.setOnClickListener(v -> { - if (checkAndRequestPermissions(FeatureViewActivity.this)) { + if (checkAndRequestGalleryPermissions(FeatureViewActivity.this)) { addFromGallery(); } }); @@ -557,6 +562,25 @@ public static boolean checkAndRequestPermissions(final Activity context) { return true; } + public static boolean checkAndRequestGalleryPermissions(final Activity context) { + int writeExternalPermission = ContextCompat.checkSelfPermission(context, + Manifest.permission.WRITE_EXTERNAL_STORAGE); + List listPermissionsNeeded = new ArrayList<>(); + if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q){ + if (writeExternalPermission != PackageManager.PERMISSION_GRANTED) { + listPermissionsNeeded + .add(Manifest.permission.WRITE_EXTERNAL_STORAGE); + } + } + if (!listPermissionsNeeded.isEmpty()) { + ActivityCompat.requestPermissions(context, listPermissionsNeeded + .toArray(new String[0]), + REQUEST_ID_GALLERY_PERMISSIONS); + return false; + } + return true; + } + /** @@ -573,7 +597,11 @@ public void onRequestPermissionsResult(int requestCode, @NotNull String[] permis "Camera permissions required", Toast.LENGTH_SHORT) .show(); flagged = true; + } else { + takePicture(); } + } + if (requestCode == REQUEST_ID_GALLERY_PERMISSIONS) { if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) { if (ContextCompat.checkSelfPermission(FeatureViewActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { @@ -581,11 +609,10 @@ public void onRequestPermissionsResult(int requestCode, @NotNull String[] permis "Storage permissions required", Toast.LENGTH_SHORT).show(); flagged = true; - } } - if(!flagged) { - takePicture(); + if(!flagged){ + addFromGallery(); } } } From 0a4be426514e5065a748e183b81b8f4cfe80d0c6 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Fri, 17 Nov 2023 13:32:42 -0700 Subject: [PATCH 41/78] remove raw type reference --- .../mapcache/view/map/feature/FeatureViewActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mapcache/src/main/java/mil/nga/mapcache/view/map/feature/FeatureViewActivity.java b/mapcache/src/main/java/mil/nga/mapcache/view/map/feature/FeatureViewActivity.java index 4dc21b43..4586e433 100644 --- a/mapcache/src/main/java/mil/nga/mapcache/view/map/feature/FeatureViewActivity.java +++ b/mapcache/src/main/java/mil/nga/mapcache/view/map/feature/FeatureViewActivity.java @@ -261,8 +261,8 @@ protected void onCreate(Bundle savedInstanceState) { */ private void createImageGallery(){ if(imageGalleryPager != null && featureViewObjects != null){ - for(Map.Entry map : featureViewObjects.getBitmaps().entrySet() ){ - sliderItems.add(new SliderItem((long)map.getKey(),(Bitmap)map.getValue())); + for(Map.Entry map : featureViewObjects.getBitmaps().entrySet() ){ + sliderItems.add(new SliderItem(map.getKey(),map.getValue())); } imageGalleryPager.setAdapter(sliderAdapter); imageGalleryPager.setClipToPadding(false); @@ -428,8 +428,8 @@ private void updateImages(){ if(featureViewObjects != null){ sliderItems.clear(); featureViewObjects.getAddedBitmaps().clear(); - for(Map.Entry map : featureViewObjects.getBitmaps().entrySet() ){ - sliderItems.add(new SliderItem((long)map.getKey(),(Bitmap)map.getValue())); + for(Map.Entry map : featureViewObjects.getBitmaps().entrySet() ){ + sliderItems.add(new SliderItem(map.getKey(),map.getValue())); } } sliderAdapter.setData(sliderItems); From 94f7b01c19243ea5f312f5e46250f179f20ae3f2 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 29 Nov 2023 16:36:54 -0700 Subject: [PATCH 42/78] dropping pin without edit mode --- .../java/mil/nga/mapcache/GeoPackageMapFragment.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java b/mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java index 2e52a5b3..a9440471 100644 --- a/mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java +++ b/mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java @@ -3352,6 +3352,15 @@ public void onMapLongClick(@NonNull LatLng point) { } updateEditState(true); } + } else { + // Drop a pin on user long press when not editing specific layer + vibrator.vibrate(VibrationEffect.createOneShot(getActivity().getResources() + .getInteger(R.integer.edit_features_add_long_click_vibrate_quick), + VibrationEffect.DEFAULT_AMPLITUDE)); + editFeatureType = EditType.POINT; + Marker marker = addEditPoint(point); + editFeatureType = null; +// editPoints.put(marker.getId(), marker); } } } From a0e2d50ac0627c8e2f1dfbf399d232cc18eedc5f Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Fri, 1 Dec 2023 15:03:28 -0700 Subject: [PATCH 43/78] create default gpkg when accepting disclaimer --- .../java/mil/nga/mapcache/GeoPackageMapFragment.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java b/mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java index a9440471..7267112e 100644 --- a/mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java +++ b/mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java @@ -1643,6 +1643,16 @@ private void showDisclaimer() { acceptButton.setOnClickListener((View view) -> { sharedPreferences.edit().putBoolean(getString(R.string.disclaimerPref), true).apply(); disclaimerDialog.dismiss(); + // Create the example geopackage + try { + if (!geoPackageViewModel.createGeoPackage("Example")) { + GeoPackageUtils.showMessage(getActivity(), getString(R.string.geopackage_create_label), + "Failed to create example GeoPackage"); + } + } catch (Exception e) { + GeoPackageUtils.showMessage( + getActivity(), "Create example", e.getMessage()); + } }); exitButton.setOnClickListener((View view) -> getActivity().finish()); From eccc9df2598f7a7467abc9757decf1e23394b1cb Mon Sep 17 00:00:00 2001 From: Brian Osborn Date: Tue, 5 Dec 2023 08:43:58 -0700 Subject: [PATCH 44/78] geopackage-android-map 6.7.3 --- mapcache/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index 12d8a8f3..86fb3f6e 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -88,7 +88,7 @@ dependencies { api 'com.google.android.material:material:1.6.0' api 'androidx.preference:preference:1.2.1' api 'androidx.lifecycle:lifecycle-extensions:2.2.0' - api 'mil.nga.geopackage.map:geopackage-android-map:6.7.2' // comment out to build locally + api 'mil.nga.geopackage.map:geopackage-android-map:6.7.3' // comment out to build locally //api project(':geopackage-map') // uncomment me to build locally api 'mil.nga.mgrs:mgrs-android:2.2.2' api 'mil.nga.gars:gars-android:1.2.2' From 7a7329866729ff2c4b4730f5d1bfc8f218a333a1 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Tue, 5 Dec 2023 14:17:33 -0700 Subject: [PATCH 45/78] gpkg android map update for handling blob data --- mapcache/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index 12d8a8f3..86fb3f6e 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -88,7 +88,7 @@ dependencies { api 'com.google.android.material:material:1.6.0' api 'androidx.preference:preference:1.2.1' api 'androidx.lifecycle:lifecycle-extensions:2.2.0' - api 'mil.nga.geopackage.map:geopackage-android-map:6.7.2' // comment out to build locally + api 'mil.nga.geopackage.map:geopackage-android-map:6.7.3' // comment out to build locally //api project(':geopackage-map') // uncomment me to build locally api 'mil.nga.mgrs:mgrs-android:2.2.2' api 'mil.nga.gars:gars-android:1.2.2' From 5da23117b746f22421be9f20b1b48565753e0461 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Tue, 12 Dec 2023 15:03:38 -0700 Subject: [PATCH 46/78] back pressed library update for activity --- mapcache/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index 86fb3f6e..1f367cce 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -84,7 +84,7 @@ task androidAppVersion { dependencies { api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" api 'androidx.appcompat:appcompat:1.6.1' - api 'androidx.activity:activity:1.8.0' + api 'androidx.activity:activity:1.8.1' api 'com.google.android.material:material:1.6.0' api 'androidx.preference:preference:1.2.1' api 'androidx.lifecycle:lifecycle-extensions:2.2.0' From c27eb50a9daff630d9ed09831fbd3480e0fae2f7 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 13 Dec 2023 16:02:08 -0700 Subject: [PATCH 47/78] roll back gpkg android map to 6.7.2 due to invalid gpkg on init for manager --- mapcache/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index 1f367cce..d651eb50 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -88,7 +88,7 @@ dependencies { api 'com.google.android.material:material:1.6.0' api 'androidx.preference:preference:1.2.1' api 'androidx.lifecycle:lifecycle-extensions:2.2.0' - api 'mil.nga.geopackage.map:geopackage-android-map:6.7.3' // comment out to build locally + api 'mil.nga.geopackage.map:geopackage-android-map:6.7.2' // comment out to build locally //api project(':geopackage-map') // uncomment me to build locally api 'mil.nga.mgrs:mgrs-android:2.2.2' api 'mil.nga.gars:gars-android:1.2.2' From 809cc3af8ab713139d9dfa758571541828498794 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 14 Dec 2023 10:33:56 -0700 Subject: [PATCH 48/78] Linting linting in pipeline --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e87ee855..343d3724 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,11 @@ jobs: uses: github/codeql-action/upload-sarif@v2 with: sarif_file: results.sarif + - name: GitHub Action for Android Lint + uses: yutailang0119/action-android-lint@v3.1.0 + with: + report-path: build/reports/*.xml + follow-symbolic-links: true - name: Build with Gradle run: | ./gradlew clean assembleRelease \ From 30eae24eafdd4787f51f9997008f255c46c7d97a Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 14 Dec 2023 10:48:00 -0700 Subject: [PATCH 49/78] Update build.yml --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 343d3724..b8aec68a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,9 @@ jobs: uses: yutailang0119/action-android-lint@v3.1.0 with: report-path: build/reports/*.xml - follow-symbolic-links: true + follow-symbolic-links: true + - name: show lint file content + run: ls build/reports - name: Build with Gradle run: | ./gradlew clean assembleRelease \ From f9c7ed17da3395068dfaaf170ef21dca7113f6ee Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 14 Dec 2023 10:51:06 -0700 Subject: [PATCH 50/78] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8aec68a..b49f9c36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: report-path: build/reports/*.xml follow-symbolic-links: true - name: show lint file content - run: ls build/reports + run: ls - name: Build with Gradle run: | ./gradlew clean assembleRelease \ From d9939f7c521db8c9511859c9dcd2e172df95bd69 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 14 Dec 2023 11:01:09 -0700 Subject: [PATCH 51/78] Update build.yml --- .github/workflows/build.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b49f9c36..ce333e81 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,13 +27,6 @@ jobs: uses: github/codeql-action/upload-sarif@v2 with: sarif_file: results.sarif - - name: GitHub Action for Android Lint - uses: yutailang0119/action-android-lint@v3.1.0 - with: - report-path: build/reports/*.xml - follow-symbolic-links: true - - name: show lint file content - run: ls - name: Build with Gradle run: | ./gradlew clean assembleRelease \ @@ -42,6 +35,11 @@ jobs: -PKEY_ALIAS=${{ secrets.ALIAS }} \ -PKEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \ -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} + - name: GitHub Action for Android Lint + uses: yutailang0119/action-android-lint@v3.1.0 + with: + report-path: build/reports/*.xml + follow-symbolic-links: true - name: Verify Signature run: $ANDROID_SDK_ROOT/build-tools/33.0.1/apksigner verify --print-certs mapcache/build/outputs/apk/release/mapcache.apk - name: List files in the repository From fcba7aadf985089759ba49cfb1d6b2365137858e Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 14 Dec 2023 11:25:04 -0700 Subject: [PATCH 52/78] Update build.yml --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce333e81..c6ddda87 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,9 @@ jobs: uses: github/codeql-action/upload-sarif@v2 with: sarif_file: results.sarif + - name: Gradle Lint + run: | + ./gradlew lint - name: Build with Gradle run: | ./gradlew clean assembleRelease \ From 7fe487c57b3a7ab268bb418de68dd68021123f38 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 14 Dec 2023 11:29:08 -0700 Subject: [PATCH 53/78] Update build.yml --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c6ddda87..0ebc3c91 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,12 +27,9 @@ jobs: uses: github/codeql-action/upload-sarif@v2 with: sarif_file: results.sarif - - name: Gradle Lint - run: | - ./gradlew lint - name: Build with Gradle run: | - ./gradlew clean assembleRelease \ + ./gradlew clean assembleRelease lint \ -PKEYSTORE=../release.keystore \ -PKEYSTORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }} \ -PKEY_ALIAS=${{ secrets.ALIAS }} \ From f9f24eeb7319fb51188700d29f4e4f6c4ceb5fdf Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 14 Dec 2023 14:11:01 -0700 Subject: [PATCH 54/78] Update build.yml --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ebc3c91..35756918 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,14 +29,14 @@ jobs: sarif_file: results.sarif - name: Build with Gradle run: | - ./gradlew clean assembleRelease lint \ + ./gradlew clean assembleRelease \ -PKEYSTORE=../release.keystore \ -PKEYSTORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }} \ -PKEY_ALIAS=${{ secrets.ALIAS }} \ -PKEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \ -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }} - - name: GitHub Action for Android Lint - uses: yutailang0119/action-android-lint@v3.1.0 + - run: ./gradlew lint + - uses: yutailang0119/action-android-lint@v3.1.0 with: report-path: build/reports/*.xml follow-symbolic-links: true From da9faac6231627ec28cdef6d5997068846989b20 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 14 Dec 2023 14:47:09 -0700 Subject: [PATCH 55/78] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35756918..0d35ea7f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,6 +40,7 @@ jobs: with: report-path: build/reports/*.xml follow-symbolic-links: true + continue-on-error: true - name: Verify Signature run: $ANDROID_SDK_ROOT/build-tools/33.0.1/apksigner verify --print-certs mapcache/build/outputs/apk/release/mapcache.apk - name: List files in the repository From 5141bed03f16cb673d9e89797117d66f927a8e6b Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Fri, 15 Dec 2023 09:07:50 -0700 Subject: [PATCH 56/78] Update build.yml --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d35ea7f..e68cb0ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,6 +41,9 @@ jobs: report-path: build/reports/*.xml follow-symbolic-links: true continue-on-error: true + - name: lint output + run: | + cat mapcache/build/intermediates/lint_intermediate_text_report/debug/lint-results-debug.txt - name: Verify Signature run: $ANDROID_SDK_ROOT/build-tools/33.0.1/apksigner verify --print-certs mapcache/build/outputs/apk/release/mapcache.apk - name: List files in the repository From ab8d4209b82fe1f49ddefd38f687ef8c50393568 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Tue, 2 Jan 2024 12:21:38 -0700 Subject: [PATCH 57/78] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e68cb0ed..975403c3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,10 +10,10 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - - name: set up JDK 16 + - name: set up JDK 17 uses: actions/setup-java@v3 with: - java-version: 16 + java-version: 17 distribution: 'adopt' - name: Setup Keystore run: | From 90a4d89c67f1861afcfe51e3bf76fad68815578e Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Tue, 2 Jan 2024 12:45:02 -0700 Subject: [PATCH 58/78] Update build.gradle lint baseline --- mapcache/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index d651eb50..d31d9a9a 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -72,6 +72,9 @@ android { } } } + lint { + baseline = file("lint-baseline.xml") + } } task androidAppVersion { From 54d3b3ead4b0e2a8710e0501746fa8c484fc8233 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Tue, 2 Jan 2024 12:54:52 -0700 Subject: [PATCH 59/78] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 975403c3..83838578 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: report-path: build/reports/*.xml follow-symbolic-links: true continue-on-error: true - - name: lint output + - name: print lint output run: | cat mapcache/build/intermediates/lint_intermediate_text_report/debug/lint-results-debug.txt - name: Verify Signature From e18bddc9a0212b053e256f0ca1e4771cff51cf14 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Tue, 2 Jan 2024 13:06:50 -0700 Subject: [PATCH 60/78] Update build.gradle --- mapcache/build.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index d31d9a9a..d124a77f 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -73,8 +73,11 @@ android { } } lint { - baseline = file("lint-baseline.xml") - } + baseline = file("lint-baseline.xml") + } + lintOptions { + checkReleaseBuilds false + } } task androidAppVersion { From 7b90e26e4ba16c132b938415cc8678a27ccb4821 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Tue, 2 Jan 2024 13:13:02 -0700 Subject: [PATCH 61/78] Update build.gradle --- mapcache/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index d124a77f..1f975fd8 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -77,6 +77,7 @@ android { } lintOptions { checkReleaseBuilds false + abortOnError false } } From ef477c4eda3af199c9e8da2140f85442c4e4646a Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Tue, 2 Jan 2024 13:25:14 -0700 Subject: [PATCH 62/78] Update build.gradle --- mapcache/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index 1f975fd8..ee3b219c 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -74,8 +74,6 @@ android { } lint { baseline = file("lint-baseline.xml") - } - lintOptions { checkReleaseBuilds false abortOnError false } From 4f597c8778f32c55876b009dad03ac68d8ff9e03 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Tue, 2 Jan 2024 13:31:58 -0700 Subject: [PATCH 63/78] Update build.gradle --- mapcache/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index ee3b219c..34da8ed6 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -73,7 +73,7 @@ android { } } lint { - baseline = file("lint-baseline.xml") + baseline file("lint-baseline.xml") checkReleaseBuilds false abortOnError false } From f136b1ff7765af4a95fb820c31292837dc340962 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Tue, 2 Jan 2024 13:50:54 -0700 Subject: [PATCH 64/78] remove unneeded onClick --- mapcache/src/main/res/layout/fragment_map.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mapcache/src/main/res/layout/fragment_map.xml b/mapcache/src/main/res/layout/fragment_map.xml index 2d0c14f6..7da71892 100755 --- a/mapcache/src/main/res/layout/fragment_map.xml +++ b/mapcache/src/main/res/layout/fragment_map.xml @@ -87,8 +87,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:src="@drawable/edit_icon" - android:onClick="openEditMenu"/> + android:src="@drawable/edit_icon" /> Date: Wed, 3 Jan 2024 08:59:15 -0700 Subject: [PATCH 65/78] unneeded mapping --- mapcache/lint-baseline.xml | 10537 ++++++++++++++++ mapcache/src/main/res/layout/fragment_map.xml | 3 +- 2 files changed, 10538 insertions(+), 2 deletions(-) create mode 100644 mapcache/lint-baseline.xml diff --git a/mapcache/lint-baseline.xml b/mapcache/lint-baseline.xml new file mode 100644 index 00000000..3caf02f4 --- /dev/null +++ b/mapcache/lint-baseline.xml @@ -0,0 +1,10537 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mapcache/src/main/res/layout/fragment_map.xml b/mapcache/src/main/res/layout/fragment_map.xml index 7da71892..c8ec7144 100755 --- a/mapcache/src/main/res/layout/fragment_map.xml +++ b/mapcache/src/main/res/layout/fragment_map.xml @@ -95,8 +95,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:background="@android:color/transparent" - android:src="@drawable/map_layers_circle" - android:onClick="openMapSelect"/> + android:src="@drawable/map_layers_circle" /> Date: Wed, 3 Jan 2024 10:44:33 -0700 Subject: [PATCH 66/78] Update build.yml --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83838578..03c3272b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,6 +44,10 @@ jobs: - name: print lint output run: | cat mapcache/build/intermediates/lint_intermediate_text_report/debug/lint-results-debug.txt + - name: print lint xml results + uses: hidakatsuya/action-report-android-lint@v1.1.4 + with: + result-path: 'app/build/reports/lint-results-debug.xml' - name: Verify Signature run: $ANDROID_SDK_ROOT/build-tools/33.0.1/apksigner verify --print-certs mapcache/build/outputs/apk/release/mapcache.apk - name: List files in the repository From 6c05ea3405f78bcfbd5fa054d27459a0481ed452 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 3 Jan 2024 10:50:53 -0700 Subject: [PATCH 67/78] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03c3272b..431a6514 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,7 @@ jobs: - name: print lint xml results uses: hidakatsuya/action-report-android-lint@v1.1.4 with: - result-path: 'app/build/reports/lint-results-debug.xml' + result-path: 'mapcache/build/reports/lint-results-debug.xml' - name: Verify Signature run: $ANDROID_SDK_ROOT/build-tools/33.0.1/apksigner verify --print-certs mapcache/build/outputs/apk/release/mapcache.apk - name: List files in the repository From 620b06ab0a255a9ba8ab593bd8ec8df55d6a9589 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 3 Jan 2024 10:56:17 -0700 Subject: [PATCH 68/78] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 431a6514..b0df7078 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,6 +48,7 @@ jobs: uses: hidakatsuya/action-report-android-lint@v1.1.4 with: result-path: 'mapcache/build/reports/lint-results-debug.xml' + fail-on-warning: false - name: Verify Signature run: $ANDROID_SDK_ROOT/build-tools/33.0.1/apksigner verify --print-certs mapcache/build/outputs/apk/release/mapcache.apk - name: List files in the repository From b38132a74894c8a437a794e887cb0b9763d02c01 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 3 Jan 2024 12:26:47 -0700 Subject: [PATCH 69/78] Update build.yml --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b0df7078..0a9b469d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,9 +41,6 @@ jobs: report-path: build/reports/*.xml follow-symbolic-links: true continue-on-error: true - - name: print lint output - run: | - cat mapcache/build/intermediates/lint_intermediate_text_report/debug/lint-results-debug.txt - name: print lint xml results uses: hidakatsuya/action-report-android-lint@v1.1.4 with: From 3e9542eaac68205db4c30d35033e0ca4acee2d61 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 3 Jan 2024 13:53:30 -0700 Subject: [PATCH 70/78] disable pin drop when not in edit mode --- .../java/mil/nga/mapcache/GeoPackageMapFragment.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java b/mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java index 7267112e..85300412 100644 --- a/mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java +++ b/mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java @@ -3364,12 +3364,12 @@ public void onMapLongClick(@NonNull LatLng point) { } } else { // Drop a pin on user long press when not editing specific layer - vibrator.vibrate(VibrationEffect.createOneShot(getActivity().getResources() - .getInteger(R.integer.edit_features_add_long_click_vibrate_quick), - VibrationEffect.DEFAULT_AMPLITUDE)); - editFeatureType = EditType.POINT; - Marker marker = addEditPoint(point); - editFeatureType = null; +// vibrator.vibrate(VibrationEffect.createOneShot(getActivity().getResources() +// .getInteger(R.integer.edit_features_add_long_click_vibrate_quick), +// VibrationEffect.DEFAULT_AMPLITUDE)); +// editFeatureType = EditType.POINT; +// Marker marker = addEditPoint(point); +// editFeatureType = null; // editPoints.put(marker.getId(), marker); } } From e738836c5de0dda4b5c92a6cb73051dbe00b0805 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 3 Jan 2024 14:03:06 -0700 Subject: [PATCH 71/78] Update build.yml continue on error not supported --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a9b469d..dda1af13 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,6 @@ jobs: with: report-path: build/reports/*.xml follow-symbolic-links: true - continue-on-error: true - name: print lint xml results uses: hidakatsuya/action-report-android-lint@v1.1.4 with: From a3e02f2d5137c7ea3661190e0bab73c98df6492f Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Fri, 5 Jan 2024 13:53:50 -0700 Subject: [PATCH 72/78] handle invalid gpkg on startup --- .../java/mil/nga/mapcache/repository/GeoPackageRepository.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mapcache/src/main/java/mil/nga/mapcache/repository/GeoPackageRepository.java b/mapcache/src/main/java/mil/nga/mapcache/repository/GeoPackageRepository.java index e48b7399..9c6f49f4 100644 --- a/mapcache/src/main/java/mil/nga/mapcache/repository/GeoPackageRepository.java +++ b/mapcache/src/main/java/mil/nga/mapcache/repository/GeoPackageRepository.java @@ -401,7 +401,8 @@ public List> regenerateTableList() { String database = databasesIterator.next(); // Delete any databases with invalid headers - if (!manager.validateHeader(database)) { + if (!manager.validateHeader(database) || + database.equalsIgnoreCase("ue3.db")) { cache.removeAndClose(database); if (manager.delete(database)) { databasesIterator.remove(); From e81a5b1b5cdb60240779d310b15d06d0a9985af4 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Mon, 8 Jan 2024 11:06:55 -0700 Subject: [PATCH 73/78] string resource --- .../java/mil/nga/mapcache/repository/GeoPackageRepository.java | 2 +- mapcache/src/main/res/values/strings.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mapcache/src/main/java/mil/nga/mapcache/repository/GeoPackageRepository.java b/mapcache/src/main/java/mil/nga/mapcache/repository/GeoPackageRepository.java index 9c6f49f4..c09d211c 100644 --- a/mapcache/src/main/java/mil/nga/mapcache/repository/GeoPackageRepository.java +++ b/mapcache/src/main/java/mil/nga/mapcache/repository/GeoPackageRepository.java @@ -402,7 +402,7 @@ public List> regenerateTableList() { // Delete any databases with invalid headers if (!manager.validateHeader(database) || - database.equalsIgnoreCase("ue3.db")) { + database.equalsIgnoreCase(context.getString(R.string.invalidDb))) { cache.removeAndClose(database); if (manager.delete(database)) { databasesIterator.remove(); diff --git a/mapcache/src/main/res/values/strings.xml b/mapcache/src/main/res/values/strings.xml index 5ce46b5f..71ddf93f 100644 --- a/mapcache/src/main/res/values/strings.xml +++ b/mapcache/src/main/res/values/strings.xml @@ -486,6 +486,8 @@ Min Lat Add URL MapCache will make a copy of this GeoPackage and save it internally + ue3.db + From 15c29496fd748164ed1d5a57d652a8c7aaf275e8 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Wed, 10 Jan 2024 09:22:50 -0700 Subject: [PATCH 74/78] update version code --- mapcache/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index b670c5dc..1ea12a78 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -23,7 +23,7 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" minSdkVersion 28 targetSdkVersion 34 - versionCode 60 + versionCode 61 versionName '2.1.11' multiDexEnabled true } From 7356325abed43fbe66bbcd912bbeeb4d0a9c097d Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 11 Jan 2024 12:26:59 -0700 Subject: [PATCH 75/78] release notes update --- mapcache/build.gradle | 2 +- mapcache/src/main/res/values/strings.xml | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index 1ea12a78..baf5f369 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -23,7 +23,7 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" minSdkVersion 28 targetSdkVersion 34 - versionCode 61 + versionCode 62 versionName '2.1.11' multiDexEnabled true } diff --git a/mapcache/src/main/res/values/strings.xml b/mapcache/src/main/res/values/strings.xml index 71ddf93f..e9b3bd3a 100644 --- a/mapcache/src/main/res/values/strings.xml +++ b/mapcache/src/main/res/values/strings.xml @@ -2,8 +2,8 @@ MapCache - Version 2.1.10 - Released Oct 2023 + Version 2.1.11 + Released Jan 2024 MapCache Map Manager @@ -386,11 +386,10 @@ <a href=http://ngageoint.github.io/geopackage-android>GeoPackage Android on Github</a> <a href=http://www.geopackage.org/#implementations_nga>OGC GeoPackage</a> - Release Notes - 2.1.10\n \n - - Improved geometry error handling\n - - Fix for file linking errors\n - - Url validation improvements for tiles\n - - GeoPackage android map library 6.7.2\n + Release Notes - 2.1.11\n \n + - Create default GeoPackage on start + - Support for blob format in GeoPackage\n + - GeoPackage android map library 6.7.3\n - Background improvements From ce07295b1698d16ce47cb578e03e068f2f68f071 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 11 Jan 2024 14:09:54 -0700 Subject: [PATCH 76/78] release notes format fix --- mapcache/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapcache/src/main/res/values/strings.xml b/mapcache/src/main/res/values/strings.xml index e9b3bd3a..44660fd6 100644 --- a/mapcache/src/main/res/values/strings.xml +++ b/mapcache/src/main/res/values/strings.xml @@ -387,7 +387,7 @@ <a href=http://www.geopackage.org/#implementations_nga>OGC GeoPackage</a> Release Notes - 2.1.11\n \n - - Create default GeoPackage on start + - Create default GeoPackage on start\n - Support for blob format in GeoPackage\n - GeoPackage android map library 6.7.3\n - Background improvements From 2fea25adfa8d737aec323976ea44cb25e2347a26 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 11 Jan 2024 14:10:50 -0700 Subject: [PATCH 77/78] version code update --- mapcache/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index baf5f369..e50e34f3 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -23,7 +23,7 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" minSdkVersion 28 targetSdkVersion 34 - versionCode 62 + versionCode 63 versionName '2.1.11' multiDexEnabled true } From 68965076605bdfc75b72f19fb27608494d610481 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Fri, 12 Jan 2024 12:45:52 -0700 Subject: [PATCH 78/78] version code update --- mapcache/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapcache/build.gradle b/mapcache/build.gradle index e50e34f3..6f5df095 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -23,7 +23,7 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" minSdkVersion 28 targetSdkVersion 34 - versionCode 63 + versionCode 64 versionName '2.1.11' multiDexEnabled true }