Skip to content

Commit

Permalink
Support for multi-select in the conversation list.
Browse files Browse the repository at this point in the history 
// FREEBIE

Closes #1601
  • Loading branch information
@moxie0
moxie0 committed Dec 29, 2014
1 parent 25028b7 commit 57a49f2
Show file tree
Hide file tree
Showing 5 changed files with 229 additions and 116 deletions.
4 changes: 3 additions & 1 deletion res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nSent/Received: %2$s</string>
<string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Sender: %1$s\nTransport: %2$s\nSent: %3$s\nReceived: %4$s</string>
<string name="ConversationFragment_confirm_message_delete">Confirm message delete</string>
<string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Are you sure that you want to permanently delete this message?</string>
<string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Are you sure that you want to permanently delete all selected messages?</string>
<string name="ConversationFragment_save_to_sd_card">Save to storage?</string>
<string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Saving this media to storage will allow any other apps on your phone to access it.\n\nContinue?</string>
<string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Error while saving attachment to storage!</string>
Expand All @@ -130,6 +130,8 @@
<string name="ConversationFragment_push">PUSH</string>
<string name="ConversationFragment_mms">MMS</string>
<string name="ConversationFragment_sms">SMS</string>
<string name="ConversationFragment_deleting">Deleting...</string>
<string name="ConversationFragment_deleting_messages">Deleting messages...</string>

<!-- ConversationListFragment -->
<string name="ConversationListFragment_delete_threads_question">Delete threads?</string>
Expand Down
37 changes: 29 additions & 8 deletions src/org/thoughtcrime/securesms/ConversationAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@

import java.lang.ref.SoftReference;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

import org.thoughtcrime.securesms.ConversationFragment.SelectionClickListener;

/**
* A cursor adapter for a conversation thread. Ultimately
Expand All @@ -55,19 +59,23 @@ public class ConversationAdapter extends CursorAdapter implements AbsListView.Re
public static final int MESSAGE_TYPE_INCOMING = 1;
public static final int MESSAGE_TYPE_GROUP_ACTION = 2;

private final Handler failedIconClickHandler;
private final Context context;
private final MasterSecret masterSecret;
private final boolean groupThread;
private final boolean pushDestination;
private final LayoutInflater inflater;
private final Set<MessageRecord> batchSelected = Collections.synchronizedSet(new HashSet<MessageRecord>());

private final SelectionClickListener selectionClickListener;
private final Handler failedIconClickHandler;
private final Context context;
private final MasterSecret masterSecret;
private final boolean groupThread;
private final boolean pushDestination;
private final LayoutInflater inflater;

public ConversationAdapter(Context context, MasterSecret masterSecret,
public ConversationAdapter(Context context, MasterSecret masterSecret, SelectionClickListener selectionClickListener,
Handler failedIconClickHandler, boolean groupThread, boolean pushDestination)
{
super(context, null, 0);
this.context = context;
this.masterSecret = masterSecret;
this.selectionClickListener = selectionClickListener;
this.failedIconClickHandler = failedIconClickHandler;
this.groupThread = groupThread;
this.pushDestination = pushDestination;
Expand All @@ -81,7 +89,8 @@ public void bindView(View view, Context context, Cursor cursor) {
String type = cursor.getString(cursor.getColumnIndexOrThrow(MmsSmsDatabase.TRANSPORT));
MessageRecord messageRecord = getMessageRecord(id, cursor, type);

item.set(masterSecret, messageRecord, failedIconClickHandler, groupThread, pushDestination);
item.set(masterSecret, messageRecord, batchSelected, selectionClickListener,
failedIconClickHandler, groupThread, pushDestination);
}

@Override
Expand Down Expand Up @@ -158,6 +167,18 @@ public void close() {
this.getCursor().close();
}

public void toggleBatchSelected(MessageRecord messageRecord) {
if (batchSelected.contains(messageRecord)) {
batchSelected.remove(messageRecord);
} else {
batchSelected.add(messageRecord);
}
}

public Set<MessageRecord> getBatchSelected() {
return batchSelected;
}

@Override
public void onMovedToScrapHeap(View view) {
((ConversationItem)view).unbind();
Expand Down
165 changes: 102 additions & 63 deletions src/org/thoughtcrime/securesms/ConversationFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,23 @@
import org.thoughtcrime.securesms.util.Dialogs;
import org.thoughtcrime.securesms.util.DirectoryHelper;
import org.thoughtcrime.securesms.util.FutureTaskListener;
import org.thoughtcrime.securesms.util.ProgressDialogAsyncTask;
import org.thoughtcrime.securesms.util.SaveAttachmentTask;
import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;

import java.sql.Date;
import java.text.SimpleDateFormat;
import java.util.LinkedList;
import java.util.List;

public class ConversationFragment extends ListFragment
implements LoaderManager.LoaderCallbacks<Cursor>
{
private static final String TAG = ConversationFragment.class.getSimpleName();

private final ActionModeCallback actionModeCallback = new ActionModeCallback();
private final SelectionClickListener selectionClickListener = new SelectionClickListener();

private ConversationFragmentListener listener;

private MasterSecret masterSecret;
Expand Down Expand Up @@ -96,7 +102,7 @@ private void initializeResources() {

private void initializeListAdapter() {
if (this.recipients != null && this.threadId != -1) {
this.setListAdapter(new ConversationAdapter(getActivity(), masterSecret,
this.setListAdapter(new ConversationAdapter(getActivity(), masterSecret, selectionClickListener,
new FailedIconClickHandler(),
(!this.recipients.isSingleRecipient()) || this.recipients.isGroupRecipient(),
DirectoryHelper.isPushDestination(getActivity(), this.recipients)));
Expand All @@ -106,49 +112,50 @@ private void initializeListAdapter() {
}

private void initializeContextualActionBar() {
getListView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
@Override
public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
if (actionMode != null) {
view.setSelected(true);
return false;
}

actionMode = ((ActionBarActivity)getActivity()).startSupportActionMode(actionModeCallback);
view.setSelected(true);
return true;
}
});

getListView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
if (actionMode != null) {
view.setSelected(true);
setCorrectMenuVisibility(getMessageRecord(), actionMode.getMenu());
}
}
});
getListView().setOnItemClickListener(selectionClickListener);
getListView().setOnItemLongClickListener(selectionClickListener);
}

private void setCorrectMenuVisibility(MessageRecord messageRecord, Menu menu) {
MenuItem resend = menu.findItem(R.id.menu_context_resend);
MenuItem saveAttachment = menu.findItem(R.id.menu_context_save_attachment);
private void setCorrectMenuVisibility(Menu menu) {
ConversationAdapter adapter = (ConversationAdapter) getListAdapter();
List<MessageRecord> messageRecords = getSelectedMessageRecords();

if (messageRecord.isFailed()) resend.setVisible(true);
else resend.setVisible(false);
if (actionMode != null && messageRecords.size() == 0) {
adapter.getBatchSelected().clear();
adapter.notifyDataSetChanged();
actionMode.finish();
return;
}

if (messageRecord.isMms() && !messageRecord.isMmsNotification()) {
saveAttachment.setVisible(((MediaMmsMessageRecord)messageRecord).containsMediaSlide());
if (messageRecords.size() > 1) {
menu.findItem(R.id.menu_context_forward).setVisible(false);
menu.findItem(R.id.menu_context_copy).setVisible(false);
menu.findItem(R.id.menu_context_details).setVisible(false);
menu.findItem(R.id.menu_context_save_attachment).setVisible(false);
menu.findItem(R.id.menu_context_resend).setVisible(false);
} else {
saveAttachment.setVisible(false);
MessageRecord messageRecord = messageRecords.get(0);

menu.findItem(R.id.menu_context_resend).setVisible(messageRecord.isFailed());
menu.findItem(R.id.menu_context_save_attachment).setVisible(messageRecord.isMms() &&
!messageRecord.isMmsNotification() &&
((MediaMmsMessageRecord)messageRecord).containsMediaSlide());

menu.findItem(R.id.menu_context_forward).setVisible(true);
menu.findItem(R.id.menu_context_details).setVisible(true);
menu.findItem(R.id.menu_context_copy).setVisible(true);
}
}

private MessageRecord getMessageRecord() {
Cursor cursor = ((CursorAdapter)getListAdapter()).getCursor();
ConversationItem conversationItem = (ConversationItem)(((ConversationAdapter)getListAdapter()).newView(getActivity(), cursor, null));
return conversationItem.getMessageRecord();
private MessageRecord getSelectedMessageRecord() {
List<MessageRecord> messageRecords = getSelectedMessageRecords();

if (messageRecords.size() == 1) return messageRecords.get(0);
else throw new AssertionError();
}

private List<MessageRecord> getSelectedMessageRecords() {
return new LinkedList<>(((ConversationAdapter)getListAdapter()).getBatchSelected());
}

public void reload(Recipients recipients, long threadId) {
Expand Down Expand Up @@ -177,23 +184,32 @@ private void handleCopyMessage(MessageRecord message) {
clipboard.setText(body);
}

private void handleDeleteMessage(final MessageRecord message) {
final long messageId = message.getId();

private void handleDeleteMessages(final List<MessageRecord> messageRecords) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(R.string.ConversationFragment_confirm_message_delete);
builder.setIcon(Dialogs.resolveIcon(getActivity(), R.attr.dialog_alert_icon));
builder.setCancelable(true);
builder.setMessage(R.string.ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message);

builder.setMessage(R.string.ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages);
builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (message.isMms()) {
DatabaseFactory.getMmsDatabase(getActivity()).delete(messageId);
} else {
DatabaseFactory.getSmsDatabase(getActivity()).deleteMessage(messageId);
}
new ProgressDialogAsyncTask<MessageRecord, Void, Void>(getActivity(),
R.string.ConversationFragment_deleting,
R.string.ConversationFragment_deleting_messages)
{
@Override
protected Void doInBackground(MessageRecord... messageRecords) {
for (MessageRecord messageRecord : messageRecords) {
if (messageRecord.isMms()) {
DatabaseFactory.getMmsDatabase(getActivity()).delete(messageRecord.getId());
} else {
DatabaseFactory.getSmsDatabase(getActivity()).deleteMessage(messageRecord.getId());
}
}

return null;
}
}.execute(messageRecords.toArray(new MessageRecord[messageRecords.size()]));
}
});

Expand Down Expand Up @@ -312,16 +328,43 @@ public interface ConversationFragmentListener {
public void setComposeText(String text);
}

private ActionMode.Callback actionModeCallback = new ActionMode.Callback() {
public class SelectionClickListener
implements AdapterView.OnItemLongClickListener, AdapterView.OnItemClickListener
{
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
if (actionMode != null && view instanceof ConversationItem) {
MessageRecord messageRecord = ((ConversationItem)view).getMessageRecord();
((ConversationAdapter) getListAdapter()).toggleBatchSelected(messageRecord);
((ConversationAdapter) getListAdapter()).notifyDataSetChanged();

setCorrectMenuVisibility(actionMode.getMenu());
}
}

@Override
public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
if (actionMode == null && view instanceof ConversationItem) {
MessageRecord messageRecord = ((ConversationItem)view).getMessageRecord();
((ConversationAdapter) getListAdapter()).toggleBatchSelected(messageRecord);
((ConversationAdapter) getListAdapter()).notifyDataSetChanged();

actionMode = ((ActionBarActivity)getActivity()).startSupportActionMode(actionModeCallback);
return true;
}

return false;
}
}

private class ActionModeCallback implements ActionMode.Callback {

@Override
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
MenuInflater inflater = mode.getMenuInflater();
inflater.inflate(R.menu.conversation_context, menu);

MessageRecord messageRecord = getMessageRecord();
setCorrectMenuVisibility(messageRecord, menu);

setCorrectMenuVisibility(menu);
return true;
}

Expand All @@ -332,41 +375,37 @@ public boolean onPrepareActionMode(ActionMode actionMode, Menu menu) {

@Override
public void onDestroyActionMode(ActionMode mode) {
if (getListView() != null && getListView().getChildCount() > 0) {
for (int i = 0; i < getListView().getChildCount(); i++){
getListView().getChildAt(i).setSelected(false);
}
}
((ConversationAdapter)getListAdapter()).getBatchSelected().clear();
((ConversationAdapter)getListAdapter()).notifyDataSetChanged();

actionMode = null;
}

@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
MessageRecord messageRecord = getMessageRecord();

switch(item.getItemId()) {
case R.id.menu_context_copy:
handleCopyMessage(messageRecord);
handleCopyMessage(getSelectedMessageRecord());
actionMode.finish();
return true;
case R.id.menu_context_delete_message:
handleDeleteMessage(messageRecord);
handleDeleteMessages(getSelectedMessageRecords());
actionMode.finish();
return true;
case R.id.menu_context_details:
handleDisplayDetails(messageRecord);
handleDisplayDetails(getSelectedMessageRecord());
actionMode.finish();
return true;
case R.id.menu_context_forward:
handleForwardMessage(messageRecord);
handleForwardMessage(getSelectedMessageRecord());
actionMode.finish();
return true;
case R.id.menu_context_resend:
handleResendMessage(messageRecord);
handleResendMessage(getSelectedMessageRecord());
actionMode.finish();
return true;
case R.id.menu_context_save_attachment:
handleSaveAttachment((MediaMmsMessageRecord)messageRecord);
handleSaveAttachment((MediaMmsMessageRecord)getSelectedMessageRecord());
actionMode.finish();
return true;
}
Expand Down
Loading

0 comments on commit 57a49f2

Please sign in to comment.