From 5d5b755fdb2a6e99c5a3301702c4861d47806ecf Mon Sep 17 00:00:00 2001
From: Mark Heinis <heinis.mark@gmail.com>
Date: Thu, 4 Jan 2018 11:00:46 +0100
Subject: [PATCH] Fix log for Alerts

#425
---
 .../nl/hnogames/domoticz/Adapters/UtilityAdapter.java     | 8 ++------
 .../java/nl/hnogames/domoticz/Fragments/Utilities.java    | 2 ++
 app/version.properties                                    | 4 ++--
 .../main/java/nl/hnogames/domoticzapi/DomoticzValues.java | 1 +
 domoticzapi/version.properties                            | 4 ++--
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/UtilityAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/UtilityAdapter.java
index 248df0abb..389ce309c 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Adapters/UtilityAdapter.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Adapters/UtilityAdapter.java
@@ -125,7 +125,7 @@ public void onBindViewHolder(final DataObjectHolder holder, final int position)
                 setButtons(holder, Buttons.THERMOSTAT);
                 CreateThermostatRow(holder, mUtilitiesInfo, setPoint);
             } else {
-                if (DomoticzValues.Device.Utility.SubType.TEXT.equalsIgnoreCase(mUtilitiesInfo.getSubType())) {
+                if (DomoticzValues.Device.Utility.SubType.TEXT.equalsIgnoreCase(mUtilitiesInfo.getSubType()) || DomoticzValues.Device.Utility.SubType.ALERT.equalsIgnoreCase(mUtilitiesInfo.getSubType())) {
                     CreateTextRow(holder, mUtilitiesInfo);
                     setButtons(holder, Buttons.TEXT);
                 } else {
@@ -155,7 +155,6 @@ private void CreateTextRow(DataObjectHolder holder, UtilitiesInfo mUtilitiesInfo
         holder.name.setText(mUtilitiesInfo.getName());
         holder.data.setText(context.getString(R.string.data) + ": " + mUtilitiesInfo.getData());
         holder.hardware.setText(context.getString(R.string.hardware) + ": " + mUtilitiesInfo.getHardwareName());
-
         if (mUtilitiesInfo.getUsage() != null && mUtilitiesInfo.getUsage().length() > 0)
             holder.data.setText(context.getString(R.string.usage) + ": " + mUtilitiesInfo.getUsage());
 
@@ -179,8 +178,7 @@ private void CreateTextRow(DataObjectHolder holder, UtilitiesInfo mUtilitiesInfo
 
         if (mUtilitiesInfo.getCounterToday() != null && mUtilitiesInfo.getCounterToday().length() > 0)
             holder.data.append(" " + context.getString(R.string.today) + ": " + mUtilitiesInfo.getCounterToday());
-        if (mUtilitiesInfo.getCounter() != null && mUtilitiesInfo.getCounter().length() > 0 &&
-                !mUtilitiesInfo.getCounter().equals(mUtilitiesInfo.getData()))
+        if (mUtilitiesInfo.getCounter() != null && mUtilitiesInfo.getCounter().length() > 0 && !mUtilitiesInfo.getCounter().equals(mUtilitiesInfo.getData()))
             holder.data.append(" " + context.getString(R.string.total) + ": " + mUtilitiesInfo.getCounter());
         if (mSharedPrefs.darkThemeEnabled()) {
             holder.buttonLog.setBackground(ContextCompat.getDrawable(context, R.drawable.button_dark_status));
@@ -380,9 +378,7 @@ public void onClick(View v) {
                 .replace("kWh", "counter")
                 .replace("Gas", "counter")
                 .replace("Energy", "counter")
-                .replace("BWR102", "counter")
                 .replace("Voltcraft", "counter")
-                .replace("Sound Level", "counter")
                 .replace("SetPoint", "temp")
                 .replace("YouLess counter", "counter").contains("counter"))
             holder.weekButton.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/nl/hnogames/domoticz/Fragments/Utilities.java b/app/src/main/java/nl/hnogames/domoticz/Fragments/Utilities.java
index a1d4665a5..640b01c82 100644
--- a/app/src/main/java/nl/hnogames/domoticz/Fragments/Utilities.java
+++ b/app/src/main/java/nl/hnogames/domoticz/Fragments/Utilities.java
@@ -288,6 +288,8 @@ public void onLogClick(final UtilitiesInfo utility, final String range) {
             .replace("Voltage", "counter")
             .replace("SetPoint", "temp")
             .replace("Lux", "counter")
+            .replace("BWR102", "counter")
+            .replace("Sound Level", "counter")
             .replace("Pressure", "counter")
             .replace("YouLess counter", "counter");
 
diff --git a/app/version.properties b/app/version.properties
index 57357e3bf..3a3d0c410 100644
--- a/app/version.properties
+++ b/app/version.properties
@@ -1,4 +1,4 @@
-#Thu Jan 04 10:41:42 CET 2018
-VERSION_BUILD=3674
+#Thu Jan 04 10:58:45 CET 2018
+VERSION_BUILD=3676
 VERSION_PATCH=419
 VERSION_CODE=236
diff --git a/domoticzapi/src/main/java/nl/hnogames/domoticzapi/DomoticzValues.java b/domoticzapi/src/main/java/nl/hnogames/domoticzapi/DomoticzValues.java
index 339020460..ca887c4bb 100644
--- a/domoticzapi/src/main/java/nl/hnogames/domoticzapi/DomoticzValues.java
+++ b/domoticzapi/src/main/java/nl/hnogames/domoticzapi/DomoticzValues.java
@@ -98,6 +98,7 @@ interface Type {
 
             interface SubType {
                 String TEXT = "Text";
+                String ALERT = "Alert";
                 String PERCENTAGE = "Percentage";
                 String ENERGY = "Energy";
                 String KWH = "kWh";
diff --git a/domoticzapi/version.properties b/domoticzapi/version.properties
index 39d73128a..6bc1e1e4a 100644
--- a/domoticzapi/version.properties
+++ b/domoticzapi/version.properties
@@ -1,4 +1,4 @@
-#Thu Jan 04 10:41:42 CET 2018
-VERSION_BUILD=3113
+#Thu Jan 04 10:58:45 CET 2018
+VERSION_BUILD=3115
 VERSION_PATCH=106
 VERSION_CODE=106