From 9d7984299badcbf926b279ede8a44e8f6d2e7095 Mon Sep 17 00:00:00 2001 From: DevarshVasani Date: Wed, 22 Jan 2025 16:22:46 +0530 Subject: [PATCH 1/2] Show error message when download fails due to internet connection Signed-off-by: DevarshVasani --- .../organicmaps/downloader/OnmapDownloader.java | 15 +++++++++++++++ .../app/src/main/res/layout/onmap_downloader.xml | 10 ++++++++++ 2 files changed, 25 insertions(+) diff --git a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java index c61f92e631..6f46eace31 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java +++ b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java @@ -31,6 +31,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener private final TextView mParent; private final TextView mTitle; private final TextView mSize; + private final TextView mError; private final WheelProgressView mProgress; private final Button mButton; @@ -52,6 +53,9 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener if (!item.isLeafNode) continue; + if (mError.getVisibility() == View.VISIBLE) + mError.setVisibility(View.GONE); + if (item.newStatus == CountryItem.STATUS_FAILED) MapManager.showError(mActivity, item, null); @@ -172,6 +176,13 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener } } + if (!ConnectionState.INSTANCE.isConnected() && + failed) + { + if (!(mError.getVisibility() == View.VISIBLE)) + mError.setVisibility(View.VISIBLE); + mError.setText("Downloading failed, please check your internet connection"); + } mButton.setText(failed ? R.string.downloader_retry : R.string.download); } @@ -191,6 +202,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener mParent = mFrame.findViewById(R.id.downloader_parent); mTitle = mFrame.findViewById(R.id.downloader_title); mSize = mFrame.findViewById(R.id.downloader_size); + mError = mFrame.findViewById(R.id.downloader_error); View controls = mFrame.findViewById(R.id.downloader_controls_frame); mProgress = controls.findViewById(R.id.wheel_downloader_progress); @@ -208,6 +220,9 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener if (mCurrentCountry == null) return; + if (mError.getVisibility() == View.VISIBLE) + mError.setVisibility(View.GONE); + boolean retry = (mCurrentCountry.status == CountryItem.STATUS_FAILED); if (retry) { diff --git a/android/app/src/main/res/layout/onmap_downloader.xml b/android/app/src/main/res/layout/onmap_downloader.xml index df6c3b856f..276ccbddb6 100644 --- a/android/app/src/main/res/layout/onmap_downloader.xml +++ b/android/app/src/main/res/layout/onmap_downloader.xml @@ -46,6 +46,16 @@ android:textAppearance="@style/MwmTextAppearance.Body2" android:gravity="center_horizontal" tools:text="1000 MB"/> + Date: Sun, 9 Mar 2025 02:08:56 +0530 Subject: [PATCH 2/2] Improve error handling for download failures and internet connection checks Signed-off-by: DevarshVasani --- .../downloader/OnmapDownloader.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java index 6f46eace31..d338ba623f 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java +++ b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java @@ -53,8 +53,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener if (!item.isLeafNode) continue; - if (mError.getVisibility() == View.VISIBLE) - mError.setVisibility(View.GONE); + mError.setVisibility(View.GONE); if (item.newStatus == CountryItem.STATUS_FAILED) MapManager.showError(mActivity, item, null); @@ -176,12 +175,14 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener } } - if (!ConnectionState.INSTANCE.isConnected() && - failed) + if (failed) { - if (!(mError.getVisibility() == View.VISIBLE)) - mError.setVisibility(View.VISIBLE); - mError.setText("Downloading failed, please check your internet connection"); + mError.setVisibility(View.VISIBLE); + + if (!ConnectionState.INSTANCE.isConnected()) + mError.setText(mActivity.getString(R.string.common_check_internet_connection_dialog)); + else + mError.setText(mActivity.getString(R.string.download_has_failed)); } mButton.setText(failed ? R.string.downloader_retry : R.string.download); @@ -220,8 +221,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener if (mCurrentCountry == null) return; - if (mError.getVisibility() == View.VISIBLE) - mError.setVisibility(View.GONE); + mError.setVisibility(View.GONE); boolean retry = (mCurrentCountry.status == CountryItem.STATUS_FAILED); if (retry) -- 2.45.3