diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java index 8883b61f6..cdd31e0a8 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java @@ -526,6 +526,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } else if (itemId == R.id.menu_show_map) { WebxdcActivity.openMaps(this, chatId); return true; + } else if (itemId == R.id.menu_show_apps) { + handleProfile(true); + return true; } else if (itemId == R.id.menu_search_up) { handleMenuSearchNext(false); return true; @@ -606,10 +609,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } } - private void handleProfile() { + private void handleProfile(boolean showApps) { Intent intent = new Intent(this, ProfileActivity.class); intent.putExtra(ProfileActivity.CHAT_ID_EXTRA, chatId); intent.putExtra(ProfileActivity.FROM_CHAT, true); + if (showApps) { + intent.putExtra(ProfileActivity.FORCE_TAB_EXTRA, ProfileActivity.TAB_WEBXDC); + } startActivity(intent); overridePendingTransition(0, 0); } @@ -863,7 +869,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity buttonToggle.getBackground().invalidateSelf(); }); - titleView.setOnClickListener(v -> handleProfile()); + titleView.setOnClickListener(v -> handleProfile(false)); titleView.setOnBackClickedListener(view -> handleReturnToConversationList()); composeText.setOnKeyListener(composeKeyPressedListener); diff --git a/src/main/res/menu/conversation.xml b/src/main/res/menu/conversation.xml index 46be4a3a6..4e0088568 100644 --- a/src/main/res/menu/conversation.xml +++ b/src/main/res/menu/conversation.xml @@ -25,6 +25,11 @@ android:visible="false" app:showAsAction="always"/> + + @@ -34,7 +39,7 @@ + app:showAsAction="never" />