Switches to our own version of the Url Detector

amethyst/src/main/java/com/vitorpamplona/amethyst/service/CachedRichTextParser.kt

@@ -24,6 +24,7 @@ import android.util.LruCache
 import com.vitorpamplona.amethyst.commons.model.ImmutableListOfLists
 import com.vitorpamplona.amethyst.commons.richtext.RichTextParser
 import com.vitorpamplona.amethyst.commons.richtext.RichTextViewerState
+import com.vitorpamplona.amethyst.commons.richtext.UrlParser
 
 object CachedRichTextParser {
     private val richTextCache = LruCache<Int, RichTextViewerState>(50)
@@ -77,7 +78,8 @@ object CachedUrlParser {
         return if (cached != null) {
             cached
         } else {
-            val newUrls = RichTextParser().parseValidUrls(content).toList()
+            val urlSet = UrlParser().parseValidUrls(content)
+            val newUrls = urlSet.withScheme.toList() + urlSet.withoutScheme.map { "http://$it" }
             parsedUrlsCache.put(key, newUrls)
             newUrls
         }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt

@@ -81,7 +81,6 @@ import com.vitorpamplona.amethyst.commons.richtext.PhoneSegment
 import com.vitorpamplona.amethyst.commons.richtext.RegularTextSegment
 import com.vitorpamplona.amethyst.commons.richtext.RelayUrlSegment
 import com.vitorpamplona.amethyst.commons.richtext.RichTextViewerState
-import com.vitorpamplona.amethyst.commons.richtext.SchemelessUrlSegment
 import com.vitorpamplona.amethyst.commons.richtext.SecretEmoji
 import com.vitorpamplona.amethyst.commons.richtext.Segment
 import com.vitorpamplona.amethyst.commons.richtext.VideoSegment
@@ -219,8 +218,8 @@ fun RenderRegularPreview() {
 
                     // is HashIndexUserSegment -> TagLink(word, accountViewModel, nav)
                     // is HashIndexEventSegment -> TagLink(word, true, backgroundColorState, accountViewModel, nav)
-                    is SchemelessUrlSegment -> {
-                        NoProtocolUrlRenderer(word)
+                    is LinkSegment -> {
+                        ClickableUrl(word.segmentText, word.segmentText)
                     }
 
                     is RegularTextSegment -> {
@@ -257,7 +256,7 @@ fun RenderRegularPreview2() {
 
                 // is HashIndexUserSegment -> TagLink(word, accountViewModel, nav)
                 // is HashIndexEventSegment -> TagLink(word, true, backgroundColorState, accountViewModel, nav)
-                is SchemelessUrlSegment -> NoProtocolUrlRenderer(word)
+                is LinkSegment -> ClickableUrl(word.segmentText, word.segmentText)
 
                 is RegularTextSegment -> Text(word.segmentText)
 
@@ -307,7 +306,6 @@ fun RenderRegularPreview3() {
 
                 // is HashIndexUserSegment -> TagLink(word, accountViewModel, nav)
                 // is HashIndexEventSegment -> TagLink(word, true, backgroundColorState, accountViewModel, nav)
-                is SchemelessUrlSegment -> NoProtocolUrlRenderer(word)
 
                 is RegularTextSegment -> Text(word.segmentText)
 
@@ -485,8 +483,6 @@ private fun RenderWordWithoutPreview(
 
         is HashIndexEventSegment -> TagLink(word, false, 0, backgroundColor, accountViewModel, nav)
 
-        is SchemelessUrlSegment -> NoProtocolUrlRenderer(word)
-
         is RegularTextSegment -> Text(word.segmentText)
 
         is RelayUrlSegment -> ClickableRelayUrl(word.segmentText, nav)
@@ -518,7 +514,6 @@ private fun RenderWordWithPreview(
         is HashTagSegment -> HashTag(word, nav)
         is HashIndexUserSegment -> TagLink(word, accountViewModel, nav)
         is HashIndexEventSegment -> TagLink(word, true, quotesLeft, backgroundColor, accountViewModel, nav)
-        is SchemelessUrlSegment -> NoProtocolUrlRenderer(word)
         is RegularTextSegment -> Text(word.segmentText)
         is Base64Segment -> ZoomableContentView(word.segmentText, state, accountViewModel)
         is RelayUrlSegment -> ClickableRelayUrl(word.segmentText, nav)
@@ -538,12 +533,6 @@ private fun ZoomableContentView(
     }
 }
 
-@Composable
-private fun NoProtocolUrlRenderer(segment: SchemelessUrlSegment) {
-    ClickableUrl(segment.url, "https://${segment.url}")
-    segment.extras?.let { it1 -> Text(it1) }
-}
-
 @Composable
 fun RenderCustomEmoji(
     word: String,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/previews/PreviewState.kt

@@ -20,6 +20,7 @@
  */
 package com.vitorpamplona.amethyst.ui.note.creators.previews
 
+import androidx.compose.runtime.Stable
 import androidx.compose.ui.text.input.TextFieldValue
 import com.vitorpamplona.amethyst.service.CachedUrlParser
 import kotlinx.coroutines.Dispatchers
@@ -30,6 +31,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 
+@Stable
 class PreviewState {
     var source = MutableStateFlow(TextFieldValue(""))
 

amethyst/src/play/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt

@@ -30,9 +30,8 @@ import com.google.mlkit.nl.translate.TranslateLanguage
 import com.google.mlkit.nl.translate.Translation
 import com.google.mlkit.nl.translate.Translator
 import com.google.mlkit.nl.translate.TranslatorOptions
-import com.linkedin.urls.detection.UrlDetector
-import com.linkedin.urls.detection.UrlDetectorOptions
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.quartz.utils.urldetector.detection.UrlDetector
 import kotlinx.coroutines.CancellationException
 import java.util.concurrent.Executors
 import java.util.regex.Pattern
@@ -185,8 +184,7 @@ object LanguageTranslatorService {
     }
 
     private fun urlDictionary(text: String): Map<String, String> {
-        val parser = UrlDetector(text, UrlDetectorOptions.Default)
-        val urlsInText = parser.detect()
+        val urlsInText = UrlDetector(text).detect()
 
         var counter = 0