more refactoring, declare abstract setCorrectMenuVisibility() and move getSelectedMessageRecord() to MessageSelectorFragment

This commit is contained in:
adbenitez
2021-04-15 12:33:43 -04:00
parent 7313c6d521
commit 55837fb9b4
4 changed files with 25 additions and 35 deletions
@@ -314,7 +314,8 @@ public class ConversationFragment extends MessageSelectorFragment
}
}
private void setCorrectMenuVisibility(Menu menu) {
@Override
protected void setCorrectMenuVisibility(Menu menu) {
Set<DcMsg> messageRecords = getListAdapter().getSelectedItems();
if (actionMode != null && messageRecords.size() == 0) {
@@ -359,13 +360,6 @@ public class ConversationFragment extends MessageSelectorFragment
return (ConversationAdapter) list.getAdapter();
}
private DcMsg getSelectedMessageRecord() {
Set<DcMsg> messageRecords = getListAdapter().getSelectedItems();
if (messageRecords.size() == 1) return messageRecords.iterator().next();
else throw new AssertionError();
}
public void reload(Recipient recipient, long chatId) {
this.recipient = recipient;
@@ -888,10 +882,10 @@ public class ConversationFragment extends MessageSelectorFragment
handleDeleteMessages(getListAdapter().getSelectedItems());
return true;
case R.id.menu_context_share:
dcContext.openForViewOrShare(getContext(), getSelectedMessageRecord().getId(), Intent.ACTION_SEND);
dcContext.openForViewOrShare(getContext(), getSelectedMessageRecord(getListAdapter().getSelectedItems()).getId(), Intent.ACTION_SEND);
return true;
case R.id.menu_context_details:
handleDisplayDetails(getSelectedMessageRecord());
handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
actionMode.finish();
return true;
case R.id.menu_context_forward:
@@ -899,14 +893,14 @@ public class ConversationFragment extends MessageSelectorFragment
actionMode.finish();
return true;
case R.id.menu_context_save_attachment:
handleSaveAttachment(getSelectedMessageRecord());
handleSaveAttachment(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
return true;
case R.id.menu_context_reply:
handleReplyMessage(getSelectedMessageRecord());
handleReplyMessage(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
actionMode.finish();
return true;
case R.id.menu_context_reply_privately:
handleReplyMessagePrivately(getSelectedMessageRecord());
handleReplyMessagePrivately(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
return true;
}
@@ -5,6 +5,7 @@ import android.content.Intent;
import android.net.Uri;
import android.os.AsyncTask;
import android.text.util.Linkify;
import android.view.Menu;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.view.ActionMode;
@@ -23,6 +24,13 @@ public abstract class MessageSelectorFragment extends Fragment
protected ActionMode actionMode;
protected ApplicationDcContext dcContext;
protected abstract void setCorrectMenuVisibility(Menu menu);
protected DcMsg getSelectedMessageRecord(Set<DcMsg> messageRecords) {
if (messageRecords.size() == 1) return messageRecords.iterator().next();
else throw new AssertionError();
}
protected void handleDisplayDetails(DcMsg dcMsg) {
String infoStr = dcContext.getMsgInfo(dcMsg.getId());
AlertDialog d = new AlertDialog.Builder(getActivity())
@@ -165,14 +165,8 @@ public class ProfileDocumentsFragment
}
}
private DcMsg getSelectedMessageRecord() {
Set<DcMsg> messageRecords = getListAdapter().getSelectedMedia();
if (messageRecords.size() == 1) return messageRecords.iterator().next();
else throw new AssertionError();
}
private void setCorrectMenuVisibility(Menu menu) {
@Override
protected void setCorrectMenuVisibility(Menu menu) {
Set<DcMsg> messageRecords = getListAdapter().getSelectedMedia();
if (actionMode != null && messageRecords.size() == 0) {
@@ -217,7 +211,7 @@ public class ProfileDocumentsFragment
public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
switch (menuItem.getItemId()) {
case R.id.details:
handleDisplayDetails(getSelectedMessageRecord());
handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
mode.finish();
return true;
case R.id.delete:
@@ -225,10 +219,10 @@ public class ProfileDocumentsFragment
mode.finish();
return true;
case R.id.show_in_chat:
handleShowInChat(getSelectedMessageRecord());
handleShowInChat(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
return true;
case R.id.save:
handleSaveAttachment(getSelectedMessageRecord());
handleSaveAttachment(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
return true;
}
return false;
@@ -177,14 +177,8 @@ public class ProfileGalleryFragment
}
}
private DcMsg getSelectedMessageRecord() {
Set<DcMsg> messageRecords = getListAdapter().getSelectedMedia();
if (messageRecords.size() == 1) return messageRecords.iterator().next();
else throw new AssertionError();
}
private void setCorrectMenuVisibility(Menu menu) {
@Override
protected void setCorrectMenuVisibility(Menu menu) {
Set<DcMsg> messageRecords = getListAdapter().getSelectedMedia();
if (actionMode != null && messageRecords.size() == 0) {
@@ -229,7 +223,7 @@ public class ProfileGalleryFragment
public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
switch (menuItem.getItemId()) {
case R.id.details:
handleDisplayDetails(getSelectedMessageRecord());
handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
mode.finish();
return true;
case R.id.delete:
@@ -237,10 +231,10 @@ public class ProfileGalleryFragment
mode.finish();
return true;
case R.id.show_in_chat:
handleShowInChat(getSelectedMessageRecord());
handleShowInChat(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
return true;
case R.id.save:
handleSaveAttachment(getSelectedMessageRecord());
handleSaveAttachment(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
return true;
}
return false;