diff options
| author | lookshe <github@lookshe.org> | 2016-03-07 23:35:35 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-07 23:35:35 +0100 |
| commit | e9b5793cefd6fd8a24a6bf710493c9bc1800850f (patch) | |
| tree | d9c7f1bbe1ea0920e0b03bd98b73f9b949d9126d /src/main | |
| parent | 739ae021068f543aa0fca2d2d9977461f7633560 (diff) | |
Finally fixes FS#142
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java | 4 | ||||
| -rw-r--r-- | src/main/res/values-de/strings.xml | 2 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 7 |
3 files changed, 0 insertions, 13 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java index 20eca48a..dda4208c 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java +++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java @@ -133,10 +133,6 @@ public class ConversationsPlusPreferences extends Settings { return getString("notification_ringtone", null); } - public static boolean alwaysNotifyInConference() { - return getBoolean("always_notify_in_conference", false); - } - public static boolean showNotification() { return getBoolean("show_notification", true); } diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index f91bf1dd..87cacb45 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -115,8 +115,6 @@ <string name="pref_vibrate_summary">Vibrieren bei Erhalt einer neuen Nachricht</string> <string name="pref_sound">Benachrichtigungston</string> <string name="pref_sound_summary">Benachrichtigungston wiedergeben</string> - <string name="pref_conference_notifications">Konferenz-Benachrichtigungen</string> - <string name="pref_conference_notifications_summary">Benachrichtige mich bei jeder Konferenz-Nachricht und nicht nur, wenn ich angesprochen werde</string> <string name="pref_notification_grace_period">Gnadenfrist</string> <string name="pref_notification_grace_period_summary">Deaktiviere Benachrichtigungen für eine kurze Zeit nach Erhalt einer Nachricht, die von einem anderen deiner Clients kommt.</string> <string name="pref_advanced_options">Erweiterte Optionen</string> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 622e772c..e468cd27 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -133,13 +133,6 @@ android:title="@string/pref_led_notification_color" app:supportsAlpha="true" android:summary="@string/pref_led_notification_color_summary"/> - - <CheckBoxPreference - android:defaultValue="true" - android:dependency="show_notification" - android:key="always_notify_in_conference" - android:summary="@string/pref_conference_notifications_summary" - android:title="@string/pref_conference_notifications" /> </PreferenceScreen> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_ui_options"> |