From 962275f04bd007730ee4823ffd98a5750a04ead9 Mon Sep 17 00:00:00 2001
From: y20k <mail@y20k.org>
Date: Mon, 16 Apr 2018 17:00:27 +0200
Subject: [PATCH] Trackbook tries to restart recording after it has been killed
 the operating system

---
 .../java/org/y20k/trackbook/TrackerService.java  | 16 +++++++++++++++-
 build.gradle                                     |  6 +++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/y20k/trackbook/TrackerService.java b/app/src/main/java/org/y20k/trackbook/TrackerService.java
index 0cf3663..72e8366 100644
--- a/app/src/main/java/org/y20k/trackbook/TrackerService.java
+++ b/app/src/main/java/org/y20k/trackbook/TrackerService.java
@@ -130,8 +130,15 @@ public class TrackerService extends Service implements TrackbookKeys, SensorEven
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
 
+        // SERVICE RESTART (via START_STICKY)
+        if (intent == null) {
+            if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(PREFS_TRACKER_SERVICE_RUNNING, false)) {
+                LogHelper.w(LOG_TAG, "Trackbook has been killed by the operating system. Trying to resume recording.");
+                resumeTracking(LocationHelper.determineLastKnownLocation(mLocationManager));
+            }
+        }
         // ACTION STOP
-        if (ACTION_STOP.equals(intent.getAction())) {
+        else if (ACTION_STOP.equals(intent.getAction())) {
             stopTracking();
         }
         // ACTION RESUME
@@ -144,6 +151,13 @@ public class TrackerService extends Service implements TrackbookKeys, SensorEven
     }
 
 
+    @Override
+    public void onTaskRemoved(Intent rootIntent) {
+        super.onTaskRemoved(rootIntent);
+        LogHelper.v(LOG_TAG, "onTaskRemoved called.");
+    }
+
+
     @Override
     public void onDestroy() {
         LogHelper.v(LOG_TAG, "onDestroy called.");
diff --git a/build.gradle b/build.gradle
index 0ad7a50..0e12d1b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,13 +20,13 @@ allprojects {
     }
     project.ext {
         applicationId = 'org.y20k.trackbook'
-        versionCode = 23
-        versionName = '1.1.7'
+        versionCode = 24
+        versionName = '1.1.8'
         minSdkVersion = 22
         compileSdkVersion = 27
         targetSdkVersion = 27
         buildToolsVersion = '27.0.3'
-        supportLibraryVersion = '27.1.0'
+        supportLibraryVersion = '27.1.1'
         constraintLayoutVersion = '1.1.0-beta5'
 
         osmdroidVersion = '6.0.1'