From 52f3ca52533dea21afab82741ecb812b7e1eb356 Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Mon, 19 Oct 2015 23:36:10 +0200
Subject: [PATCH] Always name things positively. Negating things is bad for
 comprehension :-)

---
 .../gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java  | 2 +-
 app/src/main/res/values/strings.xml                           | 4 +++-
 app/src/main/res/xml/miband_preferences.xml                   | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
index e5f20d21..d06116ac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
@@ -142,7 +142,7 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im
             return;
         }
         Set<UUID> supportedServices = getSupportedServices();
-        mAvailableCharacteristics = new HashMap();
+        mAvailableCharacteristics = new HashMap<>();
         for (BluetoothGattService service : discoveredGattServices) {
             if (supportedServices.contains(service.getUuid())) {
                 List<BluetoothGattCharacteristic> characteristics = service.getCharacteristics();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index acfb67b3..e5dc5568 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -195,8 +195,9 @@
     <string name="chart_steps">Steps</string>
     <string name="liveactivity_live_activity">Live Activity</string>
     <string name="weeksteps_today_steps_description">Steps today, target: %1$s</string>
-    <string name="pref_title_dont_ack_transfer">Do not ack activity data transfer</string>
     <string name="pref_summary_dont_ack_transfers">If the activity data are not acked to the band, they will not be cleared. Useful if GB is used together with other apps.</string>
+    <string name="pref_summary_keep_data_on_device">Will keep activity data on the Mi Band even after synchronization. Useful if GB is used together with other apps.</string>
+    <string name="pref_title_dont_ack_transfer">Do not ack activity data transfer</string>
     <string name="live_activity_steps_history">Steps History</string>
     <string name="live_activity_current_steps_per_minute">Current steps/min</string>
     <string name="live_activity_total_steps">Total Steps</string>
@@ -208,4 +209,5 @@
     <string name="abstract_chart_fragment_kind_not_worn">Not Worn</string>
     <string name="device_not_connected">Not connected.</string>
     <string name="user_feedback_all_alarms_disabled">All alarms disabled</string>
+    <string name="pref_title_keep_data_on_device">Keep activity data on device</string>
 </resources>
diff --git a/app/src/main/res/xml/miband_preferences.xml b/app/src/main/res/xml/miband_preferences.xml
index ff5be814..7612f975 100644
--- a/app/src/main/res/xml/miband_preferences.xml
+++ b/app/src/main/res/xml/miband_preferences.xml
@@ -166,8 +166,8 @@
             android:title="@string/pref_title_development_miaddr" />
         <CheckBoxPreference
             android:key="mi_dont_ack_transfer"
-            android:title="@string/pref_title_dont_ack_transfer"
-            android:summary="@string/pref_summary_dont_ack_transfers"
+            android:title="@string/pref_title_keep_data_on_device"
+            android:summary="@string/pref_summary_keep_data_on_device"
             android:defaultValue="false" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file