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

Merge pull request #367 from nikolai-r/master

Browse Source 
add option to disable audible inthread notifications
This commit is contained in:
Moxie Marlinspike 2013-10-12 09:15:54 -07:00
commit 763e4b1b27
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@ -437,6 +437,8 @@
<string name="preferences__pref_led_blink_dialogtitle">Select LED Blink Pattern</string> <string name="preferences__pref_led_blink_dialogtitle">Select LED Blink Pattern</string>
<string name="preferences__select_led_color">Select LED Color</string> <string name="preferences__select_led_color">Select LED Color</string>
<string name="preferences__sound">Sound</string> <string name="preferences__sound">Sound</string>
<string name="preferences__inthread_notifications">In thread notifications</string>
<string name="preferences__play_inthread_notifications">Play notification sound while in thread.</string>
<string name="preferences__vibrate">Vibrate</string> <string name="preferences__vibrate">Vibrate</string>
<string name="preferences__also_vibrate_when_notified">Also vibrate when notified</string> <string name="preferences__also_vibrate_when_notified">Also vibrate when notified</string>
<string name="preferences__minutes">minutes</string> <string name="preferences__minutes">minutes</string>

10
res/xml/preferences.xml
View File

@ -50,12 +50,22 @@
android:title="@string/preferences__sound" android:title="@string/preferences__sound"
android:ringtoneType="notification" android:ringtoneType="notification"
android:defaultValue="content://settings/system/notification_sound" /> android:defaultValue="content://settings/system/notification_sound" />
<CheckBoxPreference android:key="pref_key_inthread_notifications"
android:title="@string/preferences__inthread_notifications"
android:summary="@string/preferences__play_inthread_notifications"
android:layout="?android:attr/preferenceLayoutChild"
android:dependency="pref_key_enable_notifications"
android:defaultValue="true" />
<CheckBoxPreference android:layout="?android:attr/preferenceLayoutChild" <CheckBoxPreference android:layout="?android:attr/preferenceLayoutChild"
android:dependency="pref_key_enable_notifications" android:dependency="pref_key_enable_notifications"
android:key="pref_key_vibrate" android:key="pref_key_vibrate"
android:defaultValue="true" android:defaultValue="true"
android:title="@string/preferences__vibrate" android:title="@string/preferences__vibrate"
android:summary="@string/preferences__also_vibrate_when_notified" /> android:summary="@string/preferences__also_vibrate_when_notified" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="Input Settings"> <PreferenceCategory android:title="Input Settings">

1
src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
View File

@ -58,6 +58,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
private static final int ENABLE_PASSPHRASE_ACTIVITY = 2; private static final int ENABLE_PASSPHRASE_ACTIVITY = 2;
public static final String RINGTONE_PREF = "pref_key_ringtone"; public static final String RINGTONE_PREF = "pref_key_ringtone";
public static final String IN_THREAD_NOTIFICATION_PREF = "pref_key_inthread_notifications";
public static final String VIBRATE_PREF = "pref_key_vibrate"; public static final String VIBRATE_PREF = "pref_key_vibrate";
public static final String NOTIFICATION_PREF = "pref_key_enable_notifications"; public static final String NOTIFICATION_PREF = "pref_key_enable_notifications";
public static final String LED_COLOR_PREF = "pref_led_color"; public static final String LED_COLOR_PREF = "pref_led_color";

5
src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
View File

@ -228,6 +228,11 @@ public class MessageNotifier {
private static void sendInThreadNotification(Context context) { private static void sendInThreadNotification(Context context) {
try { try {
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
if (!sp.getBoolean(ApplicationPreferencesActivity.IN_THREAD_NOTIFICATION_PREF, true)) {
return;
}
String ringtone = sp.getString(ApplicationPreferencesActivity.RINGTONE_PREF, null); String ringtone = sp.getString(ApplicationPreferencesActivity.RINGTONE_PREF, null);
if (ringtone == null) if (ringtone == null)