Commit 8af9c605 by zhangchengbo

fix:优化代码,解密交由[拨号器]实现

parent eb512e00
...@@ -269,19 +269,15 @@ class NewConversationActivity : SimpleActivity() { ...@@ -269,19 +269,15 @@ class NewConversationActivity : SimpleActivity() {
// Log.d(TAG, "NewConversationActivity--phoneNumber:$phoneNumber threadId:${getThreadId(numbers)} numbers:${numbers} text:$text name = $name nameResult = $nameResult") // Log.d(TAG, "NewConversationActivity--phoneNumber:$phoneNumber threadId:${getThreadId(numbers)} numbers:${numbers} text:$text name = $name nameResult = $nameResult")
val threadTitle = intent.getStringExtra(THREAD_TITLE) val threadTitle = intent.getStringExtra(THREAD_TITLE)
// android.util.Log.d(TAG, "NewConversationActivity threadTitle = ${threadTitle} numbers = $numbers number = ${number} name = $name") android.util.Log.d(TAG, "NewConversationActivity threadTitle = $threadTitle numbers = $numbers number = ${number} name = $name")
Intent(this, ThreadActivity::class.java).apply { Intent(this, ThreadActivity::class.java).apply {
putExtra(THREAD_ID, getThreadId(numbers)) putExtra(THREAD_ID, getThreadId(numbers))
if (name.isNotEmpty()) { if (name.isNotEmpty()) {
putExtra(THREAD_TITLE, name) putExtra(THREAD_TITLE, name)
} else { } else {
if (AES.decrypt(threadTitle).isNotEmpty()) {
putExtra(THREAD_TITLE, AES.decrypt(threadTitle))
} else {
putExtra(THREAD_TITLE, threadTitle) putExtra(THREAD_TITLE, threadTitle)
} }
}
putExtra(THREAD_TEXT, text) putExtra(THREAD_TEXT, text)
putExtra(THREAD_NUMBER, number) putExtra(THREAD_NUMBER, number)
if (intent.action == Intent.ACTION_SEND && intent.extras?.containsKey(Intent.EXTRA_STREAM) == true) { if (intent.action == Intent.ACTION_SEND && intent.extras?.containsKey(Intent.EXTRA_STREAM) == true) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment