From 236c65d8edbcb5aff7537bcb8f58f7c678310a23 Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Thu, 30 Dec 2021 14:24:03 +0100
Subject: [PATCH] Fix external storage access

- Allow writing on all versions
- Skip migration if BRouter version has already setup basedir
---
 .../src/main/java/btools/routingapp/BRouterActivity.java       | 3 +--
 .../src/main/java/btools/routingapp/BRouterView.java           | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

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 9f933be..5fb8e04 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java
@@ -596,8 +596,7 @@ public class BRouterActivity extends Activity implements ActivityCompat.OnReques
       }
     }
 
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R
-        && checkExternalStorageWritable()) {
+    if (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 3141278..8b5f69c 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
@@ -127,7 +127,7 @@ public class BRouterView extends View {
             // don't ask twice
             String version = "v" + getContext().getString(R.string.app_version);
             File vFile = new File(brd, "profiles2/"+version );
-            if (android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.Q
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q
                 && vFile.exists()) {
               startSetup(baseDir, false);
               return;