From 0313500652ef50a34830e543b4740bf41f188da4 Mon Sep 17 00:00:00 2001
From: criogenic <criogenic@gmail.com>
Date: Tue, 30 Jan 2018 22:44:27 +0100
Subject: [PATCH]  fix privacy caller ID selection (#962)

---
 .../freeyourgadget/gadgetbridge/impl/GBDeviceService.java   | 6 +++---
 app/src/main/res/values/arrays.xml                          | 2 +-
 app/src/main/res/values/values.xml                          | 1 +
 app/src/main/res/xml/preferences.xml                        | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
index 9e9210ccc..1df97bb7a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
@@ -171,12 +171,12 @@ public class GBDeviceService implements DeviceService {
     public void onSetCallState(CallSpec callSpec) {
         Context context = GBApplication.getContext();
         String currentPrivacyMode = GBApplication.getPrefs().getString("pref_call_privacy_mode", GBApplication.getContext().getString(R.string.p_call_privacy_mode_off));
-        if (context.getString(R.string.p_call_privacy_mode_name).equals(currentPrivacyMode)) {
+        if (currentPrivacyMode.equals(context.getString(R.string.p_call_privacy_mode_name))) {
             callSpec.name = callSpec.number;
-        } else if (context.getString(R.string.p_call_privacy_mode_complete).equals(currentPrivacyMode)) {
+        } else if (currentPrivacyMode.equals(context.getString(R.string.p_call_privacy_mode_complete))) {
             callSpec.number = null;
             callSpec.name = null;
-        } else if (context.getString(R.string.pref_call_privacy_mode_number).equals(currentPrivacyMode)) {
+        } else if (currentPrivacyMode.equals(context.getString(R.string.p_call_privacy_mode_number))){
             callSpec.name = coalesce(callSpec.name, getContactDisplayNameByNumber(callSpec.number));
             if (callSpec.name != null && !callSpec.name.equals(callSpec.number)) {
                 callSpec.number = null;
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 95a0bcb8e..f2830dd9d 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -198,7 +198,7 @@
     <string-array name="pref_call_privacy_mode_values">
         <item>@string/p_call_privacy_mode_off</item>
         <item>@string/p_call_privacy_mode_name</item>
-        <item>@string/pref_call_privacy_mode_number</item>
+        <item>@string/p_call_privacy_mode_number</item>
         <item>@string/p_call_privacy_mode_complete</item>
     </string-array>
 
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index addbce96c..a6f7361e8 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -35,5 +35,6 @@
 
     <item name="p_call_privacy_mode_off" type="string">off</item>
     <item name="p_call_privacy_mode_name" type="string">name</item>
+    <item name="p_call_privacy_mode_number" type="string">number</item>
     <item name="p_call_privacy_mode_complete" type="string">complete</item>
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index ea56b1b3a..b62fcb8b5 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -169,11 +169,11 @@
     <PreferenceCategory
         android:title="@string/pref_header_privacy">
     <ListPreference
+        android:defaultValue="@string/p_call_privacy_mode_off"
         android:key="pref_call_privacy_mode"
         android:title="@string/pref_title_call_privacy_mode"
         android:entries="@array/pref_call_privacy_mode"
         android:entryValues="@array/pref_call_privacy_mode_values"
-        android:defaultValue="@string/pref_call_privacy_mode_off"
         android:summary="%s" />
     </PreferenceCategory>