Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/android_x_migration' into android_x_migration

Browse source
This commit is contained in:
Vitaliy 2020-03-05 19:47:43 +02:00
commit f6eb20acab
6 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/AndroidManifest-free.xml
View file

@ -20,7 +20,7 @@
android:process="net.osmand"/> android:process="net.osmand"/>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="androidx.core.content.FileProvider"
tools:replace="android:authorities" tools:replace="android:authorities"
android:authorities="net.osmand.fileprovider"/> android:authorities="net.osmand.fileprovider"/>
</application> </application>

2
OsmAnd/AndroidManifest-freecustom.xml
View file

@ -18,7 +18,7 @@
android:process="net.osmand.freecustom" android:process="net.osmand.freecustom"
tools:replace="android:process"/> tools:replace="android:process"/>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="net.osmand.freecustom.fileprovider" android:authorities="net.osmand.freecustom.fileprovider"
tools:replace="android:authorities"/> tools:replace="android:authorities"/>
</application> </application>

2
OsmAnd/AndroidManifest-freedev.xml
View file

@ -17,7 +17,7 @@
android:process="net.osmand.dev" android:process="net.osmand.dev"
tools:replace="android:process"/> tools:replace="android:process"/>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="net.osmand.dev.fileprovider" android:authorities="net.osmand.dev.fileprovider"
tools:replace="android:authorities"/> tools:replace="android:authorities"/>
</application> </application>

2
OsmAnd/AndroidManifest-freehuawei.xml
View file

@ -13,7 +13,7 @@
</activity> </activity>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="net.osmand.huawei.fileprovider" android:authorities="net.osmand.huawei.fileprovider"
tools:replace="android:authorities" /> tools:replace="android:authorities" />
<service <service

2
OsmAnd/AndroidManifest-huawei.xml
View file

@ -13,7 +13,7 @@
</activity> </activity>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="net.osmand.plus.huawei.fileprovider" android:authorities="net.osmand.plus.huawei.fileprovider"
tools:replace="android:authorities" /> tools:replace="android:authorities" />
<service <service

8
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java
View file

@ -12,6 +12,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.view.ContextThemeWrapper; import androidx.appcompat.view.ContextThemeWrapper;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import net.osmand.AndroidUtils; import net.osmand.AndroidUtils;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
@ -204,8 +205,11 @@ public class DestinationReachedMenuFragment extends Fragment {
public void dismissMenu() { public void dismissMenu() {
MapActivity mapActivity = getMapActivity(); MapActivity mapActivity = getMapActivity();
if (mapActivity != null && !mapActivity.isActivityDestroyed()) { if (mapActivity != null) {
mapActivity.getSupportFragmentManager().popBackStack(); FragmentManager fragmentManager = mapActivity.getSupportFragmentManager();
if (!fragmentManager.isStateSaved()) {
fragmentManager.popBackStack();
}
} }
} }