summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan FitiƩ <jfitie@gmail.com>2020-06-24 08:40:32 +0000
committerJohan FitiƩ <jfitie@gmail.com>2020-06-24 08:40:32 +0000
commitf4affc2e224cef9bae26ffbf038dcb9771655ac1 (patch)
treeed86d46ca3cad967a09a680d1e53d949d184d711
parent1d86a27ba127029b8a0ab00494a72eb2a8c0b45e (diff)
downloadnavit-f4affc2e224cef9bae26ffbf038dcb9771655ac1.tar.gz
Try...
-rw-r--r--navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
index b1e0ccfe8..051dc394a 100644
--- a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
+++ b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
@@ -197,8 +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 16 GiB
- if (NavitMapDownloader.osm_maps[mi].mEstSizeBytes >= Math.pow(2, 34)) {
+ // check if download larger than 4 GiB
+ long maxsz = Math.pow(2, 32);
+ if (Double.parseDouble(android.os.Build.VERSION.RELEASE.replaceAll("(\\d+[.]\\d+)(.*)","$1")) >= 8) {
+ // check if download larger than 16 GiB on Nougat and up
+ maxsz = Math.pow(2, 34);
+ }
+ if (NavitMapDownloader.osm_maps[mi].mEstSizeBytes >= maxsz) {
NavitDialogs.sendDialogMessage(NavitDialogs.MSG_TOAST_LONG, null,
getTstring(R.string.map_download_oversize),
-1, 0, 0);