diff --git a/res/values/strings.xml b/res/values/strings.xml index 6e3658612..7319a468a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -184,6 +184,8 @@ Delete contacts? This will permanently delete the selected contacts.\n\nContacts with ongoing chats and contacts from the system\'s address book cannot be deleted permanently. Cannot delete contacts with ongoing chats. Chat with %1$s? + + Remove %1$s from group? diff --git a/src/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java b/src/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java index 270644ddf..6dea8e7ef 100644 --- a/src/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java +++ b/src/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java @@ -1,7 +1,6 @@ package org.thoughtcrime.securesms; import android.content.Context; -import android.content.Intent; import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; @@ -13,8 +12,6 @@ import com.codewaves.stickyheadergrid.StickyHeaderGridAdapter; import org.thoughtcrime.securesms.components.AudioView; import org.thoughtcrime.securesms.components.DocumentView; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; -import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader.BucketedThreadMedia; import org.thoughtcrime.securesms.mms.AudioSlide; import org.thoughtcrime.securesms.mms.DocumentSlide; diff --git a/src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java b/src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java index ed386f81a..a0e79c76f 100644 --- a/src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java +++ b/src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java @@ -22,8 +22,11 @@ import org.thoughtcrime.securesms.util.Prefs; import org.thoughtcrime.securesms.util.StickyHeaderDecoration.StickyHeaderAdapter; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.Locale; +import java.util.Set; public class ProfileSettingsAdapter extends RecyclerView.Adapter implements StickyHeaderAdapter @@ -48,6 +51,7 @@ public class ProfileSettingsAdapter extends RecyclerView.Adapter private int itemDataMemberCount; private DcChatlist itemDataSharedChats; private DcContact itemDataContact; + private final Set selectedMembers; private final LayoutInflater layoutInflater; private final ItemClickListener clickListener; @@ -93,6 +97,7 @@ public class ProfileSettingsAdapter extends RecyclerView.Adapter this.clickListener = clickListener; this.dcContext = DcHelper.getContext(context); this.layoutInflater = LayoutInflater.from(context); + this.selectedMembers= new HashSet<>(); } @Override @@ -158,7 +163,9 @@ public class ProfileSettingsAdapter extends RecyclerView.Adapter contactItem.unbind(glideRequests); contactItem.set(glideRequests, contactId, dcContact, name, addr, label, false, true); + contactItem.setSelected(selectedMembers.contains(contactId)); contactItem.setOnClickListener(view -> clickListener.onMemberClicked(contactId)); + contactItem.setOnLongClickListener(view -> {clickListener.onMemberLongClicked(contactId); return true;}); } else if (holder.itemView instanceof ConversationListItem) { ConversationListItem conversationListItem = (ConversationListItem) holder.itemView; @@ -190,6 +197,7 @@ public class ProfileSettingsAdapter extends RecyclerView.Adapter void onSettingsClicked(int settingsId); void onSharedChatClicked(int chatId); void onMemberClicked(int contactId); + void onMemberLongClicked(int contactId); } @Override @@ -227,6 +235,26 @@ public class ProfileSettingsAdapter extends RecyclerView.Adapter viewHolder.textView.setText(txt); } + public void toggleMemberSelection(int contactId) { + if (!selectedMembers.remove(contactId)) { + selectedMembers.add(contactId); + } + notifyDataSetChanged(); + } + + @NonNull + public Collection getSelectedMembers() { + return new HashSet<>(selectedMembers); + } + + public int getSelectedMembersCount() { + return selectedMembers.size(); + } + + public void clearSelection() { + selectedMembers.clear(); + notifyDataSetChanged(); + } public void changeData(@Nullable int[] memberList, @Nullable DcContact dcContact, @Nullable DcChatlist sharedChats, @Nullable DcChat dcChat) { itemData.clear(); diff --git a/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java b/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java index 0e66220b7..0910e3240 100644 --- a/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java +++ b/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java @@ -4,16 +4,22 @@ import android.app.Activity; import android.content.Intent; import android.media.RingtoneManager; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.provider.Settings; import android.support.annotation.NonNull; import android.support.v4.app.Fragment; import android.support.v7.app.AlertDialog; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.view.ActionMode; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.view.Window; import android.widget.EditText; import android.widget.Toast; @@ -32,6 +38,7 @@ import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Locale; @@ -48,6 +55,9 @@ public class ProfileSettingsFragment extends Fragment private RecyclerView list; private StickyHeaderDecoration listDecoration; private ProfileSettingsAdapter adapter; + private ActionMode actionMode; + private ActionModeCallback actionModeCallback = new ActionModeCallback(); + private Locale locale; private ApplicationDcContext dcContext; @@ -151,12 +161,35 @@ public class ProfileSettingsFragment extends Fragment } } + @Override + public void onMemberLongClicked(int contactId) { + if (contactId>DcContact.DC_CONTACT_ID_LAST_SPECIAL || contactId==DcContact.DC_CONTACT_ID_SELF) { + if (actionMode==null) { + adapter.toggleMemberSelection(contactId); + actionMode = ((AppCompatActivity) getActivity()).startSupportActionMode(actionModeCallback); + } else { + onMemberClicked(contactId); + } + } + } + @Override public void onMemberClicked(int contactId) { - if(contactId==DcContact.DC_CONTACT_ID_ADD_MEMBER) { + if (actionMode!=null) { + if (contactId>DcContact.DC_CONTACT_ID_LAST_SPECIAL || contactId==DcContact.DC_CONTACT_ID_SELF) { + adapter.toggleMemberSelection(contactId); + if (adapter.getSelectedMembersCount() == 0) { + actionMode.finish(); + actionMode = null; + } else { + actionMode.setTitle(String.valueOf(adapter.getSelectedMembersCount())); + } + } + } + else if(contactId==DcContact.DC_CONTACT_ID_ADD_MEMBER) { onAddMember(); } - if(contactId==DcContact.DC_CONTACT_ID_QR_INVITE) { + else if(contactId==DcContact.DC_CONTACT_ID_QR_INVITE) { onQrInvite(); } else if(contactId>DcContact.DC_CONTACT_ID_LAST_SPECIAL) { @@ -322,6 +355,65 @@ public class ProfileSettingsFragment extends Fragment .show(); } + private class ActionModeCallback implements ActionMode.Callback { + + private int originalStatusBarColor; + + @Override + public boolean onCreateActionMode(ActionMode mode, Menu menu) { + mode.getMenuInflater().inflate(R.menu.profile_context, menu); + mode.setTitle("1"); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + Window window = getActivity().getWindow(); + originalStatusBarColor = window.getStatusBarColor(); + window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar)); + } + return true; + } + + @Override + public boolean onPrepareActionMode(ActionMode mode, Menu menu) { + return false; + } + + @Override + public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) { + switch (menuItem.getItemId()) { + case R.id.delete: + final Collection toDelIds = adapter.getSelectedMembers(); + StringBuilder readableToDelList = new StringBuilder(); + for (Integer toDelId : toDelIds) { + if(readableToDelList.length()>0) { + readableToDelList.append(", "); + } + readableToDelList.append(dcContext.getContact(toDelId).getDisplayName()); + } + new AlertDialog.Builder(getContext()) + .setPositiveButton(android.R.string.ok, (dialog, which) -> { + for (Integer toDelId : toDelIds) { + dcContext.removeContactFromChat(chatId, toDelId); + } + mode.finish(); + }) + .setNegativeButton(android.R.string.cancel, null) + .setMessage(getString(R.string.ask_remove_members, readableToDelList)) + .show(); + return true; + } + return false; + } + + @Override + public void onDestroyActionMode(ActionMode mode) { + actionMode = null; + adapter.clearSelection(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + getActivity().getWindow().setStatusBarColor(originalStatusBarColor); + } + } + } + @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data);