caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

Browse source
This commit is contained in:
Milos Kozak 2021-02-15 13:57:16 +01:00
commit aa7de3b8c4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
View file

@ -129,7 +129,7 @@ class NSSettingsStatus @Inject constructor(
fun handleNewData(nightscoutVersionName: String, nightscoutVersionCode: Int, status: JSONObject) { fun handleNewData(nightscoutVersionName: String, nightscoutVersionCode: Int, status: JSONObject) {
this.nightscoutVersionName = nightscoutVersionName this.nightscoutVersionName = nightscoutVersionName
aapsLogger.debug(LTag.NSCLIENT, "Got versions: Nightscout: $nightscoutVersionName") aapsLogger.debug(LTag.NSCLIENT, "Got versions: Nightscout: $nightscoutVersionName")
if (nightscoutVersionCode < config.SUPPORTEDNSVERSION) { if (nightscoutVersionCode != 0 && nightscoutVersionCode < config.SUPPORTEDNSVERSION) {
val notification = Notification(Notification.OLD_NS, resourceHelper.gs(R.string.unsupportednsversion), Notification.NORMAL) val notification = Notification(Notification.OLD_NS, resourceHelper.gs(R.string.unsupportednsversion), Notification.NORMAL)
rxBus.send(EventNewNotification(notification)) rxBus.send(EventNewNotification(notification))
} else { } else {

4
build.gradle
View file

@ -4,7 +4,7 @@ buildscript {
ext { ext {
kotlin_version = '1.4.30' kotlin_version = '1.4.30'
coreVersion = '1.3.2' coreVersion = '1.3.2'
rxjava_version = '2.2.20' rxjava_version = '2.2.21'
rxandroid_version = '2.1.1' rxandroid_version = '2.1.1'
rxkotlin_version = '2.4.0' rxkotlin_version = '2.4.0'
room_version = '2.2.6' room_version = '2.2.6'
@ -24,7 +24,7 @@ buildscript {
jodatime_version = '2.10.10' jodatime_version = '2.10.10'
work_version = '2.5.0' work_version = '2.5.0'
junit_version = '4.13.1' junit_version = '4.13.2'
mockitoVersion = '3.7.7' mockitoVersion = '3.7.7'
powermockVersion = '2.0.9' powermockVersion = '2.0.9'
dexmakerVersion = "1.2" dexmakerVersion = "1.2"