From b6e896a719e3a0783b860cc0b210fad8d3ad29f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Fiti=C3=A9?= <jfitie@gmail.com>
Date: Sun, 28 Jun 2020 15:45:02 +0200
Subject: Simplify

---
 .../src/org/navitproject/navit/NavitDownloadSelectMapActivity.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
index 45071e2ef..cfc51a56b 100644
--- a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
+++ b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
@@ -27,6 +27,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.location.Location;
 import android.location.LocationManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Message;
 import android.support.v4.app.ActivityCompat;
@@ -197,9 +198,9 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
         String mapIndex = child.get("map_index");
         if (mapIndex != null) {
             int mi = Integer.parseInt(mapIndex);
-            // limit map download size to 3.8GiB on Android versions before Nougat
-            if (Integer.parseInt("0" + android.os.Build.VERSION.RELEASE.replaceAll("[^0-9]*([0-9]*).*", "$1")) < 7
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N
                     && NavitMapDownloader.osm_maps[mi].mEstSizeBytes >= Math.pow(2, 32) * 0.95) {
+                // limit map download size to 3.8GiB on Android versions before Nougat
                 NavitDialogs.sendDialogMessage(NavitDialogs.MSG_TOAST_LONG, null,
                         getTstring(R.string.map_download_oversize),
                         -1, 0, 0);
-- 
cgit v1.2.1