From 80a6c657902f75f6c138b19eb5fdd81d4ab50c2d Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 20 Nov 2012 19:09:46 -0800
Subject: [PATCH] We need READ_CALL_LOG if targetSDK is > 15. What a drag.

---
 AndroidManifest.xml                                      | 1 +
 src/org/thoughtcrime/securesms/database/MmsDatabase.java | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2e2dae5c2a..0be0fbb9b9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,6 +29,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_CALL_LOG" />
         
     <application android:icon="@drawable/icon"
                  android:label="@string/app_name"
diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
index 84e261be1c..dfefaababc 100644
--- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -428,10 +428,11 @@ public class MmsDatabase extends Database {
   }
 
   public Cursor getCarrierMmsInformation(String apn) {
-    Uri uri          = Uri.withAppendedPath(Uri.parse("content://telephony/carriers"), "current");
-    String selection = (apn == null || apn.trim().length() == 0) ? null : String.format("apn = '%s'", apn.trim());
+    Uri uri                = Uri.withAppendedPath(Uri.parse("content://telephony/carriers"), "current");
+    String selection       = (apn == null || apn.trim().length() == 0) ? null : "apn = ?";
+    String[] selectionArgs = (apn == null || apn.trim().length() == 0) ? null : new String[] {apn.trim()};
 
-    return context.getContentResolver().query(uri, null, selection, null, null);
+    return context.getContentResolver().query(uri, null, selection, selectionArgs, null);
   }
 
   private PduHeaders getHeadersForId(long messageId) throws MmsException {