TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-30 13:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make SMS delivery reports optional.

Browse Source
This commit is contained in:
Moxie Marlinspike 2014-02-26 12:38:50 -08:00
parent 37a52df4e6
commit 5a62856e46
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
res/xml/preferences.xml
View File

@ -16,11 +16,6 @@
android:title="@string/preferences__make_default_sms_app" android:title="@string/preferences__make_default_sms_app"
android:summary="@string/preferences__make_textsecure_the_default_sms_mms_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" <CheckBoxPreference android:defaultValue="false"
android:key="pref_toggle_push_messaging" android:key="pref_toggle_push_messaging"
android:title="@string/preferences__use_data_channel" android:title="@string/preferences__use_data_channel"
@ -32,6 +27,11 @@
android:title="@string/preferences__allow_sms_fallback" android:title="@string/preferences__allow_sms_fallback"
android:summary="@string/preferences__send_and_receive_sms_messages_when_push_is_not_available"/> 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>
<PreferenceCategory android:title="@string/preferences__notifications"> <PreferenceCategory android:title="@string/preferences__notifications">
<CheckBoxPreference android:key="pref_key_enable_notifications" <CheckBoxPreference android:key="pref_key_enable_notifications"

2
src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
View File

@ -180,7 +180,7 @@ public class TextSecurePreferences {
} }
public static boolean isSmsDeliveryReportsEnabled(Context context) { 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) { public static boolean hasPromptedPushRegistration(Context context) {