Merge pull request #75 from zyfy29/fix-fill-shared-link-titles

fix: failed to generate title for url-encoded links

Author: AmrDeveloper

app/build.gradle.kts

@@ -84,4 +84,5 @@ dependencies {
     androidTestImplementation(libs.androidx.core.testing)
     androidTestImplementation(libs.kotlinx.coroutines.testing)
     androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(libs.androidx.espresso.intents)
 }

app/src/androidTest/java/com/amrdeveloper/linkhub/ShareLinkTest.kt

@@ -0,0 +1,49 @@
+package com.amrdeveloper.linkhub
+
+import android.content.Intent
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.amrdeveloper.linkhub.ui.MainActivity
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ShareLinkTest {
+    @get:Rule
+    val intentsTestRule = IntentsTestRule(MainActivity::class.java, true, false)
+
+    private fun runCaseFor(sharedLink: String, title: String, subTitle: String) {
+        val intent = Intent(Intent.ACTION_SEND).apply {
+            putExtra(Intent.EXTRA_TEXT, sharedLink)
+        }
+        intentsTestRule.launchActivity(intent)
+
+        onView(withId(R.id.link_url_edit))
+            .check(matches(withText(sharedLink)))
+        onView(withId(R.id.link_title_edit))
+            .check(matches(withText(title)))
+        onView(withId(R.id.link_subtitle_edit))
+            .check(matches(withText(subTitle)))
+    }
+
+    @Test
+    fun generalLink() {
+        runCaseFor("https://amr.com", "amr Link", "Link from amr website")
+    }
+
+    @Test
+    fun stackoverflowQuestion() {
+        runCaseFor("https://stackoverflow.com/questions/android", "Programming question", "Question from stackoverflow.com")
+    }
+
+    @Test
+    fun linkContainsSpace() {
+        // not a valid URI, skip generation
+        runCaseFor("https://www.example.com/hello world", "", "")
+    }
+}

app/src/main/java/com/amrdeveloper/linkhub/ui/link/LinkFragment.kt

@@ -92,8 +92,7 @@ class LinkFragment : Fragment() {
 
         binding.linkUrlEdit.setText(sharedLink)
 
-        val encodedUrl = URLEncoder.encode(sharedLink, "utf-8")
-        linkViewModel.generateLinkTitleAndSubTitle(encodedUrl)
+        linkViewModel.generateLinkTitleAndSubTitle(sharedLink)
     }
 
     private fun handleLinkArgument() {

app/src/main/java/com/amrdeveloper/linkhub/ui/link/LinkViewModel.kt

@@ -15,6 +15,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.net.URI
 import javax.inject.Inject
 
 @HiltViewModel
@@ -72,10 +73,12 @@ class LinkViewModel @Inject constructor(
         }
     }
 
+    private fun isValidURI(url: String) =
+        URLUtil.isValidUrl(url) && runCatching { URI(url) }.isSuccess
+
     fun generateLinkTitleAndSubTitle(url: String) {
         viewModelScope.launch(Dispatchers.IO) {
-            val isValidLink = URLUtil.isValidUrl(url)
-            if (isValidLink.not()) return@launch
+            if (isValidURI(url).not()) return@launch
             val linkInfo = generateLinkInfo(url)
             withContext(Dispatchers.Main) {
                 linkInfoLiveData.value = linkInfo

gradle/libs.versions.toml

@@ -33,6 +33,7 @@ ksp = "2.0.21-1.0.27"
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 androidx-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "core-testing" }
 androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso-core" }
+androidx-espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "espresso-core" }
 androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragment-ktx" }
 androidx-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-junit" }
 androidx-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "ktx" }