empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #384 from meskio/383_batch_selection

Browse source 
Add deselect to batch selection mode
This commit is contained in:
Moxie Marlinspike 2013-10-20 16:59:41 -07:00
commit 798e3c0656
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/ConversationListAdapter.java
View file

@ -69,8 +69,12 @@ public class ConversationListAdapter extends CursorAdapter implements AbsListVie
} }
} }
public void addToBatchSet(long threadId) { public void toggleThreadInBatchSet(long threadId) {
batchSet.add(threadId); if (batchSet.contains(threadId)) {
batchSet.remove(threadId);
} else {
batchSet.add(threadId);
}
} }
public Set<Long> getBatchSelections() { public Set<Long> getBatchSelections() {

4
src/org/thoughtcrime/securesms/ConversationListFragment.java
View file

@ -106,7 +106,7 @@ public class ConversationListFragment extends SherlockListFragment
headerView.getDistributionType()); headerView.getDistributionType());
} else { } else {
ConversationListAdapter adapter = (ConversationListAdapter)getListAdapter(); ConversationListAdapter adapter = (ConversationListAdapter)getListAdapter();
adapter.addToBatchSet(headerView.getThreadId()); adapter.toggleThreadInBatchSet(headerView.getThreadId());
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
} }
} }
@ -146,7 +146,7 @@ public class ConversationListFragment extends SherlockListFragment
batchMode = true; batchMode = true;
adapter.initializeBatchMode(true); adapter.initializeBatchMode(true);
adapter.addToBatchSet(((ConversationListItem) v).getThreadId()); adapter.toggleThreadInBatchSet(((ConversationListItem) v).getThreadId());
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
return true; return true;