pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed doubling sharing category dialog.

Browse source
This commit is contained in:
velichkomarija 2020-12-08 12:53:24 +03:00 • committed by Alexey
parent 74b1d0593f
commit 83aa0c78b5
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java
View file

@ -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()
{

13
android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
View file

@ -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();
}