Update play store URL regex and related methods

theapache64 · Jan 19, 2025 · 30fd907 · 30fd907
1 parent 1abb920
commit 30fd907
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/main/kotlin/com/theapache64/stackzy/ui/feature/applist/AppListViewModel.kt b/src/main/kotlin/com/theapache64/stackzy/ui/feature/applist/AppListViewModel.kt
@@ -39,11 +39,11 @@ class AppListViewModel @Inject constructor(
 
 
         private val playStoreUrlRegEx by lazy {
-            "^https:\\/\\/play\\.google\\.com\\/store\\/apps\\/details\\?id=(?<packageName>[\\w\\.]+)\$".toRegex()
+            "^https:\\/\\/play\\.google\\.com\\/store\\/apps\\/details\\?id=(?<packageName>[\\w\\.]+)(&.+)*\$".toRegex()
         }
 
         fun isPlayStoreUrl(input: String): Boolean {
-            return playStoreUrlRegEx.matches(input)
+            return playStoreUrlRegEx.containsMatchIn(input)
         }
 
         fun parsePackageName(playStoreUrl: String): String? {

diff --git a/src/test/kotlin/com/theapache64/stackzy/ui/feature/applist/AppListViewModelTest.kt b/src/test/kotlin/com/theapache64/stackzy/ui/feature/applist/AppListViewModelTest.kt
@@ -11,6 +11,13 @@ class AppListViewModelTest {
         ).should.`true`
     }
 
+    @Test
+    fun validFullUrl() {
+        AppListViewModel.isPlayStoreUrl(
+            "https://play.google.com/store/apps/details?id=in.startv.hotstar&hl=en_IN"
+        ).should.`true`
+    }
+
     @Test
     fun invalidUrl() {
         AppListViewModel.isPlayStoreUrl(
@@ -25,6 +32,13 @@ class AppListViewModelTest {
         ).should.equal("com.theapache64.papercop")
     }
 
+    @Test
+    fun parseValidPackageNameFull() {
+        AppListViewModel.parsePackageName(
+            "https://play.google.com/store/apps/details?id=com.theapache64.papercop&hl=en_IN"
+        ).should.equal("com.theapache64.papercop")
+    }
+
     @Test
     fun parseInvalidPackageName() {
         AppListViewModel.parsePackageName(