Commit 20b6b94d by zhangchengbo

fix:短信界面添加拨打电话功能

parent f80909cd
...@@ -265,7 +265,7 @@ class ThreadActivity : SimpleActivity() { ...@@ -265,7 +265,7 @@ class ThreadActivity : SimpleActivity() {
findItem(R.id.block_number).title = findItem(R.id.block_number).title =
if (blockedNumbers.isNotEmpty() && isContainsNumber) addLockedLabelIfNeeded(R.string.remove_block_number) else addLockedLabelIfNeeded(R.string.join_block_number) if (blockedNumbers.isNotEmpty() && isContainsNumber) addLockedLabelIfNeeded(R.string.remove_block_number) else addLockedLabelIfNeeded(R.string.join_block_number)
findItem(R.id.block_number).isVisible = isNougatPlus() && !isSFNumber findItem(R.id.block_number).isVisible = isNougatPlus() && !isSFNumber
findItem(R.id.dial_number).isVisible = /*participants.size == 1 && !isSpecialNumber() && !isRecycleBin*/ false findItem(R.id.dial_number).isVisible = participants.size == 1 && !isSpecialNumber() && !isRecycleBin
findItem(R.id.manage_people).isVisible = /*!isSpecialNumber() && !isRecycleBin */false findItem(R.id.manage_people).isVisible = /*!isSpecialNumber() && !isRecycleBin */false
findItem(R.id.mark_as_unread).isVisible = /*threadItems.isNotEmpty() && !isRecycleBin*/ false findItem(R.id.mark_as_unread).isVisible = /*threadItems.isNotEmpty() && !isRecycleBin*/ false
...@@ -303,13 +303,15 @@ class ThreadActivity : SimpleActivity() { ...@@ -303,13 +303,15 @@ class ThreadActivity : SimpleActivity() {
tryBlocking(isSFNumber) tryBlocking(isSFNumber)
} }
refreshMenuItems()//不刷新 黑名单的状态不正确 refreshMenuItems()//不刷新 黑名单的状态不正确
}/* R.id.restore -> askConfirmRestoreAll() }
R.id.dial_number -> dialNumber()
/* R.id.restore -> askConfirmRestoreAll()
R.id.archive -> archiveConversation() R.id.archive -> archiveConversation()
R.id.unarchive -> unarchiveConversation() R.id.unarchive -> unarchiveConversation()
R.id.rename_conversation -> renameConversation() R.id.rename_conversation -> renameConversation()
R.id.conversation_details -> showConversationDetails() R.id.conversation_details -> showConversationDetails()
R.id.add_number_to_contact -> addNumberToContact() R.id.add_number_to_contact -> addNumberToContact()
R.id.dial_number -> dialNumber()
R.id.manage_people -> managePeople() R.id.manage_people -> managePeople()
R.id.mark_as_unread -> markAsUnread()*/ R.id.mark_as_unread -> markAsUnread()*/
else -> return@setOnMenuItemClickListener false else -> return@setOnMenuItemClickListener false
......
...@@ -35,7 +35,7 @@ fun SimpleActivity.startCallIntent(recipient: String) { ...@@ -35,7 +35,7 @@ fun SimpleActivity.startCallIntent(recipient: String) {
fun Activity.dialNumber(phoneNumber: String, callback: (() -> Unit)? = null) { fun Activity.dialNumber(phoneNumber: String, callback: (() -> Unit)? = null) {
hideKeyboard() hideKeyboard()
Intent(Intent.ACTION_DIAL).apply { Intent(Intent.ACTION_CALL).apply {
data = Uri.fromParts("tel", phoneNumber, null) data = Uri.fromParts("tel", phoneNumber, null)
try { try {
......
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