diff options
author | Danny Baumann <dannybaumann@web.de> | 2014-04-17 08:20:05 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-04-17 08:20:05 +0000 |
commit | 3c9053d8a38cd6aae8d8ccc213b9fc80bcc46e21 (patch) | |
tree | 5eb4b88adb36d98ad5d4588e904bf64e9e2766f0 /src/com | |
parent | 1c82f1c5fd6ca9e864ea1b2ebd3c5c2659982e87 (diff) | |
parent | 71b121d082d777e54f7fc02338b609cbfc31ff9c (diff) | |
download | android_packages_apps_Dialer-3c9053d8a38cd6aae8d8ccc213b9fc80bcc46e21.tar.gz android_packages_apps_Dialer-3c9053d8a38cd6aae8d8ccc213b9fc80bcc46e21.tar.bz2 android_packages_apps_Dialer-3c9053d8a38cd6aae8d8ccc213b9fc80bcc46e21.zip |
Merge "Dialer: Add support for OpenCNAM paid accounts" into cm-11.0
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/dialer/lookup/opencnam/OpenCnamReverseLookup.java | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/src/com/android/dialer/lookup/opencnam/OpenCnamReverseLookup.java b/src/com/android/dialer/lookup/opencnam/OpenCnamReverseLookup.java index 2166a6011..d5661ee5e 100644 --- a/src/com/android/dialer/lookup/opencnam/OpenCnamReverseLookup.java +++ b/src/com/android/dialer/lookup/opencnam/OpenCnamReverseLookup.java @@ -21,6 +21,9 @@ import com.android.dialer.lookup.ContactBuilder; import com.android.dialer.lookup.ReverseLookup; import android.content.Context; +import android.net.Uri; +import android.provider.Settings; +import android.text.TextUtils; import android.util.Log; import android.util.Pair; @@ -43,6 +46,10 @@ public class OpenCnamReverseLookup extends ReverseLookup { private static final String LOOKUP_URL = "https://api.opencnam.com/v2/phone/"; + /** Query parameters for paid accounts */ + private static final String ACCOUNT_SID = "account_sid"; + private static final String AUTH_TOKEN = "auth_token"; + public OpenCnamReverseLookup(Context context) { } @@ -58,7 +65,7 @@ public class OpenCnamReverseLookup extends ReverseLookup { String normalizedNumber, String formattedNumber) { String displayName; try { - displayName = httpGetRequest(normalizedNumber); + displayName = httpGetRequest(context, normalizedNumber); if (DEBUG) Log.d(TAG, "Reverse lookup returned name: " + displayName); } catch (IOException e) { return null; @@ -93,9 +100,28 @@ public class OpenCnamReverseLookup extends ReverseLookup { return Pair.create(builder.build(), null); } - private String httpGetRequest(String number) throws IOException { + private String httpGetRequest(Context context, String number) throws IOException { + Uri.Builder builder = Uri.parse(LOOKUP_URL + number).buildUpon(); + + // Paid account + String accountSid = Settings.System.getString( + context.getContentResolver(), + Settings.System.DIALER_OPENCNAM_ACCOUNT_SID); + String authToken = Settings.System.getString( + context.getContentResolver(), + Settings.System.DIALER_OPENCNAM_AUTH_TOKEN); + + if (!TextUtils.isEmpty(accountSid) && !TextUtils.isEmpty(authToken)) { + Log.d(TAG, "Using paid account"); + + builder.appendQueryParameter(ACCOUNT_SID, accountSid); + builder.appendQueryParameter(AUTH_TOKEN, authToken); + } + + String url = builder.build().toString(); + HttpClient client = new DefaultHttpClient(); - HttpGet request = new HttpGet(LOOKUP_URL + number); + HttpGet request = new HttpGet(url); HttpResponse response = client.execute(request); |