diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java index 6463412dde0e4b5675ef893006418f4c9313daa2..a48b22233308e71dd7699ac31cfaf20cbf8d8a48 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java @@ -6,6 +6,7 @@ import android.view.ContextMenu; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Toast; import androidx.annotation.NonNull; import androidx.databinding.DataBindingUtil; @@ -13,6 +14,8 @@ import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.ListAdapter; import androidx.recyclerview.widget.RecyclerView; +import com.google.common.base.Strings; + import org.openintents.openpgp.util.OpenPgpUtils; import eu.siacs.conversations.R; @@ -71,9 +74,20 @@ public class UserAdapter extends ListAdapter { final XmppActivity activity = XmppActivity.find(v); - if (activity != null) { - activity.highlightInMuc(user.getConversation(), user.getName()); + if (activity == null) { + return; + } + final var contact = user.getContact(); + if (user.getRole() == MucOptions.Role.NONE && contact != null) { + Toast.makeText( + activity, + activity.getString( + R.string.user_has_left_conference, + contact.getDisplayName()), + Toast.LENGTH_SHORT) + .show(); } + activity.highlightInMuc(user.getConversation(), user.getName()); }); viewHolder.binding.getRoot().setTag(user); viewHolder.binding.getRoot().setOnCreateContextMenuListener(this); @@ -92,7 +106,7 @@ public class UserAdapter extends ListAdapter { final XmppActivity activity = XmppActivity.find(v); - if (activity != null) { - activity.highlightInMuc(user.getConversation(), user.getName()); + if (activity == null) { + return; } + final var contact = user.getContact(); + if (user.getRole() == MucOptions.Role.NONE && contact != null) { + Toast.makeText( + activity, + activity.getString( + R.string.user_has_left_conference, + contact.getDisplayName()), + Toast.LENGTH_SHORT) + .show(); + } + activity.highlightInMuc(user.getConversation(), user.getName()); }); viewHolder.binding.getRoot().setOnCreateContextMenuListener(this); viewHolder.binding.getRoot().setTag(user);