From 070c6db5ed83e7e95d9126df54800a9c7930ef7c Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Fri, 23 Jan 2015 11:32:58 +0100
Subject: [PATCH] Resolve caller names by phone number before sending to Pebble

---
 app/src/main/AndroidManifest.xml              |  2 ++
 .../BluetoothCommunicationService.java        | 36 ++++++++++++++++++-
 .../gadgetbridge/PhoneCallReceiver.java       |  1 +
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 843efd562..80ee36ac1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,8 @@
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
index a4616ae9d..2111e5da8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
@@ -7,9 +7,13 @@ import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothServerSocket;
 import android.bluetooth.BluetoothSocket;
+import android.content.ContentResolver;
 import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
 import android.os.IBinder;
 import android.os.ParcelUuid;
+import android.provider.ContactsContract;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 import android.widget.Toast;
@@ -107,6 +111,7 @@ public class BluetoothCommunicationService extends Service {
                 e.printStackTrace();
             }
             try {
+
                 mBtSocket.close();
             } catch (IOException e) {
                 e.printStackTrace();
@@ -127,8 +132,10 @@ public class BluetoothCommunicationService extends Service {
             String phoneNumber = intent.getStringExtra("incomingcall_phonenumber");
             byte phoneState = intent.getByteExtra("incomingcall_state", (byte) 0);
 
+            String callerName = getContactDisplayNameByNumber(phoneNumber);
+
             if (mBtSocketIoThread != null) {
-                byte[] msg = PebbleProtocol.encodeIncomingCall(phoneNumber, phoneNumber, phoneState);
+                byte[] msg = PebbleProtocol.encodeIncomingCall(phoneNumber, callerName, phoneState);
                 mBtSocketIoThread.write(msg);
             }
         } else if (intent.getAction().equals(ACTION_SETTIME)) {
@@ -150,6 +157,33 @@ public class BluetoothCommunicationService extends Service {
         return null;
     }
 
+
+    private String getContactDisplayNameByNumber(String number) {
+        Uri uri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(number));
+        String name = "Unknown";
+
+        if (number == null || number.equals("")) {
+            return name;
+        }
+
+        ContentResolver contentResolver = getContentResolver();
+        Cursor contactLookup = contentResolver.query(uri, null, null, null, null);
+
+        try {
+            if (contactLookup != null && contactLookup.getCount() > 0) {
+                contactLookup.moveToNext();
+                name = contactLookup.getString(contactLookup.getColumnIndex(ContactsContract.Data.DISPLAY_NAME));
+            }
+        } finally {
+            if (contactLookup != null) {
+                contactLookup.close();
+            }
+        }
+
+        return name;
+    }
+
+
     private class BtSocketAcceptThread extends Thread {
         private final BluetoothServerSocket mmServerSocket;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/PhoneCallReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/PhoneCallReceiver.java
index 769ae5ae7..3244e801d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/PhoneCallReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/PhoneCallReceiver.java
@@ -26,4 +26,5 @@ public class PhoneCallReceiver extends BroadcastReceiver {
             context.startService(startIntent);
         }
     }
+
 }