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

Fix exit

Browse source 
https://groups.google.com/forum/#!topic/osmand/tgdBv_-ht3E
This commit is contained in:
Zahnstocher 2013-01-31 00:25:32 +01:00
parent 5ea56cd969
commit 9240bb08ba
1 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -371,6 +371,12 @@ public class OsmandApplication extends Application implements ClientContext {
return bidforfix; return bidforfix;
} }
private void fullExit() {
// http://stackoverflow.com/questions/2092951/how-to-close-android-application
System.runFinalizersOnExit(true);
System.exit(0);
}
public synchronized void closeApplication(final Activity activity) { public synchronized void closeApplication(final Activity activity) {
if (getNavigationService() != null) { if (getNavigationService() != null) {
Builder bld = new AlertDialog.Builder(activity); Builder bld = new AlertDialog.Builder(activity);
@ -378,29 +384,51 @@ public class OsmandApplication extends Application implements ClientContext {
bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() { bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
closeApplicationAnyway(activity); closeApplicationAnyway(activity, true);
}
});
bld.setNegativeButton(R.string.default_buttons_no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
closeApplicationAnyway(activity, false);
} }
}); });
bld.setNegativeButton(R.string.default_buttons_no, null);
bld.show(); bld.show();
} else { } else {
closeApplicationAnyway(activity); closeApplicationAnyway(activity, true);
} }
} }
private void closeApplicationAnyway(final Activity activity) { private void closeApplicationAnyway(final Activity activity, boolean disableService) {
if (applicationInitializing) { if (applicationInitializing) {
manager.close(); manager.close();
} }
applicationInitializing = false; applicationInitializing = false;
if (getNavigationService() != null) {
activity.finish();
if (getNavigationService() == null) {
fullExit();
}
else if (disableService) {
final Intent serviceIntent = new Intent(this, NavigationService.class); final Intent serviceIntent = new Intent(this, NavigationService.class);
stopService(serviceIntent); stopService(serviceIntent);
new Thread(new Runnable() {
public void run() {
//wait until the service has fully stopped
while (getNavigationService() != null) {
try {
Thread.sleep(100);
}
catch (InterruptedException e) {
}
}
fullExit();
}
}).start();
} }
// http://stackoverflow.com/questions/2092951/how-to-close-android-application
System.runFinalizersOnExit(true);
System.exit(0);
activity.finish();
} }
public synchronized void startApplication() { public synchronized void startApplication() {