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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-09-22 18:08:36 +02:00
commit 6a3afad997
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package net.osmand.plus.firstusage; package net.osmand.plus.firstusage;
import android.Manifest; import android.Manifest;
import android.app.Activity;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.AsyncTask; import android.os.AsyncTask;
@ -653,13 +654,16 @@ public class FirstUsageWizardFragment extends Fragment implements OsmAndLocation
} }
public void closeWizard() { public void closeWizard() {
getActivity().getSupportFragmentManager().beginTransaction() FragmentActivity activity = getActivity();
.remove(FirstUsageWizardFragment.this).commit(); if (activity != null) {
location = null; activity.getSupportFragmentManager().beginTransaction()
localDownloadRegion = null; .remove(FirstUsageWizardFragment.this).commit();
localMapIndexItem = null; location = null;
baseMapIndexItem = null; localDownloadRegion = null;
wizardClosed = true; localMapIndexItem = null;
baseMapIndexItem = null;
wizardClosed = true;
}
} }
public void processLocationPermission(boolean granted) { public void processLocationPermission(boolean granted) {