diff options
| author | Johan Fitié <jfitie@gmail.com> | 2020-08-09 17:07:45 +0200 |
|---|---|---|
| committer | Viktor Verebelyi <vviktor2@gmail.com> | 2020-09-22 02:16:22 +0100 |
| commit | 1a7502dc3bc6663f24c379b06656cb04aecad644 (patch) | |
| tree | 7480edcf7e8af41159ceb514830f7e368acab1ee | |
| parent | 92a1f0202fc34e81e2077aed08b2a1af863f22f7 (diff) | |
| download | navit-1a7502dc3bc6663f24c379b06656cb04aecad644.tar.gz | |
change:android:Remove map download size limit on modern Android versions (#1029)
* Android: Increase map download size limit
* Condition
* Condition #2
* ru
* Condition #3
* Clean up
* Try...
* String
* long->double
* Incorrect version
* Fix comment indent
* 4GiB to 3.8GiB as before
* Simplify expression
* Int
* Make Android version regex more save
* Fix
* Don't crash on strings containing no numeric value
* Revert strings
* Revert string
* Simplify
* Add space and comment
* Skip variable
* CheckStyle
* Simplify
Co-authored-by: jkoan <jkoan@users.noreply.github.com>
| -rw-r--r-- | navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java index 4ee521c8c..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,7 +198,9 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity { String mapIndex = child.get("map_index"); if (mapIndex != null) { int mi = Integer.parseInt(mapIndex); - if (NavitMapDownloader.osm_maps[mi].mEstSizeBytes / 1024 / 1024 / 950 >= 4) { + 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); |