fix:1.手机号已经在电话簿里存在了，发送短信这里需要展示电话薄的名称 2.通话记录页面支持脱敏手机号发送短信

app/src/main/kotlin/com/secspace/sms/activities/NewConversationActivity.kt

@@ -7,7 +7,6 @@ import android.view.WindowManager
 import android.widget.Toast
 import com.google.gson.Gson
 import com.reddit.indicatorfastscroll.FastScrollItemIndicator
-import com.secspace.log.Log
 import com.secspace.sms.R
 import com.secspace.sms.adapters.ContactsAdapter
 import com.secspace.sms.databinding.ActivityNewConversationBinding
@@ -16,6 +15,7 @@ import com.secspace.sms.extensions.getSuggestedContacts
 import com.secspace.sms.extensions.getThreadId
 import com.secspace.sms.helpers.*
 import com.secspace.sms.messaging.isShortCodeWithLetters
+import com.secspace.sms.util.AES
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.*
@@ -29,6 +29,7 @@ class NewConversationActivity : SimpleActivity() {
     private var privateContacts = ArrayList<SimpleContact>()
 
     private val binding by viewBinding(ActivityNewConversationBinding::inflate)
+    private val TAG = "NewConversationActivity"
 
     override fun onCreate(savedInstanceState: Bundle?) {
         isMaterialActivity = true
@@ -263,11 +264,24 @@ class NewConversationActivity : SimpleActivity() {
         val text = intent.getStringExtra(Intent.EXTRA_TEXT) ?: intent.getStringExtra("sms_body") ?: ""
         val numbers = phoneNumber.split(";").toSet()
         val number = if (numbers.size == 1) phoneNumber else Gson().toJson(numbers)
-        Log.d("shuju", "--NewConversationActivity--phoneNumber:$phoneNumber  threadId：${getThreadId(numbers)}  numbers:${numbers}   text:$text ")
+
+//        val nameResult: NamePhoto = getNameAndPhotoFromPhoneNumber(phoneNumber)
+//        Log.d(TAG, "NewConversationActivity--phoneNumber:$phoneNumber  threadId：${getThreadId(numbers)}  numbers:${numbers}   text:$text  name = $name  nameResult = $nameResult")
+
+        val threadTitle = intent.getStringExtra(THREAD_TITLE)
+//        android.util.Log.d(TAG, "NewConversationActivity  threadTitle = ${threadTitle}  numbers = $numbers  number = ${number}  name = $name")
 
         Intent(this, ThreadActivity::class.java).apply {
             putExtra(THREAD_ID, getThreadId(numbers))
-            putExtra(THREAD_TITLE, name)
+            if (name.isNotEmpty()) {
+                putExtra(THREAD_TITLE, name)
+            } else {
+                if (AES.decrypt(threadTitle).isNotEmpty()) {
+                    putExtra(THREAD_TITLE, AES.decrypt(threadTitle))
+                } else {
+                    putExtra(THREAD_TITLE, threadTitle)
+                }
+            }
             putExtra(THREAD_TEXT, text)
             putExtra(THREAD_NUMBER, number)
             if (intent.action == Intent.ACTION_SEND && intent.extras?.containsKey(Intent.EXTRA_STREAM) == true) {

app/src/main/kotlin/com/secspace/sms/activities/ThreadActivity.kt

@@ -76,6 +76,7 @@ import java.io.InputStream
 import java.io.OutputStream
 
 class ThreadActivity : SimpleActivity() {
+    private val TAG = "ThreadActivity"
     private val MIN_DATE_TIME_DIFF_SECS = 300
 
     private val TYPE_EDIT = 14
@@ -138,12 +139,12 @@ class ThreadActivity : SimpleActivity() {
         threadId = intent.getLongExtra(THREAD_ID, 0L)
         intent.getStringExtra(THREAD_TITLE)?.let {
             binding.threadToolbar.title = it
-            android.util.Log.d("shuju", "ThreadActivity OnCreate  title = $it")
+//            android.util.Log.d(TAG, " OnCreate  title = $it")
         }
         isRecycleBin = intent.getBooleanExtra(IS_RECYCLE_BIN, false)
         wasProtectionHandled = intent.getBooleanExtra(WAS_PROTECTION_HANDLED, false)
 
-//        Log.d("shuju","----收到跳转信息---threadId：$threadId  THREAD_TITLE:${intent.getStringExtra(THREAD_TITLE)}   isRecycleBin:$isRecycleBin  wasProtectionHandled:$wasProtectionHandled   number:$number")
+//        Log.d(TAG,"OnCreate threadId：$threadId  THREAD_TITLE:${intent.getStringExtra(THREAD_TITLE)}   isRecycleBin:$isRecycleBin  wasProtectionHandled:$wasProtectionHandled  ")
         bus = EventBus.getDefault()
         bus!!.register(this)
 
@@ -426,18 +427,27 @@ class ThreadActivity : SimpleActivity() {
     }
 
     private fun setupThreadTitle() {
-        Log.d("shuju","--ThreadActivity--setupThreadTitle--  conversation:${Gson().toJson(conversation)}")
+//        Log.d(TAG,"--ThreadActivity--setupThreadTitle--  conversation:${Gson().toJson(conversation)}  binding.threadToolbar.title = ${binding.threadToolbar.title}")
+
+        if(binding.threadToolbar.title.isNotEmpty()) return
+
         val title = conversation?.title
+
         binding.threadToolbar.title = if (!title.isNullOrEmpty()) {
-            Log.d("shuju","--ThreadActivity--setupThreadTitle---1  THREAD_NUMBER:$title")
+//            Log.d(TAG,"--ThreadActivity--setupThreadTitle---1  THREAD_NUMBER:$title")
 //            "$title ${conversation?.phoneNumber}"
             title
         } else {
-            Log.d("shuju","--ThreadActivity--setupThreadTitle---2  THREAD_NUMBER:${intent.getStringExtra(THREAD_NUMBER)}")
+           val title =  intent.getStringExtra(THREAD_TITLE)
+            if(!title.isNullOrEmpty()){
+                binding.threadToolbar.title = title
+                return
+            }
+//            Log.d(TAG,"--ThreadActivity--setupThreadTitle---2  THREAD_NUMBER:${intent.getStringExtra(THREAD_NUMBER)}")
             val phoneNUmber  = intent.getStringExtra(THREAD_NUMBER)
-            phoneNUmber?.let {
+            /*phoneNUmber?.let {
                 binding.threadToolbar.title =it.replace(" ","")
-            }
+            }*/
 //            participants.getThreadTitle()
             phoneNUmber?.replace(" ","")
         }