caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

lints

Browse source
This commit is contained in:
Milos Kozak 2023-08-03 17:02:50 +02:00
parent 92bb64ef1a
commit a195fce692
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt
View file

@ -1,5 +1,3 @@
package info.nightscout.rx.events package info.nightscout.rx.events
import info.nightscout.rx.events.Event
class EventRefreshButtonState (val newState : Boolean): Event() class EventRefreshButtonState (val newState : Boolean): Event()

25
app-wear-shared/shared/src/main/java/info/nightscout/shared/utils/DateUtil.kt
View file

@ -96,9 +96,9 @@ class DateUtil @Inject constructor(private val context: Context) {
return calendar.timeInMillis return calendar.timeInMillis
} }
fun toSeconds(hh_colon_mm: String): Int { fun toSeconds(hhColonMm: String): Int {
val p = Pattern.compile("(\\d+):(\\d+)( a.m.| p.m.| AM| PM|AM|PM|)") val p = Pattern.compile("(\\d+):(\\d+)( a.m.| p.m.| AM| PM|AM|PM|)")
val m = p.matcher(hh_colon_mm) val m = p.matcher(hhColonMm)
var retVal = 0 var retVal = 0
if (m.find()) { if (m.find()) {
retVal = SafeParse.stringToInt(m.group(1)) * 60 * 60 + SafeParse.stringToInt(m.group(2)) * 60 retVal = SafeParse.stringToInt(m.group(1)) * 60 * 60 + SafeParse.stringToInt(m.group(2)) * 60
@ -338,8 +338,8 @@ class DateUtil @Inject constructor(private val context: Context) {
minutes = rh.gs(R.string.shortminute) minutes = rh.gs(R.string.shortminute)
} }
var result = "" var result = ""
if (diff[TimeUnit.DAYS]!! > 0) result += diff[TimeUnit.DAYS].toString() + days if (diff.getOrDefault(TimeUnit.DAYS, -1) > 0) result += diff[TimeUnit.DAYS].toString() + days
if (diff[TimeUnit.HOURS]!! > 0) result += diff[TimeUnit.HOURS].toString() + hours if (diff.getOrDefault(TimeUnit.HOURS, -1) > 0) result += diff[TimeUnit.HOURS].toString() + hours
if (diff[TimeUnit.DAYS] == 0L) result += diff[TimeUnit.MINUTES].toString() + minutes if (diff[TimeUnit.DAYS] == 0L) result += diff[TimeUnit.MINUTES].toString() + minutes
return result return result
} }
@ -364,6 +364,7 @@ class DateUtil @Inject constructor(private val context: Context) {
if (t > 28) { if (t > 28) {
unit = rh.gs(R.string.unit_week) unit = rh.gs(R.string.unit_week)
t /= 7 t /= 7
@Suppress("KotlinConstantConditions")
if (t != 1L) unit = rh.gs(R.string.unit_weeks) if (t != 1L) unit = rh.gs(R.string.unit_weeks)
} }
} }
@ -402,8 +403,8 @@ class DateUtil @Inject constructor(private val context: Context) {
} else { } else {
thisDf = DecimalFormat("#", dfs) thisDf = DecimalFormat("#", dfs)
} }
thisDf!!.maximumFractionDigits = digits thisDf?.maximumFractionDigits = digits
return thisDf.format(x) return thisDf?.format(x) ?: ""
} }
fun formatHHMM(timeAsSeconds: Int): String { fun formatHHMM(timeAsSeconds: Int): String {
@ -428,9 +429,9 @@ class DateUtil @Inject constructor(private val context: Context) {
fun timeStampToUtcDateMillis(timestamp: Long): Long { fun timeStampToUtcDateMillis(timestamp: Long): Long {
val current = Calendar.getInstance().apply { timeInMillis = timestamp } val current = Calendar.getInstance().apply { timeInMillis = timestamp }
return Calendar.getInstance().apply { return Calendar.getInstance().apply {
set(Calendar.YEAR, current.get(Calendar.YEAR)) set(Calendar.YEAR, current[Calendar.YEAR])
set(Calendar.MONTH, current.get(Calendar.MONTH)) set(Calendar.MONTH, current[Calendar.MONTH])
set(Calendar.DAY_OF_MONTH, current.get(Calendar.DAY_OF_MONTH)) set(Calendar.DAY_OF_MONTH, current[Calendar.DAY_OF_MONTH])
}.timeInMillis }.timeInMillis
} }
@ -438,9 +439,9 @@ class DateUtil @Inject constructor(private val context: Context) {
val selected = Calendar.getInstance().apply { timeInMillis = dateUtcMillis } val selected = Calendar.getInstance().apply { timeInMillis = dateUtcMillis }
return Calendar.getInstance().apply { return Calendar.getInstance().apply {
timeInMillis = timestamp timeInMillis = timestamp
set(Calendar.YEAR, selected.get(Calendar.YEAR)) set(Calendar.YEAR, selected[Calendar.YEAR])
set(Calendar.MONTH, selected.get(Calendar.MONTH)) set(Calendar.MONTH, selected[Calendar.MONTH])
set(Calendar.DAY_OF_MONTH, selected.get(Calendar.DAY_OF_MONTH)) set(Calendar.DAY_OF_MONTH, selected[Calendar.DAY_OF_MONTH])
}.timeInMillis }.timeInMillis
} }

2
app/src/main/java/info/nightscout/androidaps/MainActivity.kt
View file

@ -469,7 +469,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
* Check for existing PasswordReset file and * Check for existing PasswordReset file and
* reset password to SN of active pump if file exists * reset password to SN of active pump if file exists
*/ */
fun passwordResetCheck(context: Context) { private fun passwordResetCheck(context: Context) {
val passwordReset = File(fileListProvider.ensureExtraDirExists(), "PasswordReset") val passwordReset = File(fileListProvider.ensureExtraDirExists(), "PasswordReset")
if (passwordReset.exists()) { if (passwordReset.exists()) {
val sn = activePlugin.activePump.serialNumber() val sn = activePlugin.activePump.serialNumber()