caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' into automation

Browse source
This commit is contained in:
Milos Kozak 2019-07-13 10:11:14 +02:00
commit 1eed348fe0
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
View file

@ -242,6 +242,7 @@ public class RuffyScripter implements RuffyCommands {
Thread cmdThread = null; Thread cmdThread = null;
try { try {
activeCmd = cmd; activeCmd = cmd;
unparsableMenuEncountered = false;
long connectStart = System.currentTimeMillis(); long connectStart = System.currentTimeMillis();
ensureConnected(); ensureConnected();
log.debug("Connection ready to execute cmd " + cmd); log.debug("Connection ready to execute cmd " + cmd);

13
app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
View file

@ -1,6 +1,5 @@
package info.nightscout.androidaps.plugins.source package info.nightscout.androidaps.plugins.source
import android.Manifest
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.os.Build import android.os.Build
@ -33,9 +32,9 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
private val log = LoggerFactory.getLogger(L.BGSOURCE) private val log = LoggerFactory.getLogger(L.BGSOURCE)
private val PACKAGE_NAMES = arrayOf("com.dexcom.cgm.region1.mgdl", "com.dexcom.cgm.region1.mmol", private val PACKAGE_NAMES = arrayOf("com.dexcom.cgm.region1.mgdl", "com.dexcom.cgm.region1.mmol",
"com.dexcom.cgm.region2.mgdl", "com.dexcom.cgm.region2.mmol", "com.dexcom.cgm.region2.mgdl", "com.dexcom.cgm.region2.mmol",
"com.dexcom.g6.region1.mmol", "com.dexcom.g6.region2.mgdl", "com.dexcom.g6.region1.mmol", "com.dexcom.g6.region2.mgdl",
"com.dexcom.g6.region3.mgdl", "com.dexcom.g6.region3.mmol") "com.dexcom.g6.region3.mgdl", "com.dexcom.g6.region3.mmol")
const val PERMISSION = "com.dexcom.cgm.EXTERNAL_PERMISSION" const val PERMISSION = "com.dexcom.cgm.EXTERNAL_PERMISSION"
@ -83,7 +82,7 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
val meters = intent.getBundleExtra("meters") val meters = intent.getBundleExtra("meters")
for (i in 0 until meters.size()) { for (i in 0 until meters.size()) {
val meter = meters.getBundle(i.toString()) val meter = meters.getBundle(i.toString())
val timestamp = meter.getLong("timestamp") * 1000 val timestamp = meter!!.getLong("timestamp") * 1000
if (MainApp.getDbHelper().getCareportalEventFromTimestamp(timestamp) != null) continue if (MainApp.getDbHelper().getCareportalEventFromTimestamp(timestamp) != null) continue
val jsonObject = JSONObject() val jsonObject = JSONObject()
jsonObject.put("enteredBy", "AndroidAPS-Dexcom") jsonObject.put("enteredBy", "AndroidAPS-Dexcom")
@ -95,7 +94,7 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
NSUpload.uploadCareportalEntryToNS(jsonObject) NSUpload.uploadCareportalEntryToNS(jsonObject)
} }
if (SP.getBoolean(R.string.key_dexcom_lognssensorchange, false) && intent.hasExtra("sensorInsertionTime")) { if (SP.getBoolean(R.string.key_dexcom_lognssensorchange, false) && intent.hasExtra("sensorInsertionTime")) {
val sensorInsertionTime = intent.extras.getLong("sensorInsertionTime") * 1000 val sensorInsertionTime = intent.extras!!.getLong("sensorInsertionTime") * 1000
if (MainApp.getDbHelper().getCareportalEventFromTimestamp(sensorInsertionTime) == null) { if (MainApp.getDbHelper().getCareportalEventFromTimestamp(sensorInsertionTime) == null) {
val jsonObject = JSONObject() val jsonObject = JSONObject()
jsonObject.put("enteredBy", "AndroidAPS-Dexcom") jsonObject.put("enteredBy", "AndroidAPS-Dexcom")
@ -104,7 +103,7 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
NSUpload.uploadCareportalEntryToNS(jsonObject) NSUpload.uploadCareportalEntryToNS(jsonObject)
} }
} }
} catch (e : Exception) { } catch (e: Exception) {
log.error("Error while processing intent from Dexcom App", e) log.error("Error while processing intent from Dexcom App", e)
} }
} }

2
build.gradle
View file

@ -10,7 +10,7 @@ buildscript {
maven { url 'https://maven.fabric.io/public' } maven { url 'https://maven.fabric.io/public' }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.4.1' classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'com.google.gms:google-services:4.2.0' classpath 'com.google.gms:google-services:4.2.0'
classpath 'io.fabric.tools:gradle:1.29.0' classpath 'io.fabric.tools:gradle:1.29.0'