新增特别关注群消息的通知渠道选项

Author: Chenhe

app/src/main/java/cc/chenhe/qqnotifyevo/core/NotificationProcessor.kt

@@ -295,7 +295,11 @@ abstract class NotificationProcessor(context: Context) {
                         original.contentIntent, original.deleteIntent, special)
                 deleteOldMessage(conversation, if (isMulti) 0 else matchMessageNum(title))
                 Timber.tag(TAG).d("[${if (special) "GroupS" else "Group"}] Name: $name; Group: $groupName; Text: $text")
-                return renewConversionNotification(context, tag, NotifyChannel.GROUP, conversation, sbn, original)
+                val channel = if (special && specialGroupMsgChannel(ctx))
+                    NotifyChannel.FRIEND_SPECIAL
+                else
+                    NotifyChannel.GROUP
+                return renewConversionNotification(context, tag, channel, conversation, sbn, original)
             }
         }
 

app/src/main/java/cc/chenhe/qqnotifyevo/utils/PreferencesUtils.kt

@@ -1,6 +1,7 @@
 package cc.chenhe.qqnotifyevo.utils
 
 import android.content.Context
+import android.content.SharedPreferences
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.os.Build
@@ -36,14 +37,16 @@ const val ICON_TIM = 2
 @IntDef(ICON_AUTO, ICON_QQ, ICON_TIM)
 annotation class Icon
 
+private fun sp(context: Context): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+
 // ---------------------------------------------------------
 // Tips
 // ---------------------------------------------------------
 private const val PREF_NEVO_MULTI_MSG_TIP = "tip_nevo_multi_msg"
 
 
 fun nevoMultiMsgTip(context: Context, shouldShow: Boolean) {
-    PreferenceManager.getDefaultSharedPreferences(context).edit {
+    sp(context).edit {
         putBoolean(PREF_NEVO_MULTI_MSG_TIP, shouldShow)
     }
 }
@@ -58,7 +61,7 @@ fun nevoMultiMsgTip(context: Context): Boolean = PreferenceManager
 
 @Mode
 fun getMode(context: Context): Int {
-    val mode = PreferenceManager.getDefaultSharedPreferences(context).getString("mode", "0") ?: "0"
+    val mode = sp(context).getString("mode", "0") ?: "0"
     return when (mode.toInt()) {
         1 -> MODE_NEVO
         2 -> MODE_LEGACY
@@ -67,15 +70,15 @@ fun getMode(context: Context): Int {
 }
 
 fun fetchMode(context: Context): LiveData<Int> {
-    val source = SpStringLiveData(PreferenceManager.getDefaultSharedPreferences(context), "mode", "0", true)
+    val source = SpStringLiveData(sp(context), "mode", "0", true)
     return Transformations.map(source) { src ->
         src!!.toInt()
     }
 }
 
 @Icon
 fun getIconMode(context: Context): Int {
-    val icon = PreferenceManager.getDefaultSharedPreferences(context).getString("icon_mode", "0") ?: "0"
+    val icon = sp(context).getString("icon_mode", "0") ?: "0"
     return when (icon.toInt()) {
         0 -> ICON_AUTO
         1 -> ICON_QQ
@@ -84,27 +87,32 @@ fun getIconMode(context: Context): Int {
     }
 }
 
-fun showSpecialPrefix(context: Context): Boolean = PreferenceManager.getDefaultSharedPreferences(context)
-        .getBoolean("show_special_prefix", false)
+fun showSpecialPrefix(context: Context): Boolean = sp(context).getBoolean("show_special_prefix", false)
+
+/**
+ * 特别关注的群消息通知渠道。
+ *
+ * @return `true` 为特别关心渠道，`false` 为群消息渠道。
+ */
+fun specialGroupMsgChannel(context: Context): Boolean = sp(context).getString("special_group_channel", "group") == "special"
 
 fun getAvatarCachePeriod(context: Context): Long {
-    val s = PreferenceManager.getDefaultSharedPreferences(context).getString("avatar_cache_period", "0") ?: "0"
+    val s = sp(context).getString("avatar_cache_period", "0") ?: "0"
     return s.toLong()
 }
 
 fun fetchAvatarCachePeriod(context: Context): LiveData<Long> {
-    val source = SpStringLiveData(PreferenceManager.getDefaultSharedPreferences(context), "avatar_cache_period", "0", true)
+    val source = SpStringLiveData(sp(context), "avatar_cache_period", "0", true)
     return Transformations.map(source) { src ->
         src?.toLong() ?: 0L
     }
 }
 
 fun getShowInRecent(context: Context): Boolean {
-    return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("show_in_recent", true)
+    return sp(context).getBoolean("show_in_recent", true)
 }
 
-fun fetchLog(context: Context): SpBooleanLiveData = SpBooleanLiveData(PreferenceManager
-        .getDefaultSharedPreferences(context), "log", false, init = true)
+fun fetchLog(context: Context): SpBooleanLiveData = SpBooleanLiveData(sp(context), "log", false, init = true)
 
 fun getVersion(context: Context): String {
     var versionName = ""

app/src/main/res/values/strings.xml

@@ -140,6 +140,15 @@
     <string name="pref_cate_advanced_notify">通知</string>
     <string name="pref_advanced_show_special_prefix">显示特别关心前缀</string>
     <string name="pref_advanced_show_special_prefix_summary">添加[特别关心]或群聊中[特别关注]前缀</string>
+    <string name="pref_advanced_special_group_channel">特别关注群消息的通知渠道</string>
+    <string-array name="pref_advanced_special_group_channel_entries">
+        <item>群消息</item>
+        <item>特别关心消息</item>
+    </string-array>
+    <string-array name="pref_advanced_special_group_channel_values">
+        <item>group</item>
+        <item>special</item>
+    </string-array>
     <!-- 其他 -->
     <string name="pref_cate_advanced_other">其他</string>
     <string name="pref_avatar_cache_period">头像缓存刷新间隔</string>

app/src/main/res/xml/pref_advanced.xml

@@ -8,6 +8,14 @@
             app:key="show_special_prefix"
             app:summary="@string/pref_advanced_show_special_prefix_summary"
             app:title="@string/pref_advanced_show_special_prefix" />
+
+        <ListPreference
+            app:defaultValue="group"
+            app:entries="@array/pref_advanced_special_group_channel_entries"
+            app:entryValues="@array/pref_advanced_special_group_channel_values"
+            app:key="special_group_channel"
+            app:title="@string/pref_advanced_special_group_channel"
+            app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/pref_cate_advanced_other">