From a6d18e599b923f19eaad206aa81e0d2b126cf7f2 Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Tue, 1 Sep 2015 22:30:02 +0200
Subject: [PATCH] Tiny simplification and extract string

---
 .../activities/charts/AbstractChartFragment.java            | 6 +++---
 .../activities/charts/WeekStepsChartFragment.java           | 2 +-
 app/src/main/res/values/strings.xml                         | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
index b75273e3..5c45a637 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
@@ -281,7 +281,7 @@ public abstract class AbstractChartFragment extends AbstractGBFragment {
 
     private int getTSLast24Hours() {
         long now = System.currentTimeMillis();
-        return (int) ((now / 1000) - (24 * 60 * 60) & 0xffffffff); // -24 hours
+        return (int) ((now / 1000) - (24 * 60 * 60)); // -24 hours
     }
 
     protected List<ActivitySample> getActivitySamples(DBHandler db, GBDevice device, int tsFrom, int tsTo) {
@@ -306,7 +306,7 @@ public abstract class AbstractChartFragment extends AbstractGBFragment {
         cal.clear();
         cal.set(2015, Calendar.JUNE, 10, 6, 40);
         // ignore provided date ranges
-        tsTo = (int) ((cal.getTimeInMillis() / 1000) & 0xffffffff);
+        tsTo = (int) ((cal.getTimeInMillis() / 1000));
         tsFrom = tsTo - (24 * 60 * 60);
 
         SampleProvider provider = getProvider(device);
@@ -611,6 +611,6 @@ public abstract class AbstractChartFragment extends AbstractGBFragment {
     }
 
     private int toTimestamp(Date date) {
-        return (int) ((date.getTime() / 1000) & 0xffffffff);
+        return (int) ((date.getTime() / 1000));
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java
index f6cdc262..4a8719a8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java
@@ -192,7 +192,7 @@ public class WeekStepsChartFragment extends AbstractChartFragment {
         List<Integer> legendColors = new ArrayList<>(1);
         List<String> legendLabels = new ArrayList<>(1);
         legendColors.add(akActivity.color);
-        legendLabels.add("Steps");
+        legendLabels.add(getContext().getString(R.string.chart_steps));
         chart.getLegend().setColors(legendColors);
         chart.getLegend().setLabels(legendLabels);
         chart.getLegend().setTextColor(LEGEND_TEXT_COLOR);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cbed0cc2..9c37decc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -184,4 +184,5 @@
     <string name="updatefirmwareoperation_update_complete">Firmware installation complete</string>
     <string name="updatefirmwareoperation_update_complete_rebooting">Firmware installation complete, rebooting device…</string>
     <string name="updatefirmwareoperation_write_failed">Firmware write failed</string>
+    <string name="chart_steps">Steps</string>
 </resources>