TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 12:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for notification privacy settings.

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-07-31 15:05:24 -07:00
parent d6d7ca19c1
commit 120cde9917
12 changed files with 450 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
res/values/arrays.xml
View File

@@ -180,24 +180,15 @@
<item>2</item>
</string-array>
<string-array name="default_color_choice_values" translatable="false">
<item>#ffF44336</item>
<item>#ffE91E63</item>
<item>#ff9C27B0</item>
<item>#ff673AB7</item>
<item>#ff3F51B5</item>
<item>#ff2196F3</item>
<item>#ff03A9F4</item>
<item>#ff00BCD4</item>
<item>#ff009688</item>
<item>#ff4CAF50</item>
<item>#ff8BC34A</item>
<!--<item>#FFCDDC39</item>-->
<item>#FFFFC107</item>
<item>#ffFF9800</item>
<item>#ffFF5722</item>
<item>#ff795548</item>
<item>#ff607D8B</item>
</string-array>
<string-array name="pref_notification_privacy_entries">
<item>@string/arrays__name_and_message</item>
<item>@string/arrays__name_only</item>
<item>@string/arrays__neither</item>
</string-array>
<string-array name="pref_notification_privacy_values">
<item>all</item>
<item>contact</item>
<item>none</item>
</string-array>
</resources>

11
res/values/strings.xml
View File

@@ -467,7 +467,7 @@
<string name="KeyCachingService_lock">Lock with passphrase</string>
<!-- MessageNotifier -->
<string name="MessageNotifier_d_messages_in_d_conversations">%1$d messages in %2$d conversations</string>
<string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d new messages in %2$d conversations</string>
<string name="MessageNotifier_most_recent_from_s">Most recent from: %1$s</string>
<string name="MessageNotifier_locked_message">Locked message...</string>
<string name="MessageNotifier_media_message_with_text">Media message: %s</string>
@@ -484,6 +484,10 @@
<string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Quick response unavailable when TextSecure is locked!</string>
<string name="QuickResponseService_problem_sending_message">Problem sending message!</string>
<!-- SingleRecipientNotificationBuilder -->
<string name="SingleRecipientNotificationBuilder_new_textsecure_message">New TextSecure message</string>
<string name="SingleRecipientNotificationBuilder_contents_hidden">Contents hidden</string>
<!-- change_passphrase_activity -->
<string name="change_passphrase_activity__old_passphrase">OLD PASSPHRASE:</string>
<string name="change_passphrase_activity__new_passphrase">NEW PASSPHRASE:</string>
@@ -754,6 +758,10 @@
<string name="arrays__enabled">Enabled</string>
<string name="arrays__disabled">Disabled</string>
<string name="arrays__name_and_message">Name and message</string>
<string name="arrays__name_only">Name only</string>
<string name="arrays__neither">Neither</string>
<!-- plurals.xml -->
<plurals name="hours_ago">
<item quantity="one">%d hour</item>
@@ -858,6 +866,7 @@
<string name="preferences__support_wifi_calling">\'WiFi Calling\' compatibility mode</string>
<string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Enable if your device uses SMS/MMS delivery over WiFi (only enable when \'WiFi Calling\' is enabled on your device)</string>
<string name="preferences_app_protection__blocked_contacts">Blocked contacts</string>
<string name="preferences_notifications__display_in_notifications">Display in notifications</string>
<!-- **************************************** -->
<!-- menus -->

20
res/xml/preferences_notifications.xml
View File

@@ -36,7 +36,6 @@
android:entries="@array/pref_led_blink_pattern_entries"
android:entryValues="@array/pref_led_blink_pattern_values" />
<CheckBoxPreference android:key="pref_key_inthread_notifications"
android:title="@string/preferences__inthread_notifications"
android:summary="@string/preferences__play_inthread_notifications"
@@ -44,10 +43,17 @@
android:defaultValue="true" />
<ListPreference
android:key="pref_repeat_alerts"
android:defaultValue="0"
android:title="@string/preferences__repeat_alerts"
android:dependency="pref_key_enable_notifications"
android:entries="@array/pref_repeat_alerts_entries"
android:entryValues="@array/pref_repeat_alerts_values" />
android:key="pref_repeat_alerts"
android:defaultValue="0"
android:title="@string/preferences__repeat_alerts"
android:dependency="pref_key_enable_notifications"
android:entries="@array/pref_repeat_alerts_entries"
android:entryValues="@array/pref_repeat_alerts_values" />
<ListPreference android:key="pref_notification_privacy"
android:title="@string/preferences_notifications__display_in_notifications"
android:defaultValue="all"
android:entries="@array/pref_notification_privacy_entries"
android:entryValues="@array/pref_notification_privacy_values"/>
</PreferenceScreen>