From f5c3103dcf16e3c1bff45f53dea5f6a83c22212e Mon Sep 17 00:00:00 2001
From: afischerdev <afischer@dbserv.de>
Date: Mon, 27 Dec 2021 20:02:13 +0100
Subject: [PATCH] update workflow, add check #379

---
 .github/workflows/gradle-publish.yml                 | 12 ++++++++++++
 .github/workflows/gradle.yml                         | 12 +++++++++++-
 .../main/java/btools/routingapp/BRouterActivity.java |  3 ++-
 .../src/main/java/btools/routingapp/BRouterView.java |  4 +++-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
index 88ce852..960762b 100644
--- a/.github/workflows/gradle-publish.yml
+++ b/.github/workflows/gradle-publish.yml
@@ -12,6 +12,7 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    environment: BRouter
     permissions:
       contents: read
       packages: write
@@ -27,6 +28,17 @@ jobs:
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file
 
+    - name: Setup keystore
+      env:
+        BROUTER_KEYSTORE_BASE64: ${{ secrets.BROUTER_KEYSTORE_BASE64 }}
+      run: |
+        echo $BROUTER_KEYSTORE_BASE64 | base64 -di > ${{ github.workspace }}/brouter.jks
+    - name: Build with Gradle
+      env:
+        ORG_GRADLE_PROJECT_RELEASE_STORE_FILE: ${{ secrets.BROUTER_KEYSTORE_FILE }}
+        ORG_GRADLE_PROJECT_RELEASE_KEY_ALIAS: ${{ secrets.BROUTER_KEY_ALIAS }}
+        ORG_GRADLE_PROJECT_RELEASE_KEY_PASSWORD: ${{ secrets.BROUTER_KEY_PASSWORD }}
+        ORG_GRADLE_PROJECT_RELEASE_STORE_PASSWORD: ${{ secrets.BROUTER_STORE_PASSWORD }} 
     - name: Build with Gradle
       run: gradle build
 
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index f27ddf3..354677c 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -13,7 +13,7 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-
+    environment: BRouter
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 11
@@ -24,7 +24,17 @@ jobs:
         cache: gradle
     - name: Create local.properties
       run: touch local.properties
+    - name: Setup keystore
+      env:
+        BROUTER_KEYSTORE_BASE64: ${{ secrets.BROUTER_KEYSTORE_BASE64 }}
+      run: |
+        echo $BROUTER_KEYSTORE_BASE64 | base64 -di > ${{ github.workspace }}/brouter.jks
     - name: Build with Gradle
+      env:
+        ORG_GRADLE_PROJECT_RELEASE_STORE_FILE: ${{ secrets.BROUTER_KEYSTORE_FILE }}
+        ORG_GRADLE_PROJECT_RELEASE_KEY_ALIAS: ${{ secrets.BROUTER_KEY_ALIAS }}
+        ORG_GRADLE_PROJECT_RELEASE_KEY_PASSWORD: ${{ secrets.BROUTER_KEY_PASSWORD }}
+        ORG_GRADLE_PROJECT_RELEASE_STORE_PASSWORD: ${{ secrets.BROUTER_STORE_PASSWORD }} 
       run: ./gradlew build
     - name: Upload ZIP
       uses: actions/upload-artifact@v2
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java
index 5fb8e04..4b2e89a 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java
@@ -596,7 +596,8 @@ public class BRouterActivity extends Activity implements ActivityCompat.OnReques
       }
     }
 
-    if (checkExternalStorageWritable()) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q
+        && checkExternalStorageWritable()) {
       res.add(Environment.getExternalStorageDirectory());
     }
 
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
index 9b04dba..640c92f 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
@@ -204,7 +204,9 @@ public class BRouterView extends View {
 
       // new init is done move old files
       if (waitingForMigration) {
-        moveFolders(oldMigrationPath, basedir + "/brouter");
+        Log.d("BR", "path " + oldMigrationPath + " " + basedir);
+        if (!oldMigrationPath.equals(basedir + "/brouter"))
+          moveFolders(oldMigrationPath, basedir + "/brouter");
         waitingForMigration = false;
       }