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

Fix first usage wizard

Browse source
This commit is contained in:
Alexey Kulish 2016-11-19 16:55:48 +03:00
parent b33eac33fe
commit c4f9819353
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java
View file

@ -692,13 +692,15 @@ public class FirstUsageWizardFragment extends Fragment implements OsmAndLocation
}
public static void startWizard(FragmentActivity activity) {
OsmandApplication app = (OsmandApplication) activity.getApplication();
if (!app.getSettings().isInternetConnectionAvailable()) {
showNoInternetFragment(activity);
} else if (location == null) {
findLocation(activity, true);
} else {
showSearchMapFragment(activity);
if (activity != null) {
OsmandApplication app = (OsmandApplication) activity.getApplication();
if (!app.getSettings().isInternetConnectionAvailable()) {
showNoInternetFragment(activity);
} else if (location == null) {
findLocation(activity, true);
} else {
showSearchMapFragment(activity);
}
}
}
@ -730,19 +732,21 @@ public class FirstUsageWizardFragment extends Fragment implements OsmAndLocation
}
private static void findLocation(FragmentActivity activity, boolean searchLocationByIp) {
OsmandApplication app = (OsmandApplication) activity.getApplication();
if (searchLocationByIp) {
showSearchLocationFragment(activity, true);
} else if (OsmAndLocationProvider.isLocationPermissionAvailable(activity)) {
Location loc = app.getLocationProvider().getLastKnownLocation();
if (loc == null) {
showSearchLocationFragment(activity, false);
if (activity != null) {
OsmandApplication app = (OsmandApplication) activity.getApplication();
if (searchLocationByIp) {
showSearchLocationFragment(activity, true);
} else if (OsmAndLocationProvider.isLocationPermissionAvailable(activity)) {
Location loc = app.getLocationProvider().getLastKnownLocation();
if (loc == null) {
showSearchLocationFragment(activity, false);
} else {
location = new Location(loc);
showSearchMapFragment(activity);
}
} else {
location = new Location(loc);
showSearchMapFragment(activity);
showSearchLocationFragment(activity, false);
}
} else {
showSearchLocationFragment(activity, false);
}
}
@ -870,7 +874,7 @@ public class FirstUsageWizardFragment extends Fragment implements OsmAndLocation
}
private static void showFragment(FragmentActivity activity, Fragment fragment) {
if (!wizardClosed) {
if (!wizardClosed && activity != null) {
activity.getSupportFragmentManager()
.beginTransaction()
.replace(R.id.fragmentContainer, fragment, FirstUsageWizardFragment.TAG)