TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only show call button when we've got a conversation recipient.

Browse Source
This commit is contained in:
Moxie Marlinspike 2012-08-07 19:03:28 -07:00
parent 5fb7ae7ecf
commit f4de6c8d84
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/menu/conversation.xml
View File

@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:title="Call"
android:id="@+id/menu_call"
android:icon="@drawable/ic_menu_call"
android:showAsAction="ifRoom" />
<item android:title="Add attachment" <item android:title="Add attachment"
android:id="@+id/menu_add_attachment" android:id="@+id/menu_add_attachment"
android:icon="@drawable/ic_menu_attach" /> android:icon="@drawable/ic_menu_attach" />

10
res/menu/conversation_callable.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:title="Call"
android:id="@+id/menu_call"
android:icon="@drawable/ic_menu_call"
android:showAsAction="ifRoom" />
</menu>

20
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -197,6 +197,10 @@ public class ConversationActivity extends SherlockFragmentActivity
inflater.inflate(R.menu.conversation_insecure, menu); inflater.inflate(R.menu.conversation_insecure, menu);
} }
if (isSingleConversation()) {
inflater.inflate(R.menu.conversation_callable, menu);
}
inflater.inflate(R.menu.conversation, menu); inflater.inflate(R.menu.conversation, menu);
super.onPrepareOptionsMenu(menu); super.onPrepareOptionsMenu(menu);
return true; return true;
@ -206,14 +210,14 @@ public class ConversationActivity extends SherlockFragmentActivity
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.menu_call: handleDial(recipients.getPrimaryRecipient()); return true; case R.id.menu_call: handleDial(getRecipients().getPrimaryRecipient()); return true;
case R.id.menu_delete_thread: handleDeleteThread(); return true; case R.id.menu_delete_thread: handleDeleteThread(); return true;
case R.id.menu_add_attachment: handleAddAttachment(); return true; case R.id.menu_add_attachment: handleAddAttachment(); return true;
case R.id.menu_start_secure_session: handleStartSecureSession(); return true; case R.id.menu_start_secure_session: handleStartSecureSession(); return true;
case R.id.menu_abort_session: handleAbortSecureSession(); return true; case R.id.menu_abort_session: handleAbortSecureSession(); return true;
case R.id.menu_verify_recipient: handleVerifyRecipient(); return true; case R.id.menu_verify_recipient: handleVerifyRecipient(); return true;
case R.id.menu_verify_session: handleVerifySession(); return true; case R.id.menu_verify_session: handleVerifySession(); return true;
case android.R.id.home: finish(); return true; case android.R.id.home: finish(); return true;
} }
return false; return false;