From 362154aedb0eaeaa3c5d7ad796f8c57123766896 Mon Sep 17 00:00:00 2001
From: savsch <119003089+savsch@users.noreply.github.com>
Date: Sat, 15 Feb 2025 17:28:38 +0530
Subject: [PATCH] [android] Fix bookmark edits not updating in PP on screen
 rotation

Resolves #2418

Signed-off-by: savsch <119003089+savsch@users.noreply.github.com>
---
 .../widget/placepage/EditBookmarkFragment.java            | 8 ++++++++
 .../placepage/sections/PlacePageBookmarkFragment.java     | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
index dd31a18ac..485b752a0 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
@@ -193,6 +193,14 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
     }
   }
 
+  @Override
+  public void onAttach(@NonNull Context context)
+  {
+    super.onAttach(context);
+    if (mListener == null && getParentFragment() instanceof EditBookmarkListener)
+      mListener = (EditBookmarkListener) getParentFragment();
+  }
+
   private void initToolbar(View view)
   {
     Toolbar toolbar = view.findViewById(R.id.toolbar);
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
index 6fc56b93f..88ccf2345 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
@@ -127,7 +127,7 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
     EditBookmarkFragment.editBookmark(currentBookmark.getCategoryId(),
                                       currentBookmark.getBookmarkId(),
                                       activity,
-                                      activity.getSupportFragmentManager(),
+                                      getChildFragmentManager(),
                                       PlacePageBookmarkFragment.this);
   }