caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

remove @Jvm directives where possible

Browse source
This commit is contained in:
Milos Kozak 2021-09-20 17:20:09 +02:00
parent 71093db68a
commit 374e251801
32 changed files with 57 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.kt
View file

@ -16,8 +16,8 @@ class NSAddAck(
) : Event(), Ack { ) : Event(), Ack {
var id: String? = null var id: String? = null
@JvmField var nsClientID: String? = null var nsClientID: String? = null
@JvmField var json: JSONObject? = null var json: JSONObject? = null
override fun call(vararg args: Any) { override fun call(vararg args: Any) {
// Regular response // Regular response
try { try {

1
app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
View file

@ -133,7 +133,6 @@ class BolusWizard @Inject constructor(
private var carbTime: Int = 0 private var carbTime: Int = 0
private var quickWizard: Boolean = true private var quickWizard: Boolean = true
@JvmOverloads
fun doCalc(profile: Profile, fun doCalc(profile: Profile,
profileName: String, profileName: String,
tempTarget: TemporaryTarget?, tempTarget: TemporaryTarget?,

8
combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
View file

@ -768,7 +768,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
pumpSync.syncTemporaryBasalWithPumpId( pumpSync.syncTemporaryBasalWithPumpId(
state.timestamp, state.timestamp,
state.tbrPercent, state.tbrPercent,
T.mins(state.tbrRemainingDuration).msecs(), T.Companion.mins(state.tbrRemainingDuration).msecs(),
false, false,
tbrType, tbrType,
// There are no IDs for TBRs on the pump and none is calculated (in contrast to boluses). // There are no IDs for TBRs on the pump and none is calculated (in contrast to boluses).
@ -974,7 +974,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
pumpSync.syncTemporaryBasalWithPumpId( pumpSync.syncTemporaryBasalWithPumpId(
now, now,
0.0, 0.0,
T.mins(15).msecs(), T.Companion.mins(15).msecs(),
false, false,
PumpSync.TemporaryBasalType.PUMP_SUSPEND, PumpSync.TemporaryBasalType.PUMP_SUSPEND,
// Combo doesn't have nor uses IDs for TBRs, see note in #setTempBasalPercent // Combo doesn't have nor uses IDs for TBRs, see note in #setTempBasalPercent
@ -1107,7 +1107,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
pumpSync.syncTemporaryBasalWithPumpId( pumpSync.syncTemporaryBasalWithPumpId(
now, now,
state.tbrPercent, state.tbrPercent,
T.mins(state.tbrRemainingDuration).msecs(), T.Companion.mins(state.tbrRemainingDuration).msecs(),
false, false,
PumpSync.TemporaryBasalType.NORMAL, PumpSync.TemporaryBasalType.NORMAL,
tbrId, tbrId,
@ -1140,7 +1140,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
pumpSync.syncTemporaryBasalWithPumpId( pumpSync.syncTemporaryBasalWithPumpId(
now, now,
state.tbrPercent, state.tbrPercent,
T.mins(state.tbrRemainingDuration).msecs(), T.Companion.mins(state.tbrRemainingDuration).msecs(),
false, false,
PumpSync.TemporaryBasalType.NORMAL, PumpSync.TemporaryBasalType.NORMAL,
tbrId, tbrId,

7
core/src/main/java/info/nightscout/androidaps/Constants.java
View file

@ -23,9 +23,6 @@ public class Constants {
public static final Integer notificationID = 556677; public static final Integer notificationID = 556677;
public static final int hoursToKeepInDatabase = 72;
public static final int daysToKeepHistoryInDatabase = 30;
// SMS COMMUNICATOR // SMS COMMUNICATOR
public static final long remoteBolusMinDistance = 15 * 60 * 1000L; public static final long remoteBolusMinDistance = 15 * 60 * 1000L;
@ -72,7 +69,7 @@ public class Constants {
public static final int MIN_WATCHDOG_INTERVAL_IN_SECONDS = 12 * 60; public static final int MIN_WATCHDOG_INTERVAL_IN_SECONDS = 12 * 60;
//SMS Communicator //SMS Communicator
public static final long SMS_CONFIRM_TIMEOUT = T.mins(5L).msecs(); public static final long SMS_CONFIRM_TIMEOUT = T.Companion.mins(5L).msecs();
//Storage [MB] //Storage [MB]
public static final long MINIMUM_FREE_SPACE = 200; public static final long MINIMUM_FREE_SPACE = 200;
@ -106,7 +103,7 @@ public class Constants {
/** /**
* How many old TOTP tokens still accept. * How many old TOTP tokens still accept.
* Each token is 30s valid, but copying and SMS transmision of it can take additional seconds, * Each token is 30s valid, but copying and SMS transmission of it can take additional seconds,
* so we add leeway to still accept given amount of older tokens * so we add leeway to still accept given amount of older tokens
*/ */
public static final int OTP_ACCEPT_OLD_TOKENS_COUNT = 1; public static final int OTP_ACCEPT_OLD_TOKENS_COUNT = 1;

4
core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.kt
View file

@ -20,8 +20,8 @@ class DetailedBolusInfo {
// Additional requesting parameters // Additional requesting parameters
@JvmField var timestamp = System.currentTimeMillis() @JvmField var timestamp = System.currentTimeMillis()
@JvmField var lastKnownBolusTime: Long = 0 // for SMB check var lastKnownBolusTime: Long = 0 // for SMB check
@JvmField var deliverAtTheLatest: Long = 0 // SMB should be delivered within 1 min from this time var deliverAtTheLatest: Long = 0 // SMB should be delivered within 1 min from this time
@Transient var context: Context? = null // context for progress dialog @Transient var context: Context? = null // context for progress dialog
// Prefilled info for storing to db // Prefilled info for storing to db

2
core/src/main/java/info/nightscout/androidaps/data/InMemoryGlucoseValue.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps.data
import info.nightscout.androidaps.database.entities.GlucoseValue import info.nightscout.androidaps.database.entities.GlucoseValue
class InMemoryGlucoseValue @JvmOverloads constructor(var timestamp: Long = 0L, var value: Double = 0.0, var interpolated: Boolean = false) { class InMemoryGlucoseValue constructor(var timestamp: Long = 0L, var value: Double = 0.0, var interpolated: Boolean = false) {
constructor(gv: GlucoseValue) : this(gv.timestamp, gv.value) constructor(gv: GlucoseValue) : this(gv.timestamp, gv.value)
// var generated : value doesn't correspond to real value with timestamp close to real BG // var generated : value doesn't correspond to real value with timestamp close to real BG

4
core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
View file

@ -40,11 +40,7 @@ class BolusProgressDialog : DaggerDialogFragment() {
private val disposable = CompositeDisposable() private val disposable = CompositeDisposable()
companion object { companion object {
@JvmField
var bolusEnded = false var bolusEnded = false
@JvmField
var stopPressed = false var stopPressed = false
} }

7
core/src/main/java/info/nightscout/androidaps/utils/DateUtil.kt
View file

@ -58,10 +58,9 @@ class DateUtil @Inject constructor(private val context: Context) {
* @param tz - tz to set to, if not specified uses local timezone * @param tz - tz to set to, if not specified uses local timezone
* @return the iso-formatted date string * @return the iso-formatted date string
*/ */
@JvmOverloads fun toISOString(date: Long): String {
fun toISOString(date: Long, format: String = FORMAT_DATE_ISO_OUT, tz: TimeZone = TimeZone.getTimeZone("UTC")): String { val f: DateFormat = SimpleDateFormat(FORMAT_DATE_ISO_OUT, Locale.getDefault())
val f: DateFormat = SimpleDateFormat(format, Locale.getDefault()) f.timeZone = TimeZone.getTimeZone("UTC")
f.timeZone = tz
return f.format(date) return f.format(date)
} }

8
core/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt
View file

@ -27,7 +27,6 @@ object JsonHelper {
return result return result
} }
@JvmStatic
fun safeGetString(json: JSONObject?, fieldName: String): String? { fun safeGetString(json: JSONObject?, fieldName: String): String? {
var result: String? = null var result: String? = null
if (json != null && json.has(fieldName)) { if (json != null && json.has(fieldName)) {
@ -39,7 +38,6 @@ object JsonHelper {
return result return result
} }
@JvmStatic
fun safeGetString(json: JSONObject?, fieldName: String, defaultValue: String): String { fun safeGetString(json: JSONObject?, fieldName: String, defaultValue: String): String {
var result = defaultValue var result = defaultValue
if (json != null && json.has(fieldName)) { if (json != null && json.has(fieldName)) {
@ -51,7 +49,6 @@ object JsonHelper {
return result return result
} }
@JvmStatic
fun safeGetStringAllowNull(json: JSONObject?, fieldName: String, defaultValue: String?): String? { fun safeGetStringAllowNull(json: JSONObject?, fieldName: String, defaultValue: String?): String? {
var result = defaultValue var result = defaultValue
if (json != null && json.has(fieldName)) { if (json != null && json.has(fieldName)) {
@ -63,7 +60,6 @@ object JsonHelper {
return result return result
} }
@JvmStatic
fun safeGetDouble(json: JSONObject?, fieldName: String): Double { fun safeGetDouble(json: JSONObject?, fieldName: String): Double {
var result = 0.0 var result = 0.0
if (json != null && json.has(fieldName)) { if (json != null && json.has(fieldName)) {
@ -97,7 +93,6 @@ object JsonHelper {
return result return result
} }
@JvmStatic
fun safeGetInt(json: JSONObject?, fieldName: String): Int = fun safeGetInt(json: JSONObject?, fieldName: String): Int =
safeGetInt(json, fieldName, 0) safeGetInt(json, fieldName, 0)
@ -123,7 +118,6 @@ object JsonHelper {
return result return result
} }
@JvmStatic
fun safeGetLong(json: JSONObject?, fieldName: String): Long { fun safeGetLong(json: JSONObject?, fieldName: String): Long {
var result: Long = 0 var result: Long = 0
if (json != null && json.has(fieldName)) { if (json != null && json.has(fieldName)) {
@ -146,8 +140,6 @@ object JsonHelper {
return result return result
} }
@JvmStatic
@JvmOverloads
fun safeGetBoolean(json: JSONObject?, fieldName: String, defaultValue: Boolean = false): Boolean { fun safeGetBoolean(json: JSONObject?, fieldName: String, defaultValue: Boolean = false): Boolean {
var result = defaultValue var result = defaultValue
if (json != null && json.has(fieldName)) { if (json != null && json.has(fieldName)) {

14
core/src/main/java/info/nightscout/androidaps/utils/T.kt
View file

@ -14,12 +14,12 @@ class T(val time: Long = 0L) {
companion object { companion object {
@JvmStatic fun now(): T = T(System.currentTimeMillis()) fun now(): T = T(System.currentTimeMillis())
@JvmStatic fun msecs(msec: Long): T = T(msec) fun msecs(msec: Long): T = T(msec)
@JvmStatic fun secs(sec: Long): T = T(sec * 1000L) fun secs(sec: Long): T = T(sec * 1000L)
@JvmStatic fun mins(min: Long): T = T(min * 60 * 1000L) fun mins(min: Long): T = T(min * 60 * 1000L)
@JvmStatic fun hours(hour: Long): T = T(hour * 60 * 60 * 1000L) fun hours(hour: Long): T = T(hour * 60 * 60 * 1000L)
@JvmStatic fun days(day: Long): T = T(day * 24 * 60 * 60 * 1000L) fun days(day: Long): T = T(day * 24 * 60 * 60 * 1000L)
@JvmStatic fun months(month: Long): T = T(month * 31 * 24 * 60 * 60 * 1000L) fun months(month: Long): T = T(month * 31 * 24 * 60 * 60 * 1000L)
} }
} }

8
core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
View file

@ -55,12 +55,10 @@ object OKDialog {
.setCanceledOnTouchOutside(false) .setCanceledOnTouchOutside(false)
} }
@JvmStatic
fun showConfirmation(activity: FragmentActivity, message: String, ok: Runnable?) { fun showConfirmation(activity: FragmentActivity, message: String, ok: Runnable?) {
showConfirmation(activity, activity.getString(R.string.confirmation), message, ok, null) showConfirmation(activity, activity.getString(R.string.confirmation), message, ok, null)
} }
@JvmStatic
fun showConfirmation(activity: FragmentActivity, message: Spanned, ok: Runnable?) { fun showConfirmation(activity: FragmentActivity, message: Spanned, ok: Runnable?) {
showConfirmation(activity, activity.getString(R.string.confirmation), message, ok, null) showConfirmation(activity, activity.getString(R.string.confirmation), message, ok, null)
} }
@ -153,15 +151,11 @@ object OKDialog {
.setCanceledOnTouchOutside(false) .setCanceledOnTouchOutside(false)
} }
@JvmStatic
@JvmOverloads
fun showConfirmation(context: Context, message: String, ok: Runnable?, cancel: Runnable? = null) { fun showConfirmation(context: Context, message: String, ok: Runnable?, cancel: Runnable? = null) {
showConfirmation(context, context.getString(R.string.confirmation), message, ok, cancel) showConfirmation(context, context.getString(R.string.confirmation), message, ok, cancel)
} }
@SuppressLint("InflateParams") @SuppressLint("InflateParams")
@JvmStatic
@JvmOverloads
fun showConfirmation(context: Context, title: String, message: String, ok: Runnable?, cancel: Runnable? = null) { fun showConfirmation(context: Context, title: String, message: String, ok: Runnable?, cancel: Runnable? = null) {
var okClicked = false var okClicked = false
AlertDialogHelper.Builder(context) AlertDialogHelper.Builder(context)
@ -190,8 +184,6 @@ object OKDialog {
} }
@SuppressLint("InflateParams") @SuppressLint("InflateParams")
@JvmStatic
@JvmOverloads
fun showConfirmation(context: Context, title: String, message: String, ok: DialogInterface.OnClickListener?, cancel: DialogInterface.OnClickListener? = null) { fun showConfirmation(context: Context, title: String, message: String, ok: DialogInterface.OnClickListener?, cancel: DialogInterface.OnClickListener? = null) {
var okClicked = false var okClicked = false
AlertDialogHelper.Builder(context) AlertDialogHelper.Builder(context)

1
core/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt
View file

@ -49,7 +49,6 @@ class ProtectionCheck @Inject constructor(
} }
} }
@JvmOverloads
fun queryProtection(activity: FragmentActivity, protection: Protection, fun queryProtection(activity: FragmentActivity, protection: Protection,
ok: Runnable?, cancel: Runnable? = null, fail: Runnable? = null) { ok: Runnable?, cancel: Runnable? = null, fail: Runnable? = null) {
when (ProtectionType.values()[sp.getInt(protectionTypeResourceIDs[protection.ordinal], ProtectionType.NONE.ordinal)]) { when (ProtectionType.values()[sp.getInt(protectionTypeResourceIDs[protection.ordinal], ProtectionType.NONE.ordinal)]) {

4
danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
View file

@ -184,7 +184,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
if (Math.abs(timeDiff) > 10) { if (Math.abs(timeDiff) > 10) {
waitForWholeMinute(); // Dana can set only whole minute waitForWholeMinute(); // Dana can set only whole minute
// add 10sec to be sure we are over minute (will be cut off anyway) // add 10sec to be sure we are over minute (will be cut off anyway)
mSerialIOThread.sendMessage(new MsgSetTime(injector, dateUtil.now() + T.secs(10).msecs())); mSerialIOThread.sendMessage(new MsgSetTime(injector, dateUtil.now() + T.Companion.secs(10).msecs()));
mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector)); mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L; timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds"); aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
@ -258,7 +258,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
public boolean bolus(double amount, int carbs, long carbTimeStamp, final EventOverviewBolusProgress.Treatment t) { public boolean bolus(double amount, int carbs, long carbTimeStamp, final EventOverviewBolusProgress.Treatment t) {
if (!isConnected()) return false; if (!isConnected()) return false;
if (BolusProgressDialog.stopPressed) return false; if (BolusProgressDialog.Companion.getStopPressed()) return false;
danaPump.setBolusingTreatment(t); danaPump.setBolusingTreatment(t);
danaPump.setBolusDone(false); danaPump.setBolusDone(false);

6
danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
View file

@ -181,7 +181,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
double carbs = detailedBolusInfo.carbs; double carbs = detailedBolusInfo.carbs;
detailedBolusInfo.carbs = 0; detailedBolusInfo.carbs = 0;
long carbTimeStamp = detailedBolusInfo.getCarbsTimestamp() != null ? detailedBolusInfo.getCarbsTimestamp() : detailedBolusInfo.timestamp; long carbTimeStamp = detailedBolusInfo.getCarbsTimestamp() != null ? detailedBolusInfo.getCarbsTimestamp() : detailedBolusInfo.timestamp;
if (carbTimeStamp == detailedBolusInfo.timestamp) carbTimeStamp -= T.mins(1).msecs(); // better set 1 min back to prevents clash with insulin if (carbTimeStamp == detailedBolusInfo.timestamp) carbTimeStamp -= T.Companion.mins(1).msecs(); // better set 1 min back to prevents clash with insulin
detailedBolusInfoStorage.add(detailedBolusInfo); // will be picked up on reading history detailedBolusInfoStorage.add(detailedBolusInfo); // will be picked up on reading history
@ -259,7 +259,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
} }
} }
} }
temporaryBasalStorage.add(new PumpSync.PumpState.TemporaryBasal(dateUtil.now(), T.mins(durationInMinutes).msecs(), percentRate, false, tbrType, 0L, 0L)); temporaryBasalStorage.add(new PumpSync.PumpState.TemporaryBasal(dateUtil.now(), T.Companion.mins(durationInMinutes).msecs(), percentRate, false, tbrType, 0L, 0L));
// Convert duration from minutes to hours // Convert duration from minutes to hours
aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Setting temp basal " + percentRate + "% for " + durationInMinutes + " minutes (doLowTemp || doHighTemp)"); aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Setting temp basal " + percentRate + "% for " + durationInMinutes + " minutes (doLowTemp || doHighTemp)");
if (percentRate == 0 && durationInMinutes > 30) { if (percentRate == 0 && durationInMinutes > 30) {
@ -298,7 +298,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
aapsLogger.debug(LTag.PUMP, "setTempBasalPercent: Correct value already set"); aapsLogger.debug(LTag.PUMP, "setTempBasalPercent: Correct value already set");
return result; return result;
} }
temporaryBasalStorage.add(new PumpSync.PumpState.TemporaryBasal(dateUtil.now(), T.mins(durationInMinutes).msecs(), percent, false, tbrType, 0L, 0L)); temporaryBasalStorage.add(new PumpSync.PumpState.TemporaryBasal(dateUtil.now(), T.Companion.mins(durationInMinutes).msecs(), percent, false, tbrType, 0L, 0L));
boolean connectionOK; boolean connectionOK;
if (durationInMinutes == 15 || durationInMinutes == 30) { if (durationInMinutes == 15 || durationInMinutes == 30) {
connectionOK = sExecutionService.tempBasalShortDuration(percent, durationInMinutes); connectionOK = sExecutionService.tempBasalShortDuration(percent, durationInMinutes);

10
danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
View file

@ -203,7 +203,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
} else { } else {
waitForWholeMinute(); // Dana can set only whole minute waitForWholeMinute(); // Dana can set only whole minute
// add 10sec to be sure we are over minute (will be cutted off anyway) // add 10sec to be sure we are over minute (will be cutted off anyway)
mSerialIOThread.sendMessage(new MsgSetTime(injector, dateUtil.now() + T.secs(10).msecs())); mSerialIOThread.sendMessage(new MsgSetTime(injector, dateUtil.now() + T.Companion.secs(10).msecs()));
mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector)); mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L; timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds"); aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
@ -327,7 +327,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
public boolean bolus(final double amount, int carbs, long carbtime, final EventOverviewBolusProgress.Treatment t) { public boolean bolus(final double amount, int carbs, long carbtime, final EventOverviewBolusProgress.Treatment t) {
if (!isConnected()) return false; if (!isConnected()) return false;
if (BolusProgressDialog.stopPressed) return false; if (BolusProgressDialog.Companion.getStopPressed()) return false;
rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus))); rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus)));
danaPump.setBolusingTreatment(t); danaPump.setBolusingTreatment(t);
@ -346,7 +346,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
mSerialIOThread.sendMessage(msg); mSerialIOThread.sendMessage(msg);
MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(injector, DanaPump.CARBS, carbtime, carbs, 0); MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(injector, DanaPump.CARBS, carbtime, carbs, 0);
mSerialIOThread.sendMessage(msgSetHistoryEntry_v2); mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
danaPump.lastHistoryFetched = Math.min(danaPump.lastHistoryFetched, carbtime - T.mins(1).msecs()); danaPump.lastHistoryFetched = Math.min(danaPump.lastHistoryFetched, carbtime - T.Companion.mins(1).msecs());
} }
final long bolusStart = System.currentTimeMillis(); final long bolusStart = System.currentTimeMillis();
@ -415,7 +415,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
mSerialIOThread.sendMessage(msg); mSerialIOThread.sendMessage(msg);
MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(injector, DanaPump.CARBS, time, amount, 0); MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(injector, DanaPump.CARBS, time, amount, 0);
mSerialIOThread.sendMessage(msgSetHistoryEntry_v2); mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
danaPump.lastHistoryFetched = Math.min(danaPump.lastHistoryFetched, time - T.mins(1).msecs()); danaPump.lastHistoryFetched = Math.min(danaPump.lastHistoryFetched, time - T.Companion.mins(1).msecs());
return true; return true;
} }
@ -439,7 +439,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
} }
SystemClock.sleep(200); SystemClock.sleep(200);
if (danaRv2Plugin.lastEventTimeLoaded != 0) if (danaRv2Plugin.lastEventTimeLoaded != 0)
danaPump.lastHistoryFetched = danaRv2Plugin.lastEventTimeLoaded - T.mins(1).msecs(); danaPump.lastHistoryFetched = danaRv2Plugin.lastEventTimeLoaded - T.Companion.mins(1).msecs();
else else
danaPump.lastHistoryFetched = 0; danaPump.lastHistoryFetched = 0;
danaPump.setLastConnection(System.currentTimeMillis()); danaPump.setLastConnection(System.currentTimeMillis());

2
danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
View file

@ -264,7 +264,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
public boolean bolus(double amount, int carbs, long carbTimeStamp, final EventOverviewBolusProgress.Treatment t) { public boolean bolus(double amount, int carbs, long carbTimeStamp, final EventOverviewBolusProgress.Treatment t) {
if (!isConnected()) return false; if (!isConnected()) return false;
if (BolusProgressDialog.stopPressed) return false; if (BolusProgressDialog.Companion.getStopPressed()) return false;
danaPump.setBolusingTreatment(t); danaPump.setBolusingTreatment(t);
danaPump.setBolusDone(false); danaPump.setBolusDone(false);

2
danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBasal.kt
View file

@ -4,7 +4,7 @@ import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.logging.LTag import info.nightscout.androidaps.logging.LTag
import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.androidaps.danars.encryption.BleEncryption
class DanaRSPacketHistoryBasal @JvmOverloads constructor( class DanaRSPacketHistoryBasal constructor(
injector: HasAndroidInjector, injector: HasAndroidInjector,
from: Long = 0 from: Long = 0
) : DanaRSPacketHistory(injector, from) { ) : DanaRSPacketHistory(injector, from) {

2
danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryPrime.kt
View file

@ -4,7 +4,7 @@ import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.logging.LTag import info.nightscout.androidaps.logging.LTag
import info.nightscout.androidaps.danars.encryption.BleEncryption import info.nightscout.androidaps.danars.encryption.BleEncryption
class DanaRSPacketHistoryPrime @JvmOverloads constructor( class DanaRSPacketHistoryPrime constructor(
injector: HasAndroidInjector, injector: HasAndroidInjector,
from: Long = 0 from: Long = 0
) : DanaRSPacketHistory(injector, from) { ) : DanaRSPacketHistory(injector, from) {

1
database/src/main/java/info/nightscout/androidaps/database/interfaces/DBEntryWithTimeAndDuration.kt
View file

@ -11,5 +11,4 @@ var DBEntryWithTimeAndDuration.end
require(duration > 0) require(duration > 0)
} }
@JvmOverloads
fun DBEntryWithTimeAndDuration.getRemainingDuration(current: Long = System.currentTimeMillis()) = min(0L, end - current) fun DBEntryWithTimeAndDuration.getRemainingDuration(current: Long = System.currentTimeMillis()) = min(0L, end - current)

10
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
View file

@ -590,7 +590,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
bolusingEvent.setPercent(0); bolusingEvent.setPercent(0);
rxBus.send(bolusingEvent); rxBus.send(bolusingEvent);
int trials = 0; int trials = 0;
Long now = dateUtil.now(); long now = dateUtil.now();
String serial = serialNumber(); String serial = serialNumber();
insightDbHelper.createOrUpdate( new InsightBolusID( insightDbHelper.createOrUpdate( new InsightBolusID(
now, now,
@ -1183,8 +1183,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
for (InsightPumpID pumpID : pumpStartedEvents) { for (InsightPumpID pumpID : pumpStartedEvents) {
InsightPumpID stoppedEvent = insightDbHelper.getPumpStoppedEvent(pumpID.getPumpSerial(), pumpID.getTimestamp()); InsightPumpID stoppedEvent = insightDbHelper.getPumpStoppedEvent(pumpID.getPumpSerial(), pumpID.getTimestamp());
if (stoppedEvent != null && stoppedEvent.getEventType().equals(EventType.PumpStopped)) { // Search if Stop event is after 15min of Pause if (stoppedEvent != null && stoppedEvent.getEventType().equals(EventType.PumpStopped)) { // Search if Stop event is after 15min of Pause
InsightPumpID pauseEvent = insightDbHelper.getPumpStoppedEvent(pumpID.getPumpSerial(), stoppedEvent.getTimestamp() - T.mins(1).msecs()); InsightPumpID pauseEvent = insightDbHelper.getPumpStoppedEvent(pumpID.getPumpSerial(), stoppedEvent.getTimestamp() - T.Companion.mins(1).msecs());
if (pauseEvent != null && pauseEvent.getEventType().equals(EventType.PumpPaused) && (stoppedEvent.getTimestamp() - pauseEvent.getTimestamp() < T.mins(16).msecs())) { if (pauseEvent != null && pauseEvent.getEventType().equals(EventType.PumpPaused) && (stoppedEvent.getTimestamp() - pauseEvent.getTimestamp() < T.Companion.mins(16).msecs())) {
stoppedEvent = pauseEvent; stoppedEvent = pauseEvent;
stoppedEvent.setEventType(EventType.PumpStopped); stoppedEvent.setEventType(EventType.PumpStopped);
} }
@ -1343,7 +1343,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
event.getEventPosition())); event.getEventPosition()));
temporaryBasals.add(new TemporaryBasal( temporaryBasals.add(new TemporaryBasal(
timestamp, timestamp,
T.mins(event.getDuration()).msecs(), T.Companion.mins(event.getDuration()).msecs(),
event.getAmount(), event.getAmount(),
false, false,
PumpSync.TemporaryBasalType.NORMAL, PumpSync.TemporaryBasalType.NORMAL,
@ -1406,7 +1406,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
pumpSync.syncExtendedBolusWithPumpId( pumpSync.syncExtendedBolusWithPumpId(
bolusID.getTimestamp(), bolusID.getTimestamp(),
event.getExtendedAmount(), event.getExtendedAmount(),
T.mins(event.getDuration()).msecs(), T.Companion.mins(event.getDuration()).msecs(),
isFakingTempsByExtendedBoluses(), isFakingTempsByExtendedBoluses(),
bolusID.getId(), bolusID.getId(),
PumpType.ACCU_CHEK_INSIGHT, PumpType.ACCU_CHEK_INSIGHT,

3
medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.kt
View file

@ -27,7 +27,6 @@ enum class CGMSHistoryEntryType(val code: Int, val description: String, val head
private val opCodeMap: MutableMap<Int, CGMSHistoryEntryType> = mutableMapOf() private val opCodeMap: MutableMap<Int, CGMSHistoryEntryType> = mutableMapOf()
@JvmStatic
fun getByCode(opCode: Int): CGMSHistoryEntryType { fun getByCode(opCode: Int): CGMSHistoryEntryType {
return if (opCodeMap.containsKey(opCode)) return if (opCodeMap.containsKey(opCode))
opCodeMap[opCode]!! opCodeMap[opCode]!!
@ -42,7 +41,7 @@ enum class CGMSHistoryEntryType(val code: Int, val description: String, val head
} }
} }
@JvmField var schemaSet: Boolean var schemaSet: Boolean
val totalLength: Int val totalLength: Int
val dateType: DateType val dateType: DateType

2
medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt
View file

@ -300,7 +300,6 @@ class BasalProfile {
return if (b < 0) b + 256 else b.toInt() return if (b < 0) b + 256 else b.toInt()
} }
@JvmStatic
fun getProfilesByHourToString(data: DoubleArray): String { fun getProfilesByHourToString(data: DoubleArray): String {
val stringBuilder = StringBuilder() val stringBuilder = StringBuilder()
for (value in data) { for (value in data) {
@ -310,7 +309,6 @@ class BasalProfile {
return stringBuilder.toString() return stringBuilder.toString()
} }
@JvmStatic
fun isBasalProfileByHourUndefined(basalByHour: DoubleArray): Boolean { fun isBasalProfileByHourUndefined(basalByHour: DoubleArray): Boolean {
for (i in 0..23) { for (i in 0..23) {
if (basalByHour[i] > 0.0) { if (basalByHour[i] > 0.0) {

1
medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.kt
View file

@ -148,7 +148,6 @@ enum class MedtronicCommandType(
} }
} }
@JvmStatic
fun getSettings(medtronicPumpModel: MedtronicDeviceType): MedtronicCommandType { fun getSettings(medtronicPumpModel: MedtronicDeviceType): MedtronicCommandType {
return if (isSameDevice(medtronicPumpModel, MedtronicDeviceType.Medtronic_512_712)) return if (isSameDevice(medtronicPumpModel, MedtronicDeviceType.Medtronic_512_712))
Settings_512 Settings_512

1
medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.kt
View file

@ -39,7 +39,6 @@ enum class MedtronicDeviceType {
companion object { companion object {
var mapByDescription: MutableMap<String, MedtronicDeviceType> = mutableMapOf() var mapByDescription: MutableMap<String, MedtronicDeviceType> = mutableMapOf()
@JvmStatic
fun isSameDevice(deviceWeCheck: MedtronicDeviceType, deviceSources: MedtronicDeviceType): Boolean { fun isSameDevice(deviceWeCheck: MedtronicDeviceType, deviceSources: MedtronicDeviceType): Boolean {
if (deviceSources.isFamily) { if (deviceSources.isFamily) {
for (mdt in deviceSources.familyMembers!!) { for (mdt in deviceSources.familyMembers!!) {

16
medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.kt
View file

@ -10,14 +10,14 @@ object MedtronicConst {
const val Prefix = "AAPS.Medtronic." const val Prefix = "AAPS.Medtronic."
object Prefs { object Prefs {
@JvmField val PumpSerial = R.string.key_medtronic_serial val PumpSerial = R.string.key_medtronic_serial
@JvmField val PumpType = R.string.key_medtronic_pump_type val PumpType = R.string.key_medtronic_pump_type
@JvmField val PumpFrequency = R.string.key_medtronic_frequency val PumpFrequency = R.string.key_medtronic_frequency
@JvmField val MaxBolus = R.string.key_medtronic_max_bolus val MaxBolus = R.string.key_medtronic_max_bolus
@JvmField val MaxBasal = R.string.key_medtronic_max_basal val MaxBasal = R.string.key_medtronic_max_basal
@JvmField val BolusDelay = R.string.key_medtronic_bolus_delay val BolusDelay = R.string.key_medtronic_bolus_delay
@JvmField val Encoding = R.string.key_medtronic_encoding val Encoding = R.string.key_medtronic_encoding
@JvmField val BatteryType = R.string.key_medtronic_battery_type val BatteryType = R.string.key_medtronic_battery_type
val BolusDebugEnabled = R.string.key_medtronic_bolus_debug val BolusDebugEnabled = R.string.key_medtronic_bolus_debug
} }

3
medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt
View file

@ -257,7 +257,6 @@ class MedtronicUtil @Inject constructor(
return b2 and 0xff shl 8 or b1 and 0xff return b2 and 0xff shl 8 or b1 and 0xff
} }
@JvmStatic
fun getByteArrayFromUnsignedShort(shortValue: Int, returnFixedSize: Boolean): ByteArray { fun getByteArrayFromUnsignedShort(shortValue: Int, returnFixedSize: Boolean): ByteArray {
val highByte = (shortValue shr 8 and 0xFF).toByte() val highByte = (shortValue shr 8 and 0xFF).toByte()
val lowByte = (shortValue and 0xFF).toByte() val lowByte = (shortValue and 0xFF).toByte()
@ -272,7 +271,6 @@ class MedtronicUtil @Inject constructor(
return data return data
} }
@JvmStatic
fun createByteArray(data: List<Byte>): ByteArray { fun createByteArray(data: List<Byte>): ByteArray {
val array = ByteArray(data.size) val array = ByteArray(data.size)
for (i in data.indices) { for (i in data.indices) {
@ -304,7 +302,6 @@ class MedtronicUtil @Inject constructor(
return strokes return strokes
} }
@JvmStatic
fun isSame(d1: Double, d2: Double): Boolean { fun isSame(d1: Double, d2: Double): Boolean {
val diff = d1 - d2 val diff = d1 - d2
return Math.abs(diff) <= 0.000001 return Math.abs(diff) <= 0.000001

2
omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java
View file

@ -678,7 +678,7 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
if (tbrCurrent != null) { if (tbrCurrent != null) {
aapsLogger.info(LTag.PUMP, "setTempBasalAbsolute: Current Basal: duration: {} min, rate={}", aapsLogger.info(LTag.PUMP, "setTempBasalAbsolute: Current Basal: duration: {} min, rate={}",
T.msecs(tbrCurrent.getDuration()).mins(), tbrCurrent.getRate()); T.Companion.msecs(tbrCurrent.getDuration()).mins(), tbrCurrent.getRate());
} }
if (tbrCurrent != null && !enforceNew) { if (tbrCurrent != null && !enforceNew) {

6
omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java
View file

@ -93,7 +93,6 @@ public class AapsOmnipodErosManager {
private final RxBusWrapper rxBus; private final RxBusWrapper rxBus;
private final ResourceHelper resourceHelper; private final ResourceHelper resourceHelper;
private final HasAndroidInjector injector; private final HasAndroidInjector injector;
private final ActivePlugin activePlugin;
private final SP sp; private final SP sp;
private final OmnipodManager delegate; private final OmnipodManager delegate;
private final OmnipodAlertUtil omnipodAlertUtil; private final OmnipodAlertUtil omnipodAlertUtil;
@ -125,7 +124,6 @@ public class AapsOmnipodErosManager {
SP sp, SP sp,
ResourceHelper resourceHelper, ResourceHelper resourceHelper,
HasAndroidInjector injector, HasAndroidInjector injector,
ActivePlugin activePlugin,
OmnipodAlertUtil omnipodAlertUtil, OmnipodAlertUtil omnipodAlertUtil,
Context context, Context context,
PumpSync pumpSync) { PumpSync pumpSync) {
@ -137,7 +135,6 @@ public class AapsOmnipodErosManager {
this.sp = sp; this.sp = sp;
this.resourceHelper = resourceHelper; this.resourceHelper = resourceHelper;
this.injector = injector; this.injector = injector;
this.activePlugin = activePlugin;
this.omnipodAlertUtil = omnipodAlertUtil; this.omnipodAlertUtil = omnipodAlertUtil;
this.context = context; this.context = context;
this.pumpSync = pumpSync; this.pumpSync = pumpSync;
@ -779,7 +776,6 @@ public class AapsOmnipodErosManager {
// Cancels current TBR and adds a new TBR for the remaining duration // Cancels current TBR and adds a new TBR for the remaining duration
private void splitActiveTbr() { private void splitActiveTbr() {
PumpSync.PumpState pumpState = pumpSync.expectedPumpState();
PumpSync.PumpState.TemporaryBasal previouslyRunningTempBasal = pumpSync.expectedPumpState().getTemporaryBasal(); PumpSync.PumpState.TemporaryBasal previouslyRunningTempBasal = pumpSync.expectedPumpState().getTemporaryBasal();
if (previouslyRunningTempBasal != null) { if (previouslyRunningTempBasal != null) {
// Cancel the previously running TBR and start a NEW TBR here for the remaining duration, // Cancel the previously running TBR and start a NEW TBR here for the remaining duration,
@ -810,7 +806,7 @@ public class AapsOmnipodErosManager {
pumpSync.syncTemporaryBasalWithPumpId( pumpSync.syncTemporaryBasalWithPumpId(
time, time,
tempBasalPair.getInsulinRate(), tempBasalPair.getInsulinRate(),
T.mins(tempBasalPair.getDurationMinutes()).msecs(), T.Companion.mins(tempBasalPair.getDurationMinutes()).msecs(),
true, true,
PumpSync.TemporaryBasalType.NORMAL, PumpSync.TemporaryBasalType.NORMAL,
pumpId, pumpId,

6
omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java
View file

@ -146,7 +146,7 @@ public class ErosPodHistoryActivity extends NoSplashAppCompatActivity {
statusView.setVisibility(View.GONE); statusView.setVisibility(View.GONE);
typeListFull = getTypeList(PumpHistoryEntryGroup.getTranslatedList(resourceHelper)); typeListFull = getTypeList(PumpHistoryEntryGroup.Companion.getTranslatedList(resourceHelper));
ArrayAdapter<TypeList> spinnerAdapter = new ArrayAdapter<>(this, R.layout.spinner_centered, typeListFull); ArrayAdapter<TypeList> spinnerAdapter = new ArrayAdapter<>(this, R.layout.spinner_centered, typeListFull);
historyTypeSpinner.setAdapter(spinnerAdapter); historyTypeSpinner.setAdapter(spinnerAdapter);
@ -306,7 +306,7 @@ public class ErosPodHistoryActivity extends NoSplashAppCompatActivity {
try { try {
Profile.ProfileValue[] profileValuesArray = aapsOmnipodUtil.getGsonInstance().fromJson(data, Profile.ProfileValue[].class); Profile.ProfileValue[] profileValuesArray = aapsOmnipodUtil.getGsonInstance().fromJson(data, Profile.ProfileValue[].class);
valueView.setText(ProfileUtil.getBasalProfilesDisplayable(profileValuesArray, PumpType.OMNIPOD_EROS)); valueView.setText(ProfileUtil.INSTANCE.getBasalProfilesDisplayable(profileValuesArray, PumpType.OMNIPOD_EROS));
} catch (Exception e) { } catch (Exception e) {
aapsLogger.error(LTag.PUMP, "Problem parsing Profile json. Ex: {}, Data:\n{}", e.getMessage(), data); aapsLogger.error(LTag.PUMP, "Problem parsing Profile json. Ex: {}, Data:\n{}", e.getMessage(), data);
valueView.setText(""); valueView.setText("");
@ -321,7 +321,7 @@ public class ErosPodHistoryActivity extends NoSplashAppCompatActivity {
@Override @Override
public void onAttachedToRecyclerView(RecyclerView recyclerView) { public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
super.onAttachedToRecyclerView(recyclerView); super.onAttachedToRecyclerView(recyclerView);
} }

8
pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt
View file

@ -63,10 +63,10 @@ abstract class PumpPluginAbstract protected constructor(
final override var pumpDescription = PumpDescription() final override var pumpDescription = PumpDescription()
//protected set //protected set
@JvmField protected var serviceConnection: ServiceConnection? = null protected var serviceConnection: ServiceConnection? = null
@JvmField protected var serviceRunning = false protected var serviceRunning = false
@JvmField protected var pumpState = PumpDriverState.NotInitialized protected var pumpState = PumpDriverState.NotInitialized
@JvmField protected var displayConnectionMessages = false protected var displayConnectionMessages = false
var pumpType: PumpType = PumpType.GENERIC_AAPS var pumpType: PumpType = PumpType.GENERIC_AAPS
get() = field get() = field

1
pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt
View file

@ -43,7 +43,6 @@ enum class PumpHistoryEntryGroup(val resourceId: Int) {
} }
} }
@JvmStatic
fun getTranslatedList(resourceHelper: ResourceHelper): List<PumpHistoryEntryGroup> { fun getTranslatedList(resourceHelper: ResourceHelper): List<PumpHistoryEntryGroup> {
if (translatedList == null) doTranslation(resourceHelper) if (translatedList == null) doTranslation(resourceHelper)
return translatedList!! return translatedList!!

2
pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt
View file

@ -19,7 +19,6 @@ object ProfileUtil {
return if (stringBuilder.length > 3) stringBuilder.substring(0, stringBuilder.length - 2) else stringBuilder.toString() return if (stringBuilder.length > 3) stringBuilder.substring(0, stringBuilder.length - 2) else stringBuilder.toString()
} }
@JvmStatic
fun getBasalProfilesDisplayable(profiles: Array<ProfileValue>, pumpType: PumpType): String { fun getBasalProfilesDisplayable(profiles: Array<ProfileValue>, pumpType: PumpType): String {
val stringBuilder = StringBuilder() val stringBuilder = StringBuilder()
for (basalValue in profiles) { for (basalValue in profiles) {
@ -32,7 +31,6 @@ object ProfileUtil {
return if (stringBuilder.length > 3) stringBuilder.substring(0, stringBuilder.length - 2) else stringBuilder.toString() return if (stringBuilder.length > 3) stringBuilder.substring(0, stringBuilder.length - 2) else stringBuilder.toString()
} }
@JvmStatic
fun getBasalProfilesDisplayableAsStringOfArray(profile: Profile, pumpType: PumpType): String? { fun getBasalProfilesDisplayableAsStringOfArray(profile: Profile, pumpType: PumpType): String? {
val stringBuilder = java.lang.StringBuilder() val stringBuilder = java.lang.StringBuilder()
// for (basalValue in profiles) { // for (basalValue in profiles) {