Merge pull request #93 from SUPLA/develop

v2.3.17
SUPLA · Jul 30, 2019 · 171d9e5 · 171d9e5
2 parents 8218a2a + d71d125
commit 171d9e5
Show file tree

Hide file tree

Showing 70 changed files with 739 additions and 363 deletions.
diff --git 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 70
-        versionName "2.3.16"
+        versionCode 71
+        versionName "2.3.17"
 
         sourceSets.main {
             jniLibs.srcDir 'src/main/libs'

diff --git a/app/src/main/java/org/supla/android/AddWizardActivity.java b/app/src/main/java/org/supla/android/AddWizardActivity.java
@@ -962,7 +962,8 @@ private void bindNetwork() {
 
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                         cm.bindProcessToNetwork(n);
-                    } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    } else //noinspection ConstantConditions
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                         ConnectivityManager.setProcessDefaultNetwork(n);
                     }
 

diff --git a/app/src/main/java/org/supla/android/CfgActivity.java b/app/src/main/java/org/supla/android/CfgActivity.java
@@ -247,7 +247,6 @@ public void onClick(View v) {
 
             DbHelper DbH = new DbHelper(this);
             DbH.deleteUserIcons();
-            DbH = null;
 
             prefs.setPreferedProtocolVersion();
 

diff --git a/app/src/main/java/org/supla/android/ChannelDetailEM.java b/app/src/main/java/org/supla/android/ChannelDetailEM.java
@@ -344,8 +344,8 @@ public void channelExtendedDataToViews(boolean setIcon) {
             chartHelper.setPricePerUnit(em.getPricePerUnit());
             SuplaChannelElectricityMeterValue.Summary sum = em.getSummary();
 
-            double currentConsumption = 0;
-            double currentCost = 0;
+            double currentConsumption;
+            double currentCost;
 
             DbHelper mDBH = new DbHelper(getContext(), true);
 

diff --git a/app/src/main/java/org/supla/android/ChannelDetailIC.java b/app/src/main/java/org/supla/android/ChannelDetailIC.java
@@ -149,8 +149,8 @@ private void channelExtendedDataToViews(boolean setIcon) {
 
             SuplaChannelImpulseCounterValue ic = cev.getExtendedValue().ImpulseCounterValue;
 
-            double currentConsumption = 0;
-            double currentCost = 0;
+            double currentConsumption;
+            double currentCost;
 
             if (mDBH.impulseCounterMeasurementsStartsWithTheCurrentMonth(channel.getChannelId())) {
                 currentConsumption = ic.getCalculatedValue();

diff --git a/app/src/main/java/org/supla/android/ChannelDetailRS.java b/app/src/main/java/org/supla/android/ChannelDetailRS.java
@@ -198,7 +198,6 @@ public void run() {
                 tvPercent.setText("---");
             }
 
-            withoutDelay = false;
         }
 
     }