remove support for QQ Lite and QQ HD

Author: ichenhe

README.md

@@ -8,9 +8,7 @@
 
 ## 主要功能
 
-⚠️最低系统要求 Android 8.0 (O)。
-
-支持原版 QQ / Tim / 轻聊版。
+支持 QQ 标准版 与 TIM。
 
 ![](https://i.loli.net/2020/07/22/g4yIqwZADcozR7K.png)
 
@@ -25,5 +23,4 @@
 
 - [QQ-Notfiy-Improve](https://github.com/Jinhaihan/QQ-Notfiy-Improve)（已获授权）
 - [QQNotfAndShare](https://github.com/ekibun/QQNotfAndShare)（原始项目）
-
 - [QQNotifyPlus](https://github.com/ekibun/QQNotifyPlus)（QQ 与 QZone 图标）

app/src/main/AndroidManifest.xml

@@ -63,7 +63,7 @@
 
             <meta-data
                 android:name="packages"
-                android:value="com.tencent.mobileqq|com.tencent.tim|com.tencent.qqlite|com.tencent.minihd.qq" />
+                android:value="com.tencent.mobileqq|com.tencent.tim" />
             <meta-data
                 android:name="settings.activity"
                 android:value="cc.chenhe.qqnotifyevo.preference.PreferenceAty" />

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

@@ -18,8 +18,6 @@ class DelegateNotificationResolver : NotificationResolver {
         return when (tag) {
             Tag.UNKNOWN -> null
             Tag.QQ -> qqResolver
-            Tag.QQ_HD -> qqResolver
-            Tag.QQ_LITE -> qqResolver
             Tag.TIM -> timResolver
         }?.run { resolveNotification(tag, title, content, ticker) }
     }

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

@@ -39,8 +39,6 @@ class InnerNotificationProcessor(
 
     // 储存所有通知的 id 以便清除
     private val qqNotifyIds: MutableSet<Int> = HashSet()
-    private val qqLiteNotifyIds: MutableSet<Int> = HashSet()
-    private val qqHdNotifyIds: MutableSet<Int> = HashSet()
     private val timNotifyIds: MutableSet<Int> = HashSet()
 
     /**
@@ -50,9 +48,7 @@ class InnerNotificationProcessor(
         clearHistory(tag)
         val ids = when (tag) {
             Tag.QQ -> qqNotifyIds
-            Tag.QQ_LITE -> qqLiteNotifyIds
             Tag.TIM -> timNotifyIds
-            Tag.QQ_HD -> qqHdNotifyIds
             Tag.UNKNOWN -> null
         }
         Timber.tag(TAG).v("Clear all evolutionary notifications.")
@@ -127,8 +123,6 @@ class InnerNotificationProcessor(
     private fun addNotifyId(tag: Tag, ids: Int) {
         when (tag) {
             Tag.QQ -> qqNotifyIds.add(ids)
-            Tag.QQ_HD -> qqHdNotifyIds.add(ids)
-            Tag.QQ_LITE -> qqLiteNotifyIds.add(ids)
             Tag.TIM -> timNotifyIds.add(ids)
             Tag.UNKNOWN -> {
             }

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

@@ -45,8 +45,6 @@ abstract class NotificationProcessor(context: Context, scope: CoroutineScope) {
             return when (packageName) {
                 "com.tencent.mobileqq" -> Tag.QQ
                 "com.tencent.tim" -> Tag.TIM
-                "com.tencent.qqlite" -> Tag.QQ_LITE
-                "com.tencent.minihd.qq" -> Tag.QQ_HD
                 else -> Tag.UNKNOWN
             }
         }
@@ -62,8 +60,6 @@ abstract class NotificationProcessor(context: Context, scope: CoroutineScope) {
     private val qzoneSpecialTitle = context.getString(R.string.notify_qzone_special_title)
 
     private val qqHistory = ArrayList<Conversation>()
-    private val qqLiteHistory = ArrayList<Conversation>()
-    private val qqHdHistory = ArrayList<Conversation>()
     private val timHistory = ArrayList<Conversation>()
 
     private val avatarManager =
@@ -529,7 +525,7 @@ abstract class NotificationProcessor(context: Context, scope: CoroutineScope) {
         }
         when (iconStyle) {
             IconStyle.Auto -> when (tag) {
-                Tag.QQ, Tag.QQ_HD, Tag.QQ_LITE -> R.drawable.ic_notify_qq
+                Tag.QQ -> R.drawable.ic_notify_qq
                 Tag.TIM -> R.drawable.ic_notify_tim
                 else -> R.drawable.ic_notify_qq
             }
@@ -546,9 +542,7 @@ abstract class NotificationProcessor(context: Context, scope: CoroutineScope) {
     protected fun getHistoryMessage(tag: Tag): ArrayList<Conversation> {
         return when (tag) {
             Tag.TIM -> timHistory
-            Tag.QQ_LITE -> qqLiteHistory
             Tag.QQ -> qqHistory
-            Tag.QQ_HD -> qqHdHistory
             else -> throw RuntimeException("Unknown tag: $tag.")
         }
     }

app/src/main/java/cc/chenhe/qqnotifyevo/ui/common/ErrorCard.kt

@@ -18,6 +18,7 @@ import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -46,9 +47,10 @@ internal fun ErrorCard(
     icon: ImageVector = Icons.Rounded.ErrorOutline,
     description: String? = null,
     button: (@Composable () -> Unit)? = null,
+    containerColor: Color = MaterialTheme.colorScheme.errorContainer,
 ) {
     Card(
-        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer),
+        colors = CardDefaults.cardColors(containerColor = containerColor),
         modifier = modifier
     ) {
         Column(

app/src/main/java/cc/chenhe/qqnotifyevo/ui/main/MainPreferenceScreen.kt

@@ -33,6 +33,7 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -41,10 +42,14 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import cc.chenhe.qqnotifyevo.R
 import cc.chenhe.qqnotifyevo.ui.common.ErrorCard
@@ -70,8 +75,14 @@ fun MainPreferenceScreen(
     navigateToPermissionScreen: () -> Unit,
     navigateToAdvancedOptionsScreen: () -> Unit,
     model: MainPreferenceViewModel = viewModel(),
+    lifecycleOwner: LifecycleOwner = LocalLifecycleOwner.current
 ) {
     val uiState by model.uiState.collectAsStateWithLifecycle()
+    LaunchedEffect(key1 = lifecycleOwner) {
+        lifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
+            model.checkUnsupportedApp()
+        }
+    }
     MainPreference(
         uiState = uiState,
         onIntent = { model.sendIntent(it) },
@@ -125,6 +136,7 @@ private fun MainPreference(
             }
 
             WarningCards(
+                uiState.showUnsupportedAppWarning,
                 isServiceRunning = uiState.isServiceRunning,
                 mode = uiState.mode,
                 onIntent = onIntent,
@@ -142,36 +154,34 @@ private fun MainPreference(
 
 @Composable
 private fun WarningCards(
+    unsupportedAppDetected: Boolean,
     isServiceRunning: Boolean,
     mode: Mode,
     onIntent: (MainPreferenceIntent) -> Unit,
     navigateToPermissionScreen: () -> Unit,
 ) {
     val ctx = LocalContext.current
+    val space = PaddingValues(bottom = 12.dp)
+
+    // 不支持的 QQ 版本
+    AnimatedVisibility(visible = unsupportedAppDetected) {
+        UnsupportedAppWarningCard(modifier = Modifier.padding(space), onIntent = onIntent)
+    }
+
     // 通知权限
     val notificationPermission = rememberNotificationPermissionState(onAlwaysDenied = {
         openNotificationSettings(ctx)
     })
-    val space = PaddingValues(bottom = 12.dp)
     AnimatedVisibility(visible = !notificationPermission.isGranted) {
-        ErrorCard(
+        NotificationPermissionWarningCard(
             modifier = Modifier.padding(space),
-            title = stringResource(id = R.string.permission_notification_card_title),
-            description = stringResource(id = R.string.permission_notification_card_text),
-            button = {
-                TextButton(
-                    onClick = {
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                            notificationPermission.launchPermissionRequest()
-                        } else {
-                            openNotificationSettings(ctx)
-                        }
-                    },
-                    colors = ButtonDefaults.textButtonColors(contentColor = MaterialTheme.colorScheme.onErrorContainer)
-                ) {
-                    Text(text = stringResource(id = R.string.permission_notification_card_allow))
+            requestPermission = {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    notificationPermission.launchPermissionRequest()
+                } else {
+                    openNotificationSettings(ctx)
                 }
-            },
+            }
         )
     }
 
@@ -198,6 +208,46 @@ private fun openNotificationSettings(context: Context) {
     }
 }
 
+@Composable
+@Preview
+private fun UnsupportedAppWarningCard(
+    modifier: Modifier = Modifier,
+    onIntent: (MainPreferenceIntent) -> Unit = {},
+) {
+    ErrorCard(
+        containerColor = MaterialTheme.colorScheme.primaryContainer,
+        title = stringResource(id = R.string.unsupported_app_card_title),
+        description = stringResource(id = R.string.unsupported_app_card_text),
+        button = {
+            TextButton(onClick = { onIntent(MainPreferenceIntent.DismissUnsupportedAppWarning) }) {
+                Text(text = stringResource(id = R.string.unsupported_app_card_button))
+            }
+        },
+        modifier = modifier,
+    )
+}
+
+@Composable
+@Preview
+private fun NotificationPermissionWarningCard(
+    modifier: Modifier = Modifier,
+    requestPermission: () -> Unit = {},
+) {
+    ErrorCard(
+        modifier = modifier,
+        title = stringResource(id = R.string.permission_notification_card_title),
+        description = stringResource(id = R.string.permission_notification_card_text),
+        button = {
+            TextButton(
+                onClick = requestPermission,
+                colors = ButtonDefaults.textButtonColors(contentColor = MaterialTheme.colorScheme.onErrorContainer)
+            ) {
+                Text(text = stringResource(id = R.string.permission_notification_card_allow))
+            }
+        },
+    )
+}
+
 @Composable
 @Preview
 private fun NevoServiceWarningCard(

app/src/main/java/cc/chenhe/qqnotifyevo/ui/main/MainPreferenceViewModel.kt

@@ -1,6 +1,8 @@
 package cc.chenhe.qqnotifyevo.ui.main
 
+import android.annotation.SuppressLint
 import android.app.Application
+import android.content.Context
 import androidx.datastore.preferences.core.edit
 import androidx.lifecycle.viewModelScope
 import cc.chenhe.qqnotifyevo.service.NevoDecorator
@@ -12,23 +14,29 @@ import cc.chenhe.qqnotifyevo.utils.Mode.Legacy
 import cc.chenhe.qqnotifyevo.utils.Mode.Nevo
 import cc.chenhe.qqnotifyevo.utils.PREFERENCE_ICON
 import cc.chenhe.qqnotifyevo.utils.PREFERENCE_MODE
+import cc.chenhe.qqnotifyevo.utils.USAGE_SHOW_UNSUPPORTED_APP_WARNING
+import cc.chenhe.qqnotifyevo.utils.USAGE_SHOW_UNSUPPORTED_APP_WARNING_DEFAULT
 import cc.chenhe.qqnotifyevo.utils.dataStore
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.getAndUpdate
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
 data class MainPreferenceUiState(
     val mode: Mode = Legacy,
     val iconStyle: IconStyle = IconStyle.Auto,
     val isServiceRunning: Boolean = true,
     val showNevoNotInstalledDialog: Boolean = false,
+    val showUnsupportedAppWarning: Boolean = false,
 )
 
 sealed interface MainPreferenceIntent {
     data class SetMode(val newMode: Mode) : MainPreferenceIntent
     data class SetIconStyle(val newIcon: IconStyle) : MainPreferenceIntent
     data class ShowNevoNotInstalledDialog(val show: Boolean) : MainPreferenceIntent
+    data object DismissUnsupportedAppWarning : MainPreferenceIntent
 }
 
 class MainPreferenceViewModel(application: Application) :
@@ -41,6 +49,10 @@ class MainPreferenceViewModel(application: Application) :
     }
 
     init {
+        viewModelScope.launch {
+            checkUnsupportedApp()
+        }
+
         viewModelScope.launch {
             application.dataStore.data.collectLatest { pref ->
                 val newMode = Mode.fromValue(pref[PREFERENCE_MODE])
@@ -62,6 +74,20 @@ class MainPreferenceViewModel(application: Application) :
         }
     }
 
+    @SuppressLint("QueryPermissionsNeeded")
+    internal suspend fun checkUnsupportedApp() {
+        val ctx: Context = getApplication()
+        val shouldShowWarning =
+            ctx.dataStore.data.map {
+                it[USAGE_SHOW_UNSUPPORTED_APP_WARNING]
+            }.first() ?: USAGE_SHOW_UNSUPPORTED_APP_WARNING_DEFAULT
+                    && getApplication<Application>().packageManager.getInstalledApplications(0)
+                .find {
+                    it.packageName == "com.tencent.qqlite" || it.packageName == "com.tencent.minihd.qq"
+                } != null
+        _uiState.getAndUpdate { it.copy(showUnsupportedAppWarning = shouldShowWarning) }
+    }
+
     private fun updateServiceState(running: Boolean) {
         _uiState.getAndUpdate { old ->
             if (old.isServiceRunning == running) old else old.copy(isServiceRunning = running)
@@ -85,6 +111,13 @@ class MainPreferenceViewModel(application: Application) :
             is MainPreferenceIntent.ShowNevoNotInstalledDialog -> {
                 _uiState.getAndUpdate { it.copy(showNevoNotInstalledDialog = intent.show) }
             }
+
+            MainPreferenceIntent.DismissUnsupportedAppWarning -> {
+                getApplication<Application>().dataStore.edit {
+                    it[USAGE_SHOW_UNSUPPORTED_APP_WARNING] = false
+                }
+                _uiState.getAndUpdate { it.copy(showUnsupportedAppWarning = false) }
+            }
         }
     }
 

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

@@ -97,13 +97,16 @@ val PREFERENCE_NICKNAME_FORMAT = stringPreferencesKey("format_nickname_format")
 const val PREFERENCE_NICKNAME_FORMAT_DEFAULT = "[\$n]"
 val PREFERENCE_AVATAR_CACHE_AGE = longPreferencesKey("avatar_cache_age")
 val PREFERENCE_AVATAR_CACHE_AGE_DEFAULT = AvatarCacheAge.OneDay
-val USAGE_TIP_NEVO_MULTI_MESSAGE = booleanPreferencesKey("show_nevo_multi_message_tip")
-const val USAGE_TIP_NEVO_MULTI_MESSAGE_DEFAULT = true
 val PREFERENCE_SHOW_IN_RECENT_APPS = booleanPreferencesKey("show_in_recent_apps")
 const val PREFERENCE_SHOW_IN_RECENT_APPS_DEFAULT = true
 val PREFERENCE_ENABLE_LOG = booleanPreferencesKey("enable_log")
 const val PREFERENCE_ENABLE_LOG_DEFAULT = false
 
+val USAGE_TIP_NEVO_MULTI_MESSAGE = booleanPreferencesKey("show_nevo_multi_message_tip")
+const val USAGE_TIP_NEVO_MULTI_MESSAGE_DEFAULT = true
+val USAGE_SHOW_UNSUPPORTED_APP_WARNING = booleanPreferencesKey("show_unsupported_app_warning")
+const val USAGE_SHOW_UNSUPPORTED_APP_WARNING_DEFAULT = true
+
 
 fun getAvatarCachePeriod(context: Context): Long {
     val s = sp(context).getString("avatar_cache_period", "0") ?: "0"

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

@@ -6,7 +6,5 @@ package cc.chenhe.qqnotifyevo.utils
 enum class Tag(val pkg: String) {
     UNKNOWN(""),
     QQ("com.tencent.mobileqq"),
-    QQ_HD("com.tencent.minihd.qq"),
-    QQ_LITE("com.tencent.qqlite"),
     TIM("com.tencent.tim");
 }