caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix merge conflict

Browse source
This commit is contained in:
Milos Kozak 2017-10-26 21:23:23 +02:00
parent 3e6fcabfab 8a6e811c95
commit e71ce02131
7 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

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

12
app/src/main/java/info/nightscout/androidaps/MainApp.java
View file

@ -169,9 +169,6 @@ public class MainApp extends Application {
else else
Answers.getInstance().logCustom(new CustomEvent("AppStart")); Answers.getInstance().logCustom(new CustomEvent("AppStart"));
startKeepAliveService();
Thread t = new Thread(new Runnable() { Thread t = new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -179,8 +176,9 @@ public class MainApp extends Application {
PumpInterface pump = MainApp.getConfigBuilder(); PumpInterface pump = MainApp.getConfigBuilder();
if (pump != null) if (pump != null)
pump.refreshDataFromPump("Initialization"); pump.refreshDataFromPump("Initialization");
startKeepAliveService();
} }
}); }, "pump-initialization");
t.start(); t.start();
} }
@ -213,12 +211,6 @@ public class MainApp extends Application {
private void startKeepAliveService() { private void startKeepAliveService() {
if (keepAliveReceiver == null) { if (keepAliveReceiver == null) {
keepAliveReceiver = new KeepAliveReceiver(); 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); keepAliveReceiver.setAlarm(this);
} }
} }

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

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

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

@ -1,7 +1,5 @@
package info.nightscout.androidaps.plugins.OpenAPSAMA; package info.nightscout.androidaps.plugins.OpenAPSAMA;
import com.eclipsesource.v8.V8Object;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import org.mozilla.javascript.NativeObject; import org.mozilla.javascript.NativeObject;

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

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

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

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

2
gradle.properties
View file

@ -16,5 +16,3 @@
# This option should only be used with decoupled projects. More details, visit # 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 # 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