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

Fix permission restart

Browse source
This commit is contained in:
Alexey Kulish 2016-03-10 13:32:48 +03:00
parent 543b035f3a
commit 361dabac8c
1 changed files with 69 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -2,6 +2,7 @@ package net.osmand.plus.activities;
import android.Manifest; import android.Manifest;
import android.app.Activity; import android.app.Activity;
import android.app.AlarmManager;
import android.app.Dialog; import android.app.Dialog;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationManager; import android.app.NotificationManager;
@ -165,6 +166,7 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents,
private DrawerLayout drawerLayout; private DrawerLayout drawerLayout;
private boolean drawerDisabled; private boolean drawerDisabled;
private static boolean permissionDone;
private boolean permissionAsked; private boolean permissionAsked;
private boolean permissionGranted; private boolean permissionGranted;
@ -591,25 +593,28 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents,
System.err.println("OnCreate for MapActivity took " + (System.currentTimeMillis() - tm) + " ms"); System.err.println("OnCreate for MapActivity took " + (System.currentTimeMillis() - tm) + " ms");
} }
if (!permissionAsked) { if (!permissionDone) {
if (app.isExternalStorageDirectoryReadOnly() if (!permissionAsked) {
&& getSupportFragmentManager().findFragmentByTag(DataStoragePlaceDialogFragment.TAG) == null) { if (app.isExternalStorageDirectoryReadOnly()
if (DownloadActivity.hasPermissionToWriteExternalStorage(this)) { && getSupportFragmentManager().findFragmentByTag(DataStoragePlaceDialogFragment.TAG) == null) {
DataStoragePlaceDialogFragment.showInstance(getSupportFragmentManager(), true); if (DownloadActivity.hasPermissionToWriteExternalStorage(this)) {
} else { DataStoragePlaceDialogFragment.showInstance(getSupportFragmentManager(), true);
ActivityCompat.requestPermissions(this, } else {
new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, ActivityCompat.requestPermissions(this,
DownloadActivity.PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE); new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
DownloadActivity.PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE);
}
} }
} else {
if (permissionGranted) {
restartApp();
} else if (getSupportFragmentManager().findFragmentByTag(DataStoragePlaceDialogFragment.TAG) == null) {
DataStoragePlaceDialogFragment.showInstance(getSupportFragmentManager(), true);
}
permissionAsked = false;
permissionGranted = false;
permissionDone = true;
} }
} else {
if (permissionGranted) {
restartApp();
} else if (getSupportFragmentManager().findFragmentByTag(DataStoragePlaceDialogFragment.TAG) == null) {
DataStoragePlaceDialogFragment.showInstance(getSupportFragmentManager(), true);
}
permissionAsked = false;
permissionGranted = false;
} }
} }
@ -620,12 +625,58 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents,
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
android.os.Process.killProcess(android.os.Process.myPid()); doRestart(MapActivity.this);
//android.os.Process.killProcess(android.os.Process.myPid());
} }
}); });
bld.show(); bld.show();
} }
public static void doRestart(Context c) {
boolean res = false;
try {
//check if the context is given
if (c != null) {
//fetch the packagemanager so we can get the default launch activity
// (you can replace this intent with any other activity if you want
PackageManager pm = c.getPackageManager();
//check if we got the PackageManager
if (pm != null) {
//create the intent with the default start activity for your application
Intent mStartActivity = pm.getLaunchIntentForPackage(
c.getPackageName()
);
if (mStartActivity != null) {
mStartActivity.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
//create a pending intent so the application is restarted after System.exit(0) was called.
// We use an AlarmManager to call this intent in 100ms
int mPendingIntentId = 84523443;
PendingIntent mPendingIntent = PendingIntent
.getActivity(c, mPendingIntentId, mStartActivity,
PendingIntent.FLAG_CANCEL_CURRENT);
AlarmManager mgr = (AlarmManager) c.getSystemService(Context.ALARM_SERVICE);
mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent);
//kill the application
res = true;
android.os.Process.killProcess(android.os.Process.myPid());
//System.exit(0);
} else {
LOG.error("Was not able to restart application, mStartActivity null");
}
} else {
LOG.error("Was not able to restart application, PM null");
}
} else {
LOG.error("Was not able to restart application, Context null");
}
} catch (Exception ex) {
LOG.error("Was not able to restart application");
}
if (!res) {
android.os.Process.killProcess(android.os.Process.myPid());
}
}
private void parseNavigationIntent(final Uri data) { private void parseNavigationIntent(final Uri data) {
final String schemeSpecificPart = data.getSchemeSpecificPart(); final String schemeSpecificPart = data.getSchemeSpecificPart();