From 83aa0c78b5cbd69d5be1298ef73f053cd6b41f77 Mon Sep 17 00:00:00 2001
From: velichkomarija <velichkomarija4@gmail.com>
Date: Tue, 8 Dec 2020 12:53:24 +0300
Subject: [PATCH] [android] Fixed doubling sharing category dialog.

---
 .../bookmarks/BaseBookmarkCategoriesFragment.java   |  9 ---------
 .../maps/bookmarks/BookmarkCategoriesFragment.java  | 13 +++++++++++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java
index c4d8346423..6be5be11a5 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java
@@ -40,7 +40,6 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
     implements EditTextDialogFragment.EditTextDialogInterface,
                MenuItem.OnMenuItemClickListener,
                BookmarkManager.BookmarksLoadingListener,
-               BookmarkManager.BookmarksSharingListener,
                CategoryListCallback,
                KmlImportController.ImportKmlCallback,
                OnItemClickListener<BookmarkCategory>,
@@ -125,7 +124,6 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
   {
     super.onStart();
     BookmarkManager.INSTANCE.addLoadingListener(this);
-    BookmarkManager.INSTANCE.addSharingListener(this);
     BookmarkManager.INSTANCE.addCatalogListener(mCatalogListener);
   }
 
@@ -134,7 +132,6 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
   {
     super.onStop();
     BookmarkManager.INSTANCE.removeLoadingListener(this);
-    BookmarkManager.INSTANCE.removeSharingListener(this);
     BookmarkManager.INSTANCE.removeCatalogListener(mCatalogListener);
   }
 
@@ -232,12 +229,6 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
     // Do nothing here.
   }
 
-  @Override
-  public void onPreparedFileForSharing(@NonNull BookmarkSharingResult result)
-  {
-    SharingHelper.INSTANCE.onPreparedFileForSharing(getActivity(), result);
-  }
-
   @Override
   public void onFooterClick()
   {
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
index fd13ea7ddf..a8ce66c434 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
@@ -12,11 +12,13 @@ import com.mapswithme.maps.auth.Authorizer;
 import com.mapswithme.maps.auth.TargetFragmentCallback;
 import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
+import com.mapswithme.maps.bookmarks.data.BookmarkSharingResult;
 import com.mapswithme.maps.widget.BookmarkBackupView;
 import com.mapswithme.util.UiUtils;
+import com.mapswithme.util.sharing.SharingHelper;
 
 public class BookmarkCategoriesFragment extends BaseBookmarkCategoriesFragment
-    implements TargetFragmentCallback, AuthCompleteListener
+    implements TargetFragmentCallback, AuthCompleteListener, BookmarkManager.BookmarksSharingListener
 {
   @Nullable
   private BookmarkBackupController mBackupController;
@@ -27,15 +29,21 @@ public class BookmarkCategoriesFragment extends BaseBookmarkCategoriesFragment
     Authorizer authorizer = new Authorizer(this);
     BookmarkBackupView backupView = view.findViewById(R.id.backup);
 
-
     mBackupController = new BookmarkBackupController(requireActivity(), backupView, authorizer,
                                                      this);
   }
 
+  @Override
+  public void onPreparedFileForSharing(@NonNull BookmarkSharingResult result)
+  {
+    SharingHelper.INSTANCE.onPreparedFileForSharing(requireActivity(), result);
+  }
+
   @Override
   public void onStart()
   {
     super.onStart();
+    BookmarkManager.INSTANCE.addSharingListener(this);
     if (mBackupController != null)
       mBackupController.onStart();
   }
@@ -52,6 +60,7 @@ public class BookmarkCategoriesFragment extends BaseBookmarkCategoriesFragment
   public void onStop()
   {
     super.onStop();
+    BookmarkManager.INSTANCE.removeSharingListener(this);
     if (mBackupController != null)
       mBackupController.onStop();
   }