fix merge conflict

app/build.gradle

@@ -50,7 +50,6 @@ android {
         buildConfigField "String", "BUILDVERSION", generateGitBuild()
 
         ndk {
-            abiFilters "armeabi-v7a", "x86", "armeabi", "mips"
             moduleName "BleCommandUtil"
         }
     }
@@ -152,7 +151,6 @@ dependencies {
     }
     compile 'org.slf4j:slf4j-api:1.7.12'
     compile 'com.jjoe64:graphview:4.0.1'
-    compile 'com.eclipsesource.j2v8:j2v8:3.1.6@aar'
     compile 'com.joanzapata.iconify:android-iconify-fontawesome:2.1.1'
     compile 'com.google.android.gms:play-services-wearable:7.5.0'
     compile 'junit:junit:4.12'

app/src/main/java/info/nightscout/androidaps/MainApp.java

@@ -169,9 +169,6 @@ public class MainApp extends Application {
         else
             Answers.getInstance().logCustom(new CustomEvent("AppStart"));
 
-
-        startKeepAliveService();
-
         Thread t = new Thread(new Runnable() {
             @Override
             public void run() {
@@ -179,8 +176,9 @@ public class MainApp extends Application {
                 PumpInterface pump = MainApp.getConfigBuilder();
                 if (pump != null)
                     pump.refreshDataFromPump("Initialization");
+                startKeepAliveService();
             }
-        });
+        }, "pump-initialization");
         t.start();
 
     }
@@ -213,12 +211,6 @@ public class MainApp extends Application {
     private void startKeepAliveService() {
         if (keepAliveReceiver == null) {
             keepAliveReceiver = new KeepAliveReceiver();
-            if (Config.DANAR) {
-                startService(new Intent(this, DanaRExecutionService.class));
-                startService(new Intent(this, DanaRKoreanExecutionService.class));
-                startService(new Intent(this, DanaRv2ExecutionService.class));
-                startService(new Intent(this, DanaRSService.class));
-            }
             keepAliveReceiver.setAlarm(this);
         }
     }

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSDeviceStatus.java

@@ -254,7 +254,7 @@ public class NSDeviceStatus {
         long clockEnacted = 0L;
 
         JSONObject suggested = null;
-        JSONObject enacted = null;
+        public JSONObject enacted = null;
     }
 
     public void updateOpenApsData(JSONObject object) {

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java

@@ -1,7 +1,5 @@
 package info.nightscout.androidaps.plugins.OpenAPSAMA;
 
-import com.eclipsesource.v8.V8Object;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.mozilla.javascript.NativeObject;
@@ -32,7 +30,7 @@ public class DetermineBasalResultAMA extends APSResult {
             if (result.containsKey("eventualBG")) eventualBG = (Double) result.get("eventualBG");
             if (result.containsKey("snoozeBG")) snoozeBG = (Double) result.get("snoozeBG");
             if (result.containsKey("rate")) {
-                rate =  (Double) result.get("rate");
+                rate = (Double) result.get("rate");
                 if (rate < 0d) rate = 0d;
                 changeRequested = true;
             } else {
@@ -40,7 +38,7 @@ public class DetermineBasalResultAMA extends APSResult {
                 changeRequested = false;
             }
             if (result.containsKey("duration")) {
-                duration = ((Double)result.get("duration")).intValue();
+                duration = ((Double) result.get("duration")).intValue();
                 //changeRequested as above
             } else {
                 duration = -1;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.java

@@ -51,7 +51,7 @@ public class DanaRS_Packet_APS_Basal_Set_Temporary_Basal extends DanaRS_Packet {
     @Override
     public void handleMessage(byte[] data) {
         int result = byteArrayToInt(getBytes(data, DATA_START, 1));
-        if (result != 1) {
+        if (result != 0) {
             failed = true;
             log.error("Set APS temp basal start result: " + result + " FAILED!!!");
         } else {

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Set_Event_History.java

@@ -61,7 +61,7 @@ public class DanaRS_Packet_APS_Set_Event_History extends DanaRS_Packet {
     @Override
     public void handleMessage(byte[] data) {
         int result = intFromBuff(data, 0, 1);
-        if (result != 1) {
+        if (result != 0) {
             failed = true;
             log.error("Set history entry result: " + result + " FAILED!!!");
         } else {

gradle.properties

@@ -15,6 +15,4 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
-
-android.useDeprecatedNdk=true