diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalBottomActionBar.kt b/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalBottomActionBar.kt index 0992920bf..e57c45251 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalBottomActionBar.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalBottomActionBar.kt @@ -11,7 +11,6 @@ import android.view.animation.AnimationUtils import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView -import androidx.core.view.isGone import androidx.interpolator.view.animation.FastOutSlowInInterpolator import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.util.ViewUtil @@ -64,12 +63,7 @@ class SignalBottomActionBar(context: Context, attributeSet: AttributeSet) : Line } private fun present(items: List) { - if (isGone) { - return - } - if (width == 0) { - post { present(items) } return } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java index d2da2e5a8..981711266 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java @@ -1328,7 +1328,6 @@ public class ConversationListFragment extends MainFragment implements ActionMode items.add(new ActionItem(R.drawable.ic_delete_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete_plural, count), () -> handleDelete(selectionIds))); - if (hasUnmuted) { items.add(new ActionItem(R.drawable.ic_mute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_mute_plural, count), () -> handleMute(viewModel.currentSelectedConversations()))); } else { @@ -1337,7 +1336,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode items.add(new ActionItem(R.drawable.ic_select_24, getString(R.string.ConversationListFragment_select_all), viewModel::onSelectAllClick)); -// bottomActionBar.setItems(items); + bottomActionBar.setItems(items); } protected Toolbar getToolbar(@NonNull View rootView) {