From 35d31d4cfbaca2f68ffe46dc1d4899d1cd996d38 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 28 Sep 2018 15:57:43 +0200 Subject: [PATCH] remove phone icon from chat view --- .../securesms/ConversationActivity.java | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index 8983a4f6d..78f0094eb 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -509,10 +509,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } } - if (isSingleConversation()) { - if (isSecureText) inflater.inflate(R.menu.conversation_callable_secure, menu); - else inflater.inflate(R.menu.conversation_callable_insecure, menu); - } else if (isGroupConversation()) { + if (isGroupConversation()) { inflater.inflate(R.menu.conversation_group_options, menu); if (!isPushGroupConversation()) { @@ -550,8 +547,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity public boolean onOptionsItemSelected(MenuItem item) { super.onOptionsItemSelected(item); switch (item.getItemId()) { - case R.id.menu_call_secure: - case R.id.menu_call_insecure: handleDial(getRecipient()); return true; case R.id.menu_add_attachment: handleAddAttachment(); return true; case R.id.menu_view_media: handleViewMedia(); return true; case R.id.menu_add_to_contacts: handleAddToContacts(); return true; @@ -803,25 +798,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } } - private void handleDial(final Recipient recipient) { - if (recipient == null) return; - - if (isSecureText) { - CommunicationActions.startVoiceCall(this, recipient); - } else { - try { - Intent dialIntent = new Intent(Intent.ACTION_DIAL, - Uri.parse("tel:" + recipient.getAddress().serialize())); - startActivity(dialIntent); - } catch (ActivityNotFoundException anfe) { - Log.w(TAG, anfe); - Dialogs.showAlertDialog(this, - getString(R.string.ConversationActivity_calls_not_supported), - getString(R.string.ConversationActivity_this_device_does_not_appear_to_support_dial_actions)); - } - } - } - private void handleDisplayGroupRecipients() { //TODO: i think this button is not needed and the group options just go to the profile //new GroupMembersDialog(this, getRecipient()).display();