diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index be6165cdf9..7c339d36c9 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -136,6 +136,7 @@ import com.mapswithme.maps.widget.menu.MenuController; import com.mapswithme.maps.widget.menu.MenuControllerFactory; import com.mapswithme.maps.widget.menu.MenuStateObserver; import com.mapswithme.maps.widget.menu.MyPositionButton; +import com.mapswithme.maps.base.NoConnectionListener; import com.mapswithme.maps.widget.placepage.PlacePageController; import com.mapswithme.maps.widget.placepage.PlacePageData; import com.mapswithme.maps.widget.placepage.PlacePageFactory; @@ -192,7 +193,8 @@ public class MwmActivity extends BaseMwmFragmentActivity WelcomeDialogFragment.OnboardingStepPassedListener, OnIsolinesLayerToggleListener, OnGuidesLayerToggleListener, - GuidesGalleryListener + GuidesGalleryListener, + NoConnectionListener { private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC); private static final String TAG = MwmActivity.class.getSimpleName(); @@ -553,7 +555,8 @@ public class MwmActivity extends BaseMwmFragmentActivity mPlacePageController.onActivityCreated(this, savedInstanceState); mMainMenuController = MenuControllerFactory.createMainMenuController(new MainMenuStateObserver(), - new MainMenuOptionSelectedListener()); + new MainMenuOptionSelectedListener(), + this); mMainMenuController.initialize(findViewById(R.id.coordinator)); boolean isLaunchByDeepLink = getIntent().getBooleanExtra(EXTRA_LAUNCH_BY_DEEP_LINK, false); @@ -587,6 +590,15 @@ public class MwmActivity extends BaseMwmFragmentActivity tryToShowAdditionalViewOnTop(); } + @Override + public void onNoConnectionError() + { + DialogInterface.OnClickListener listener = (dialog, which) -> {}; + DialogUtils.showAlertDialog(this, R.string.common_check_internet_connection_dialog_title, + R.string.common_check_internet_connection_dialog, + R.string.ok, listener); + } + private void initControllersAndValidatePurchases(@Nullable Bundle savedInstanceState) { mAdsRemovalPurchaseController = PurchaseFactory.createAdsRemovalPurchaseController(this); @@ -1495,7 +1507,6 @@ public class MwmActivity extends BaseMwmFragmentActivity private void onGuidesFatalError() { - Mode.GUIDES.setEnabled(getApplicationContext(), false); mToggleMapLayerController.turnOff(); RecyclerView bottomSheetRecycler = findViewById(R.id.layers_recycler); Objects.requireNonNull(bottomSheetRecycler.getAdapter()).notifyDataSetChanged(); diff --git a/android/src/com/mapswithme/maps/base/NoConnectionListener.java b/android/src/com/mapswithme/maps/base/NoConnectionListener.java new file mode 100644 index 0000000000..05756107a6 --- /dev/null +++ b/android/src/com/mapswithme/maps/base/NoConnectionListener.java @@ -0,0 +1,6 @@ +package com.mapswithme.maps.base; + +public interface NoConnectionListener +{ + void onNoConnectionError(); +} diff --git a/android/src/com/mapswithme/maps/maplayer/DefaultClickListener.java b/android/src/com/mapswithme/maps/maplayer/DefaultClickListener.java index c898136be6..a3a58a31a9 100644 --- a/android/src/com/mapswithme/maps/maplayer/DefaultClickListener.java +++ b/android/src/com/mapswithme/maps/maplayer/DefaultClickListener.java @@ -17,7 +17,7 @@ public abstract class DefaultClickListener implements OnItemClickListener