From 7fdad04b781af61eec8e6a164e67a9b6f5a5633f Mon Sep 17 00:00:00 2001 From: Przemek Zygmunt Date: Thu, 16 May 2019 12:33:34 +0200 Subject: [PATCH 1/2] A fix for displaying user icons for a gate with an partial sensor --- app/src/main/java/org/supla/android/db/ChannelBase.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/org/supla/android/db/ChannelBase.java b/app/src/main/java/org/supla/android/db/ChannelBase.java index 01b163748..d75ce84e1 100644 --- a/app/src/main/java/org/supla/android/db/ChannelBase.java +++ b/app/src/main/java/org/supla/android/db/ChannelBase.java @@ -306,6 +306,10 @@ && getFunc() != SuplaConst.SUPLA_CHANNELFNC_HUMIDITYANDTEMPERATURE) case SuplaConst.SUPLA_CHANNELFNC_THERMOMETER: Id = new ImageId(getUserIconId(), 1); break; + case SuplaConst.SUPLA_CHANNELFNC_CONTROLLINGTHEGATE: + Id = new ImageId(getUserIconId(), (active & 0x1) > 0 ? 2 + : ((active & 0x2) > 0 ? 3 : 1)); + break; default: Id = new ImageId(getUserIconId(), active+1); break; From 0e159af9abaaecf8a44c3e82744657c1a9fcb519 Mon Sep 17 00:00:00 2001 From: Przemek Zygmunt Date: Thu, 16 May 2019 12:34:08 +0200 Subject: [PATCH 2/2] Version increment --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0fbdf3d6c..c7d9daaa6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.supla.android" minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION) targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) - versionCode 52 - versionName "2.3.1" + versionCode 53 + versionName "2.3.2" sourceSets.main { jniLibs.srcDir 'src/main/libs'