mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-20 16:49:40 +01:00
Always perform CDSI lookups when starting new chats.
This commit is contained in:
committed by
Alex Hart
parent
184c1b67cc
commit
2e4ac7ede1
@@ -5,10 +5,7 @@ import android.content.Intent
|
||||
import android.widget.Toast
|
||||
import androidx.annotation.MainThread
|
||||
import org.thoughtcrime.securesms.R
|
||||
import org.thoughtcrime.securesms.keyvalue.SignalStore
|
||||
import org.thoughtcrime.securesms.recipients.Recipient
|
||||
import org.thoughtcrime.securesms.util.CommunicationActions
|
||||
import org.thoughtcrime.securesms.util.Util
|
||||
|
||||
/**
|
||||
* Handles 'invite to signal' actions.
|
||||
@@ -25,29 +22,18 @@ object InviteActions {
|
||||
@MainThread
|
||||
fun inviteUserToSignal(
|
||||
context: Context,
|
||||
recipient: Recipient,
|
||||
appendInviteToComposer: ((String) -> Unit)?,
|
||||
launchIntent: (Intent) -> Unit
|
||||
) {
|
||||
val inviteText = context.getString(
|
||||
R.string.ConversationActivity_lets_switch_to_signal,
|
||||
context.getString(R.string.install_url)
|
||||
)
|
||||
val intent = CommunicationActions.createIntentToShareTextViaShareSheet(inviteText)
|
||||
|
||||
if (appendInviteToComposer != null && Util.isDefaultSmsProvider(context) && SignalStore.misc().smsExportPhase.isSmsSupported()) {
|
||||
appendInviteToComposer(inviteText)
|
||||
} else if (recipient.hasSmsAddress()) {
|
||||
launchIntent(
|
||||
CommunicationActions.createIntentToComposeSmsThroughDefaultApp(recipient, inviteText)
|
||||
)
|
||||
if (intent.resolveActivity(context.packageManager) != null) {
|
||||
launchIntent(Intent.createChooser(intent, context.getString(R.string.InviteActivity_invite_to_signal)))
|
||||
} else {
|
||||
val intent = CommunicationActions.createIntentToShareTextViaShareSheet(inviteText)
|
||||
|
||||
if (intent.resolveActivity(context.packageManager) != null) {
|
||||
launchIntent(Intent.createChooser(intent, context.getString(R.string.InviteActivity_invite_to_signal)))
|
||||
} else {
|
||||
Toast.makeText(context, R.string.InviteActivity_no_app_to_share_to, Toast.LENGTH_LONG).show()
|
||||
}
|
||||
Toast.makeText(context, R.string.InviteActivity_no_app_to_share_to, Toast.LENGTH_LONG).show()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user