diff options
| author | Johan Fitié <jfitie@gmail.com> | 2020-06-24 11:46:14 +0000 |
|---|---|---|
| committer | Johan Fitié <jfitie@gmail.com> | 2020-06-24 11:46:14 +0000 |
| commit | 2193f0bc5dccb466c2dbfdeb295f11a28fc8cedc (patch) | |
| tree | 6772167a3feb5e15b127245be01a5289a71ccfd4 | |
| parent | d3f5a6398395174ffd087616ced3e24b81ef4ac5 (diff) | |
| download | navit-2193f0bc5dccb466c2dbfdeb295f11a28fc8cedc.tar.gz | |
Simplify expression
| -rw-r--r-- | navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java index 2360f35e0..9c9d1b68a 100644 --- a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java +++ b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java @@ -197,12 +197,13 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity { String mapIndex = child.get("map_index"); if (mapIndex != null) { int mi = Integer.parseInt(mapIndex); - // check if download larger than 3.8 GiB + // default map download size limit is 3.8 GiB double maxsz = Math.pow(2, 32) * 0.95; - if (Double.parseDouble(android.os.Build.VERSION.RELEASE.replaceAll("(\\d+[.]\\d+)(.*)","$1")) >= 7) { - // check if download larger than 16 GiB on Nougat and up + if (Double.parseDouble(android.os.Build.VERSION.RELEASE.replaceAll("(\\d+)(.*)", "$1")) >= 7) { + // map download size limit is 16 GiB on Nougat and up maxsz = Math.pow(2, 34); } + // check if download too large if (NavitMapDownloader.osm_maps[mi].mEstSizeBytes >= maxsz) { NavitDialogs.sendDialogMessage(NavitDialogs.MSG_TOAST_LONG, null, getTstring(R.string.map_download_oversize), |