From 5c09cf923d0106bf569b66590f26fac30f5fe072 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Mon, 19 Apr 2021 15:27:26 -0400 Subject: [PATCH 1/3] hidde unused menu items in ProfileSettingsFragment --- src/org/thoughtcrime/securesms/ProfileSettingsFragment.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java b/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java index 0f9192084..f989f6ea5 100644 --- a/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java +++ b/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java @@ -250,6 +250,9 @@ public class ProfileSettingsFragment extends Fragment mode.getMenuInflater().inflate(R.menu.profile_context, menu); DcChat dcChat = dcContext.getChat(chatId); menu.findItem(R.id.delete).setVisible(!dcChat.isMailingList()); + menu.findItem(R.id.details).setVisible(false); + menu.findItem(R.id.show_in_chat).setVisible(false); + menu.findItem(R.id.save).setVisible(false); mode.setTitle("1"); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { From 737498252476d207d0e8aa4a7c44d4306d3d3f6c Mon Sep 17 00:00:00 2001 From: adbenitez Date: Mon, 19 Apr 2021 16:53:13 -0400 Subject: [PATCH 2/3] add share item in gallery selection menu --- res/menu/profile_context.xml | 5 +++++ src/org/thoughtcrime/securesms/MessageSelectorFragment.java | 4 ++++ src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java | 1 + src/org/thoughtcrime/securesms/ProfileGalleryFragment.java | 4 ++++ src/org/thoughtcrime/securesms/ProfileSettingsFragment.java | 1 + 5 files changed, 15 insertions(+) diff --git a/res/menu/profile_context.xml b/res/menu/profile_context.xml index aa68f333b..de29350f3 100644 --- a/res/menu/profile_context.xml +++ b/res/menu/profile_context.xml @@ -10,6 +10,11 @@ android:icon="@drawable/ic_delete_white_24dp" app:showAsAction="always"/> + + diff --git a/src/org/thoughtcrime/securesms/MessageSelectorFragment.java b/src/org/thoughtcrime/securesms/MessageSelectorFragment.java index 08727fb79..3deae3d04 100644 --- a/src/org/thoughtcrime/securesms/MessageSelectorFragment.java +++ b/src/org/thoughtcrime/securesms/MessageSelectorFragment.java @@ -91,4 +91,8 @@ public abstract class MessageSelectorFragment intent.putExtra(ConversationActivity.STARTING_POSITION_EXTRA, DcMsg.getMessagePosition(dcMsg, dcContext)); startActivity(intent); } + + protected void handleShare(final DcMsg dcMsg) { + dcContext.openForViewOrShare(getContext(), dcMsg.getId(), Intent.ACTION_SEND); + } } diff --git a/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java b/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java index 3fc8a1ed1..890852850 100644 --- a/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java +++ b/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java @@ -177,6 +177,7 @@ public class ProfileDocumentsFragment menu.findItem(R.id.details).setVisible(singleSelection); menu.findItem(R.id.show_in_chat).setVisible(singleSelection); menu.findItem(R.id.save).setVisible(singleSelection); + menu.findItem(R.id.share).setVisible(false); } private ProfileDocumentsAdapter getListAdapter() { diff --git a/src/org/thoughtcrime/securesms/ProfileGalleryFragment.java b/src/org/thoughtcrime/securesms/ProfileGalleryFragment.java index 771766eff..57277701b 100644 --- a/src/org/thoughtcrime/securesms/ProfileGalleryFragment.java +++ b/src/org/thoughtcrime/securesms/ProfileGalleryFragment.java @@ -189,6 +189,7 @@ public class ProfileGalleryFragment menu.findItem(R.id.details).setVisible(singleSelection); menu.findItem(R.id.show_in_chat).setVisible(singleSelection); menu.findItem(R.id.save).setVisible(singleSelection); + menu.findItem(R.id.share).setVisible(singleSelection); } private ProfileGalleryAdapter getListAdapter() { @@ -229,6 +230,9 @@ public class ProfileGalleryFragment handleDeleteMessages(getListAdapter().getSelectedMedia()); mode.finish(); return true; + case R.id.share: + handleShare(getSelectedMessageRecord(getListAdapter().getSelectedMedia())); + return true; case R.id.show_in_chat: handleShowInChat(getSelectedMessageRecord(getListAdapter().getSelectedMedia())); return true; diff --git a/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java b/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java index f989f6ea5..5c556dc8a 100644 --- a/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java +++ b/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java @@ -253,6 +253,7 @@ public class ProfileSettingsFragment extends Fragment menu.findItem(R.id.details).setVisible(false); menu.findItem(R.id.show_in_chat).setVisible(false); menu.findItem(R.id.save).setVisible(false); + menu.findItem(R.id.share).setVisible(false); mode.setTitle("1"); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { From 6db123e82edf577a944b62085c4f6a17a069f4a7 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Mon, 19 Apr 2021 18:59:37 -0400 Subject: [PATCH 3/3] allow to share document in Document profile tab --- src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java b/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java index 890852850..a52b34f8e 100644 --- a/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java +++ b/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java @@ -177,7 +177,7 @@ public class ProfileDocumentsFragment menu.findItem(R.id.details).setVisible(singleSelection); menu.findItem(R.id.show_in_chat).setVisible(singleSelection); menu.findItem(R.id.save).setVisible(singleSelection); - menu.findItem(R.id.share).setVisible(false); + menu.findItem(R.id.share).setVisible(singleSelection); } private ProfileDocumentsAdapter getListAdapter() { @@ -218,6 +218,9 @@ public class ProfileDocumentsFragment handleDeleteMessages(getListAdapter().getSelectedMedia()); mode.finish(); return true; + case R.id.share: + handleShare(getSelectedMessageRecord(getListAdapter().getSelectedMedia())); + return true; case R.id.show_in_chat: handleShowInChat(getSelectedMessageRecord(getListAdapter().getSelectedMedia())); return true;