caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

finish apllication after clicking Exit

Browse source
This commit is contained in:
Milos Kozak 2018-07-31 19:11:32 +02:00
parent ce16dd747b
commit 9d686adf7e
6 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java
View file

@ -161,8 +161,6 @@ public class NSClientService extends Service {
destroy(); destroy();
stopSelf(); stopSelf();
if (L.isEnabled(L.NSCLIENT))
log.debug("EventAppExit finished");
} }
@Subscribe @Subscribe

27
app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/DummyService.java
View file

@ -6,10 +6,21 @@ import android.content.Intent;
import android.os.IBinder; import android.os.IBinder;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import com.squareup.otto.Subscribe;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.events.EventAppExit;
import info.nightscout.androidaps.logging.L;
/** /**
* Keeps AndroidAPS in foreground state, so it won't be terminated by Android nor get restricted by the background execution limits * Keeps AndroidAPS in foreground state, so it won't be terminated by Android nor get restricted by the background execution limits
*/ */
public class DummyService extends Service { public class DummyService extends Service {
private static Logger log = LoggerFactory.getLogger(L.CORE);
@Nullable @Nullable
@Override @Override
public IBinder onBind(Intent intent) { public IBinder onBind(Intent intent) {
@ -24,8 +35,24 @@ public class DummyService extends Service {
return START_STICKY; return START_STICKY;
} }
@Subscribe
public void onStatusEvent(EventAppExit event) {
if (L.isEnabled(L.CORE))
log.debug("EventAppExit received");
stopSelf();
}
@Override
public void onCreate() {
MainApp.bus().register(this);
}
@Override @Override
public void onDestroy() { public void onDestroy() {
if (L.isEnabled(L.CORE))
log.debug("onDestroy");
MainApp.bus().unregister(this);
stopForeground(true); stopForeground(true);
} }
} }

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
View file

@ -412,8 +412,6 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
MainApp.instance().getApplicationContext().unregisterReceiver(receiver); MainApp.instance().getApplicationContext().unregisterReceiver(receiver);
stopSelf(); stopSelf();
if (L.isEnabled(L.PUMP))
log.debug("EventAppExit finished");
} }
public PumpEnactResult setUserOptions() { public PumpEnactResult setUserOptions() {

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
View file

@ -93,8 +93,6 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
MainApp.instance().getApplicationContext().unregisterReceiver(receiver); MainApp.instance().getApplicationContext().unregisterReceiver(receiver);
stopSelf(); stopSelf();
if (L.isEnabled(L.PUMP))
log.debug("EventAppExit finished");
} }
@Subscribe @Subscribe

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
View file

@ -526,8 +526,6 @@ public class DanaRSService extends Service {
log.debug("EventAppExit received"); log.debug("EventAppExit received");
stopSelf(); stopSelf();
if (L.isEnabled(L.PUMP))
log.debug("EventAppExit finished");
} }
void waitForWholeMinute() { void waitForWholeMinute() {

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
View file

@ -112,8 +112,6 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
MainApp.instance().getApplicationContext().unregisterReceiver(receiver); MainApp.instance().getApplicationContext().unregisterReceiver(receiver);
stopSelf(); stopSelf();
if (L.isEnabled(L.PUMP))
log.debug("EventAppExit finished");
} }
@Subscribe @Subscribe