From 1f95a542079dd2fbc97c265edf7df3e002030baa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Feb 2021 08:06:52 +0000 Subject: [PATCH 1/3] Bump rxjava from 2.2.20 to 2.2.21 Bumps [rxjava](https://github.com/ReactiveX/RxJava) from 2.2.20 to 2.2.21. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Changelog](https://github.com/ReactiveX/RxJava/blob/v2.2.21/CHANGES.md) - [Commits](https://github.com/ReactiveX/RxJava/compare/v2.2.20...v2.2.21) Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 61aeae6ce4..11e6fb7293 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { ext { kotlin_version = '1.4.30' coreVersion = '1.3.2' - rxjava_version = '2.2.20' + rxjava_version = '2.2.21' rxandroid_version = '2.1.1' rxkotlin_version = '2.4.0' room_version = '2.2.6' From 735b09bc21dd698ca9d65c7f0d2001ed30943ab1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Feb 2021 08:07:00 +0000 Subject: [PATCH 2/3] Bump junit from 4.13.1 to 4.13.2 Bumps [junit](https://github.com/junit-team/junit4) from 4.13.1 to 4.13.2. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.13.1...r4.13.2) Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 61aeae6ce4..6657143938 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { jodatime_version = '2.10.10' work_version = '2.5.0' - junit_version = '4.13.1' + junit_version = '4.13.2' mockitoVersion = '3.7.7' powermockVersion = '2.0.9' dexmakerVersion = "1.2" From e5521956c5cec3d919585c5d592c510537c81a76 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Mon, 15 Feb 2021 12:53:53 +0100 Subject: [PATCH 3/3] ignore missing versionNum --- .../plugins/general/nsclient/data/NSSettingsStatus.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt index 06c853185a..bfb306eac2 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt @@ -127,7 +127,7 @@ class NSSettingsStatus @Inject constructor( fun handleNewData(nightscoutVersionName: String, nightscoutVersionCode: Int, status: JSONObject) { this.nightscoutVersionName = 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) rxBus.send(EventNewNotification(notification)) } else {