Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Use a different notification preference summary for Android 8

Browse Source
This commit is contained in:
Torsten Grote
2018-03-14 10:01:38 -03:00
parent f609ad1a92
commit ff8b38f7e8
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
View File

@@ -7,6 +7,7 @@ import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.StringRes;
import android.support.v7.preference.CheckBoxPreference;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
@@ -240,11 +241,15 @@ public class SettingsFragment extends PreferenceFragmentCompat
notifySound.setSummary(text);
} else {
setupNotificationPreference(notifyPrivateMessages,
CONTACT_CHANNEL_ID);
CONTACT_CHANNEL_ID,
R.string.notify_private_messages_setting_summary_26);
setupNotificationPreference(notifyGroupMessages,
GROUP_CHANNEL_ID);
setupNotificationPreference(notifyForumPosts, FORUM_CHANNEL_ID);
setupNotificationPreference(notifyBlogPosts, BLOG_CHANNEL_ID);
GROUP_CHANNEL_ID,
R.string.notify_group_messages_setting_summary_26);
setupNotificationPreference(notifyForumPosts, FORUM_CHANNEL_ID,
R.string.notify_forum_posts_setting_summary_26);
setupNotificationPreference(notifyBlogPosts, BLOG_CHANNEL_ID,
R.string.notify_blog_posts_setting_summary_26);
notifyVibration.setVisible(false);
notifyLockscreen.setVisible(false);
notifySound.setVisible(false);
@@ -267,8 +272,9 @@ public class SettingsFragment extends PreferenceFragmentCompat
@TargetApi(26)
private void setupNotificationPreference(CheckBoxPreference pref,
String channelId) {
String channelId, @StringRes int summary) {
pref.setWidgetLayoutResource(0);
pref.setSummary(summary);
pref.setOnPreferenceClickListener(clickedPref -> {
Intent intent = new Intent(ACTION_CHANNEL_NOTIFICATION_SETTINGS)
.putExtra(EXTRA_APP_PACKAGE, getContext().getPackageName())

4
briar-android/src/main/res/values/strings.xml
View File

@@ -355,12 +355,16 @@
<string name="notification_settings_title">Notifications</string>
<string name="notify_private_messages_setting_title">Private messages</string>
<string name="notify_private_messages_setting_summary">Show alerts for private messages</string>
<string name="notify_private_messages_setting_summary_26">Configure alerts for private messages</string>
<string name="notify_group_messages_setting_title">Group messages</string>
<string name="notify_group_messages_setting_summary">Show alerts for group messages</string>
<string name="notify_group_messages_setting_summary_26">Configure alerts for group messages</string>
<string name="notify_forum_posts_setting_title">Forum posts</string>
<string name="notify_forum_posts_setting_summary">Show alerts for forum posts</string>
<string name="notify_forum_posts_setting_summary_26">Configure alerts for forum posts</string>
<string name="notify_blog_posts_setting_title">Blog posts</string>
<string name="notify_blog_posts_setting_summary">Show alerts for blog posts</string>
<string name="notify_blog_posts_setting_summary_26">Configure alerts for blog posts</string>
<string name="notify_vibration_setting">Vibrate</string>
<string name="notify_lock_screen_setting_title">Lock Screen</string>
<string name="notify_lock_screen_setting_summary">Show notifications on the lock screen</string>