Avoid screen updates if hr is disabled

micrusa · Jun 7, 2020 · 1cde3bc · 1cde3bc
1 parent aa9a55e
commit 1cde3bc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/app/src/main/java/me/micrusa/amaztimer/AmazTimer.java b/app/src/main/java/me/micrusa/amaztimer/AmazTimer.java
@@ -321,11 +321,13 @@ private void timerUpdate(int v) {
             if (!time.getText().toString().equals("--:--")) {
                 time.setText("--:--");
             }
-            int latestHr = hrSensor.getLatestValue();
-            if(latestHr == 0)
-                hr.setText(getResources().getString(R.string.nullinfo));
-            else
-                hr.setText(hrSensor.getLatestValue());
+            if (new file(defValues.SETTINGS_FILE, this).get(defValues.SETTINGS_HRSWITCH, defValues.DEFAULT_HRSWITCH)){
+                int latestHr = hrSensor.getLatestValue();
+                if(latestHr == 0)
+                    hr.setText(getResources().getString(R.string.nullinfo));
+                else
+                    hr.setText(hrSensor.getLatestValue());
+            }
         }
         if (v < 4) {
             if (v == 1)

diff --git a/app/src/main/java/me/micrusa/amaztimer/widget.java b/app/src/main/java/me/micrusa/amaztimer/widget.java
@@ -332,11 +332,13 @@ private void timerUpdate(int v) {
             if (!time.getText().toString().equals("--:--")) {
                 time.setText("--:--");
             }
-            int latestHr = hrSensor.getLatestValue();
-            if(latestHr == 0)
-                hr.setText(this.mView.getContext().getResources().getString(R.string.nullinfo));
-            else
-                hr.setText(hrSensor.getLatestValue());
+            if (new file(defValues.SETTINGS_FILE, this.mView.getContext()).get(defValues.SETTINGS_HRSWITCH, defValues.DEFAULT_HRSWITCH)) {
+                int latestHr = hrSensor.getLatestValue();
+                if (latestHr == 0)
+                    hr.setText(this.mView.getContext().getResources().getString(R.string.nullinfo));
+                else
+                    hr.setText(hrSensor.getLatestValue());
+            }
         }
         if (v < 4) {
             if (v == 1)