From 5a62856e46448a6d060939993be5ebe21c87872e Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 26 Feb 2014 12:38:50 -0800
Subject: [PATCH] Make SMS delivery reports optional.

---
 res/xml/preferences.xml                                | 10 +++++-----
 .../securesms/util/TextSecurePreferences.java          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index d47e4c891..e6fb46eee 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -16,11 +16,6 @@
                     android:title="@string/preferences__make_default_sms_app"
                     android:summary="@string/preferences__make_textsecure_the_default_sms_mms_app" />
 
-        <!--<CheckBoxPreference android:defaultValue="false"-->
-                            <!--android:key="pref_delivery_report_sms"-->
-                            <!--android:summary="@string/preferences__request_a_delivery_report_for_each_sms_message_you_send"-->
-                            <!--android:title="@string/preferences__sms_delivery_reports" />-->
-
         <CheckBoxPreference android:defaultValue="false"
                             android:key="pref_toggle_push_messaging"
                             android:title="@string/preferences__use_data_channel"
@@ -32,6 +27,11 @@
                             android:title="@string/preferences__allow_sms_fallback"
                             android:summary="@string/preferences__send_and_receive_sms_messages_when_push_is_not_available"/>
 
+        <CheckBoxPreference android:defaultValue="false"
+                            android:key="pref_delivery_report_sms"
+                            android:summary="@string/preferences__request_a_delivery_report_for_each_sms_message_you_send"
+                            android:title="@string/preferences__sms_delivery_reports" />
+        
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/preferences__notifications">
         <CheckBoxPreference android:key="pref_key_enable_notifications"
diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index 2a9549a4f..18cd3f885 100644
--- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -180,7 +180,7 @@ public class TextSecurePreferences {
   }
 
   public static boolean isSmsDeliveryReportsEnabled(Context context) {
-    return getBooleanPreference(context, SMS_DELIVERY_REPORT_PREF, true);
+    return getBooleanPreference(context, SMS_DELIVERY_REPORT_PREF, false);
   }
 
   public static boolean hasPromptedPushRegistration(Context context) {