Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove SMS popup from CFv2.

Browse Source
This commit is contained in:
Clark
2023-07-27 16:04:07 -04:00
committed by GitHub
parent f740b69ffe
commit 938309d125
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt
View File

@@ -35,7 +35,7 @@ class SendButton(context: Context, attributeSet: AttributeSet?) : AppCompatImage
private var defaultTransportType: MessageSendType.TransportType = MessageSendType.TransportType.SIGNAL
private var defaultSubscriptionId: Int? = null
lateinit var snackbarContainer: View
var snackbarContainer: View? = null
private var popupContainer: ViewGroup? = null
init {
@@ -157,8 +157,8 @@ class SendButton(context: Context, attributeSet: AttributeSet?) : AppCompatImage
fun showSendTypeMenu(): Boolean {
return if (availableSendTypes.size == 1) {
if (scheduledSendListener == null && !SignalStore.misc().smsExportPhase.allowSmsFeatures()) {
Snackbar.make(snackbarContainer, R.string.InputPanel__sms_messaging_is_no_longer_supported_in_signal, Snackbar.LENGTH_SHORT).show()
if (scheduledSendListener == null && snackbarContainer != null && !SignalStore.misc().smsExportPhase.allowSmsFeatures()) {
Snackbar.make(snackbarContainer!!, R.string.InputPanel__sms_messaging_is_no_longer_supported_in_signal, Snackbar.LENGTH_SHORT).show()
}
false
} else {
@@ -177,8 +177,8 @@ class SendButton(context: Context, attributeSet: AttributeSet?) : AppCompatImage
return if (scheduleListener?.canSchedule() == true && selectedSendType.transportType != MessageSendType.TransportType.SMS) {
scheduleListener.onSendScheduled()
true
} else if (!SignalStore.misc().smsExportPhase.allowSmsFeatures()) {
Snackbar.make(snackbarContainer, R.string.InputPanel__sms_messaging_is_no_longer_supported_in_signal, Snackbar.LENGTH_SHORT).show()
} else if (snackbarContainer != null && !SignalStore.misc().smsExportPhase.allowSmsFeatures()) {
Snackbar.make(snackbarContainer!!, R.string.InputPanel__sms_messaging_is_no_longer_supported_in_signal, Snackbar.LENGTH_SHORT).show()
true
} else {
false

1
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View File

@@ -842,7 +842,6 @@ class ConversationFragment :
}
sendButton.apply {
snackbarContainer = binding.root
setPopupContainer(binding.root)
setOnClickListener(sendButtonListener)
setScheduledSendListener(sendButtonListener)