diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java index 473dc4f39877966703529a9f85b179176b2ca5f3..1efca23465491c20b513f321237c79ed89812573 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java @@ -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()) diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index 14de9071b5dd7e220b2ed96e66999f29c6e197b2..70fe23010942753d3a5e418970deffa2020b998e 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -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>