diff --git a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
index 924c144454..8e14376469 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -337,7 +337,6 @@ public final class ContactSelectionListFragment extends LoggingFragment {
selectionLimit,
new ContactSearchAdapter.DisplayOptions(
isMulti,
- ContactSearchAdapter.DisplaySmsTag.DEFAULT,
ContactSearchAdapter.DisplaySecondaryInformation.ALWAYS,
newCallCallback != null,
false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt
index 1d252378ae..5b2a056846 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt
@@ -507,7 +507,6 @@ open class ContactSearchAdapter(
protected val name: FromTextView = itemView.findViewById(R.id.name)
protected val number: TextView = itemView.findViewById(R.id.number)
protected val label: TextView = itemView.findViewById(R.id.label)
- protected val smsTag: View = itemView.findViewById(R.id.sms_tag)
private val startAudio: View = itemView.findViewById(R.id.start_audio)
private val startVideo: View = itemView.findViewById(R.id.start_video)
@@ -543,7 +542,6 @@ open class ContactSearchAdapter(
bindAvatar(model)
bindNumberField(model)
bindLabelField(model)
- bindSmsTagField(model)
bindCallButtons(model)
}
@@ -578,14 +576,6 @@ open class ContactSearchAdapter(
label.visible = false
}
- protected open fun bindSmsTagField(model: T) {
- smsTag.visible = when (displayOptions.displaySmsTag) {
- DisplaySmsTag.DEFAULT -> isSmsContact(model)
- DisplaySmsTag.IF_NOT_REGISTERED -> isNotRegistered(model)
- DisplaySmsTag.NEVER -> false
- }
- }
-
protected open fun bindLongPress(model: T) = Unit
private fun bindCallButtons(model: T) {
@@ -607,14 +597,6 @@ open class ContactSearchAdapter(
}
}
- private fun isSmsContact(model: T): Boolean {
- return getRecipient(model).isUnregistered && !getRecipient(model).isDistributionList
- }
-
- private fun isNotRegistered(model: T): Boolean {
- return getRecipient(model).isUnregistered && !getRecipient(model).isDistributionList
- }
-
abstract fun isSelected(model: T): Boolean
abstract fun getData(model: T): D
abstract fun getRecipient(model: T): Recipient
@@ -748,12 +730,6 @@ open class ContactSearchAdapter(
fun onDeletePrivateStory(story: ContactSearchData.Story, isSelected: Boolean)
}
- enum class DisplaySmsTag {
- DEFAULT,
- IF_NOT_REGISTERED,
- NEVER
- }
-
/**
* Whether or not we should display a recipient's 'about' or e164, if either are
* available.
@@ -765,7 +741,6 @@ open class ContactSearchAdapter(
data class DisplayOptions(
val displayCheckBox: Boolean = false,
- val displaySmsTag: DisplaySmsTag = DisplaySmsTag.NEVER,
val displaySecondaryInformation: DisplaySecondaryInformation = DisplaySecondaryInformation.NEVER,
val displayCallButtons: Boolean = false,
val displayStoryRing: Boolean = false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt
index 6731304e36..1d25c08be0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt
@@ -31,7 +31,6 @@ import java.util.concurrent.TimeUnit
* @param fixedContacts Contacts which are "pre-selected" (for example, already a member of a group we're adding to)
* @param selectionLimits [SelectionLimits] describing how large the result set can be.
* @param displayCheckBox Whether or not to display checkboxes on items.
- * @param displaySmsTag Whether or not to display the SMS tag on items.
* @param displaySecondaryInformation Whether or not to display phone numbers on known contacts.
* @param mapStateToConfiguration Maps a [ContactSearchState] to a [ContactSearchConfiguration]
* @param callbacks Hooks to help process, filter, and react to selection
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt
index 039f1a656a..63c5df637e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt
@@ -127,7 +127,6 @@ class MultiselectForwardFragment :
FeatureFlags.shareSelectionLimit(),
ContactSearchAdapter.DisplayOptions(
displayCheckBox = !args.selectSingleRecipient,
- displaySmsTag = ContactSearchAdapter.DisplaySmsTag.DEFAULT,
displaySecondaryInformation = ContactSearchAdapter.DisplaySecondaryInformation.NEVER,
displayStoryRing = true
),
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 e4ffc4dc19..03059d0507 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -301,7 +301,6 @@ public class ConversationListFragment extends MainFragment implements ActionMode
SelectionLimits.NO_LIMITS,
new ContactSearchAdapter.DisplayOptions(
false,
- ContactSearchAdapter.DisplaySmsTag.DEFAULT,
ContactSearchAdapter.DisplaySecondaryInformation.NEVER,
false,
false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt
index 82dcb6aa59..c9f1be061f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt
@@ -68,7 +68,6 @@ class ChooseGroupStoryBottomSheet : FixedRoundedCornerBottomSheetDialogFragment(
selectionLimits = FeatureFlags.shareSelectionLimit(),
displayOptions = ContactSearchAdapter.DisplayOptions(
displayCheckBox = true,
- displaySmsTag = ContactSearchAdapter.DisplaySmsTag.DEFAULT,
displaySecondaryInformation = ContactSearchAdapter.DisplaySecondaryInformation.NEVER
),
mapStateToConfiguration = { state ->
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/connections/ViewAllSignalConnectionsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/connections/ViewAllSignalConnectionsFragment.kt
index 37433f78e7..10d3834543 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/connections/ViewAllSignalConnectionsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/connections/ViewAllSignalConnectionsFragment.kt
@@ -29,7 +29,6 @@ class ViewAllSignalConnectionsFragment : Fragment(R.layout.view_all_signal_conne
selectionLimits = SelectionLimits(0, 0),
displayOptions = ContactSearchAdapter.DisplayOptions(
displayCheckBox = false,
- displaySmsTag = ContactSearchAdapter.DisplaySmsTag.IF_NOT_REGISTERED,
displaySecondaryInformation = ContactSearchAdapter.DisplaySecondaryInformation.NEVER
),
mapStateToConfiguration = { getConfiguration() },
diff --git a/app/src/main/res/layout/contact_search_item.xml b/app/src/main/res/layout/contact_search_item.xml
index 4f9e56eb78..3f831f5eb1 100644
--- a/app/src/main/res/layout/contact_search_item.xml
+++ b/app/src/main/res/layout/contact_search_item.xml
@@ -105,24 +105,9 @@
tools:ignore="RtlSymmetry"
tools:text="ยท Mobile" />
-
-
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3c96a1bb7f..979eac29c6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5108,9 +5108,6 @@
Select a color
-
- SMS
-
Share