From b6f1ad24baaf1b9c4891b5401f1544af96dd4628 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Thu, 16 Apr 2026 18:30:20 +0200
Subject: [PATCH 01/12] updated libraries

---
 app/build.gradle.kts          | 7 +++++++
 app/gradle/libs.versions.toml | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d75ea0951..8477886de 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,4 +19,11 @@ buildscript {
         classpath(libs.navigation.plugin)
         classpath(libs.hilt.plugin)
     }
+}
+
+// dependencyUpdates fails in parallel mode with Gradle 9+ (https://github.com/ben-manes/gradle-versions-plugin/issues/968)
+tasks.named("dependencyUpdates") {
+    doFirst {
+        gradle.startParameter.isParallelProjectExecutionEnabled = false
+    }
 }
\ No newline at end of file
diff --git a/app/gradle/libs.versions.toml b/app/gradle/libs.versions.toml
index 06a94727d..9087c5d8d 100644
--- a/app/gradle/libs.versions.toml
+++ b/app/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
-android_gradle_plugin = "9.1.0"
+android_gradle_plugin = "9.1.1"
 appcompat = "1.7.1"
 constraint_layout = "2.2.1"
 coil = "2.7.0"
 core_ktx = "1.18.0"
 coroutines = "1.10.2"
 # non-compliant with new Play Store, but it's not used in production
-countly = "26.1.1"
+countly = "26.1.2"
 dagger = "2.59.2"
 datetime = "0.7.1"
 espresso = "3.7.0"
@@ -16,8 +16,8 @@ fragment = "1.8.9"
 hilt_navigation = "1.3.0"
 jsoup = "1.22.1"
 junit = "4.13.2"
-kotlin = "2.3.0"
-kotlin_serialization_plugin = "2.3.0"
+kotlin = "2.3.20"
+kotlin_serialization_plugin = "2.3.20"
 ktfmt = "0.26.0"
 ksp = "2.3.6"
 lifecycle = "2.10.0"

From e81160d1e0375781158fb712866a2a508c84b2dd Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Thu, 16 Apr 2026 18:30:36 +0200
Subject: [PATCH 02/12] moved plugins button

see #458
---
 .../sidesheet_search_plugins_options.xml      | 57 ++++++++-----------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/app/app/src/main/res/layout/sidesheet_search_plugins_options.xml b/app/app/src/main/res/layout/sidesheet_search_plugins_options.xml
index 988fd84a4..599aeb3d4 100644
--- a/app/app/src/main/res/layout/sidesheet_search_plugins_options.xml
+++ b/app/app/src/main/res/layout/sidesheet_search_plugins_options.xml
@@ -1,4 +1,5 @@
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/optionsSideSheet"
     style="@style/Widget.Material3.SideSheet.Modal"
@@ -8,28 +9,22 @@
     android:padding="10dp"
     app:layout_behavior="com.google.android.material.sidesheet.SideSheetBehavior">
 
-    <Button
-        android:id="@+id/btnOpenRepositories"
-        style="?attr/materialButtonStyle"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/manage_plugins"
-        app:layout_constraintBottom_toTopOf="@id/tvTitle"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        >
 
     <TextView
         android:id="@+id/tvTitle"
         android:layout_width="0dp"
+        android:layout_weight="1"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:text="@string/search_options"
         android:textAppearance="?attr/textAppearanceTitleLarge"
-        app:layout_constraintBottom_toTopOf="@id/sortingPicker"
-        app:layout_constraintEnd_toStartOf="@id/closeButton"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btnOpenRepositories" />
+        />
 
     <Button
         android:id="@+id/closeButton"
@@ -37,21 +32,25 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:icon="@drawable/icon_close"
-        app:layout_constraintBottom_toBottomOf="@id/tvTitle"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/tvTitle"
-        app:layout_constraintTop_toTopOf="@id/tvTitle" />
+        />
+    </LinearLayout>
+<!-- for some reason this button is missing the fill on the phones if we don't use certain styles!-->
+<Button
+        android:id="@+id/btnOpenRepositories"
+        style="?attr/materialButtonOutlinedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/manage_plugins"
+        android:layout_gravity="center" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/sortingPicker"
         style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        app:layout_constraintBottom_toTopOf="@id/categoryPicker"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvTitle">
+        >
 
         <AutoCompleteTextView
             android:id="@+id/sortingPickerTextView"
@@ -65,13 +64,10 @@
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/categoryPicker"
         style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        app:layout_constraintBottom_toTopOf="@id/cvPlugins"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/sortingPicker">
+        >
 
         <AutoCompleteTextView
             android:id="@+id/categoryPickerTextView"
@@ -94,9 +90,6 @@
         android:focusable="false"
         app:cardBackgroundColor="@android:color/transparent"
         app:cardElevation="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/categoryPicker"
         app:strokeWidth="0dp">
 
         <LinearLayout
@@ -136,4 +129,4 @@
             </androidx.core.widget.NestedScrollView>
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file

From 50c8ee1bacceaada7e788821e82cea4a4a3d8c53 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Thu, 16 Apr 2026 19:13:15 +0200
Subject: [PATCH 03/12] fixed kodi test not working

---
 .../data/repository/KodiRepository.kt         | 29 +++++++++++++++++++
 .../viewmodel/ServiceViewModel.kt             |  5 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/KodiRepository.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/KodiRepository.kt
index cf03d8dd2..8a8c097e7 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/KodiRepository.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/KodiRepository.kt
@@ -70,6 +70,35 @@ constructor(protoStore: ProtoStore, @param:ClassicClient private val client: OkH
         }
     }
 
+    suspend fun getVolume(
+        address: String,
+        username: String? = null,
+        password: String? = null,
+    ): KodiGenericResponse? {
+        try {
+            val kodiApiHelper: KodiApiHelper = provideApiHelper(address)
+            val kodiResponse =
+                safeApiCall(
+                    call = {
+                        kodiApiHelper.getVolume(
+                            request =
+                                KodiRequest(
+                                    method = "Application.GetProperties",
+                                    params = KodiParams(properties = listOf("volume")),
+                                ),
+                            auth = encodeAuthentication(username, password),
+                        )
+                    },
+                    errorMessage = "Error getting Kodi volume",
+                )
+
+            return kodiResponse
+        } catch (e: Exception) {
+            Timber.e(e)
+            return null
+        }
+    }
+
     suspend fun openUrl(
         baseUrl: String,
         port: Int,
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt
index 6efc69ae3..aa011f5de 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.github.livingwithhippos.unchained.data.local.CompleteRemoteService
 import com.github.livingwithhippos.unchained.data.local.RemoteServiceType
+import com.github.livingwithhippos.unchained.data.repository.KodiRepository
 import com.github.livingwithhippos.unchained.data.repository.ServiceRepository
 import com.github.livingwithhippos.unchained.di.ClassicClient
 import com.github.livingwithhippos.unchained.remotedevice.viewmodel.ServiceErrorType
@@ -21,6 +22,7 @@ class ServiceViewModel
 @Inject
 constructor(
     private val serviceRepository: ServiceRepository,
+    private val kodiRepository: KodiRepository,
     @param:ClassicClient private val client: OkHttpClient,
 ) : ViewModel() {
 
@@ -70,8 +72,9 @@ constructor(
                     }
 
                     is RemoteServiceType.KODI -> {
-                        // todo: implement or manage from caller
+                        val response = kodiRepository.getVolume(address, username, password)
                         serviceLiveData.postValue(
+                            if (response != null) ServiceEvent.ServiceWorking else
                             ServiceEvent.ServiceNotWorking(ServiceErrorType.InvalidService)
                         )
                     }

From ee9ee2c1cd746415637fea18e61e743e1c562220 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Thu, 16 Apr 2026 20:04:11 +0200
Subject: [PATCH 04/12] better jackett magnet and torrent recognition

see #458
---
 .../unchained/data/model/torznab/TZSearch.kt  | 65 +++++++++++++------
 1 file changed, 44 insertions(+), 21 deletions(-)

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/model/torznab/TZSearch.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/model/torznab/TZSearch.kt
index f8b85822c..fe7d952ef 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/model/torznab/TZSearch.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/model/torznab/TZSearch.kt
@@ -6,6 +6,8 @@ import com.github.livingwithhippos.unchained.utilities.directChild
 import com.github.livingwithhippos.unchained.utilities.directChildText
 import com.github.livingwithhippos.unchained.utilities.directChildren
 import com.github.livingwithhippos.unchained.utilities.extension.getFileSizeString
+import com.github.livingwithhippos.unchained.utilities.extension.isMagnet
+import com.github.livingwithhippos.unchained.utilities.extension.isTorrent
 import com.github.livingwithhippos.unchained.utilities.parseCommonSize
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -99,28 +101,49 @@ fun rssToScrapedItems(context: Context, rss: SearchRSS): Pair<List<ScrapedItem>,
     rss.channel.items.forEach { item ->
         try {
             val sizeLong = item.size.toLongOrNull()
-            scraped.add(
-                ScrapedItem(
-                    name = item.title,
-                    link = item.comments,
-                    seeders =
-                        item.torznabAttributes
-                            .firstOrNull { it.name.equals("seeders", ignoreCase = true) }
-                            ?.value,
-                    leechers =
-                        item.torznabAttributes
-                            .firstOrNull { it.name.equals("leechers", ignoreCase = true) }
-                            ?.value,
-                    size =
-                        if (sizeLong !== null) getFileSizeString(context, sizeLong) else item.size,
-                    addedDate = item.pubDate,
-                    parsedSize = parseCommonSize(item.size),
-                    // todo: add better recognition of links
-                    magnets = listOf(item.link),
-                    torrents = emptyList(),
-                    hosting = emptyList(),
+
+            var magnet: String?
+            var torrent: String? = null
+
+            magnet =
+                item.torznabAttributes
+                    .firstOrNull { it.name.equals("magneturl", ignoreCase = true) }
+                    ?.value
+            if (magnet == null) {
+                if (item.link.isMagnet()) magnet = item.link
+                else if (item.guid.isMagnet()) magnet = item.guid
+                else if (item.enclosure.url.isMagnet()) magnet = item.enclosure.url
+            }
+
+            if (item.link.isTorrent()) torrent = item.link
+            else if (item.guid.isTorrent()) torrent = item.guid
+            else if (item.enclosure.url.isTorrent()) torrent = item.enclosure.url
+
+            if (magnet != null || torrent != null) {
+                scraped.add(
+                    ScrapedItem(
+                        name = item.title,
+                        link = item.comments,
+                        seeders =
+                            item.torznabAttributes
+                                .firstOrNull { it.name.equals("seeders", ignoreCase = true) }
+                                ?.value,
+                        leechers =
+                            item.torznabAttributes
+                                .firstOrNull { it.name.equals("leechers", ignoreCase = true) }
+                                ?.value,
+                        size =
+                            if (sizeLong !== null) getFileSizeString(context, sizeLong)
+                            else item.size,
+                        addedDate = item.pubDate,
+                        parsedSize = parseCommonSize(item.size),
+                        // todo: add better recognition of links
+                        magnets = if (magnet != null) listOf(magnet) else emptyList(),
+                        torrents = if (torrent != null) listOf(torrent) else emptyList(),
+                        hosting = emptyList(),
+                    )
                 )
-            )
+            }
         } catch (ex: Exception) {
             Timber.e(ex)
             errors++

From d56513847f062f7c439e9f317e7d4956decca4d9 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Thu, 16 Apr 2026 20:04:33 +0200
Subject: [PATCH 05/12] fixed test kodi button not working

---
 .../unchained/remoteservice/viewmodel/ServiceViewModel.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt
index aa011f5de..1beb7c917 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt
@@ -74,8 +74,8 @@ constructor(
                     is RemoteServiceType.KODI -> {
                         val response = kodiRepository.getVolume(address, username, password)
                         serviceLiveData.postValue(
-                            if (response != null) ServiceEvent.ServiceWorking else
-                            ServiceEvent.ServiceNotWorking(ServiceErrorType.InvalidService)
+                            if (response != null) ServiceEvent.ServiceWorking
+                            else ServiceEvent.ServiceNotWorking(ServiceErrorType.InvalidService)
                         )
                     }
 

From d667df88b8d765255790d2cde2e5173b52053cc6 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Thu, 16 Apr 2026 21:11:40 +0200
Subject: [PATCH 06/12] fixed vlc remote not managing spaces

close #386
---
 .../{RemoteRepository.kt => VLCRemoteRepository.kt} | 13 +++++++++----
 .../viewmodel/DownloadDetailsViewModel.kt           |  4 ++--
 .../unchained/utilities/Constants.kt                |  1 +
 .../livingwithhippos/unchained/utilities/Strings.kt | 10 +++++++---
 4 files changed, 19 insertions(+), 9 deletions(-)
 rename app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/{RemoteRepository.kt => VLCRemoteRepository.kt} (83%)

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/RemoteRepository.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/VLCRemoteRepository.kt
similarity index 83%
rename from app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/RemoteRepository.kt
rename to app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/VLCRemoteRepository.kt
index e7d5fbe9f..810e787c7 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/RemoteRepository.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/VLCRemoteRepository.kt
@@ -1,5 +1,6 @@
 package com.github.livingwithhippos.unchained.data.repository
 
+import androidx.core.net.toUri
 import com.github.livingwithhippos.unchained.di.ClassicClient
 import com.github.livingwithhippos.unchained.utilities.EitherResult
 import com.github.livingwithhippos.unchained.utilities.addHttpScheme
@@ -10,8 +11,9 @@ import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import timber.log.Timber
+import java.net.URLEncoder
 
-class RemoteRepository @Inject constructor(@param:ClassicClient private val client: OkHttpClient) {
+class VLCRemoteRepository @Inject constructor(@param:ClassicClient private val client: OkHttpClient) {
     // todo: add https://mpv.io/manual/stable/#json-ipc
 
     suspend fun openUrl(
@@ -23,8 +25,9 @@ class RemoteRepository @Inject constructor(@param:ClassicClient private val clie
     ): EitherResult<Exception, Boolean> =
         withContext(Dispatchers.IO) {
             // https://wiki.videolan.org/Documentation:Modules/http_intf/#VLC_2.0.0_and_later
-            // needs a password or it won't work:
+            // needs a password, or it won't work:
             // vlc --http-host 0.0.0.0 --http-port 9090 --http-password pass
+            // important! enable the web interface in the settings or the command won't print errors but also won't work!
             // also on some linux distro there may be a bug crashing the app 'glconv_vaapi_x11 gl
             // error: vaInitialize: unknown libva error'
             // workaround with export LIBVA_DRIVER_NAME=nvidia
@@ -53,13 +56,15 @@ class RemoteRepository @Inject constructor(@param:ClassicClient private val clie
         url: String,
         username: String? = null,
         password: String? = null,
+        encodeUrl: Boolean = true,
     ): EitherResult<Exception, Boolean> =
         withContext(Dispatchers.IO) {
             val credential = okhttp3.Credentials.basic(username ?: "", password ?: "")
-            val newBaseUrl = if (baseUrl.endsWith("/")) baseUrl.dropLast(1) else baseUrl
+            val newBaseUrl = addHttpScheme(if (baseUrl.endsWith("/")) baseUrl.dropLast(1) else baseUrl)
+            val finalUrl = if (encodeUrl) URLEncoder.encode(url, "UTF-8") else url
             val request =
                 Request.Builder()
-                    .url("$newBaseUrl/requests/status.xml?command=in_play&input=$url")
+                    .url("$newBaseUrl/requests/status.xml?command=in_play&input=$finalUrl")
                     .header("Authorization", credential)
                     .build()
 
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/viewmodel/DownloadDetailsViewModel.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/viewmodel/DownloadDetailsViewModel.kt
index 624b9a3e9..c4489b41c 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/viewmodel/DownloadDetailsViewModel.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/viewmodel/DownloadDetailsViewModel.kt
@@ -12,7 +12,7 @@ import com.github.livingwithhippos.unchained.data.model.KodiDevice
 import com.github.livingwithhippos.unchained.data.model.Stream
 import com.github.livingwithhippos.unchained.data.repository.DownloadRepository
 import com.github.livingwithhippos.unchained.data.repository.KodiRepository
-import com.github.livingwithhippos.unchained.data.repository.RemoteRepository
+import com.github.livingwithhippos.unchained.data.repository.VLCRemoteRepository
 import com.github.livingwithhippos.unchained.data.repository.ServiceRepository
 import com.github.livingwithhippos.unchained.data.repository.StreamingRepository
 import com.github.livingwithhippos.unchained.utilities.EitherResult
@@ -33,7 +33,7 @@ constructor(
     private val streamingRepository: StreamingRepository,
     private val downloadRepository: DownloadRepository,
     private val kodiRepository: KodiRepository,
-    private val remoteServiceRepository: RemoteRepository,
+    private val remoteServiceRepository: VLCRemoteRepository,
     private val serviceRepository: ServiceRepository,
 ) : ViewModel() {
 
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt
index 58e37e829..684fbc7ff 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt
@@ -27,6 +27,7 @@ const val MAGNET_PATTERN: String = "magnet:\\?xt=urn:btih:([a-zA-Z0-9]{32,})"
 const val TORRENT_PATTERN: String = "https?://[^\\s]{7,}\\.torrent"
 const val CONTAINER_PATTERN: String = "https?://[^\\s]{7,}\\.(rsdf|ccf3|ccf|dlc)"
 const val CONTAINER_EXTENSION_PATTERN: String = "[^\\s]+\\.(rsdf|ccf3|ccf|dlc)$"
+const val IP_PATTERN: String = "^(((?!25?[6-9])[12]\\d|[1-9])?\\d\\.?\\b){4}"
 
 const val FEEDBACK_URL = "https://github.com/LivingWithHippos/unchained-android"
 const val GPLV3_URL = "https://www.gnu.org/licenses/gpl-3.0.en.html"
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Strings.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Strings.kt
index 1c4c87247..03d087a0f 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Strings.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Strings.kt
@@ -3,6 +3,7 @@ package com.github.livingwithhippos.unchained.utilities
 import com.github.livingwithhippos.unchained.data.repository.PluginRepository
 
 val noWordDigitRegex = Regex("[^\\w\\d]+")
+val ipRegex = Regex(IP_PATTERN)
 
 /**
  * Return a hashed string from the repository link, to be used as a folder name in the plugins
@@ -34,7 +35,10 @@ fun getManualPluginFilename(author: String?, name: String): String {
  * Add the http scheme to the base url if it's not already there Optionally add https No checks are
  * performed on the url validity
  */
-fun addHttpScheme(baseUrl: String, useSecureHttp: Boolean = false): String {
-    return if (baseUrl.startsWith("http", ignoreCase = true)) baseUrl
-    else if (useSecureHttp) "https://$baseUrl" else "http://$baseUrl"
+fun addHttpScheme(baseUrl: String, setIPHttp: Boolean = true): String {
+    if (baseUrl.startsWith("http", ignoreCase = true)) return baseUrl
+    if (!setIPHttp) return "http://$baseUrl"
+    if (ipRegex.containsMatchIn(baseUrl)) return "http://$baseUrl"
+    // we suppose it's a domain
+    return "https://$baseUrl"
 }

From 674cd10781f55ecc4a46afcde08bf018a22ca14c Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Thu, 16 Apr 2026 21:21:05 +0200
Subject: [PATCH 07/12] implemented vlc connection test

---
 .../data/repository/VLCRemoteRepository.kt    | 66 ++++++++++++++-----
 .../viewmodel/ServiceViewModel.kt             |  9 ++-
 2 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/VLCRemoteRepository.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/VLCRemoteRepository.kt
index 810e787c7..8e1ef80d0 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/VLCRemoteRepository.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/VLCRemoteRepository.kt
@@ -46,7 +46,6 @@ class VLCRemoteRepository @Inject constructor(@param:ClassicClient private val c
                         IOException("Unexpected http code $response")
                     )
 
-                Timber.d(response.body!!.string())
                 return@withContext EitherResult.Success(true)
             }
         }
@@ -59,23 +58,58 @@ class VLCRemoteRepository @Inject constructor(@param:ClassicClient private val c
         encodeUrl: Boolean = true,
     ): EitherResult<Exception, Boolean> =
         withContext(Dispatchers.IO) {
-            val credential = okhttp3.Credentials.basic(username ?: "", password ?: "")
-            val newBaseUrl = addHttpScheme(if (baseUrl.endsWith("/")) baseUrl.dropLast(1) else baseUrl)
-            val finalUrl = if (encodeUrl) URLEncoder.encode(url, "UTF-8") else url
-            val request =
-                Request.Builder()
-                    .url("$newBaseUrl/requests/status.xml?command=in_play&input=$finalUrl")
-                    .header("Authorization", credential)
-                    .build()
+            try {
+                val credential = okhttp3.Credentials.basic(username ?: "", password ?: "")
+                val newBaseUrl =
+                    addHttpScheme(if (baseUrl.endsWith("/")) baseUrl.dropLast(1) else baseUrl)
+                val finalUrl = if (encodeUrl) URLEncoder.encode(url, "UTF-8") else url
+                val request =
+                    Request.Builder()
+                        .url("$newBaseUrl/requests/status.xml?command=in_play&input=$finalUrl")
+                        .header("Authorization", credential)
+                        .build()
 
-            client.newCall(request).execute().use { response ->
-                if (!response.isSuccessful)
-                    return@withContext EitherResult.Failure(
-                        IOException("Unexpected http code $response")
-                    )
+                client.newCall(request).execute().use { response ->
+                    if (!response.isSuccessful)
+                        return@withContext EitherResult.Failure(
+                            IOException("Unexpected http code $response")
+                        )
 
-                Timber.d(response.body!!.string())
-                return@withContext EitherResult.Success(true)
+                    return@withContext EitherResult.Success(true)
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Error opening VLC remote url")
+                return@withContext EitherResult.Failure(e)
+            }
+        }
+
+    suspend fun getPlayList(
+        baseUrl: String,
+        username: String? = null,
+        password: String? = null,
+    ): EitherResult<Exception, Boolean> =
+        withContext(Dispatchers.IO) {
+            try {
+                val credential = okhttp3.Credentials.basic(username ?: "", password ?: "")
+                val newBaseUrl =
+                    addHttpScheme(if (baseUrl.endsWith("/")) baseUrl.dropLast(1) else baseUrl)
+                val request =
+                    Request.Builder()
+                        .url("$newBaseUrl/requests/playlist.xml")
+                        .header("Authorization", credential)
+                        .build()
+
+                client.newCall(request).execute().use { response ->
+                    if (!response.isSuccessful)
+                        return@withContext EitherResult.Failure(
+                            IOException("Unexpected http code $response")
+                        )
+
+                    return@withContext EitherResult.Success(true)
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Error testing VLC service")
+                return@withContext EitherResult.Failure(e)
             }
         }
 }
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt
index 1beb7c917..56de22a1f 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt
@@ -7,8 +7,10 @@ import com.github.livingwithhippos.unchained.data.local.CompleteRemoteService
 import com.github.livingwithhippos.unchained.data.local.RemoteServiceType
 import com.github.livingwithhippos.unchained.data.repository.KodiRepository
 import com.github.livingwithhippos.unchained.data.repository.ServiceRepository
+import com.github.livingwithhippos.unchained.data.repository.VLCRemoteRepository
 import com.github.livingwithhippos.unchained.di.ClassicClient
 import com.github.livingwithhippos.unchained.remotedevice.viewmodel.ServiceErrorType
+import com.github.livingwithhippos.unchained.utilities.EitherResult
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
@@ -23,6 +25,7 @@ class ServiceViewModel
 constructor(
     private val serviceRepository: ServiceRepository,
     private val kodiRepository: KodiRepository,
+    private val vlcRemoteRepository: VLCRemoteRepository,
     @param:ClassicClient private val client: OkHttpClient,
 ) : ViewModel() {
 
@@ -75,13 +78,15 @@ constructor(
                         val response = kodiRepository.getVolume(address, username, password)
                         serviceLiveData.postValue(
                             if (response != null) ServiceEvent.ServiceWorking
-                            else ServiceEvent.ServiceNotWorking(ServiceErrorType.InvalidService)
+                            else ServiceEvent.ServiceNotWorking(ServiceErrorType.ResponseError)
                         )
                     }
 
                     is RemoteServiceType.VLC -> {
+                        val response = vlcRemoteRepository.getPlayList(address, username, password)
                         serviceLiveData.postValue(
-                            ServiceEvent.ServiceNotWorking(ServiceErrorType.InvalidService)
+                            if (response is EitherResult.Success) ServiceEvent.ServiceWorking
+                            else ServiceEvent.ServiceNotWorking(ServiceErrorType.ResponseError)
                         )
                     }
                 }

From 76ee574a15236af280fd7cd7614176d9dba61dd3 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Thu, 16 Apr 2026 21:21:42 +0200
Subject: [PATCH 08/12] formatted code

---
 .../unchained/data/repository/VLCRemoteRepository.kt   | 10 ++++++----
 .../viewmodel/DownloadDetailsViewModel.kt              |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/VLCRemoteRepository.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/VLCRemoteRepository.kt
index 8e1ef80d0..6b698e502 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/VLCRemoteRepository.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/VLCRemoteRepository.kt
@@ -1,19 +1,20 @@
 package com.github.livingwithhippos.unchained.data.repository
 
-import androidx.core.net.toUri
 import com.github.livingwithhippos.unchained.di.ClassicClient
 import com.github.livingwithhippos.unchained.utilities.EitherResult
 import com.github.livingwithhippos.unchained.utilities.addHttpScheme
 import java.io.IOException
+import java.net.URLEncoder
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import timber.log.Timber
-import java.net.URLEncoder
 
-class VLCRemoteRepository @Inject constructor(@param:ClassicClient private val client: OkHttpClient) {
+class VLCRemoteRepository
+@Inject
+constructor(@param:ClassicClient private val client: OkHttpClient) {
     // todo: add https://mpv.io/manual/stable/#json-ipc
 
     suspend fun openUrl(
@@ -27,7 +28,8 @@ class VLCRemoteRepository @Inject constructor(@param:ClassicClient private val c
             // https://wiki.videolan.org/Documentation:Modules/http_intf/#VLC_2.0.0_and_later
             // needs a password, or it won't work:
             // vlc --http-host 0.0.0.0 --http-port 9090 --http-password pass
-            // important! enable the web interface in the settings or the command won't print errors but also won't work!
+            // important! enable the web interface in the settings or the command won't print errors
+            // but also won't work!
             // also on some linux distro there may be a bug crashing the app 'glconv_vaapi_x11 gl
             // error: vaInitialize: unknown libva error'
             // workaround with export LIBVA_DRIVER_NAME=nvidia
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/viewmodel/DownloadDetailsViewModel.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/viewmodel/DownloadDetailsViewModel.kt
index c4489b41c..1f4f71cf2 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/viewmodel/DownloadDetailsViewModel.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/viewmodel/DownloadDetailsViewModel.kt
@@ -12,9 +12,9 @@ import com.github.livingwithhippos.unchained.data.model.KodiDevice
 import com.github.livingwithhippos.unchained.data.model.Stream
 import com.github.livingwithhippos.unchained.data.repository.DownloadRepository
 import com.github.livingwithhippos.unchained.data.repository.KodiRepository
-import com.github.livingwithhippos.unchained.data.repository.VLCRemoteRepository
 import com.github.livingwithhippos.unchained.data.repository.ServiceRepository
 import com.github.livingwithhippos.unchained.data.repository.StreamingRepository
+import com.github.livingwithhippos.unchained.data.repository.VLCRemoteRepository
 import com.github.livingwithhippos.unchained.utilities.EitherResult
 import com.github.livingwithhippos.unchained.utilities.Event
 import com.github.livingwithhippos.unchained.utilities.postEvent

From c235daaf302d16daf370b3eaaee12fd89900005c Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Tue, 21 Apr 2026 18:36:48 +0200
Subject: [PATCH 09/12] updated libraries

---
 app/build.gradle.kts          | 2 +-
 app/gradle/libs.versions.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8477886de..5376196fd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     alias(libs.plugins.hilt.android) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.room) apply false
-    id("com.github.ben-manes.versions") version "0.53.0"
+    id("com.github.ben-manes.versions") version "0.54.0"
 }
 
 buildscript {
diff --git a/app/gradle/libs.versions.toml b/app/gradle/libs.versions.toml
index 9087c5d8d..367991862 100644
--- a/app/gradle/libs.versions.toml
+++ b/app/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ navigation = "2.9.7"
 okhttp = "5.3.2"
 paging = "3.4.2"
 protobuf = "4.34.1"
-protobuf_plugin = "0.9.6"
+protobuf_plugin = "0.10.0"
 preference = "1.2.1"
 recyclerview = "1.4.0"
 recyclerview_selection = "1.2.0"

From 4b119143405ed686ac612528f0bc745affe360d5 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Tue, 21 Apr 2026 18:38:15 +0200
Subject: [PATCH 10/12] added prowlarr support

close #306
---
 .../data/local/RemoteServiceEntity.kt         |   3 +
 .../unchained/data/model/Prowlarr.kt          |  91 +++++++++++++++
 .../data/repository/JackettRepository.kt      |   2 +-
 .../data/repository/ProwlarrRepository.kt     | 105 ++++++++++++++++++
 .../view/DownloadDetailsFragment.kt           |  20 +---
 .../view/RemoteServiceFragment.kt             |  25 +++++
 .../remotedevice/viewmodel/DeviceViewModel.kt |  30 +++++
 .../view/CompleteServiceFragment.kt           |  24 ++++
 .../viewmodel/ServiceViewModel.kt             |  24 ++++
 .../search/view/SearchItemFragment.kt         |   3 -
 .../search/viewmodel/SearchViewModel.kt       |  49 ++++++--
 .../unchained/utilities/Constants.kt          |   1 +
 .../utilities/extension/ViewExtension.kt      |   1 +
 .../src/main/res/drawable/icon_prowlarr.xml   |   5 +
 .../main/res/layout/item_complete_service.xml |   3 +-
 .../res/navigation/settings_nav_graph.xml     |   4 +-
 app/app/src/main/res/values/arrays.xml        |   1 +
 app/app/src/main/res/values/strings.xml       |   1 +
 18 files changed, 358 insertions(+), 34 deletions(-)
 create mode 100644 app/app/src/main/java/com/github/livingwithhippos/unchained/data/model/Prowlarr.kt
 create mode 100644 app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/ProwlarrRepository.kt
 create mode 100644 app/app/src/main/res/drawable/icon_prowlarr.xml

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/local/RemoteServiceEntity.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/local/RemoteServiceEntity.kt
index b600cb4f8..e86129cc4 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/local/RemoteServiceEntity.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/local/RemoteServiceEntity.kt
@@ -66,6 +66,8 @@ sealed class RemoteServiceType(
     data object VLC : RemoteServiceType(1, true, R.string.player_vlc, R.drawable.icon_vlc)
 
     data object JACKETT : RemoteServiceType(2, false, R.string.jackett, R.drawable.icon_jackett)
+
+    data object PROWLARR : RemoteServiceType(3, false, R.string.prowlarr, R.drawable.icon_prowlarr)
 }
 
 val serviceTypeMap =
@@ -73,6 +75,7 @@ val serviceTypeMap =
         RemoteServiceType.KODI.value to RemoteServiceType.KODI,
         RemoteServiceType.VLC.value to RemoteServiceType.VLC,
         RemoteServiceType.JACKETT.value to RemoteServiceType.JACKETT,
+        RemoteServiceType.PROWLARR.value to RemoteServiceType.PROWLARR,
     )
 
 /** Helper class to have all the service details together */
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/model/Prowlarr.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/model/Prowlarr.kt
new file mode 100644
index 000000000..1b10cb759
--- /dev/null
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/model/Prowlarr.kt
@@ -0,0 +1,91 @@
+package com.github.livingwithhippos.unchained.data.model
+
+import android.content.Context
+import com.github.livingwithhippos.unchained.plugins.model.ScrapedItem
+import com.github.livingwithhippos.unchained.utilities.HASH_PATTERN
+import com.github.livingwithhippos.unchained.utilities.MAGNET_PATTERN
+import com.github.livingwithhippos.unchained.utilities.extension.getFileSizeString
+import java.util.regex.Pattern
+import kotlinx.serialization.Serializable
+import timber.log.Timber
+
+private val magnetPattern = Pattern.compile(MAGNET_PATTERN)
+private val hashPattern = Regex(HASH_PATTERN)
+
+@Serializable
+data class ProwlarrResponse(
+    val guid: String,
+    val age: Int,
+    val ageHours: Double,
+    val ageMinutes: Double,
+    val size: Long,
+    val files: Int? = null,
+    val indexerId: Int,
+    val indexer: String,
+    val title: String,
+    val sortTitle: String,
+    val imdbId: Int? = null,
+    val tmdbId: Int? = null,
+    val tvdbId: Int? = null,
+    val tvMazeId: Int? = null,
+    val publishDate: String,
+    val infoUrl: String,
+    val indexerFlags: List<String> = emptyList(),
+    val categories: List<PCategory> = emptyList(),
+    val downloadUrl: String? = null,
+    val magnetUrl: String? = null,
+    val infoHash: String? = null,
+    val seeders: Int,
+    val leechers: Int,
+    val protocol: String,
+    val fileName: String,
+)
+
+@Serializable
+data class PCategory(
+    val id: Int,
+    val name: String? = null,
+    val subCategories: List<PCategory> = emptyList(),
+)
+
+fun prowlarrToScrapedItems(context: Context, response: List<ProwlarrResponse>): List<ScrapedItem> {
+    return response.mapNotNull {
+        when (it.protocol) {
+            "torrent",
+            "magnet" -> {
+                // todo: sometimes indexers have no magnet links, and the downloadUtl
+                //  need to be followed because it returns a magnet link
+                //  (and maybe some of them returns a torrent file)
+                //  the user can still long click on the result and manually follow the link
+                //  so we still shown it
+
+                var magnet: String? = null
+                if (magnetPattern.matcher(it.guid).lookingAt()) magnet = it.guid
+                else if (it.magnetUrl != null && magnetPattern.matcher(it.magnetUrl).lookingAt())
+                    magnet = it.magnetUrl
+                else if (it.infoHash != null && hashPattern.matches(it.infoHash))
+                    magnet = "magnet:?xt=urn:btih:${it.infoHash}"
+                else if (it.magnetUrl != null) magnet = it.magnetUrl
+
+                ScrapedItem(
+                    name = it.title,
+                    link = it.infoUrl,
+                    size = getFileSizeString(context, it.size),
+                    addedDate = it.publishDate,
+                    parsedSize = it.size.toDouble(),
+                    seeders = it.seeders.toString(),
+                    leechers = it.leechers.toString(),
+                    magnets = if (magnet != null) listOf(magnet) else emptyList(),
+                    torrents = if (it.downloadUrl != null) listOf(it.downloadUrl) else emptyList(),
+                    hosting = emptyList(),
+                )
+            }
+            else -> {
+                Timber.e(
+                    "Don't know how to handle Prowlarr response with protocol ${it.protocol}, $it"
+                )
+                null
+            }
+        }
+    }
+}
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/JackettRepository.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/JackettRepository.kt
index 4995ef8a3..32e29acc6 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/JackettRepository.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/JackettRepository.kt
@@ -128,7 +128,7 @@ constructor(
                         emit(ParserResult.Results(items.first))
                         return@flow
                     } catch (ex: Exception) {
-                        Timber.e(ex, "Error parsing Search response")
+                        Timber.e(ex, "Error parsing Jackett search response")
                     }
 
                     emit(ParserResult.SourceError)
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/ProwlarrRepository.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/ProwlarrRepository.kt
new file mode 100644
index 000000000..9fdfc78c7
--- /dev/null
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/repository/ProwlarrRepository.kt
@@ -0,0 +1,105 @@
+package com.github.livingwithhippos.unchained.data.repository
+
+import android.content.Context
+import android.net.Uri
+import androidx.core.net.toUri
+import com.github.livingwithhippos.unchained.data.local.CompleteRemoteService
+import com.github.livingwithhippos.unchained.data.model.ProwlarrResponse
+import com.github.livingwithhippos.unchained.data.model.prowlarrToScrapedItems
+import com.github.livingwithhippos.unchained.di.ClassicClient
+import com.github.livingwithhippos.unchained.plugins.ParserResult
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.serialization.json.Json
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import timber.log.Timber
+
+class ProwlarrRepository
+@Inject
+constructor(
+    @param:ClassicClient private val client: OkHttpClient,
+    @ApplicationContext private val applicationContext: Context,
+) {
+    // todo: implement POST search with json body, as it is more flexible and allows to bypass url
+    // length limits
+    //  https://prowlarr.com/docs/api/#/Search/post_api_v1_search
+
+    private val json = Json { ignoreUnknownKeys = true }
+
+    private fun getBasicApi(service: CompleteRemoteService): Uri.Builder? {
+        return try {
+            val baseUri = service.address.toUri()
+            if (baseUri.scheme.isNullOrBlank() || baseUri.encodedAuthority.isNullOrBlank()) {
+                return null
+            }
+
+            baseUri
+                .buildUpon()
+                .encodedQuery(null)
+                .fragment(null)
+                .appendPath("api")
+                .appendPath("v1")
+                .appendPath("search")
+                .appendQueryParameter("apikey", service.apiToken)
+        } catch (ex: Exception) {
+            Timber.e(ex, "Error parsing url from $service")
+            null
+        }
+    }
+
+    fun performSearch(
+        service: CompleteRemoteService,
+        query: String,
+        indexers: List<Int> = emptyList(),
+        categories: List<Int> = emptyList(),
+        offset: Int? = null,
+        limit: Int? = null,
+    ) =
+        flow {
+                val builder = getBasicApi(service)
+                if (builder == null) {
+                    emit(ParserResult.SourceError)
+                    return@flow
+                }
+
+                builder.appendQueryParameter("query", query)
+                if (indexers.isNotEmpty()) {
+                    indexers.forEach { builder.appendQueryParameter("indexerIds", it.toString()) }
+                }
+                if (categories.isNotEmpty()) {
+                    categories.forEach { builder.appendQueryParameter("categories", it.toString()) }
+                }
+
+                if (offset != null) builder.appendQueryParameter("offset", offset.toString())
+                if (limit != null) builder.appendQueryParameter("limit", limit.toString())
+
+                val request = Request.Builder().url(builder.build().toString()).build()
+
+                client.newCall(request).execute().use { response ->
+                    if (!response.isSuccessful) {
+                        emit(ParserResult.SourceError)
+                        return@flow
+                    }
+                    if (response.body == null) {
+                        emit(ParserResult.NetworkBodyError)
+                        return@flow
+                    }
+                    val body: String = response.body.string()
+                    try {
+                        val results: List<ProwlarrResponse> = json.decodeFromString(body)
+                        val items = prowlarrToScrapedItems(applicationContext, results)
+                        emit(ParserResult.Results(items))
+                        return@flow
+                    } catch (ex: Exception) {
+                        Timber.e(ex, "Error parsing Prowlarr search response")
+                    }
+
+                    emit(ParserResult.SourceError)
+                }
+            }
+            .flowOn(Dispatchers.IO)
+}
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/view/DownloadDetailsFragment.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/view/DownloadDetailsFragment.kt
index 2dee71705..012d442c9 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/view/DownloadDetailsFragment.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/downloaddetails/view/DownloadDetailsFragment.kt
@@ -367,14 +367,14 @@ class DownloadDetailsFragment : UnchainedFragment(), DownloadDetailsListener {
                     if (recentServiceItem != null) {
 
                         val serviceType: RemoteServiceType =
-                            getServiceType(recentServiceItem.type)!!
+                            serviceTypeMap[recentServiceItem.type]!!
                         playOnService(url ?: args.details.download, recentServiceItem, serviceType)
                     }
                 }
 
                 R.id.default_service -> {
                     if (defaultService != null) {
-                        val serviceType: RemoteServiceType = getServiceType(defaultService.type)!!
+                        val serviceType: RemoteServiceType = serviceTypeMap[defaultService.type]!!
                         playOnService(url ?: args.details.download, defaultService, serviceType)
                     }
                 }
@@ -423,7 +423,7 @@ class DownloadDetailsFragment : UnchainedFragment(), DownloadDetailsListener {
             popup.contentView.findViewById<ConstraintLayout>(R.id.defaultServiceLayout)
 
         if (defaultService != null) {
-            val serviceType: RemoteServiceType? = getServiceType(defaultService.type)
+            val serviceType: RemoteServiceType? = serviceTypeMap[defaultService.type]
             if (serviceType != null) {
                 defaultLayout
                     .findViewById<ImageView>(R.id.serviceIcon)
@@ -451,7 +451,7 @@ class DownloadDetailsFragment : UnchainedFragment(), DownloadDetailsListener {
                 service.id == recentService
             }
             if (recentServiceItem != null) {
-                val serviceType: RemoteServiceType? = getServiceType(recentServiceItem.type)
+                val serviceType: RemoteServiceType? = serviceTypeMap[recentServiceItem.type]
                 if (serviceType != null) {
                     recentLayout
                         .findViewById<ImageView>(R.id.recentServiceIcon)
@@ -684,18 +684,6 @@ class DownloadDetailsFragment : UnchainedFragment(), DownloadDetailsListener {
         }
     }
 
-    private fun getServiceType(type: Int): RemoteServiceType? {
-        return when (type) {
-            RemoteServiceType.KODI.value -> RemoteServiceType.KODI
-            RemoteServiceType.VLC.value -> RemoteServiceType.VLC
-            RemoteServiceType.JACKETT.value -> RemoteServiceType.JACKETT
-            else -> {
-                Timber.e("Unknown service type $type")
-                null
-            }
-        }
-    }
-
     companion object {
         const val SHOW_SHARE_BUTTON = "show_share_button"
         const val SHOW_OPEN_BUTTON = "show_open_button"
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/remotedevice/view/RemoteServiceFragment.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/remotedevice/view/RemoteServiceFragment.kt
index 4702a1557..440e792ad 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/remotedevice/view/RemoteServiceFragment.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/remotedevice/view/RemoteServiceFragment.kt
@@ -134,6 +134,21 @@ class RemoteServiceFragment : Fragment() {
                         )
                     viewModel.updateService(remoteService)
                 }
+                RemoteServiceType.PROWLARR -> {
+                    val remoteService =
+                        RemoteService(
+                            id = serviceId,
+                            device = deviceID,
+                            name = name,
+                            port = port,
+                            username = username.ifBlank { null },
+                            password = password.ifBlank { null },
+                            type = serviceType.value,
+                            apiToken = apiToken,
+                            isDefault = false,
+                        )
+                    viewModel.updateService(remoteService)
+                }
 
                 RemoteServiceType.KODI -> {
                     val remoteService =
@@ -232,6 +247,10 @@ class RemoteServiceFragment : Fragment() {
                 RemoteServiceType.JACKETT
             }
 
+            getString(R.string.prowlarr) -> {
+                RemoteServiceType.PROWLARR
+            }
+
             else -> {
                 null
             }
@@ -265,6 +284,12 @@ class RemoteServiceFragment : Fragment() {
                 binding.tfApiToken.visibility = View.VISIBLE
             }
 
+            RemoteServiceType.PROWLARR -> {
+                binding.switchDefault.isEnabled = false
+                binding.switchDefault.isChecked = false
+                binding.tfApiToken.visibility = View.VISIBLE
+            }
+
             null -> {
                 Timber.e("Unknown service type $type")
                 return
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/remotedevice/viewmodel/DeviceViewModel.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/remotedevice/viewmodel/DeviceViewModel.kt
index 8297c2353..e816fd535 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/remotedevice/viewmodel/DeviceViewModel.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/remotedevice/viewmodel/DeviceViewModel.kt
@@ -37,6 +37,36 @@ constructor(
         viewModelScope.launch {
             withContext(Dispatchers.IO) {
                 when (type) {
+                    is RemoteServiceType.PROWLARR -> {
+                        val url: StringBuilder = StringBuilder()
+                        if (
+                            !address.startsWith("http://", ignoreCase = true) &&
+                                !address.startsWith("https://", ignoreCase = true)
+                        ) {
+                            if (port == 443) url.append("https://") else url.append("http://")
+                        }
+                        url.append(address)
+                        if (port != 80 && port != 443) url.append(":$port")
+                        url.append("/api")
+                        if (apiToken != null) url.append("&apikey=$apiToken")
+                        val request = okhttp3.Request.Builder().url(url.toString()).build()
+                        try {
+                            val response = client.newCall(request).execute()
+                            if (response.isSuccessful) {
+                                Timber.d(response.body.toString())
+                                deviceLiveData.postValue(DeviceEvent.ServiceWorking)
+                            } else {
+                                deviceLiveData.postValue(
+                                    DeviceEvent.ServiceNotWorking(ServiceErrorType.ResponseError)
+                                )
+                            }
+                        } catch (e: Exception) {
+                            Timber.e(e, "Error testing the service $url")
+                            deviceLiveData.postValue(
+                                DeviceEvent.ServiceNotWorking(ServiceErrorType.Generic)
+                            )
+                        }
+                    }
                     is RemoteServiceType.JACKETT -> {
                         val url: StringBuilder = StringBuilder()
                         if (
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/view/CompleteServiceFragment.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/view/CompleteServiceFragment.kt
index 2b7c9b148..0e7000634 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/view/CompleteServiceFragment.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/view/CompleteServiceFragment.kt
@@ -132,6 +132,21 @@ class CompleteServiceFragment : Fragment() {
                     viewModel.updateService(remoteService)
                 }
 
+                RemoteServiceType.PROWLARR -> {
+                    val remoteService =
+                        CompleteRemoteService(
+                            id = serviceId,
+                            name = name,
+                            address = address,
+                            username = username.ifBlank { null },
+                            password = password.ifBlank { null },
+                            type = serviceType.value,
+                            apiToken = apiToken,
+                            isDefault = false,
+                        )
+                    viewModel.updateService(remoteService)
+                }
+
                 RemoteServiceType.KODI -> {
                     val remoteService =
                         CompleteRemoteService(
@@ -232,6 +247,9 @@ class CompleteServiceFragment : Fragment() {
             getString(R.string.jackett) -> {
                 RemoteServiceType.JACKETT
             }
+            getString(R.string.prowlarr) -> {
+                RemoteServiceType.PROWLARR
+            }
 
             else -> {
                 null
@@ -265,6 +283,12 @@ class CompleteServiceFragment : Fragment() {
                 binding.tfApiToken.visibility = View.VISIBLE
             }
 
+            RemoteServiceType.PROWLARR -> {
+                binding.switchDefault.isEnabled = false
+                binding.switchDefault.isChecked = false
+                binding.tfApiToken.visibility = View.VISIBLE
+            }
+
             null -> {
                 Timber.e("Unknown service type $type")
                 return
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt
index 56de22a1f..0aa4d3161 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/remoteservice/viewmodel/ServiceViewModel.kt
@@ -74,6 +74,30 @@ constructor(
                         }
                     }
 
+                    is RemoteServiceType.PROWLARR -> {
+                        val url: StringBuilder = StringBuilder()
+                        url.append(address)
+                        url.append("/api")
+                        if (apiToken != null) url.append("&apikey=$apiToken")
+                        val request = okhttp3.Request.Builder().url(url.toString()).build()
+                        try {
+                            val response = client.newCall(request).execute()
+                            if (response.isSuccessful) {
+                                Timber.d(response.body.toString())
+                                serviceLiveData.postValue(ServiceEvent.ServiceWorking)
+                            } else {
+                                serviceLiveData.postValue(
+                                    ServiceEvent.ServiceNotWorking(ServiceErrorType.ResponseError)
+                                )
+                            }
+                        } catch (e: Exception) {
+                            Timber.e(e, "Error testing the service $url")
+                            serviceLiveData.postValue(
+                                ServiceEvent.ServiceNotWorking(ServiceErrorType.Generic)
+                            )
+                        }
+                    }
+
                     is RemoteServiceType.KODI -> {
                         val response = kodiRepository.getVolume(address, username, password)
                         serviceLiveData.postValue(
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/search/view/SearchItemFragment.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/search/view/SearchItemFragment.kt
index fce0473f6..5e21f6fa8 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/search/view/SearchItemFragment.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/search/view/SearchItemFragment.kt
@@ -12,7 +12,6 @@ import com.github.livingwithhippos.unchained.plugins.model.ScrapedItem
 import com.github.livingwithhippos.unchained.search.model.LinkItem
 import com.github.livingwithhippos.unchained.search.model.LinkItemAdapter
 import com.github.livingwithhippos.unchained.search.model.LinkItemListener
-import com.github.livingwithhippos.unchained.utilities.MAGNET_PATTERN
 import com.github.livingwithhippos.unchained.utilities.extension.copyToClipboard
 import com.github.livingwithhippos.unchained.utilities.extension.openExternalWebPage
 import com.github.livingwithhippos.unchained.utilities.extension.showToast
@@ -23,8 +22,6 @@ class SearchItemFragment : UnchainedFragment(), LinkItemListener {
 
     private val args: SearchItemFragmentArgs by navArgs()
 
-    private val magnetPattern = Regex(MAGNET_PATTERN, RegexOption.IGNORE_CASE)
-
     private var _binding: FragmentSearchItemBinding? = null
 
     // This property is only valid between onCreateView and onDestroyView.
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/search/viewmodel/SearchViewModel.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/search/viewmodel/SearchViewModel.kt
index 078926372..dc7fcdb8d 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/search/viewmodel/SearchViewModel.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/search/viewmodel/SearchViewModel.kt
@@ -13,6 +13,7 @@ import com.github.livingwithhippos.unchained.data.local.RemoteServiceType
 import com.github.livingwithhippos.unchained.data.repository.DatabasePluginRepository
 import com.github.livingwithhippos.unchained.data.repository.JackettRepository
 import com.github.livingwithhippos.unchained.data.repository.PluginRepository
+import com.github.livingwithhippos.unchained.data.repository.ProwlarrRepository
 import com.github.livingwithhippos.unchained.data.repository.ServiceRepository
 import com.github.livingwithhippos.unchained.folderlist.view.FolderListFragment
 import com.github.livingwithhippos.unchained.folderlist.viewmodel.FolderListViewModel
@@ -45,6 +46,7 @@ constructor(
     private val databasePluginsRepository: DatabasePluginRepository,
     private val serviceRepository: ServiceRepository,
     private val jackettRepository: JackettRepository,
+    private val prowlarrRepository: ProwlarrRepository,
     private val parser: Parser,
 ) : ViewModel() {
 
@@ -136,7 +138,10 @@ constructor(
                     plugin.copy(selected = selectedPlugins.contains(plugin.name.lowercase()))
                 }
             val services =
-                serviceRepository.getServicesTypes(types = listOf(RemoteServiceType.JACKETT.value))
+                serviceRepository.getServicesTypes(
+                    types =
+                        listOf(RemoteServiceType.JACKETT.value, RemoteServiceType.PROWLARR.value)
+                )
             pluginLiveData.postEvent(
                 PluginsAndServices(
                     plugins = pluginsWithSelection,
@@ -247,7 +252,8 @@ constructor(
             // todo add repo with suspend to access the db of complete remote servceis
             val enabledServices =
                 serviceRepository.getEnabledServicesTypes(
-                    types = listOf(RemoteServiceType.JACKETT.value)
+                    types =
+                        listOf(RemoteServiceType.JACKETT.value, RemoteServiceType.PROWLARR.value)
                 )
 
             if (enabledPlugins.isEmpty() && enabledServices.isEmpty()) {
@@ -293,17 +299,38 @@ constructor(
                     launch {
                         Timber.d("Starting search for service ${service.name}")
                         // todo: add categories support
-                        jackettRepository.performSearch(service, query = query).collect {
-                            when (it) {
-                                is ParserResult.Results -> {
-                                    parsingLiveData.value = ParserResult.Results(it.values)
+                        when (service.type) {
+                            RemoteServiceType.JACKETT.value -> {
+                                jackettRepository.performSearch(service, query = query).collect {
+                                    when (it) {
+                                        is ParserResult.Results -> {
+                                            parsingLiveData.value = ParserResult.Results(it.values)
+                                        }
+
+                                        else -> {
+                                            // not used yet
+                                            Timber.d(
+                                                "Received non-results parser result from service search: $it"
+                                            )
+                                        }
+                                    }
                                 }
+                            }
 
-                                else -> {
-                                    // not used yet
-                                    Timber.d(
-                                        "Received non-results parser result from service search: $it"
-                                    )
+                            RemoteServiceType.PROWLARR.value -> {
+                                prowlarrRepository.performSearch(service, query = query).collect {
+                                    when (it) {
+                                        is ParserResult.Results -> {
+                                            parsingLiveData.value = ParserResult.Results(it.values)
+                                        }
+
+                                        else -> {
+                                            // not used yet
+                                            Timber.d(
+                                                "Received non-results parser result from service search: $it"
+                                            )
+                                        }
+                                    }
                                 }
                             }
                         }
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt
index 684fbc7ff..712fe9d31 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/Constants.kt
@@ -23,6 +23,7 @@ const val PRIVATE_TOKEN: String = "private_token"
 
 const val REMOTE_TRAFFIC_ON: Int = 1
 
+const val HASH_PATTERN: String = "[a-zA-Z0-9]{32,}"
 const val MAGNET_PATTERN: String = "magnet:\\?xt=urn:btih:([a-zA-Z0-9]{32,})"
 const val TORRENT_PATTERN: String = "https?://[^\\s]{7,}\\.torrent"
 const val CONTAINER_PATTERN: String = "https?://[^\\s]{7,}\\.(rsdf|ccf3|ccf|dlc)"
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/ViewExtension.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/ViewExtension.kt
index e7ad50cb8..5ccf2b4b0 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/ViewExtension.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/utilities/extension/ViewExtension.kt
@@ -197,6 +197,7 @@ fun setDrawableByServiceType(view: ImageView, type: Int) {
         RemoteServiceType.KODI.value -> view.setImageResource(R.drawable.icon_kodi)
         RemoteServiceType.VLC.value -> view.setImageResource(R.drawable.icon_vlc)
         RemoteServiceType.JACKETT.value -> view.setImageResource(R.drawable.icon_jackett)
+        RemoteServiceType.PROWLARR.value -> view.setImageResource(R.drawable.icon_prowlarr)
         else -> view.setImageResource(R.drawable.icon_play_outline)
     }
 }
diff --git a/app/app/src/main/res/drawable/icon_prowlarr.xml b/app/app/src/main/res/drawable/icon_prowlarr.xml
new file mode 100644
index 000000000..5d621fcd6
--- /dev/null
+++ b/app/app/src/main/res/drawable/icon_prowlarr.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="128dp" android:viewportHeight="512" android:viewportWidth="512" android:width="128dp">
+      
+    <path android:fillColor="#FF000000" android:pathData="M200.5,259.5c-6.4,0 -11.6,-5.2 -11.6,-11.6s5.2,-11.6 11.6,-11.6 11.6,5.2 11.6,11.6 -5.2,11.6 -11.6,11.6m16.2,47.7s2.5,16 0,18c-2.4,2 -18,-11 -12.7,-24.4 0.1,-0.4 0.3,-0.8 0.5,-1.2 4.1,-8.5 7.7,-3.8 10,1.2 1.4,3.2 2.2,6.4 2.2,6.4m135.2,-79.9c8.5,-3.1 15.3,-10.4 17.3,-19.9 3,-14.6 -6.3,-28.8 -20.9,-31.9 -14.5,-3 -28.8,6.3 -31.9,20.9 -0.1,0.3 -0.1,0.7 -0.2,1 -27.5,-17.7 -64,-30.6 -107.4,-15.7 -11.2,3.8 -21.9,10.1 -31.7,17.8 -3.3,-14.3 -17.5,-23.3 -31.8,-20.4 -14.6,3 -24,17.3 -20.9,31.9 2.3,10.6 10.4,18.5 20.3,20.8 -22.6,27.7 -36.3,55.6 -36.3,55.6l33.5,-11.2c5.8,12.8 21.2,23.1 23.6,24.6l0.2,0.1 -0.1,-0.1 -9.9,-15.3c-2.5,-3.9 -1.6,-9 2,-11.9l15.5,-12.3s-20.9,6.7 -24.3,1.7c-3.6,-5.1 -0.9,-24.9 -0.9,-24.9 3.6,-7.3 9.7,-14.3 19.6,-19.6 34.2,-18.3 49.4,0.5 54.1,11.4 3,7 4.1,21.4 4.5,30.8 -1.6,0.3 -2.9,1.1 -3.9,2.7 -4.2,6.9 6.3,15.2 6.3,15.2s2.5,-7.3 8.7,-3.8c6.3,3.5 1,10.9 1,10.9s3.6,2.4 7.1,3.3v17.6c0.9,-0.4 1.5,-0.7 1.5,-0.7s0.8,0.7 2.1,1.8v-18.6c3.5,-0.9 7.3,-4 7.3,-4s-3,-8.4 3.4,-11.6c6.5,-3.3 7.4,8.2 7.4,8.2s12,-14.1 4.2,-20.2c-1.2,-1 -2.5,-1.5 -3.7,-1.8 1,-13.4 4.5,-36.8 16.7,-45.2 17.6,-12.3 44,-13.9 54.3,8.9q1.05,2.25 1.8,4.5c-0.2,2.4 -1.7,15.8 -5.2,22.8 -3.8,7.7 -17,4.2 -17,4.2s14.7,7.5 14.7,12.2 -9.9,19.6 -9.9,19.6 10.7,-6.8 16.9,-19.9l45.6,22.7c0,-0.4 -12.2,-36.7 -33.6,-62.2m-186.6,-17.7c-3.6,3.4 -7,6.9 -10.4,10.4 -0.3,0.1 -0.7,0.2 -1,0.3 -8.1,1.7 -16.1,-3.5 -17.8,-11.6s3.5,-16.1 11.6,-17.8 16.1,3.5 17.8,11.6c0.5,2.4 0.4,4.8 -0.2,7.1m176.6,7.3c-0.3,-0.3 -0.7,-0.6 -1,-0.9 -3.9,-3.3 -8.1,-6.8 -12.6,-10.2 -0.6,-2.2 -0.7,-4.6 -0.2,-7 1.7,-8.1 9.7,-13.3 17.8,-11.6s13.3,9.7 11.6,17.8c-1.5,7.4 -8.3,12.3 -15.6,11.9M256,0C114.6,0 0,114.6 0,256s114.6,256 256,256 256,-114.6 256,-256S397.4,0 256,0m145.6,361.5L365,361.5v-6.3h36.6zM392.9,334v16.3h-19.2L373.7,334L365,334l18.3,-20.8 18.3,20.8zM460.4,259 L422.9,306h-44.2l-0.8,0.9h-76.1c-3.4,3.7 -7.6,6.9 -8.8,7.8 -1.1,3.7 -3.4,7.3 -6.8,10.6 -1.7,1.6 -6.5,5.7 -11.1,5.7 -1.3,0 -2.6,-0.3 -3.7,-1.1 -1.3,-0.9 -3.5,-2.4 -3.5,-9.1 -2.5,-0.4 -5.3,-1.1 -8.2,-2 -8,-2.7 -12.6,-8.7 -12.6,-8.7s-8.9,5.5 -20.9,7.6c-1,0.2 -2,0.3 -2.8,0.5 0.6,9 -2.1,10.8 -3.5,11.8 -1.2,0.8 -2.4,1.1 -3.7,1.1 -4.6,0 -9.4,-4.1 -11.1,-5.7 -5.6,-5.3 -8.2,-11.6 -7.4,-17.6 -0.1,-0.3 -0.1,-0.6 -0.2,-0.8h-78.3l-17.9,-18.3 1.9,-3.8c0.2,-0.5 1.2,-2.4 2.7,-5.3L87.6,301v71.5c-23,-33.1 -36.4,-73.3 -36.4,-116.5 0,-113.1 91.7,-204.8 204.8,-204.8 1.6,0 3.2,0 4.8,0.1 3.3,-9.9 13.9,-15.8 24.3,-13.2 5.3,1.3 9.7,4.6 12.5,9.3 1.6,2.7 2.5,5.6 2.8,8.7 89.2,19.7 156.6,97.6 160.3,191.8 -0.1,-0.3 -0.2,-0.4 0,0.1l0.1,3.3zM287.1,300.9c5.3,13.4 -10.3,26.4 -12.7,24.4 -2.5,-2.1 0,-18 0,-18s0.8,-3.2 2.2,-6.3v-0.1c2.2,-4.9 5.8,-9.5 9.9,-1.1 0.3,0.3 0.5,0.7 0.6,1.1m167.8,-43L420.5,301h-37.3l9.2,-10.1 -1.1,-3.3c-0.6,-1.7 -11.5,-33.9 -31,-59.5 6.9,-4.6 11.7,-11.6 13.3,-19.8 3.5,-16.9 -7.5,-33.6 -24.4,-37.2 -14.7,-3 -29.2,4.8 -35.1,18 -27.1,-16.1 -53.9,-22.5 -81.2,-19.1 15.1,-12.6 52.2,-36.4 112,-28 7.1,1 13.8,2.8 20.1,5.1 0.6,-3.1 0.4,-6.5 -0.8,-10.5 -4.5,-14.1 -13.1,-16.2 -38.4,-18.9 -4.6,-0.5 -9.5,-1 -14.4,-1.7 -17.9,-2.6 -31.1,-10 -39.2,-22 -11.8,-17.6 -7.2,-37.5 -6.6,-39.8 2,-8 10.1,-12.8 18.1,-10.8s12.8,10.2 10.8,18.1c0,0 -2,9.3 2.6,16 3.2,4.6 9.4,7.7 18.5,9 4.5,0.6 9,1.1 13.4,1.6 23.5,2.5 52.9,5.6 63.7,39.4 4.2,13.1 3.1,24.6 -0.9,34.2 45.2,33.6 63.1,96.2 63.1,96.2m-162.2,1.6c-6.4,0 -11.6,-5.2 -11.6,-11.6s5.2,-11.6 11.6,-11.6 11.6,5.2 11.6,11.6 -5.2,11.6 -11.6,11.6m-80.6,-11.6c0,6.4 -5.2,11.6 -11.6,11.6s-11.6,-5.2 -11.6,-11.6 5.2,-11.6 11.6,-11.6 11.6,5.2 11.6,11.6m92.1,0c0,6.4 -5.2,11.6 -11.6,11.6s-11.6,-5.2 -11.6,-11.6 5.2,-11.6 11.6,-11.6 11.6,5.2 11.6,11.6"/>
+    
+</vector>
diff --git a/app/app/src/main/res/layout/item_complete_service.xml b/app/app/src/main/res/layout/item_complete_service.xml
index f519eba1a..2bd96bb05 100644
--- a/app/app/src/main/res/layout/item_complete_service.xml
+++ b/app/app/src/main/res/layout/item_complete_service.xml
@@ -57,7 +57,8 @@
         <ImageView
             android:id="@+id/ivType"
             android:layout_width="40dp"
-            android:layout_height="wrap_content"
+            android:layout_height="40dp"
+            android:scaleType="fitCenter"
             android:layout_marginStart="5dp"
             android:contentDescription="@string/service"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/app/src/main/res/navigation/settings_nav_graph.xml b/app/app/src/main/res/navigation/settings_nav_graph.xml
index 9910813cf..374c26cb4 100644
--- a/app/app/src/main/res/navigation/settings_nav_graph.xml
+++ b/app/app/src/main/res/navigation/settings_nav_graph.xml
@@ -70,7 +70,7 @@
     <fragment
         android:id="@+id/completeServiceListFragment"
         android:name="com.github.livingwithhippos.unchained.remoteservice.view.CompleteServiceListFragment"
-        android:label="CompleteServiceListFragment"
+        android:label="@string/remote_devices"
         tools:layout="@layout/fragment_services_list"
         >
         <action
@@ -80,7 +80,7 @@
     <fragment
         android:id="@+id/completeServiceFragment"
         android:name="com.github.livingwithhippos.unchained.remoteservice.view.CompleteServiceFragment"
-        android:label="CompleteServiceFragment"
+        android:label="@string/remote_device"
         tools:layout="@layout/fragment_complete_service"
         >
         <action
diff --git a/app/app/src/main/res/values/arrays.xml b/app/app/src/main/res/values/arrays.xml
index 569e0a324..9972eb092 100644
--- a/app/app/src/main/res/values/arrays.xml
+++ b/app/app/src/main/res/values/arrays.xml
@@ -96,6 +96,7 @@
         <item>@string/kodi</item>
         <item>@string/player_vlc</item>
         <item>@string/jackett</item>
+        <item>@string/prowlarr</item>
     </string-array>
     <string-array name="search_categories">
         <item>@string/category_all</item>
diff --git a/app/app/src/main/res/values/strings.xml b/app/app/src/main/res/values/strings.xml
index 59aa5642a..ac8c8777f 100644
--- a/app/app/src/main/res/values/strings.xml
+++ b/app/app/src/main/res/values/strings.xml
@@ -769,4 +769,5 @@
     <string name="service_added">Service Added</string>
     <string name="please_select_plugins">Please select at least a plugin</string>
     <string name="disabled">Disabled</string>
+    <string name="prowlarr" translatable="false">Prowlarr</string>
 </resources>
\ No newline at end of file

From 2293d94139daf0db6c59560727cd0c5f4c1c887d Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Tue, 21 Apr 2026 18:48:42 +0200
Subject: [PATCH 11/12] restore search results when pressing back on plugin
 search page

---
 .../search/view/PluginSearchFragment.kt       |  9 +++++++
 .../search/viewmodel/SearchViewModel.kt       | 25 +++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/search/view/PluginSearchFragment.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/search/view/PluginSearchFragment.kt
index d3adb9fd3..4e86b50f8 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/search/view/PluginSearchFragment.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/search/view/PluginSearchFragment.kt
@@ -239,6 +239,15 @@ class PluginSearchFragment : UnchainedFragment(), SearchItemListener {
         val adapter = SearchItemAdapter(this)
         binding.rvSearchList.adapter = adapter
 
+        // Restore any previously saved search results from the ViewModel so results
+        // are preserved when navigating to a detail and back (or on configuration change).
+        val savedResults = viewModel.getSearchResults()
+        if (savedResults.isNotEmpty()) {
+            searchResultsList.clear()
+            searchResultsList.addAll(savedResults)
+            submitSortedList(adapter, searchResultsList)
+        }
+
         binding.bStartSearch.setOnClickListener {
             val query: String = binding.tiSearch.text?.toString()?.trim() ?: ""
             if (query.isBlank()) {
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/search/viewmodel/SearchViewModel.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/search/viewmodel/SearchViewModel.kt
index dc7fcdb8d..8ff0e5071 100644
--- a/app/app/src/main/java/com/github/livingwithhippos/unchained/search/viewmodel/SearchViewModel.kt
+++ b/app/app/src/main/java/com/github/livingwithhippos/unchained/search/viewmodel/SearchViewModel.kt
@@ -265,17 +265,26 @@ constructor(
             delay(100)
 
             supervisorScope {
+                // accumulate results from all plugin/service searches so they survive fragment
+                // recreation (saved to SavedStateHandle via setSearchResults)
+                val results = mutableListOf<ScrapedItem>()
+
                 val pluginSearches = enabledPlugins.map { plugin ->
                     launch {
                         parser.completeSearch(plugin, query, category, page).collect {
                             when (it) {
                                 is ParserResult.SingleResult -> {
-                                    parsingLiveData.value = ParserResult.SingleResult(it.value)
+                                    // accumulate and publish aggregated results
+                                    results.add(it.value)
+                                    parsingLiveData.value = ParserResult.Results(results)
+                                    setSearchResults(results)
                                 }
 
                                 is ParserResult.Results -> {
-                                    // here I have all the results at once
-                                    parsingLiveData.value = ParserResult.Results(it.values)
+                                    // add all and publish aggregated results
+                                    results.addAll(it.values)
+                                    parsingLiveData.value = ParserResult.Results(results)
+                                    setSearchResults(results)
                                 }
 
                                 is ParserResult.SearchStarted -> {
@@ -295,6 +304,7 @@ constructor(
                         }
                     }
                 }
+
                 val servicesSearches = enabledServices.map { service ->
                     launch {
                         Timber.d("Starting search for service ${service.name}")
@@ -304,7 +314,9 @@ constructor(
                                 jackettRepository.performSearch(service, query = query).collect {
                                     when (it) {
                                         is ParserResult.Results -> {
-                                            parsingLiveData.value = ParserResult.Results(it.values)
+                                            results.addAll(it.values)
+                                            parsingLiveData.value = ParserResult.Results(results)
+                                            setSearchResults(results)
                                         }
 
                                         else -> {
@@ -321,7 +333,9 @@ constructor(
                                 prowlarrRepository.performSearch(service, query = query).collect {
                                     when (it) {
                                         is ParserResult.Results -> {
-                                            parsingLiveData.value = ParserResult.Results(it.values)
+                                            results.addAll(it.values)
+                                            parsingLiveData.value = ParserResult.Results(results)
+                                            setSearchResults(results)
                                         }
 
                                         else -> {
@@ -336,6 +350,7 @@ constructor(
                         }
                     }
                 }
+
                 pluginSearches.joinAll()
                 servicesSearches.joinAll()
             }

From af1e4302414634c16081d730c2349d2ec9a18f76 Mon Sep 17 00:00:00 2001
From: LivingWithHippos <LivingWithHippos@users.noreply.github.com>
Date: Tue, 21 Apr 2026 18:48:55 +0200
Subject: [PATCH 12/12] bumped version to 1.7.0

---
 app/app/build.gradle.kts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts
index 861dfa036..25c64c796 100644
--- a/app/app/build.gradle.kts
+++ b/app/app/build.gradle.kts
@@ -40,14 +40,14 @@ kotlin { jvmToolchain(11) }
 
 android {
     namespace = "com.github.livingwithhippos.unchained"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId = "com.github.livingwithhippos.unchained"
         minSdk = 27
-        targetSdk = 36
-        versionCode = 58
-        versionName = "1.6.1"
+        targetSdk = 37
+        versionCode = 59
+        versionName = "1.7.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }