fix:补充通话列表为空与列表没有掩码号码时,也需要同步添加黑名单

commons/src/main/kotlin/com/simplemobiletools/commons/activities/ManageBlockedNumbersActivity.kt

@@ -105,25 +105,32 @@ class ManageBlockedNumbersActivity : BaseSimpleActivity() {
                             updateBlockedNumbers()
                         } else {
                             RecentsHelperCommon(context).getRecentCalls(false, Int.MAX_VALUE) { recents ->
-                                if (recents.isEmpty()) return@getRecentCalls
-
-                                Log.d(TAG, "onCreate  获取通话列表数据 = ${Gson().toJson(recents)}")
-                                val listSfNumbers = recents.filter { it.isShunFeng }.map { it.phoneNumber }.distinct()
-                                Log.d(TAG, "onCreate: 获取过滤顺丰手机号列表数据 = $listSfNumbers")
-
-                                listSfNumbers.forEach { number ->
-                                    if (!PhoneFromUtilCommon.isNumeric(number) && !number.isPhoneNumber()) {
-                                        val decodeNumber = AESCommon.decrypt(number)
-                                        Log.d(TAG, "onCreate: 获取顺丰手机号  number = $number  decode = $decodeNumber  blockedNumber = $blockedNumber")
-                                        if (decodeNumber == blockedNumber) {
-                                            Log.d(TAG, "onCreate: if 添加成功黑名单 blockedNumber = $blockedNumber")
-                                            addBlockedNumber(blockedNumber,true)
-                                        }else{
-                                            addBlockedNumber(blockedNumber)
-                                            Log.d(TAG, "onCreate: else 添加成功黑名单 blockedNumber = $blockedNumber")
+                                if (recents.isEmpty()){
+                                    addBlockedNumber(blockedNumber)
+                                }else {
+                                    Log.d(TAG, "onCreate  获取通话列表数据 = ${Gson().toJson(recents)}")
+                                    val listSfNumbers = recents.filter { it.isShunFeng }.map { it.phoneNumber }.distinct()
+                                    Log.d(TAG, "onCreate: 获取过滤顺丰手机号列表数据 = $listSfNumbers")
+
+                                    if (listSfNumbers.isEmpty()) {
+                                        addBlockedNumber(blockedNumber)
+                                    } else {
+                                        listSfNumbers.forEach { number ->
+                                            if (!PhoneFromUtilCommon.isNumeric(number) && !number.isPhoneNumber()) {
+                                                val decodeNumber = AESCommon.decrypt(number)
+                                                Log.d(TAG, "onCreate: 获取顺丰手机号  number = $number  decode = $decodeNumber  blockedNumber = $blockedNumber")
+                                                if (decodeNumber == blockedNumber) {
+                                                    Log.d(TAG, "onCreate: if 添加成功黑名单 blockedNumber = $blockedNumber")
+                                                    addBlockedNumber(blockedNumber, true)
+                                                } else {
+                                                    addBlockedNumber(blockedNumber)
+                                                    Log.d(TAG, "onCreate: else 添加成功黑名单 blockedNumber = $blockedNumber")
+                                                }
+                                            }
                                         }
                                     }
                                 }
+
                                 clickedBlockedNumber = null
                                 updateBlockedNumbers()
                             }

commons/src/main/kotlin/com/simplemobiletools/commons/compose/screens/ManageBlockedNumbersScreen.kt

@@ -397,8 +397,8 @@ private fun blockedNumberListItemColors(
 private fun BlockedNumberHeadlineContent(modifier: Modifier = Modifier, blockedNumber: BlockedNumber, hasContactName: Boolean) {
     Log.d("ManageBlockedNumbersScreen", "BlockedNumberHeadlineContent: blockedNumber = ${Gson().toJson(blockedNumber)}")
     var showNumber = ""
-    if (!blockedNumber.normalizedNumber.isPhoneNumber() || !PhoneFromUtilCommon.isNumeric(blockedNumber.normalizedNumber)) {
-        val decryptResult = AESCommon.decrypt(blockedNumber.normalizedNumber)
+    if (!blockedNumber.number.isPhoneNumber() || !PhoneFromUtilCommon.isNumeric(blockedNumber.number)) {
+        val decryptResult = AESCommon.decrypt(blockedNumber.number)
         if (decryptResult.isPhoneNumber()) {
             showNumber = PhoneUtilsCommon.phoneConvert(decryptResult)
         }