Minor fixes.

jilleb · Aug 30, 2019 · e83cba7 · e83cba7
1 parent d8fe8a6
commit e83cba7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/app/src/main/java/com/mqbcoding/stats/DashboardFragment.java b/app/src/main/java/com/mqbcoding/stats/DashboardFragment.java
@@ -894,6 +894,7 @@ private void startTorque() {
         }
     }
 
+
     private void stopTorque() {
         Intent sendIntent = new Intent();
         sendIntent.setAction("org.prowl.torque.REQUEST_TORQUE_QUIT");
@@ -933,10 +934,11 @@ public void onPause() {
         if (torqueBind)
             try {
                 getContext().unbindService(torqueConnection);
+                stopTorque();
             } catch (Exception E) {
                 throw E;
             }
-        stopTorque();
+
 
         LocalBroadcastManager.getInstance(getContext())
                 .unregisterReceiver(onNoticeGoogleNavigationUpdate);
@@ -1007,14 +1009,6 @@ public void onDestroyView() {
         mGraphValueCenter = null;
         mGraphValueRight = null;
 
-        if (torqueBind)
-            try {
-                //   getContext().unbindService(torqueConnection);
-                stopTorque();
-            } catch (Exception E) {
-                throw E;
-            }
-
         super.onDestroyView();
     }
 
@@ -1223,10 +1217,10 @@ private void setupElement(String queryElement, TextView value, TextView label) {
             case "torque_fueltrimshortterm2_0x08":
             case "torque_fueltrimlongterm2_0x09":
             case "torque-fuelrailpressure_0x23":
-            case "torque-exhaustgastempbank1sensor1_0x78":
-            case "torque-exhaustgastempbank1sensor2_0xff1282":
-            case "torque-exhaustgastempbank1sensor3_0xff1283":
-            case "torque-exhaustgastempbank1sensor4_0xff1284":
+            case "torque_exhaustgastempbank1sensor1_0x78":
+            case "torque_exhaustgastempbank1sensor2_0xff1282":
+            case "torque_exhaustgastempbank1sensor3_0xff1283":
+            case "torque_exhaustgastempbank1sensor4_0xff1284":
                 label.setText("");
                 value.setText("-");
                 break;

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 27 09:44:24 CEST 2018
+#Wed Aug 28 15:16:35 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip