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

Disable forwarding for shared contacts.

Browse Source 
Forwarding of shared contacts currently just creates an empty draft.
You can't preview a shared contact before you send, which would make the
forwarding flow inconsistent across media types. So it's easier to just
hide it for now.

Fixes #8195
This commit is contained in:
Greyson Parrelli 2018-09-16 22:48:57 -07:00
parent 5d11e321a8
commit 1d4020ffc6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/org/thoughtcrime/securesms/ConversationFragment.java
View File

@ -242,6 +242,7 @@ public class ConversationFragment extends Fragment
Set<MessageRecord> messageRecords = getListAdapter().getSelectedItems(); Set<MessageRecord> messageRecords = getListAdapter().getSelectedItems();
boolean actionMessage = false; boolean actionMessage = false;
boolean hasText = false; boolean hasText = false;
boolean sharedContact = false;
if (actionMode != null && messageRecords.size() == 0) { if (actionMode != null && messageRecords.size() == 0) {
actionMode.finish(); actionMode.finish();
@ -256,11 +257,13 @@ public class ConversationFragment extends Fragment
{ {
actionMessage = true; actionMessage = true;
} }
if (messageRecord.getBody().length() > 0) { if (messageRecord.getBody().length() > 0) {
hasText = true; hasText = true;
} }
if (actionMessage && hasText) {
break; if (messageRecord.isMms() && !((MmsMessageRecord) messageRecord).getSharedContacts().isEmpty()) {
sharedContact = true;
} }
} }
@ -279,7 +282,7 @@ public class ConversationFragment extends Fragment
!messageRecord.isMmsNotification() && !messageRecord.isMmsNotification() &&
((MediaMmsMessageRecord)messageRecord).containsMediaSlide()); ((MediaMmsMessageRecord)messageRecord).containsMediaSlide());
menu.findItem(R.id.menu_context_forward).setVisible(!actionMessage); menu.findItem(R.id.menu_context_forward).setVisible(!actionMessage && !sharedContact);
menu.findItem(R.id.menu_context_details).setVisible(!actionMessage); menu.findItem(R.id.menu_context_details).setVisible(!actionMessage);
menu.findItem(R.id.menu_context_reply).setVisible(!actionMessage && menu.findItem(R.id.menu_context_reply).setVisible(!actionMessage &&
!messageRecord.isPending() && !messageRecord.isPending() &&