From febe5e33610deed6fa5c5a7e401d8f9f3777635d Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Thu, 5 Mar 2020 19:30:07 +0200
Subject: [PATCH] Fix possible crash and migrate file provider name in
 manifests

---
 OsmAnd/AndroidManifest-free.xml                           | 2 +-
 OsmAnd/AndroidManifest-freecustom.xml                     | 2 +-
 OsmAnd/AndroidManifest-freedev.xml                        | 2 +-
 OsmAnd/AndroidManifest-freehuawei.xml                     | 2 +-
 OsmAnd/AndroidManifest-huawei.xml                         | 2 +-
 .../other/DestinationReachedMenuFragment.java             | 8 ++++++--
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/AndroidManifest-free.xml b/OsmAnd/AndroidManifest-free.xml
index 0cc15e429d..873848e1e9 100644
--- a/OsmAnd/AndroidManifest-free.xml
+++ b/OsmAnd/AndroidManifest-free.xml
@@ -20,7 +20,7 @@
             android:process="net.osmand"/>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             tools:replace="android:authorities"
             android:authorities="net.osmand.fileprovider"/>
     </application>
diff --git a/OsmAnd/AndroidManifest-freecustom.xml b/OsmAnd/AndroidManifest-freecustom.xml
index 3b9368a468..66ced1602a 100644
--- a/OsmAnd/AndroidManifest-freecustom.xml
+++ b/OsmAnd/AndroidManifest-freecustom.xml
@@ -18,7 +18,7 @@
             android:process="net.osmand.freecustom"
             tools:replace="android:process"/>
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="net.osmand.freecustom.fileprovider"
             tools:replace="android:authorities"/>
     </application>
diff --git a/OsmAnd/AndroidManifest-freedev.xml b/OsmAnd/AndroidManifest-freedev.xml
index 0ef9c72e9c..09ecf8a880 100644
--- a/OsmAnd/AndroidManifest-freedev.xml
+++ b/OsmAnd/AndroidManifest-freedev.xml
@@ -17,7 +17,7 @@
             android:process="net.osmand.dev"
             tools:replace="android:process"/>
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="net.osmand.dev.fileprovider"
             tools:replace="android:authorities"/>
     </application>
diff --git a/OsmAnd/AndroidManifest-freehuawei.xml b/OsmAnd/AndroidManifest-freehuawei.xml
index 9fe9a01ccf..e96bb7fe47 100644
--- a/OsmAnd/AndroidManifest-freehuawei.xml
+++ b/OsmAnd/AndroidManifest-freehuawei.xml
@@ -13,7 +13,7 @@
 		</activity>
 
 		<provider
-			android:name="android.support.v4.content.FileProvider"
+			android:name="androidx.core.content.FileProvider"
 			android:authorities="net.osmand.huawei.fileprovider"
 			tools:replace="android:authorities" />
 		<service
diff --git a/OsmAnd/AndroidManifest-huawei.xml b/OsmAnd/AndroidManifest-huawei.xml
index 7b62dfffcc..bc847980cd 100644
--- a/OsmAnd/AndroidManifest-huawei.xml
+++ b/OsmAnd/AndroidManifest-huawei.xml
@@ -13,7 +13,7 @@
 		</activity>
 
 		<provider
-			android:name="android.support.v4.content.FileProvider"
+			android:name="androidx.core.content.FileProvider"
 			android:authorities="net.osmand.plus.huawei.fileprovider"
 			tools:replace="android:authorities" />
 		<service
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java
index eb85e274d3..d0af66e0c3 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java
@@ -12,6 +12,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 
 import net.osmand.AndroidUtils;
 import net.osmand.data.LatLon;
@@ -204,8 +205,11 @@ public class DestinationReachedMenuFragment extends Fragment {
 
 	public void dismissMenu() {
 		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null && !mapActivity.isActivityDestroyed()) {
-			mapActivity.getSupportFragmentManager().popBackStack();
+		if (mapActivity != null) {
+			FragmentManager fragmentManager = mapActivity.getSupportFragmentManager();
+			if (!fragmentManager.isStateSaved()) {
+				fragmentManager.popBackStack();
+			}
 		}
 	}