Make Android version regex more save

1 files changed, 3 insertions, 1 deletions

diff --git a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
index 4e54ef29c..0e254cddb 100644
--- a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
+++ b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
@@ -199,7 +199,9 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
             int mi = Integer.parseInt(mapIndex);
             // default map download size limit is 3.8 GiB
             double maxsz = Math.pow(2, 32) * 0.95;
-            if (Integer.parseInt(android.os.Build.VERSION.RELEASE.replaceAll("(\\d+)(.*)", "$1")) >= 7) {
+            // get android version; this regex would return 16 for the string "Android v16.7.8c Beta"
+            int ver = Integer.parseInt("0" + android.os.Build.VERSION.RELEASE.replaceAll("[^0-9]*([0-9]+).*", "$1"))
+            if (ver >= 7) {
                 // map download size limit is 16 GiB on Nougat and up
                 maxsz = Math.pow(2, 34);
             }