From dabea567234a6a7bdf50bb8178a97c3a64593b15 Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Fri, 22 Jan 2016 15:55:40 +0300
Subject: [PATCH] [Old map downloader] [android] fix: Show migrate dialog from
 zoomed map also.

---
 .../src/com/mapswithme/maps/MapFragment.java  | 16 ++++++++-
 .../src/com/mapswithme/maps/MwmActivity.java  | 33 +++++++++++--------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/android/src/com/mapswithme/maps/MapFragment.java b/android/src/com/mapswithme/maps/MapFragment.java
index a13ddae749..7f5c23ea59 100644
--- a/android/src/com/mapswithme/maps/MapFragment.java
+++ b/android/src/com/mapswithme/maps/MapFragment.java
@@ -7,7 +7,15 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 import android.util.DisplayMetrics;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.mapswithme.country.ActiveCountryTree;
 import com.mapswithme.maps.base.BaseMwmFragment;
 import com.mapswithme.maps.downloader.DownloadHelper;
 import com.mapswithme.util.UiUtils;
@@ -275,6 +283,12 @@ public class MapFragment extends BaseMwmFragment
       @Override
       public void run()
       {
+        if (ActiveCountryTree.isLegacyMode())
+        {
+          ((MwmActivity)getActivity()).showMigrateDialog();
+          return;
+        }
+
         final MapStorage.Index index = new MapStorage.Index(group, country, region);
         if (options == -1)
         {
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 2b9ee06df2..c987599e99 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -281,24 +281,29 @@ public class MwmActivity extends BaseMwmFragmentActivity
         .show();
   }
 
+  void showMigrateDialog()
+  {
+    new AlertDialog.Builder(MwmActivity.this)
+        .setTitle(R.string.migrate_title)
+        .setMessage(R.string.migrate_subtitle)
+        .setNegativeButton(android.R.string.cancel, null)
+        .setPositiveButton(android.R.string.ok, new Dialog.OnClickListener()
+        {
+          @Override
+          public void onClick(DialogInterface dialog, int which)
+          {
+            ActiveCountryTree.migrate();
+            showDownloader(false);
+          }
+        }).show();
+  }
+
   @Override
-  public void showDownloader(final boolean openDownloadedList)
+  public void showDownloader(boolean openDownloadedList)
   {
     if (ActiveCountryTree.isLegacyMode())
     {
-      new AlertDialog.Builder(MwmActivity.this)
-          .setTitle(R.string.migrate_title)
-          .setMessage(R.string.migrate_subtitle)
-          .setPositiveButton(android.R.string.ok, new Dialog.OnClickListener()
-          {
-            @Override
-            public void onClick(DialogInterface dialog, int which)
-            {
-              ActiveCountryTree.migrate();
-              showDownloader(openDownloadedList);
-            }
-          }).show();
-
+      showMigrateDialog();
       return;
     }