Add filters only with selfoss >= 2.19

Source filters have been implemented in 2014 (commit 849957ca) but there is no reliable way to determine whether the selfoss instance does support source filters.
Fix sourceDetails unit tests
2025-04-13 20:01:56 +02:00 · 2025-04-13 00:01:46 +02:00 · 2025-04-12 23:58:12 +02:00
22 changed files with 279 additions and 521 deletions
--- a/.gitea/workflows/common_coverage.yml
+++ b/.gitea/workflows/common_coverage.yml
@@ -1,65 +0,0 @@
-name: Coverage
-on:
-  workflow_call:
-
-jobs:
-  BuildAndTestAndCoverage:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Fetch tags
-        run: git fetch --tags -p
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: gradle
-      - uses: gradle/actions/setup-gradle@v3
-      - uses: android-actions/setup-android@v3
-      - name: Configure gradle...
-        run: mkdir -p ~/.gradle && echo "ignoreGitVersion=true" >> ~/.gradle/gradle.properties
-      - uses: KengoTODA/actions-setup-docker-compose@v1
-        with:
-          version: "2.23.3"
-      - name: run selfoss
-        run: |
-          docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
-      - name: Set env url
-        run: |
-          export SELFOSS_URL=172.17.0.1:8888
-      # https://github.com/ReactiveCircus/android-emulator-runner/issues/385
-      - name: Kill crashpad_handler processes
-        if: always()
-        run: |
-          pkill -SIGTERM crashpad_handler || true
-          sleep 5
-          pkill -SIGKILL crashpad_handler || true
-      - name: Tests
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: 29
-          script: |
-            ./gradlew androidApp:connectedAndroidTest
-            killall -INT crashpad_handler || true
-      - uses: actions/upload-artifact@v3
-        if: failure()
-        with:
-          name: failure-espresso
-          path: build/reports/androidTests/connected/screenshots
-          retention-days: 2
-          overwrite: true
-          include-hidden-files: true
-      - uses: actions/upload-artifact@v3
-        with:
-          name: coverage-espresso
-          path: build/reports/coverage/androidTest/githubConfig/debug/connected
-          retention-days: 1
-          overwrite: true
-          include-hidden-files: true
-      - name: Clean
-        if: always()
-        run: |
-          docker compose -f .gitea/workflows/assets/docker-compose.yml stop
--- a/.gitea/workflows/on_pr.yml
+++ b/.gitea/workflows/on_pr.yml
@@ -3,148 +3,89 @@ on:
  pull_request:
    branches:
      - master
+      - chore-crowdin-ci

 jobs:
-  BuildAndTestAndCoverage:
+  Lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+      - name: Install klint
+        run: curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.5.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
+      - name: Install detekt
+        run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.7/detekt-cli-1.23.7.zip && unzip detekt-cli-1.23.7.zip
+      - name: Linting...
+        run: ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build'
+      - name: Detecting...
+        run: ./detekt-cli-1.23.7/bin/detekt-cli -c detekt.yml --excludes '**/shared/build/**/*.kt'
+  translations:
    runs-on: ubuntu-latest
    steps:
      - name: Check out repository code
        uses: actions/checkout@v4
        with:
          fetch-depth: 0
-      - name: Fetch tags
-        run: git fetch --tags -p
-      - uses: actions/setup-java@v4
+      - name: "Check translations changes"
+        id: check-translations-changes
+        uses: tj-actions/changed-files@v45
        with:
-          distribution: 'temurin'
-          java-version: '17'
-      - uses: gradle/actions/setup-gradle@v3
-      - uses: android-actions/setup-android@v3
-      - name: Configure gradle...
-        run: mkdir -p ~/.gradle && echo "ignoreGitVersion=true" >> ~/.gradle/gradle.properties
-      - uses: KengoTODA/actions-setup-docker-compose@v1
+          files: |
+            androidApp/src/main/res/values/strings.xml
+      - name: upload translation sources
+        if: steps.check-api-changes.outputs.any_modified == 'true'
+        uses: crowdin/github-action@v2
        with:
-          version: "2.23.3"
-      - name: run selfoss
+          config: './.gitea/workflows/assets/crowdin.yml'
+          upload_sources: true
+          upload_translations: false
+          download_translations: false
+          create_pull_request: false
+          push_translations: false
+        env:
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+      - name: wait
+        if: steps.check-api-changes.outputs.any_modified == 'true'
+        run: sleep 10s
+      - name: download translations
+        if: steps.check-api-changes.outputs.any_modified == 'true'
+        uses: crowdin/github-action@v2
+        with:
+          config: './.gitea/workflows/assets/crowdin.yml'
+          upload_sources: false
+          upload_translations: false
+          download_translations: true
+          create_pull_request: false
+          push_translations: false
+        env:
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+      - name: Check for uncommitted changes
+        if: steps.check-api-changes.outputs.any_modified == 'true'
+        id: check-changes
+        uses: mskri/check-uncommitted-changes-action@v1.0.1
+      - name: Commit Changes
+        if: steps.check-api-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.changes != ''
        run: |
-          docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
-      - name: Set env url
-        run: |
-          export SELFOSS_URL=172.17.0.1:8888
-      # https://github.com/ReactiveCircus/android-emulator-runner/issues/385
-      - name: Kill crashpad_handler processes
-        if: always()
-        run: |
-          pkill -SIGTERM crashpad_handler || true
-          sleep 5
-          pkill -SIGKILL crashpad_handler || true
-      - name: Tests
-        uses: reactivecircus/android-emulator-runner@v2
+          git config --global user.email aminecmi+giteadrone@pm.me
+          git config --global user.name giteadrone
+          git add ./androidApp/src/main/res/*
+          git commit -m "translation: translation files"
+      - name: Push changes
+        if: steps.check-api-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.changes != ''
+        uses: appleboy/git-push-action@v1.0.0
        with:
-          api-level: 29
-          script: |
-            ./gradlew androidApp:connectedAndroidTest || true
-            ./gradlew androidApp:fetchScreenshots
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: failure-espresso
-          path: build/reports/androidTests/connected/screenshots
-          retention-days: 2
-          overwrite: true
-          include-hidden-files: true
-      - uses: actions/upload-artifact@v3
-        with:
-          name: coverage-espresso
-          path: build/reports/coverage/androidTest/githubConfig/debug/connected
-          retention-days: 1
-          overwrite: true
-          include-hidden-files: true
-      - name: Clean
-        if: always()
-        run: |
-          docker compose -f .gitea/workflows/assets/docker-compose.yml stop
-
-#  Lint:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Check out repository code
-#        uses: actions/checkout@v4
-#      - uses: actions/setup-java@v4
-#        with:
-#          distribution: 'temurin'
-#          java-version: '17'
-#          cache: gradle
-#      - name: Install klint
-#        run: curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.5.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
-#      - name: Install detekt
-#        run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.7/detekt-cli-1.23.7.zip && unzip detekt-cli-1.23.7.zip
-#      - name: Linting...
-#        run: ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build'
-#      - name: Detecting...
-#        run: ./detekt-cli-1.23.7/bin/detekt-cli -c detekt.yml --excludes '**/shared/build/**/*.kt'
-#  translations:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Check out repository code
-#        uses: actions/checkout@v4
-#        with:
-#          fetch-depth: 0
-#      - name: "Check translations changes"
-#        id: check-translations-changes
-#        uses: tj-actions/changed-files@v45
-#        with:
-#          files: |
-#            androidApp/src/main/res/values/strings.xml
-#      - name: upload translation sources
-#        if: steps.check-api-changes.outputs.any_modified == 'true'
-#        uses: crowdin/github-action@v2
-#        with:
-#          config: './.gitea/workflows/assets/crowdin.yml'
-#          upload_sources: true
-#          upload_translations: false
-#          download_translations: false
-#          create_pull_request: false
-#          push_translations: false
-#        env:
-#          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-#          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-#      - name: wait
-#        if: steps.check-api-changes.outputs.any_modified == 'true'
-#        run: sleep 10s
-#      - name: download translations
-#        if: steps.check-api-changes.outputs.any_modified == 'true'
-#        uses: crowdin/github-action@v2
-#        with:
-#          config: './.gitea/workflows/assets/crowdin.yml'
-#          upload_sources: false
-#          upload_translations: false
-#          download_translations: true
-#          create_pull_request: false
-#          push_translations: false
-#        env:
-#          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-#          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-#      - name: Check for uncommitted changes
-#        if: steps.check-api-changes.outputs.any_modified == 'true'
-#        id: check-changes
-#        uses: mskri/check-uncommitted-changes-action@v1.0.1
-#      - name: Commit Changes
-#        if: steps.check-api-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.changes != ''
-#        run: |
-#          git config --global user.email aminecmi+giteadrone@pm.me
-#          git config --global user.name giteadrone
-#          git add ./androidApp/src/main/res/*
-#          git commit -m "translation: translation files"
-#      - name: Push changes
-#        if: steps.check-api-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.changes != ''
-#        uses: appleboy/git-push-action@v1.0.0
-#        with:
-#          author_name: giteadrone
-#          author_email: aminecmi+giteadrone@pm.me
-#          remote: ${{ secrets.REMOTE_URL }}
-#          ssh_key: ${{ secrets.PRIVATE_KEY }}
-#          branch: ${{ github.head_ref || github.ref_name }}
-#  build:
-#    needs: Lint
-#    uses: ./.gitea/workflows/common_build.yml
+          author_name: giteadrone
+          author_email: aminecmi+giteadrone@pm.me
+          remote: ${{ secrets.REMOTE_URL }}
+          ssh_key: ${{ secrets.PRIVATE_KEY }}
+          branch: ${{ github.head_ref || github.ref_name }}
+  build:
+    needs: Lint
+    uses: ./.gitea/workflows/common_build.yml
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -95,7 +95,7 @@ android {

        // tests
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArguments["useTestStorageService"] = "true"
+        testInstrumentationRunnerArguments["clearPackageData"] = "true"
    }
    packaging {
        resources {
@@ -109,11 +109,6 @@ android {
            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
        }
        getByName("debug") {
-            isTestCoverageEnabled = true
-            enableAndroidTestCoverage = true
-            installation {
-                installOptions("-g", "-r")
-            }
        }
    }
    flavorDimensions.add("build")
@@ -126,6 +121,7 @@ android {
    namespace = "bou.amine.apps.readerforselfossv2.android"
    testOptions {
        animationsDisabled = true
+        execution = "ANDROIDX_TEST_ORCHESTRATOR"
        unitTests {
            isIncludeAndroidResources = true
        }
@@ -158,8 +154,8 @@ dependencies {
    implementation("androidx.multidex:multidex:2.0.1")

    // About
-    implementation("com.mikepenz:aboutlibraries-core:11.6.3")
-    implementation("com.mikepenz:aboutlibraries:11.6.3")
+    implementation("com.mikepenz:aboutlibraries-core:10.5.1")
+    implementation("com.mikepenz:aboutlibraries:10.5.1")

    // Material-ish things
    implementation("com.ashokvarma.android:bottom-navigation-bar:2.2.0")
@@ -201,15 +197,14 @@ dependencies {
    testImplementation("io.mockk:mockk:1.13.14")
    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
-    androidTestImplementation("androidx.test:runner:1.7.0-alpha01")
-    androidTestImplementation("androidx.test:rules:1.7.0-alpha01")
+    androidTestImplementation("androidx.test:runner:1.6.2")
+    androidTestImplementation("androidx.test:rules:1.6.1")
    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
    implementation("androidx.test.espresso:espresso-idling-resource:3.6.1")
    androidTestImplementation("androidx.test.ext:junit-ktx:1.2.1")
-    androidTestUtil("androidx.test.services:test-services:1.6.0-alpha02")
+    androidTestUtil("androidx.test:orchestrator:1.5.1")
    testImplementation("org.robolectric:robolectric:4.14.1")
-    testImplementation("androidx.test:core-ktx:1.7.0-alpha01")
-    androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
+    testImplementation("androidx.test:core-ktx:1.6.1")

    implementation("ch.acra:acra-http:$acraVersion")
    implementation("ch.acra:acra-toast:$acraVersion")
@@ -232,7 +227,6 @@ tasks.withType<Test> {
 }

 aboutLibraries {
-    excludeFields = arrayOf("generated")
    offlineMode = true
    fetchRemoteLicense = false
    fetchRemoteFunding = false
@@ -241,33 +235,3 @@ aboutLibraries {
    duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
    duplicationRule = com.mikepenz.aboutlibraries.plugin.DuplicateRule.GROUP
 }
-
-// Screenshot failure handling
-val reportsDirectory = file("$buildDir/reports/androidTests/connected")
-
-val clearScreenshotsTask =
-    tasks.register<Exec>("clearScreenshots") {
-        println("AMINE : clear")
-        commandLine = listOf("adb", "shell", "rm", "-r", "/sdcard/Pictures/selfoss_tests")
-    }
-
-val createScreenshotDirectoryTask =
-    tasks.register<Exec>("createScreenshotDirectory") {
-        println("AMINE : create directory")
-        group = "reporting"
-        commandLine = listOf("adb", "shell", "mkdir", "-p", "/sdcard/Pictures/selfoss_tests")
-    }
-
-tasks.register<Exec>("fetchScreenshots") {
-    println("AMINE : fetch")
-    group = "reporting"
-    executable(android.adbExecutable.toString())
-    commandLine = listOf("adb", "pull", "/sdcard/Pictures/selfoss_tests/.", reportsDirectory.toString())
-
-    finalizedBy(clearScreenshotsTask)
-    dependsOn(createScreenshotDirectoryTask)
-
-    doFirst {
-        reportsDirectory.mkdirs()
-    }
-}
--- a/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
+++ b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
@@ -1,11 +1,7 @@
 package bou.amine.apps.readerforselfossv2.android

 import android.content.Context
-import android.os.Environment.DIRECTORY_PICTURES
-import android.os.Environment.getExternalStoragePublicDirectory
-import android.util.Log
 import androidx.annotation.ArrayRes
-import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.onData
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
@@ -13,38 +9,29 @@ import androidx.test.espresso.action.ViewActions.replaceText
 import androidx.test.espresso.action.ViewActions.typeTextIntoFocusedView
 import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.base.DefaultFailureHandler
 import androidx.test.espresso.matcher.ViewMatchers.isChecked
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isNotChecked
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
-import androidx.test.runner.screenshot.BasicScreenCaptureProcessor
-import androidx.test.runner.screenshot.Screenshot
-import androidx.test.uiautomator.UiDevice
-import androidx.test.uiautomator.UiSelector
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.Matchers.hasToString
-import org.junit.BeforeClass
-import org.junit.rules.TestWatcher
-import org.junit.runner.Description
-import java.io.File
-import java.io.IOException
-import java.util.Locale
-
-val defaultUrl = (System.getenv("SELFOSS_URL") ?: "").ifEmpty { "http://10.0.2.2:8888" }

 fun performLogin(someUrl: String? = null) {
-    Log.i("AUTOMATION", "The url used will be ${if (!someUrl.isNullOrEmpty()) someUrl else defaultUrl}")
    onView(withId(R.id.urlView)).perform(click()).perform(
        typeTextIntoFocusedView(
-            if (!someUrl.isNullOrEmpty()) someUrl else defaultUrl,
+            if (!someUrl.isNullOrEmpty()) someUrl else "http://10.0.2.2:8888",
        ),
    )
    onView(withId(R.id.signInButton)).perform(click())
 }

+fun loginAndInitHome() {
+    performLogin()
+    onView(withText(R.string.gdpr_dialog_title)).check(matches(isDisplayed()))
+    onView(withText("OK")).perform(click())
+}
+
 fun changeAndCancelSetting(
    oldValue: String,
    newValue: String,
@@ -110,12 +97,6 @@ fun testPreferencesFromArray(
    }
 }

-fun goToSources() {
-    openMenu()
-    onView(withText(R.string.menu_home_sources))
-        .perform(click())
-}
-
 fun testAddSourceWithUrl(
    url: String,
    sourceName: String,
@@ -138,87 +119,3 @@ fun testAddSourceWithUrl(
        .perform(click())
    onView(withText(sourceName)).check(matches(isDisplayed()))
 }
-
-@Suppress("detekt:UtilityClassWithPublicConstructor")
-open class WithANRException {
-    companion object {
-        // Running count of the number of Android Not Responding dialogues to prevent endless dismissal.
-        private var anrCount = 0
-
-        // `RootViewWithoutFocusException` class is private, need to match the message (instead of using type matching).
-        private val rootViewWithoutFocusExceptionMsg =
-            java.lang.String.format(
-                Locale.ROOT,
-                "Waited for the root of the view hierarchy to have " +
-                    "window focus and not request layout for 10 seconds. If you specified a non " +
-                    "default root matcher, it may be picking a root that never takes focus. " +
-                    "Root:",
-            )
-
-        private fun handleAnrDialogue() {
-            val device = UiDevice.getInstance(getInstrumentation())
-            // If running the device in English Locale
-            val waitButton = device.findObject(UiSelector().textContains("wait"))
-            if (waitButton.exists()) waitButton.click()
-        }
-
-        @JvmStatic
-        @BeforeClass
-        fun setUpHandler() {
-            Espresso.setFailureHandler { error, viewMatcher ->
-
-                if (error.message!!.contains(rootViewWithoutFocusExceptionMsg) && anrCount < 3) {
-                    anrCount++
-                    handleAnrDialogue()
-                } else { // chain all failures down to the default espresso handler
-                    DefaultFailureHandler(getInstrumentation().targetContext).handle(error, viewMatcher)
-                }
-            }
-        }
-    }
-}
-
-class MyScreenCaptureProcessor(
-    parentFolderPath: String,
-) : BasicScreenCaptureProcessor() {
-    init {
-        this.mDefaultScreenshotPath =
-            File(
-                File(
-                    getExternalStoragePublicDirectory(DIRECTORY_PICTURES),
-                    "selfoss_tests",
-                ).absolutePath,
-                "screenshots/$parentFolderPath",
-            )
-    }
-
-    override fun getFilename(prefix: String): String = prefix
-}
-
-fun takeScreenshot(
-    parentFolderPath: String = "",
-    screenShotName: String,
-) {
-    Log.d("Screenshots", "Taking screenshot of '$screenShotName'")
-    val screenCapture = Screenshot.capture()
-    val processors = setOf(MyScreenCaptureProcessor(parentFolderPath))
-    try {
-        screenCapture.apply {
-            name = screenShotName
-            process(processors)
-        }
-        Log.d("Screenshots", "Screenshot taken")
-    } catch (ex: IOException) {
-        Log.e("Screenshots", "Could not take the screenshot", ex)
-    }
-}
-
-class ScreenshotTakingRule : TestWatcher() {
-    override fun failed(
-        e: Throwable?,
-        description: Description,
-    ) {
-        val parentFolderPath = "failures/${description.className}"
-        takeScreenshot(parentFolderPath = parentFolderPath, screenShotName = description.methodName)
-    }
-}
--- a/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/2-HomeActivityTest.kt
+++ b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/2-HomeActivityTest.kt
@@ -15,27 +15,21 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import org.hamcrest.CoreMatchers.not
-import org.junit.FixMethodOrder
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
-import org.junit.runners.MethodSorters

-@Suppress("ktlint:standard:class-naming", "detekt:ClassNaming")
@RunWith(AndroidJUnit4::class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@LargeTest
-class `2-HomeActivityTest` : WithANRException() {
+class HomeActivityTest {
    @get:Rule
-    val activityRule = ActivityScenarioRule(HomeActivity::class.java)
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)

-    @JvmField
-    @Rule
-    val ruleChain: RuleChain =
-        RuleChain
-            .outerRule(activityRule)
-            .around(ScreenshotTakingRule())
+    @Before
+    fun init() {
+        loginAndInitHome()
+    }

    @Test
    fun testMenu() {
--- a/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/1-LoginActivityTest.kt
+++ b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/1-LoginActivityTest.kt
@@ -15,28 +15,16 @@ import androidx.test.filters.LargeTest
 import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 import org.junit.After
 import org.junit.Before
-import org.junit.FixMethodOrder
 import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
-import org.junit.runners.MethodSorters

-@Suppress("ktlint:standard:class-naming", "detekt:ClassNaming")
@RunWith(AndroidJUnit4::class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@LargeTest
-class `1-LoginActivityTest` : WithANRException() {
+class LoginActivityTest {
    @get:Rule
    val activityRule = ActivityScenarioRule(LoginActivity::class.java)

-    @JvmField
-    @Rule
-    val ruleChain: RuleChain =
-        RuleChain
-            .outerRule(activityRule)
-            .around(ScreenshotTakingRule())
-
    @Before
    fun registerIdlingResource() {
        IdlingRegistry
@@ -52,7 +40,7 @@ class `1-LoginActivityTest` : WithANRException() {
    }

    @Test
-    fun `1-viewIsInitialized`() {
+    fun viewIsInitialized() {
        onView(withId(R.id.urlView)).check(matches(isDisplayed()))
        onView(withId(R.id.selfSigned))
            .check(matches(isDisplayed()))
@@ -69,28 +57,28 @@ class `1-LoginActivityTest` : WithANRException() {
    }

    @Test
-    fun `2-urlError`() {
+    fun urlError() {
        performLogin("10.0.2.2:8888")
        onView(withId(R.id.urlView)).perform(click())
        onView(withId(R.id.urlView)).check(matches(withError(R.string.login_url_problem)))
    }

    @Test
-    fun `3-urlSlashError`() {
-        performLogin("https://google.fr/toto")
-        onView(withId(R.id.urlView)).perform(click())
-        onView(withId(R.id.urlView)).check(matches(withError(R.string.login_url_problem)))
-    }
-
-    @Test
-    fun `4-connectError`() {
+    fun connectError() {
        performLogin("http://10.0.2.2:8889")
        onView(withId(R.id.urlView)).perform(click())
        onView(withId(R.id.urlView)).check(matches(withError(R.string.wrong_infos)))
    }

    @Test
-    fun `5-multiError`() {
+    fun urlSlashError() {
+        performLogin("https://google.fr/toto")
+        onView(withId(R.id.urlView)).perform(click())
+        onView(withId(R.id.urlView)).check(matches(withError(R.string.login_url_problem)))
+    }
+
+    @Test
+    fun multiError() {
        onView(withId(R.id.signInButton)).perform(click())
        onView(withId(R.id.signInButton)).perform(click())
        onView(withId(R.id.signInButton)).perform(click())
@@ -98,9 +86,8 @@ class `1-LoginActivityTest` : WithANRException() {
    }

    @Test
-    fun `6-connect`() {
+    fun connect() {
        performLogin()
        onView(withText(R.string.gdpr_dialog_title)).check(matches(isDisplayed()))
-        onView(withText("OK")).perform(click())
    }
 }
--- a/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/4-SettingsActivityGeneralTest.kt
+++ b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/4-SettingsActivityGeneralTest.kt
@@ -22,30 +22,19 @@ import androidx.test.filters.LargeTest
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.not
 import org.junit.Before
-import org.junit.FixMethodOrder
 import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
-import org.junit.runners.MethodSorters

-@Suppress("ktlint:standard:class-naming", "detekt:ClassNaming")
@RunWith(AndroidJUnit4::class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@LargeTest
-class `4-SettingsActivityGeneralTest` : WithANRException() {
+class SettingsActivityGeneralTest {
    @get:Rule
-    val activityRule = ActivityScenarioRule(HomeActivity::class.java)
-
-    @JvmField
-    @Rule
-    val ruleChain: RuleChain =
-        RuleChain
-            .outerRule(activityRule)
-            .around(ScreenshotTakingRule())
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)

    @Before
    fun init() {
+        loginAndInitHome()
        openActionBarOverflowOrOptionsMenu(
            ApplicationProvider.getApplicationContext(),
        )
--- a/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/6-SettingsActivityOfflineTest.kt
+++ b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/6-SettingsActivityOfflineTest.kt
@@ -1,42 +1,31 @@
 package bou.amine.apps.readerforselfossv2.android

 import android.content.Context
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isChecked
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isEnabled
 import androidx.test.espresso.matcher.ViewMatchers.isNotEnabled
-import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.not
-import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.RuleChain
 import org.junit.runner.RunWith

-@Suppress("ktlint:standard:class-naming", "detekt:ClassNaming")
@RunWith(AndroidJUnit4::class)
@LargeTest
-class `6-SettingsActivityOfflineTest` : WithANRException() {
+class SettingsActivityOfflineTest {
    @get:Rule
-    val activityRule = ActivityScenarioRule(SettingsActivity::class.java)
-
-    @JvmField
-    @Rule
-    val ruleChain: RuleChain =
-        RuleChain
-            .outerRule(activityRule)
-            .around(ScreenshotTakingRule())
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)

    lateinit var context: Context

@@ -45,14 +34,14 @@ class `6-SettingsActivityOfflineTest` : WithANRException() {
        activityRule.scenario.onActivity { activity ->
            context = activity.window.context
        }
+        loginAndInitHome()
+        openActionBarOverflowOrOptionsMenu(
+            ApplicationProvider.getApplicationContext(),
+        )
+        onView(withText(R.string.title_activity_settings)).perform(click())
        onView(withText(R.string.pref_header_offline)).perform(click())
    }

-    @After
-    fun back() {
-        onView(isRoot()).perform(ViewActions.pressBack())
-    }
-
    @Suppress("detekt:LongMethod")
    @Test
    fun testOffline() {
--- a/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/5-SettingsActivityReaderTest.kt
+++ b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/5-SettingsActivityReaderTest.kt
@@ -1,40 +1,29 @@
 package bou.amine.apps.readerforselfossv2.android

 import android.content.Context
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isChecked
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.not
-import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.RuleChain
 import org.junit.runner.RunWith

-@Suppress("ktlint:standard:class-naming", "detekt:ClassNaming")
@RunWith(AndroidJUnit4::class)
@LargeTest
-class `5-SettingsActivityReaderTest` : WithANRException() {
+class SettingsActivityReaderTest {
    @get:Rule
-    val activityRule = ActivityScenarioRule(SettingsActivity::class.java)
-
-    @JvmField
-    @Rule
-    val ruleChain: RuleChain =
-        RuleChain
-            .outerRule(activityRule)
-            .around(ScreenshotTakingRule())
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)

    lateinit var context: Context

@@ -43,14 +32,14 @@ class `5-SettingsActivityReaderTest` : WithANRException() {
        activityRule.scenario.onActivity { activity ->
            context = activity.window.context
        }
+        loginAndInitHome()
+        openActionBarOverflowOrOptionsMenu(
+            ApplicationProvider.getApplicationContext(),
+        )
+        onView(withText(R.string.title_activity_settings)).perform(click())
        onView(withText(R.string.pref_header_viewer)).perform(click())
    }

-    @After
-    fun back() {
-        onView(isRoot()).perform(ViewActions.pressBack())
-    }
-
    @Test
    fun testReader() {
        onView(withSettingsCheckboxFrame(R.string.pref_switch_actions_pager_scroll)).check(
--- a/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/3-SettingsActivityTest.kt
+++ b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/3-SettingsActivityTest.kt
@@ -15,23 +15,13 @@ import org.hamcrest.CoreMatchers.not
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.RuleChain
 import org.junit.runner.RunWith

@RunWith(AndroidJUnit4::class)
@LargeTest
-@Suppress("ktlint:standard:class-naming", "detekt:ClassNaming")
-class `3-SettingsActivityTest` : WithANRException() {
+class SettingsActivityTest {
    @get:Rule
-    val activityRule = ActivityScenarioRule(HomeActivity::class.java)
-
-    @JvmField
-    @Rule
-    val ruleChain: RuleChain =
-        RuleChain
-            .outerRule(activityRule)
-            .around(ScreenshotTakingRule())
-
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
    lateinit var context: Context

    @Before
@@ -39,6 +29,7 @@ class `3-SettingsActivityTest` : WithANRException() {
        activityRule.scenario.onActivity { activity ->
            context = activity.window.context
        }
+        loginAndInitHome()
        openMenu()
        onView(withText(R.string.title_activity_settings)).perform(click())
    }
@@ -77,9 +68,6 @@ class `3-SettingsActivityTest` : WithANRException() {
        changeAndSaveSetting("", "10") {
            onView(withText(R.string.pref_api_timeout)).perform(click())
        }
-        changeAndSaveSetting("", "60") {
-            onView(withText(R.string.pref_api_timeout)).perform(click())
-        }
    }

    @Test
--- a/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/7-SourcesActivityTest.kt
+++ b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/7-SourcesActivityTest.kt
@@ -18,23 +18,14 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 import java.util.UUID

-@Suppress("ktlint:standard:class-naming", "detekt:ClassNaming")
@RunWith(AndroidJUnit4::class)
@LargeTest
-class `7-SourcesActivityTest` : WithANRException() {
+class SourcesActivityTest {
    @get:Rule
-    val activityRule = ActivityScenarioRule(HomeActivity::class.java)
-
-    @JvmField
-    @Rule
-    val ruleChain: RuleChain =
-        RuleChain
-            .outerRule(activityRule)
-            .around(ScreenshotTakingRule())
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)

    lateinit var sourceName: String

@@ -42,6 +33,7 @@ class `7-SourcesActivityTest` : WithANRException() {
    fun init() {
        sourceName = UUID.randomUUID().toString().substring(0, 15)

+        loginAndInitHome()
        goToSources()
    }

@@ -79,8 +71,12 @@ class `7-SourcesActivityTest` : WithANRException() {
    fun deleteTheCreatedSource() {
        onView(withText(sourceName)).check(matches(isDisplayed()))
        onView(withId(R.id.deleteBtn)).perform(click())
-        onView(withText(R.string.confirm_delete_title)).check(matches(isDisplayed()))
-        onView(withId(android.R.id.button1)).perform(click())
        onView(withText(sourceName)).check(doesNotExist())
    }
+
+    private fun goToSources() {
+        openMenu()
+        onView(withText(R.string.menu_home_sources))
+            .perform(click())
+    }
 }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/UpsertSourceActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/UpsertSourceActivity.kt
@@ -65,6 +65,7 @@ class UpsertSourceActivity :
    private fun initFields(items: Map<String, SelfossModel.Spout>) {
        binding.nameInput.setText(existingSource!!.title)
        binding.tags.setText(existingSource!!.tags?.joinToString(", "))
+        binding.filter.setText(existingSource!!.filter)
        binding.sourceUri.setText(existingSource!!.params?.url)
        binding.spoutsSpinner.setSelection(items.keys.indexOf(existingSource!!.spout))
        binding.progress.visibility = View.GONE
@@ -169,6 +170,7 @@ class UpsertSourceActivity :
                                url,
                                mSpoutsValue!!,
                                binding.tags.text.toString(),
+                                binding.filter.text.toString(),
                            )
                        } else {
                            repository.createSource(
@@ -176,6 +178,7 @@ class UpsertSourceActivity :
                                url,
                                mSpoutsValue!!,
                                binding.tags.text.toString(),
+                                binding.filter.text.toString(),
                            )
                        }
                    if (successfullyAddedSource) {
--- a/androidApp/src/main/res/layout/activity_upsert_source.xml
+++ b/androidApp/src/main/res/layout/activity_upsert_source.xml
@@ -64,15 +64,28 @@
                android:id="@+id/tags"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:minHeight="48dp"
                android:layout_marginTop="16dp"
                android:autofillHints="false"
                android:hint="@string/add_source_hint_tags"
                android:inputType="text"
+                android:minHeight="48dp"
                android:textColorHint="?android:textColorPrimary"
                app:layout_constraintLeft_toLeftOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/sourceUri" />

+            <EditText
+                android:id="@+id/filter"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:autofillHints="false"
+                android:hint="@string/add_source_hint_filter"
+                android:inputType="text"
+                android:minHeight="48dp"
+                android:textColorHint="?android:textColorPrimary"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tags" />
+
            <Spinner
                android:id="@+id/spoutsSpinner"
                android:layout_width="match_parent"
@@ -80,7 +93,7 @@
                android:minHeight="48dp"
                android:layout_marginTop="16dp"
                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tags" />
+                app:layout_constraintTop_toBottomOf="@+id/filter" />

            <Button
                android:id="@+id/saveBtn"
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -17,6 +17,7 @@
    <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
    <string name="add_source_hint_url">"Link"</string>
    <string name="add_source_hint_name">"Name"</string>
+    <string name="add_source_hint_filter">/Filter/</string>
    <string name="add_source">"Add a source"</string>
    <string name="add_source_save">"Save"</string>
    <string name="wrong_infos">"Check your details again."</string>
--- a/androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/android/tests/robolectric/Helpers.kt
+++ b/androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/android/tests/robolectric/Helpers.kt
@@ -1,5 +1,3 @@
-@file:Suppress("ktlint")
-/*
 package bou.amine.apps.readerforselfossv2.android.tests.robolectric

 import android.view.Menu
@@ -27,4 +25,3 @@ fun Menu.assertVisible(
    val item = this.findItem(id)
    assertTrue(item.isVisible)
 }
-*/
--- a/androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/android/tests/robolectric/LoginActivityTest.kt
+++ b/androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/android/tests/robolectric/LoginActivityTest.kt
@@ -1,5 +1,3 @@
-@file:Suppress("ktlint")
-/*
 package bou.amine.apps.readerforselfossv2.android.tests.robolectric

 import android.widget.Button
@@ -59,8 +57,7 @@ class LoginActivityTest {
        }
    }

- */
-/* @Test
+    /* @Test
     fun connect() {
         Robolectric.buildActivity(LoginActivity::class.java).use { controller ->
             controller.setup() // Moves the Activity to the RESUMED state
@@ -75,7 +72,4 @@ class LoginActivityTest {
             assertEquals(expectedIntent.component, actual.component)
         }
     }*/
-/*
-
 }
-*/
--- a/androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/android/tests/robolectric/RobotElectriqueRunner.kt
+++ b/androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/android/tests/robolectric/RobotElectriqueRunner.kt
@@ -1,5 +1,3 @@
-@file:Suppress("ktlint")
-/*
 package bou.amine.apps.readerforselfossv2.android.tests.robolectric

 import org.robolectric.RobolectricTestRunner
@@ -10,4 +8,3 @@ class RobotElectriqueRunner(
 ) : RobolectricTestRunner(testClass) {
    override fun buildGlobalConfig(): Config = Config.Builder().setSdk(25, 30, 33).build()
 }
-*/
--- a/androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/tests/repository/RepositoryTest.kt
+++ b/androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/tests/repository/RepositoryTest.kt
@@ -44,6 +44,8 @@ private const val FEED_URL = "https://test.com/feed"

 private const val TAGS = "Test, New"

+private const val FILTER = "/filter/"
+
 private const val NUMBER_ARTICLES = 100
 private const val NUMBER_UNREAD = 50
 private const val NUMBER_STARRED = 20
@@ -836,7 +838,7 @@ class RepositoryTest {

    @Test
    fun create_source() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
            SuccessResponse(true)

        initializeRepository()
@@ -848,6 +850,7 @@ class RepositoryTest {
                    FEED_URL,
                    SPOUT,
                    TAGS,
+                    FILTER,
                )
        }

@@ -857,6 +860,7 @@ class RepositoryTest {
                any(),
                any(),
                any(),
+                any(),
            )
        }
        assertSame(true, response)
@@ -864,7 +868,7 @@ class RepositoryTest {

    @Test
    fun create_source_but_response_fails() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
            SuccessResponse(false)

        initializeRepository()
@@ -876,6 +880,7 @@ class RepositoryTest {
                    FEED_URL,
                    SPOUT,
                    TAGS,
+                    FILTER,
                )
        }

@@ -885,6 +890,7 @@ class RepositoryTest {
                any(),
                any(),
                any(),
+                any(),
            )
        }
        assertSame(false, response)
@@ -892,7 +898,7 @@ class RepositoryTest {

    @Test
    fun create_source_without_connection() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
            SuccessResponse(true)

        initializeRepository(false)
@@ -904,6 +910,7 @@ class RepositoryTest {
                    FEED_URL,
                    SPOUT,
                    TAGS,
+                    FILTER,
                )
        }

@@ -913,6 +920,7 @@ class RepositoryTest {
                any(),
                any(),
                any(),
+                any(),
            )
        }
        assertSame(false, response)
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,4 +27,3 @@ org.gradle.caching=true
 ignoreGitVersion=false
 kotlin.native.cacheKind.iosX64=none
 org.gradle.configureondemand=true
-kotlin.jvm.target.validation.mode=IGNORE
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt
@@ -102,6 +102,7 @@ class SelfossModel {
        override var error: String? = null,
        override var icon: String? = null,
        var params: SourceParams? = null,
+        var filter: String? = null,
    ) : Source

    @Serializable
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/Repository.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/Repository.kt
@@ -224,25 +224,16 @@ class Repository(
            appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
        val shouldFetch = if (!appSettingsService.isUpdateSourcesEnabled()) !fetchedSources else true
        if (shouldFetch && connectivityService.isNetworkAvailable()) {
-            sources = sourceDetails(isDatabaseEnabled)
+            val apiSources = api.sourcesDetailed()
+            if (apiSources.success && apiSources.data != null) {
+                fetchedSources = true
+                sources = apiSources.data
+                if (isDatabaseEnabled) {
+                    resetDBSourcesWithData(sources)
+                }
+            }
        } else if (isDatabaseEnabled) {
            sources = getDBSources().map { it.toView() } as ArrayList<SelfossModel.SourceDetail>
-            if (sources.isEmpty() && !connectivityService.isNetworkAvailable() && !fetchedSources) {
-                sources = sourceDetails(isDatabaseEnabled)
-            }
-        }
-        return sources
-    }
-
-    private suspend fun sourceDetails(isDatabaseEnabled: Boolean): ArrayList<SelfossModel.SourceDetail> {
-        var sources = ArrayList<SelfossModel.SourceDetail>()
-        val apiSources = api.sourcesDetailed()
-        if (apiSources.success && apiSources.data != null) {
-            fetchedSources = true
-            sources = apiSources.data
-            if (isDatabaseEnabled) {
-                resetDBSourcesWithData(sources)
-            }
        }
        return sources
    }
@@ -377,16 +368,17 @@ class Repository(
        url: String,
        spout: String,
        tags: String,
+        filter: String,
    ): Boolean {
        var response = false
        if (connectivityService.isNetworkAvailable()) {
-            fetchedSources = false
            response = api
                .createSourceForVersion(
                    title,
                    url,
                    spout,
                    tags,
+                    filter,
                ).isSuccess == true
        }

@@ -399,11 +391,11 @@ class Repository(
        url: String,
        spout: String,
        tags: String,
+        filter: String,
    ): Boolean {
        var response = false
        if (connectivityService.isNetworkAvailable()) {
-            fetchedSources = false
-            response = api.updateSourceForVersion(id, title, url, spout, tags).isSuccess == true
+            response = api.updateSourceForVersion(id, title, url, spout, tags, filter).isSuccess == true
        }

        return response
@@ -417,7 +409,6 @@ class Repository(
        if (connectivityService.isNetworkAvailable()) {
            val response = api.deleteSource(id)
            success = response.isSuccess
-            fetchedSources = false
        }

        // We filter on success or if the network isn't available
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt
@@ -638,17 +638,59 @@ class SelfossApi(
        url: String,
        spout: String,
        tags: String,
+        filter: String,
    ): SuccessResponse =
        maybeResponse(
            if (appSettingsService.getApiVersion() > 1) {
-                createSource("tags[]", title, url, spout, tags)
+                createSource(title, url, spout, tags, filter)
            } else {
-                createSource("tags", title, url, spout, tags)
+                createSourceOld(title, url, spout, tags)
            },
        )

    private suspend fun createSource(
-        tagsParamName: String,
+        title: String,
+        url: String,
+        spout: String,
+        tags: String,
+        filter: String,
+    ): HttpResponse? =
+        client.tryToSubmitForm(
+            url = url("/source"),
+            formParameters =
+                Parameters.build {
+                    if (!shouldHavePostLogin()) {
+                        append("username", appSettingsService.getUserName())
+                        append("password", appSettingsService.getPassword())
+                    }
+                    append("title", title)
+                    append("url", url)
+                    append("spout", spout)
+                    append("filter", filter)
+                    append("tags[]", tags)
+                },
+            block = {
+                if (appSettingsService
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
+                ) {
+                    headers {
+                        append(
+                            HttpHeaders.Authorization,
+                            constructBasicAuthValue(
+                                BasicAuthCredentials(
+                                    username = appSettingsService.getBasicUserName(),
+                                    password = appSettingsService.getBasicPassword(),
+                                ),
+                            ),
+                        )
+                    }
+                }
+            },
+        )
+
+    private suspend fun createSourceOld(
        title: String,
        url: String,
        spout: String,
@@ -665,7 +707,7 @@ class SelfossApi(
                    append("title", title)
                    append("url", url)
                    append("spout", spout)
-                    append(tagsParamName, tags)
+                    append("tags", tags)
                },
            block = {
                if (appSettingsService
@@ -694,18 +736,61 @@ class SelfossApi(
        url: String,
        spout: String,
        tags: String,
+        filter: String,
    ): SuccessResponse =
        maybeResponse(
            if (appSettingsService.getApiVersion() > 1) {
-                updateSource(id, "tags[]", title, url, spout, tags)
+                updateSource(id, title, url, spout, tags, filter)
            } else {
-                updateSource(id, "tags", title, url, spout, tags)
+                updateSourceOld(id, title, url, spout, tags)
            },
        )

    private suspend fun updateSource(
        id: Int,
-        tagsParamName: String,
+        title: String,
+        url: String,
+        spout: String,
+        tags: String,
+        filter: String,
+    ): HttpResponse? =
+        client.tryToSubmitForm(
+            url = url("/source/$id"),
+            formParameters =
+                Parameters.build {
+                    if (!shouldHavePostLogin()) {
+                        append("username", appSettingsService.getUserName())
+                        append("password", appSettingsService.getPassword())
+                    }
+                    append("title", title)
+                    append("url", url)
+                    append("spout", spout)
+                    append("tags[]", tags)
+                    append("filter", filter)
+                },
+            block = {
+                if (appSettingsService
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
+                ) {
+                    headers {
+                        append(
+                            HttpHeaders.Authorization,
+                            constructBasicAuthValue(
+                                BasicAuthCredentials(
+                                    username = appSettingsService.getBasicUserName(),
+                                    password = appSettingsService.getBasicPassword(),
+                                ),
+                            ),
+                        )
+                    }
+                }
+            },
+        )
+
+    private suspend fun updateSourceOld(
+        id: Int,
        title: String,
        url: String,
        spout: String,
@@ -722,7 +807,7 @@ class SelfossApi(
                    append("title", title)
                    append("url", url)
                    append("spout", spout)
-                    append(tagsParamName, tags)
+                    append("tags", tags)
                },
            block = {
                if (appSettingsService