From 619b64e0e9820cd82a371e0cf49ebb6304af6d56 Mon Sep 17 00:00:00 2001 From: DevarshVasani Date: Wed, 5 Mar 2025 17:24:30 +0530 Subject: [PATCH 1/3] Fix IllegalStateException in destroySurface method Signed-off-by: DevarshVasani --- android/app/src/main/java/app/organicmaps/MapFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/app/organicmaps/MapFragment.java b/android/app/src/main/java/app/organicmaps/MapFragment.java index 958aa564f2..99a50d7a87 100644 --- a/android/app/src/main/java/app/organicmaps/MapFragment.java +++ b/android/app/src/main/java/app/organicmaps/MapFragment.java @@ -43,7 +43,8 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener public void destroySurface() { - mMap.onSurfaceDestroyed(requireActivity().isChangingConfigurations(), isAdded()); + if (getActivity() != null) + mMap.onSurfaceDestroyed(getActivity().isChangingConfigurations(), isAdded()); } public boolean isContextCreated() -- 2.45.3 From 914abbcc77f0f5557f2b38d1a1c3b0cb7e61fac7 Mon Sep 17 00:00:00 2001 From: DevarshVasani Date: Sat, 8 Mar 2025 21:27:46 +0530 Subject: [PATCH 2/3] Pass `true` for config change in `onSurfaceDestroyed`. Signed-off-by: DevarshVasani --- android/app/src/main/java/app/organicmaps/MapFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/src/main/java/app/organicmaps/MapFragment.java b/android/app/src/main/java/app/organicmaps/MapFragment.java index 99a50d7a87..8fd3df959e 100644 --- a/android/app/src/main/java/app/organicmaps/MapFragment.java +++ b/android/app/src/main/java/app/organicmaps/MapFragment.java @@ -44,7 +44,7 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener public void destroySurface() { if (getActivity() != null) - mMap.onSurfaceDestroyed(getActivity().isChangingConfigurations(), isAdded()); + mMap.onSurfaceDestroyed(true, isAdded()); } public boolean isContextCreated() -- 2.45.3 From 2fbe8e9f9d3d67bc8927159fbb3c561800cea81d Mon Sep 17 00:00:00 2001 From: DevarshVasani Date: Sat, 8 Mar 2025 21:31:54 +0530 Subject: [PATCH 3/3] The `onSurfaceDestroyed` method is now called unconditionally within `destroySurface`, removing the previous check for a non-null activity. Signed-off-by: DevarshVasani --- android/app/src/main/java/app/organicmaps/MapFragment.java | 1 - 1 file changed, 1 deletion(-) diff --git a/android/app/src/main/java/app/organicmaps/MapFragment.java b/android/app/src/main/java/app/organicmaps/MapFragment.java index 8fd3df959e..934391fef4 100644 --- a/android/app/src/main/java/app/organicmaps/MapFragment.java +++ b/android/app/src/main/java/app/organicmaps/MapFragment.java @@ -43,7 +43,6 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener public void destroySurface() { - if (getActivity() != null) mMap.onSurfaceDestroyed(true, isAdded()); } -- 2.45.3