changes to add a new setting that allows user to choose to allow all message links, block all message links (including in notifications), or ask via a dialog box whether the user wishes to proceed

This commit is contained in:
gavine99
2025-02-02 21:23:01 +11:00
parent f32e0b4528
commit d7514d65b6
13 changed files with 199 additions and 48 deletions
@@ -43,6 +43,7 @@ import androidx.appcompat.app.AlertDialog
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.constraintlayout.widget.ConstraintSet
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import androidx.core.view.isVisible
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders
@@ -121,6 +122,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
override val viewQksmsPlusIntent: Subject<Unit> = PublishSubject.create()
override val backPressedIntent: Subject<Unit> = PublishSubject.create()
override val confirmDeleteIntent: Subject<List<Long>> = PublishSubject.create()
override val messageLinkAskIntent: Subject<Uri> by lazy { messageAdapter.messageLinkClicks }
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ComposeViewModel::class.java] }
@@ -350,6 +352,23 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
.show()
}
override fun showMessageLinkAskDialog(uri: Uri) {
AlertDialog.Builder(this)
.setTitle(R.string.messageLinkHandling_dialog_title)
.setMessage(getString(R.string.messageLinkHandling_dialog_body, uri.toString()))
.setPositiveButton(
R.string.messageLinkHandling_dialog_positive
) { _, _ ->
ContextCompat.startActivity(
this,
Intent(Intent.ACTION_VIEW).setData(uri),
null
)
}
.setNegativeButton(R.string.messageLinkHandling_dialog_negative) { _, _ -> { } }
.show()
}
override fun requestDefaultSms() {
navigator.showDefaultSmsDialog(this)
}
@@ -68,11 +68,13 @@ interface ComposeView : QkView<ComposeState> {
val viewQksmsPlusIntent: Subject<Unit>
val backPressedIntent: Observable<Unit>
val confirmDeleteIntent: Observable<List<Long>>
val messageLinkAskIntent: Observable<Uri>
fun clearSelection()
fun toggleSelectAll()
fun expandMessages(messageIds: List<Long>, expand: Boolean)
fun showDetails(details: String)
fun showMessageLinkAskDialog(uri: Uri)
fun requestDefaultSms()
fun requestStoragePermission()
fun requestSmsPermission()
@@ -513,6 +513,11 @@ class ComposeViewModel @Inject constructor(
)
}
// Show the message details
view.messageLinkAskIntent
.autoDisposable(view.scope())
.subscribe { view.showMessageLinkAskDialog(it) }
// Set the current conversation
Observables
.combineLatest(
@@ -21,17 +21,21 @@ package dev.octoshrimpy.quik.feature.compose
import android.animation.ObjectAnimator
import android.content.Context
import android.graphics.Typeface
import android.os.Build
import android.net.Uri
import android.text.Layout
import android.text.Spannable
import android.text.SpannableString
import android.text.SpannableStringBuilder
import android.text.method.LinkMovementMethod
import android.text.style.ClickableSpan
import android.text.style.StyleSpan
import android.text.style.URLSpan
import android.text.util.Linkify
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.ProgressBar
import androidx.recyclerview.widget.RecyclerView
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.common.QkMediaPlayer
import dev.octoshrimpy.quik.R
@@ -107,6 +111,7 @@ class MessagesAdapter @Inject constructor(
val clicks: Subject<Long> = PublishSubject.create()
val partClicks: Subject<Long> = PublishSubject.create()
val messageLinkClicks: Subject<Uri> = PublishSubject.create()
val cancelSending: Subject<Long> = PublishSubject.create()
val sendNow: Subject<Long> = PublishSubject.create()
@@ -170,7 +175,6 @@ class MessagesAdapter @Inject constructor(
val partsAdapter = partsAdapterProvider.get()
partsAdapter.clicks.subscribe(partClicks)
view.attachments.adapter = partsAdapter
view.body.forwardTouches(view)
return QkViewHolder(view).apply {
view.setOnClickListener {
@@ -240,6 +244,8 @@ class MessagesAdapter @Inject constructor(
}
}
val cancelableSimpleOnGestureListener = holder.body.forwardTouches(holder.containerView)
// Bind the message status
bindStatus(holder, message, next)
@@ -297,8 +303,47 @@ class MessagesAdapter @Inject constructor(
false -> TextViewStyler.SIZE_PRIMARY
})
holder.body.text = messageText
holder.body.setVisible(message.isSms() || messageText.isNotBlank())
val spanString = SpannableStringBuilder(messageText)
when (prefs.messageLinkHandling.get()) {
Preferences.MESSAGE_LINK_HANDLING_BLOCK -> holder.body.autoLinkMask = 0
Preferences.MESSAGE_LINK_HANDLING_ASK -> {
// manually handle link clicks if user has set to ask before opening links
holder.body.isClickable = false
holder.body.linksClickable = false
holder.body.movementMethod = LinkMovementMethod.getInstance()
Linkify.addLinks(spanString, holder.body.autoLinkMask)
for (span in spanString.getSpans(
0,
spanString.length,
URLSpan::class.java)
) {
// set handler for when user touches a link into new span
spanString.setSpan(
object : ClickableSpan() {
override fun onClick(widget: View) {
messageLinkClicks.onNext(Uri.parse(span.url))
// interrupt the upcoming click event on the body view
cancelableSimpleOnGestureListener.cancelCurrentClick()
}
},
spanString.getSpanStart(span),
spanString.getSpanEnd(span),
spanString.getSpanFlags(span)
)
// remove original span
spanString.removeSpan(span)
}
}
}
holder.body.text = spanString
holder.body.setVisible(message.isSms() || spanString.isNotBlank())
holder.body.setBackgroundResource(getBubble(
emojiOnly = emojiOnly,
canGroupWithPrevious = canGroup(message, previous) || media.isNotEmpty(),