From 1d1a206f9787e9cbbaba5b71c3f68b4e05628017 Mon Sep 17 00:00:00 2001
From: Roman Romanov <rromanov@65gb.net>
Date: Wed, 24 May 2017 07:59:17 +0400
Subject: [PATCH] [android] Review fixes

---
 .../src/com/mapswithme/maps/MwmActivity.java  | 22 -------------------
 .../downloader/UpdaterDialogFragment.java     | 14 ++++++------
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 21aa3bf1c5..faa9d2e372 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -18,7 +18,6 @@ import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
@@ -626,27 +625,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
   }
 
-  public void detachMap(@NonNull FragmentTransaction transaction)
-  {
-    if (mMapFragment == null)
-      return;
-
-    transaction.remove(mMapFragment);
-    mMapFragment = null;
-  }
-
-  public void attachMap()
-  {
-    if (mMapFragment != null)
-      return;
-
-    mMapFragment = (MapFragment) MapFragment.instantiate(this, MapFragment.class.getName(), null);
-    getSupportFragmentManager()
-        .beginTransaction()
-        .replace(R.id.map_fragment_container, mMapFragment, MapFragment.class.getName())
-        .commit();
-  }
-
   private void initNavigationButtons()
   {
     View frame = findViewById(R.id.navigation_buttons);
diff --git a/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java b/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java
index 595561e49c..cef12883e0 100644
--- a/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java
+++ b/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java
@@ -54,7 +54,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
   @Nullable
   private String[] mOutdatedMaps;
   @Nullable
-  private BaseNewsFragment.NewsDialogListener mDoneTask;
+  private BaseNewsFragment.NewsDialogListener mDoneListener;
 
   @NonNull
   private final MapManager.StorageCallback mStorageCallback = new MapManager.StorageCallback()
@@ -126,8 +126,8 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
   private void finish()
   {
     dismiss();
-    if (mDoneTask != null)
-      mDoneTask.onDialogDone();
+    if (mDoneListener != null)
+      mDoneListener.onDialogDone();
   }
 
   @NonNull
@@ -167,7 +167,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
   };
 
   public static boolean showOn(@NonNull FragmentActivity activity,
-                               @Nullable BaseNewsFragment.NewsDialogListener doneTask)
+                               @Nullable BaseNewsFragment.NewsDialogListener doneListener)
   {
     final FragmentManager fm = activity.getSupportFragmentManager();
     if (fm.isDestroyed())
@@ -205,7 +205,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
 
     final UpdaterDialogFragment fragment = new UpdaterDialogFragment();
     fragment.setArguments(args);
-    fragment.mDoneTask = doneTask;
+    fragment.mDoneListener = doneListener;
     FragmentTransaction transaction = fm.beginTransaction()
       .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out);
     fragment.show(transaction, UpdaterDialogFragment.class.getName());
@@ -285,8 +285,8 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
     if (MapManager.nativeIsDownloading())
       MapManager.nativeCancel(CountryItem.getRootId());
 
-    if (mDoneTask != null)
-      mDoneTask.onDialogDone();
+    if (mDoneListener != null)
+      mDoneListener.onDialogDone();
 
     super.onCancel(dialog);
   }