ci: Instrumentation tests coverage in ci.

.gitea/workflows/common_build.yml

@@ -6,7 +6,8 @@ jobs:
   BuildAndTestAndCoverage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Check out repository code
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: "Check android app changes"
@@ -15,9 +16,6 @@ jobs:
         with:
           files: |
             androidApp/src/**
-            shared/src/commonMain/**
-            shared/src/androidMain/**
-            shared/src/commonTest/**
       - name: Fetch tags
         if: steps.check-android-changes.outputs.any_modified == 'true'
         run: git fetch --tags -p
@@ -26,6 +24,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
+          cache: gradle
       - uses: gradle/actions/setup-gradle@v3
         if: steps.check-android-changes.outputs.any_modified == 'true'
       - uses: android-actions/setup-android@v3
@@ -35,7 +34,14 @@ jobs:
         run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true" >> ~/.gradle/gradle.properties
       - name: Build and test
         if: steps.check-android-changes.outputs.any_modified == 'true'
-        run: ./gradlew build -x testReleaseUnitTest -x testDebugUnitTest -x testGithubConfigReleaseUnitTest -x testGithubConfigDebugUnitTest
+        run: ./gradlew build -x testReleaseUnitTest -x testDebugUnitTest -x testGithubConfigReleaseUnitTest -x testGithubConfigDebugUnitTest # These tests will be done
+      # TESTS ARE RUN LOCALLY
+      #      - 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: coverage
         if: steps.check-android-changes.outputs.any_modified == 'true'
         run: |
@@ -48,3 +54,8 @@ jobs:
           retention-days: 1
           overwrite: true
           include-hidden-files: true
+#      TESTS ARE RUN LOCALLY
+#      - name: Clean
+#        if: always()
+#        run: |
+#          docker compose -f .gitea/workflows/assets/docker-compose.yml stop

.gitea/workflows/common_coverage.yml

@@ -0,0 +1,56 @@
+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 "org.gradle.daemon=false\nignoreGitVersion=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: Tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 36
+          target: google_apis
+          arch: x86_64
+          script: ./gradlew androidApp:connectedAndroidTest
+          pre-emulator-launch-script: sdkmanager --list | grep system-images
+      - 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

.gitea/workflows/on_merge_on_release.yml

@@ -1,4 +1,4 @@
-name: Realease
+name: Create tag
 on:
   push:
     branches:
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    uses: ./.gitea/workflows/on_called_build.yml
+    uses: ./.gitea/workflows/common_build.yml
   createTagAndChangelog:
     runs-on: ubuntu-latest
     needs: build
@@ -86,6 +86,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
+          cache: gradle
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
       - name: Configure gradle...

.gitea/workflows/on_pr.yml

@@ -1,89 +1,93 @@
-name: PR
+name: Check PR code
 on:
   pull_request:
     branches:
       - master
 
 jobs:
-  PR:
+  EspressoReports:
     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'
-      - 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-translations-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-translations-changes.outputs.any_modified == 'true'
-        run: sleep 10s
-      - name: download translations
-        if: steps.check-translations-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-translations-changes.outputs.any_modified == 'true'
-        id: check-changes
-        uses: mskri/check-uncommitted-changes-action@v1.0.1
-      - name: Commit Changes
-        if: steps.check-translations-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-translations-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/on_called_build.yml
+    uses: ./.gitea/workflows/common_coverage.yml
+#  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

.gitea/workflows/on_pr_test.yml

@@ -1,67 +0,0 @@
-name: PR test
-on:
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  integrationTests:
-    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: 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
-      - uses: actions/setup-java@v4
-        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 "org.gradle.daemon=false\nignoreGitVersion=true" >> ~/.gradle/gradle.properties
-      - name: Change url until I find a better way to do it
-        run: |
-          sed -i "s/const val DEFAULT_URL = \"http:\/\/10\.0\.2\.2\:8888\"/const val DEFAULT_URL = \"http:\/\/172\.17\.0\.1\:8888\"/g" ./androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
-      - name: Tests
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: 29
-          profile: pixel_2
-          script: |
-            ./gradlew androidApp:clearScreenshotsTask || true
-            ./gradlew androidApp:createScreenshotDirectory
-            adb logcat -G 16M
-            ./gradlew JacocoDebugCodeCoverage || (./gradlew androidApp:fetchScreenshots && adb logcat 'InputReader:S' 'chatty:S' 'audio_hw_generic:S' 'LogApiCalls:D' '*:I' -d > ./androidApp/build/reports/androidTests/connected/screenshots/logs.txt)
-      - uses: actions/upload-artifact@v3
-        with:
-          name: screenshot-espresso
-          path: androidApp/build/reports/androidTests/connected/screenshots
-          retention-days: 2
-          overwrite: true
-          include-hidden-files: true
-      - uses: actions/upload-artifact@v3
-        with:
-          path: androidApp/build/reports/androidTests/connected/debug/flavors/githubConfig
-          retention-days: 1
-          overwrite: true
-          include-hidden-files: true
-      - uses: actions/upload-artifact@v3
-        with:
-          name: coverage-espresso
-          path: androidApp/build/reports/jacoco/JacocoDebugCodeCoverage
-          retention-days: 1
-          overwrite: true
-          include-hidden-files: true
-      - name: Clean
-        if: always()
-        run: |
-          docker compose -f .gitea/workflows/assets/docker-compose.yml stop

.gitea/workflows/on_push.yml

@@ -1,4 +1,4 @@
-name: Master
+name: Check master code
 on:
   push:
     branches:
@@ -6,4 +6,4 @@ on:
 
 jobs:
   build:
-    uses: ./.gitea/workflows/on_called_build.yml
+    uses: ./.gitea/workflows/common_build.yml

androidApp/build.gradle.kts

@@ -10,7 +10,6 @@ plugins {
     id("com.mikepenz.aboutlibraries.plugin")
     id("org.jetbrains.kotlinx.kover")
     id("app.cash.sqldelight") version "2.0.2"
-    jacoco
 }
 
 fun Project.execWithOutput(
@@ -65,15 +64,6 @@ fun versionNameFromGit(): String {
     return gitVersion()
 }
 
-val exclusions =
-    listOf(
-        "**/R.class",
-        "**/R\$*.class",
-        "**/BuildConfig.*",
-        "**/Manifest*.*",
-        "**/*Test*.*",
-    )
-
 android {
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
@@ -105,6 +95,7 @@ android {
 
         // tests
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments["clearPackageData"] = "true"
         testInstrumentationRunnerArguments["useTestStorageService"] = "true"
     }
     packaging {
@@ -124,39 +115,6 @@ android {
             installation {
                 installOptions("-g", "-r")
             }
-
-            val androidTests = "connectedAndroidTest"
-            tasks.register<JacocoReport>("JacocoDebugCodeCoverage") {
-                // Depend on unit tests and Android tests tasks
-                dependsOn(listOf(androidTests))
-                // Set task grouping and description
-                group = "Reporting"
-                description = "Execute UI and unit tests, generate and combine Jacoco coverage report"
-                // Configure reports to generate both XML and HTML formats
-                reports {
-                    xml.required.set(true)
-                    html.required.set(true)
-                }
-                // Set source directories to the main source directory
-                sourceDirectories.setFrom(layout.projectDirectory.dir("src/main"))
-                // Set class directories to compiled Java and Kotlin classes, excluding specified exclusions
-                classDirectories.setFrom(
-                    files(
-                        fileTree(layout.buildDirectory.dir("intermediates/javac/")) {
-                            exclude(exclusions)
-                        },
-                        fileTree(layout.buildDirectory.dir("tmp/kotlin-classes/")) {
-                            exclude(exclusions)
-                        },
-                    ),
-                )
-                // Collect execution data from .exec and .ec files generated during test execution
-                executionData.setFrom(
-                    files(
-                        fileTree(layout.buildDirectory) { include(listOf("**/*.exec", "**/*.ec")) },
-                    ),
-                )
-            }
         }
     }
     flavorDimensions.add("build")
@@ -169,6 +127,7 @@ android {
     namespace = "bou.amine.apps.readerforselfossv2.android"
     testOptions {
         animationsDisabled = true
+        execution = "ANDROIDX_TEST_ORCHESTRATOR"
         unitTests {
             isIncludeAndroidResources = true
         }
@@ -201,8 +160,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")
@@ -249,6 +208,7 @@ dependencies {
     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:orchestrator:1.6.0-alpha02")
     androidTestUtil("androidx.test.services:test-services:1.6.0-alpha02")
     testImplementation("org.robolectric:robolectric:4.14.1")
     testImplementation("androidx.test:core-ktx:1.7.0-alpha01")
@@ -272,12 +232,6 @@ tasks.withType<Test> {
             )
         showStandardStreams = true
     }
-    if (this.name == "connectedAndroidTest") {
-        configure<JacocoTaskExtension> {
-            isIncludeNoLocationClasses = true
-            excludes = listOf("jdk.internal.*")
-        }
-    }
 }
 
 aboutLibraries {
@@ -291,29 +245,39 @@ aboutLibraries {
     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", "/storage/emulated/0/Pictures/selfoss_tests/screenshots/*")
+        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", "/storage/emulated/0/Pictures/selfoss_tests/screenshots")
+        commandLine = listOf("adb", "shell", "mkdir", "-p", "/sdcard/Pictures/selfoss_tests")
     }
 
+val fetchScreenshotsTask =
     tasks.register<Exec>("fetchScreenshots") {
-    val reportsDirectory = file("$buildDir/reports/androidTests/connected")
         println("AMINE : fetch")
         group = "reporting"
         executable(android.adbExecutable.toString())
-    commandLine = listOf("adb", "pull", "/storage/emulated/0/Pictures/selfoss_tests/screenshots", reportsDirectory.toString())
+        commandLine = listOf("adb", "pull", "/sdcard/Pictures/selfoss_tests/.", reportsDirectory.toString())
 
         finalizedBy(clearScreenshotsTask)
+        dependsOn(createScreenshotDirectoryTask)
 
         doFirst {
             reportsDirectory.mkdirs()
         }
     }
+
+tasks.whenTaskAdded {
+    if (this.name == "connectedAndroidTest") {
+        this.finalizedBy(fetchScreenshotsTask)
+    }
+}

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt

@@ -1,7 +1,6 @@
 package bou.amine.apps.readerforselfossv2.android
 
 import android.content.Context
-import android.graphics.Bitmap
 import android.os.Environment.DIRECTORY_PICTURES
 import android.os.Environment.getExternalStoragePublicDirectory
 import android.util.Log
@@ -15,38 +14,40 @@ 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.RootMatchers.isDialog
 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.CoreMatchers.not
 import org.hamcrest.Matchers.hasToString
 import org.junit.BeforeClass
-import java.io.BufferedOutputStream
+import org.junit.rules.TestWatcher
+import org.junit.runner.Description
 import java.io.File
-import java.io.FileOutputStream
 import java.io.IOException
 import java.util.Locale
 
-// For now, do not move this as it is modified by the integration tests
-const val DEFAULT_URL = "http://10.0.2.2:8888"
-
 fun performLogin(someUrl: String? = null) {
-    Log.i("AUTOMATION", "The url used will be ${if (!someUrl.isNullOrEmpty()) someUrl else DEFAULT_URL}")
     onView(withId(R.id.urlView)).perform(click()).perform(
         typeTextIntoFocusedView(
-            if (!someUrl.isNullOrEmpty()) someUrl else DEFAULT_URL,
+            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,
@@ -112,12 +113,6 @@ fun testPreferencesFromArray(
     }
 }
 
-fun goToSources() {
-    openMenu()
-    onView(withText(R.string.menu_home_sources))
-        .perform(click())
-}
-
 fun testAddSourceWithUrl(
     url: String,
     sourceName: String,
@@ -141,11 +136,6 @@ fun testAddSourceWithUrl(
     onView(withText(sourceName)).check(matches(isDisplayed()))
 }
 
-fun checkHomeLoadingDone() {
-    onView(withId(R.id.swipeRefreshLayout)).inRoot(not(isDialog())).perform(waitForRecyclerViewToStopLoading(300000))
-}
-
-@Suppress("detekt:UtilityClassWithPublicConstructor")
 open class WithANRException {
     companion object {
         // Running count of the number of Android Not Responding dialogues to prevent endless dismissal.
@@ -160,7 +150,6 @@ open class WithANRException {
                     "default root matcher, it may be picking a root that never takes focus. " +
                     "Root:",
             )
-        private const val OTHER_EXCEPTION = "System Ul isn't responding"
 
         private fun handleAnrDialogue() {
             val device = UiDevice.getInstance(getInstrumentation())
@@ -174,17 +163,10 @@ open class WithANRException {
         fun setUpHandler() {
             Espresso.setFailureHandler { error, viewMatcher ->
 
-                takeScreenshot()
-                if (error.message!!.contains(OTHER_EXCEPTION)) {
-                    handleAnrDialogue()
-                } else if (error.message!!.contains(rootViewWithoutFocusExceptionMsg) &&
-                    anrCount < 20
-                ) {
+                if (error.message!!.contains(rootViewWithoutFocusExceptionMsg) && anrCount < 3) {
                     anrCount++
                     handleAnrDialogue()
                 } else { // chain all failures down to the default espresso handler
-                    Log.e("AMINE", "AMINE : ${error.message}")
-                    println("AMINE : ${error.message}")
                     DefaultFailureHandler(getInstrumentation().targetContext).handle(error, viewMatcher)
                 }
             }
@@ -192,41 +174,47 @@ open class WithANRException {
     }
 }
 
-@Suppress("detekt:NestedBlockDepth")
-fun takeScreenshot() {
-    try {
-        val bitmap = getInstrumentation().uiAutomation.takeScreenshot()
-
-        val folder =
+class MyScreenCaptureProcessor(
+    parentFolderPath: String,
+) : BasicScreenCaptureProcessor() {
+    init {
+        this.mDefaultScreenshotPath =
             File(
                 File(
                     getExternalStoragePublicDirectory(DIRECTORY_PICTURES),
                     "selfoss_tests",
                 ).absolutePath,
-                "screenshots",
+                "screenshots/$parentFolderPath",
             )
-        if (!folder.exists()) {
-            folder.mkdirs()
     }
 
-        var out: BufferedOutputStream? = null
-        val size = folder.list().size + 1
+    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 {
-            out = BufferedOutputStream(FileOutputStream(folder.path + "/" + size + ".png"))
-            bitmap.compress(Bitmap.CompressFormat.PNG, 100, out)
+        screenCapture.apply {
+            name = screenShotName
+            process(processors)
+        }
         Log.d("Screenshots", "Screenshot taken")
-        } catch (e: IOException) {
-            Log.e("Screenshots", "Could not save the screenshot", e)
-        } finally {
-            if (out != null) {
-                try {
-                    out.close()
-                } catch (e: IOException) {
-                    Log.e("Screenshots", "Could not save the screenshot", e)
-                }
-            }
-        }
     } 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)
+    }
+}

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/Helpers.kt

@@ -8,32 +8,22 @@ import android.widget.RelativeLayout
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.core.graphics.drawable.toBitmap
-import androidx.core.view.isVisible
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
-import androidx.test.espresso.PerformException
 import androidx.test.espresso.Root
-import androidx.test.espresso.UiController
-import androidx.test.espresso.ViewAction
 import androidx.test.espresso.matcher.RootMatchers.isPlatformPopup
 import androidx.test.espresso.matcher.ViewMatchers.hasSibling
-import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withChild
 import androidx.test.espresso.matcher.ViewMatchers.withClassName
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withParent
 import androidx.test.espresso.matcher.ViewMatchers.withResourceName
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.espresso.util.HumanReadables
-import androidx.test.espresso.util.TreeIterables
 import org.hamcrest.CoreMatchers.allOf
-import org.hamcrest.CoreMatchers.any
 import org.hamcrest.Description
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers
 import org.hamcrest.TypeSafeMatcher
-import java.util.concurrent.TimeoutException
 
 fun withError(
     @StringRes id: Int,
@@ -54,86 +44,6 @@ fun withError(
     }
 }
 
-fun waitUntilShown(
-    viewText: String,
-    millis: Long,
-): ViewAction {
-    return object : ViewAction {
-        override fun getConstraints(): Matcher<View> = isRoot()
-
-        override fun getDescription(): String = "wait for $millis millis, for a specific view with text <$viewText> to be visible."
-
-        override fun perform(
-            uiController: UiController,
-            view: View,
-        ) {
-            uiController.loopMainThreadUntilIdle()
-            val startTime = System.currentTimeMillis()
-            val endTime = startTime + millis
-            val viewMatcher = withText(viewText)
-
-            do {
-                for (child in TreeIterables.breadthFirstViewTraversal(view)) {
-                    if (viewMatcher.matches(child) && child.isShown) {
-                        return
-                    }
-                }
-
-                uiController.loopMainThreadForAtLeast(100)
-            } while (System.currentTimeMillis() < endTime)
-
-            // timeout happens
-            throw PerformException
-                .Builder()
-                .withActionDescription(this.description)
-                .withViewDescription(HumanReadables.describe(view))
-                .withCause(TimeoutException())
-                .build()
-        }
-    }
-}
-
-fun waitForRecyclerViewToStopLoading(millis: Long): ViewAction {
-    return object : ViewAction {
-        override fun getConstraints(): Matcher<View> = any(View::class.java)
-
-        override fun getDescription(): String = "wait for  $millis millis for the recyclerview to stop loading."
-
-        override fun perform(
-            uiController: UiController,
-            view: View?,
-        ) {
-            uiController.loopMainThreadUntilIdle()
-            val startTime = System.currentTimeMillis()
-            val endTime = startTime + millis
-
-            do {
-                // either the empty view is displayed
-                for (child in TreeIterables.breadthFirstViewTraversal(view)) {
-                    // found view with required ID
-                    if (withId(R.id.emptyText).matches(child) && child.isVisible) {
-                        return
-                    }
-                }
-
-                // or the refresh layout is refreshing
-                if (view is SwipeRefreshLayout && !view.isRefreshing) {
-                    return
-                }
-                uiController.loopMainThreadForAtLeast(100)
-            } while (System.currentTimeMillis() < endTime)
-
-            // timeout happens
-            throw PerformException
-                .Builder()
-                .withActionDescription(this.description)
-                .withViewDescription(HumanReadables.describe(view))
-                .withCause(TimeoutException())
-                .build()
-        }
-    }
-}
-
 fun isPopupWindow(): Matcher<Root> = isPlatformPopup()
 
 fun withDrawable(

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/HomeActivityTest.kt

@@ -1,7 +1,6 @@
 package bou.amine.apps.readerforselfossv2.android
 
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -15,34 +14,34 @@ 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.testing.CountingIdlingResourceSingleton
 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 `2-HomeActivityTest` : WithANRException() {
+class HomeActivityTest : WithANRException() {
     @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 registerIdlingResource() {
-        IdlingRegistry
-            .getInstance()
-            .register(CountingIdlingResourceSingleton.countingIdlingResource)
-        checkHomeLoadingDone()
+    fun init() {
+        loginAndInitHome()
     }
 
     @Test
     fun testMenu() {
-        onView(withId(R.id.action_search)).check(matches(isDisplayed())).check(
+        onView(withId(R.id.action_search)).check(matches(not(isDisplayed()))).check(
             matches(
                 isClickable(),
             ),

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/LoginActivityTest.kt

@@ -15,20 +15,24 @@ 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 : WithANRException() {
     @get:Rule
     val activityRule = ActivityScenarioRule(LoginActivity::class.java)
 
+    @JvmField
+    @Rule
+    val ruleChain: RuleChain =
+        RuleChain
+            .outerRule(activityRule)
+            .around(ScreenshotTakingRule())
+
     @Before
     fun registerIdlingResource() {
         IdlingRegistry
@@ -44,7 +48,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()))
@@ -61,27 +65,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`() {
+    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 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`() {
-        performLogin("http://10.0.2.2:8889")
-        onView(withId(R.id.urlView)).check(matches(withError(R.string.wrong_infos)))
-    }
-
-    @Test
-    fun `5-multiError`() {
+    fun multiError() {
         onView(withId(R.id.signInButton)).perform(click())
         onView(withId(R.id.signInButton)).perform(click())
         onView(withId(R.id.signInButton)).perform(click())
@@ -89,10 +94,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())
-        checkHomeLoadingDone()
     }
 }

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/SettingsActivityGeneralTest.kt

@@ -3,7 +3,6 @@ package bou.amine.apps.readerforselfossv2.android
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
-import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.replaceText
@@ -20,29 +19,30 @@ 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.testing.CountingIdlingResourceSingleton
 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 : WithANRException() {
     @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() {
-        IdlingRegistry
-            .getInstance()
-            .register(CountingIdlingResourceSingleton.countingIdlingResource)
+        loginAndInitHome()
         openActionBarOverflowOrOptionsMenu(
             ApplicationProvider.getApplicationContext(),
         )

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/SettingsActivityOfflineTest.kt

@@ -1,36 +1,39 @@
 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.IdlingRegistry
-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 bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 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 : WithANRException() {
     @get:Rule
-    val activityRule = ActivityScenarioRule(SettingsActivity::class.java)
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
+
+    @JvmField
+    @Rule
+    val ruleChain: RuleChain =
+        RuleChain
+            .outerRule(activityRule)
+            .around(ScreenshotTakingRule())
 
     lateinit var context: Context
 
@@ -39,17 +42,14 @@ class `6-SettingsActivityOfflineTest` : WithANRException() {
         activityRule.scenario.onActivity { activity ->
             context = activity.window.context
         }
-        IdlingRegistry
-            .getInstance()
-            .register(CountingIdlingResourceSingleton.countingIdlingResource)
+        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() {

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/SettingsActivityReaderTest.kt

@@ -1,34 +1,37 @@
 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.IdlingRegistry
-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 bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 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 : WithANRException() {
     @get:Rule
-    val activityRule = ActivityScenarioRule(SettingsActivity::class.java)
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
+
+    @JvmField
+    @Rule
+    val ruleChain: RuleChain =
+        RuleChain
+            .outerRule(activityRule)
+            .around(ScreenshotTakingRule())
 
     lateinit var context: Context
 
@@ -37,17 +40,14 @@ class `5-SettingsActivityReaderTest` : WithANRException() {
         activityRule.scenario.onActivity { activity ->
             context = activity.window.context
         }
-        IdlingRegistry
-            .getInstance()
-            .register(CountingIdlingResourceSingleton.countingIdlingResource)
+        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(

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/SettingsActivityTest.kt

@@ -2,30 +2,34 @@ package bou.amine.apps.readerforselfossv2.android
 
 import android.content.Context
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.isSelected
 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.testing.CountingIdlingResourceSingleton
 import org.hamcrest.CoreMatchers.allOf
 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 : WithANRException() {
     @get:Rule
-    val activityRule = ActivityScenarioRule(HomeActivity::class.java)
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
+
+    @JvmField
+    @Rule
+    val ruleChain: RuleChain =
+        RuleChain
+            .outerRule(activityRule)
+            .around(ScreenshotTakingRule())
 
     lateinit var context: Context
 
@@ -34,9 +38,7 @@ class `3-SettingsActivityTest` : WithANRException() {
         activityRule.scenario.onActivity { activity ->
             context = activity.window.context
         }
-        IdlingRegistry
-            .getInstance()
-            .register(CountingIdlingResourceSingleton.countingIdlingResource)
+        loginAndInitHome()
         openMenu()
         onView(withText(R.string.title_activity_settings)).perform(click())
     }
@@ -75,9 +77,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
@@ -97,7 +96,6 @@ class `3-SettingsActivityTest` : WithANRException() {
     @Test
     fun testAbout() {
         onView(withText(R.string.action_about)).perform(click())
-        onView(isRoot()).perform(waitUntilShown("ACRA", 30000))
         onView(withText("ACRA")).check(matches(isDisplayed()))
     }
 }

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/SourcesActivityTest.kt

@@ -2,7 +2,6 @@ package bou.amine.apps.readerforselfossv2.android
 
 import androidx.test.espresso.AmbiguousViewMatcherException
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.swipeDown
@@ -15,30 +14,34 @@ 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.testing.CountingIdlingResourceSingleton
 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 : WithANRException() {
     @get:Rule
-    val activityRule = ActivityScenarioRule(HomeActivity::class.java)
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
+
+    @JvmField
+    @Rule
+    val ruleChain: RuleChain =
+        RuleChain
+            .outerRule(activityRule)
+            .around(ScreenshotTakingRule())
 
     lateinit var sourceName: String
 
     @Before
     fun init() {
-        IdlingRegistry
-            .getInstance()
-            .register(CountingIdlingResourceSingleton.countingIdlingResource)
         sourceName = UUID.randomUUID().toString().substring(0, 15)
 
+        loginAndInitHome()
         goToSources()
     }
 
@@ -80,4 +83,10 @@ class `7-SourcesActivityTest` : WithANRException() {
         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())
+    }
 }

androidApp/src/debug/AndroidManifest.xml

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
-    <application
-        android:name=".MyApp"
-        android:allowBackup="false"
-        android:configChanges="uiMode"
-        android:dataExtractionRules="@xml/data_extraction_rules"
-        android:fullBackupContent="false"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:networkSecurityConfig="@xml/network_security_config"
-        android:requestLegacyExternalStorage="true"
-        android:supportsRtl="true"
-        android:theme="@style/NoBar"
-        tools:replace="android:allowBackup">
-        <activity
-            android:name=".MainActivity"
-            android:exported="true"
-            android:theme="@style/SplashTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
-        </activity>
-        <activity
-            android:name=".LoginActivity"
-            android:label="@string/title_activity_login"></activity>
-        <activity android:name=".HomeActivity"></activity>
-        <activity
-            android:name=".settings.SettingsActivity"
-            android:label="@string/title_activity_settings"
-            android:parentActivityName=".HomeActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".HomeActivity" />
-        </activity>
-        <activity
-            android:name=".SourcesActivity"
-            android:parentActivityName=".HomeActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".HomeActivity" />
-        </activity>
-        <activity
-            android:name=".UpsertSourceActivity"
-            android:exported="true"
-            android:parentActivityName=".SourcesActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".SourcesActivity" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-        </activity>
-        <activity android:name=".ReaderActivity"></activity>
-        <activity
-            android:name=".ImageActivity"
-            android:theme="@style/Theme.AppCompat.ImageActivity"></activity>
-
-        <meta-data
-            android:name="android.webkit.WebView.MetricsOptOut"
-            android:value="true" />
-
-        <meta-data
-            android:name="android.webkit.WebView.EnableSafeBrowsing"
-            android:value="true" />
-
-        <meta-data
-            android:name="android.max_aspect"
-            android:value="2.1" />
-    </application>
-</manifest>

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt

@@ -104,7 +104,7 @@ class HomeActivity :
 
         if (appSettingsService.isItemCachingEnabled()) {
             CountingIdlingResourceSingleton.increment()
-            CoroutineScope(Dispatchers.IO).launch {
+            CoroutineScope(Dispatchers.Main).launch {
                 repository.tryToCacheItemsAndGetNewOnes()
                 CountingIdlingResourceSingleton.decrement()
             }
@@ -120,9 +120,12 @@ class HomeActivity :
         binding.swipeRefreshLayout.setOnRefreshListener {
             repository.offlineOverride = false
             lastFetchDone = false
-            items.clear()
+            CountingIdlingResourceSingleton.increment()
+            CoroutineScope(Dispatchers.Main).launch {
                 getElementsAccordingToTab()
                 binding.swipeRefreshLayout.isRefreshing = false
+                CountingIdlingResourceSingleton.decrement()
+            }
         }
 
         val swipeDirs =
@@ -286,7 +289,7 @@ class HomeActivity :
 
         handleRecurringTask()
         CountingIdlingResourceSingleton.increment()
-        CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.Main).launch {
             repository.handleDBActions()
             CountingIdlingResourceSingleton.decrement()
         }
@@ -459,11 +462,9 @@ class HomeActivity :
         appendResults: Boolean,
         itemType: ItemType,
     ) {
-        @Suppress("detekt:ComplexCondition")
-        if ((appendResults && items.size > 0) || (!appendResults && items.size == 0)) {
         CountingIdlingResourceSingleton.increment()
+        CoroutineScope(Dispatchers.Main).launch {
             binding.swipeRefreshLayout.isRefreshing = true
-            CoroutineScope(Dispatchers.IO).launch {
             repository.displayedItems = itemType
             items =
                 if (appendResults) {
@@ -471,17 +472,10 @@ class HomeActivity :
                 } else {
                     repository.getNewerItems()
                 }
-                CountingIdlingResourceSingleton.increment()
-                launch(Dispatchers.Main) {
             binding.swipeRefreshLayout.isRefreshing = false
             handleListResult()
             CountingIdlingResourceSingleton.decrement()
         }
-                CountingIdlingResourceSingleton.decrement()
-            }
-        } else {
-            handleListResult()
-        }
     }
 
     private fun handleListResult(appendResults: Boolean = false) {
@@ -540,10 +534,7 @@ class HomeActivity :
     }
 
     private fun reloadBadges() {
-        if (appSettingsService.isInfiniteLoadingEnabled() ||
-            appSettingsService.isDisplayUnreadCountEnabled() ||
-            appSettingsService.isDisplayAllCountEnabled()
-        ) {
+        if (appSettingsService.isDisplayUnreadCountEnabled() || appSettingsService.isDisplayAllCountEnabled()) {
             CountingIdlingResourceSingleton.increment()
             CoroutineScope(Dispatchers.IO).launch {
                 repository.reloadBadges()
@@ -622,10 +613,8 @@ class HomeActivity :
                 needsConfirmation(R.string.menu_home_refresh, R.string.refresh_dialog_message) {
                     Toast.makeText(this, R.string.refresh_in_progress, Toast.LENGTH_SHORT).show()
                     CountingIdlingResourceSingleton.increment()
-                    CoroutineScope(Dispatchers.IO).launch {
+                    CoroutineScope(Dispatchers.Main).launch {
                         val updatedRemote = repository.updateRemote()
-                        CountingIdlingResourceSingleton.increment()
-                        launch(Dispatchers.Main) {
                         if (updatedRemote) {
                             Toast
                                 .makeText(
@@ -643,8 +632,6 @@ class HomeActivity :
                         }
                         CountingIdlingResourceSingleton.decrement()
                     }
-                        CountingIdlingResourceSingleton.decrement()
-                    }
                 }
                 return true
             }
@@ -652,12 +639,10 @@ class HomeActivity :
             R.id.readAll -> {
                 if (elementsShown == ItemType.UNREAD) {
                     needsConfirmation(R.string.readAll, R.string.markall_dialog_message) {
-                        CountingIdlingResourceSingleton.increment()
                         binding.swipeRefreshLayout.isRefreshing = true
-                        CoroutineScope(Dispatchers.IO).launch {
-                            val success = repository.markAllAsRead(items)
                         CountingIdlingResourceSingleton.increment()
-                            launch(Dispatchers.Main) {
+                        CoroutineScope(Dispatchers.Main).launch {
+                            val success = repository.markAllAsRead(items)
                             if (success) {
                                 Toast
                                     .makeText(
@@ -676,11 +661,10 @@ class HomeActivity :
                                         Toast.LENGTH_SHORT,
                                     ).show()
                             }
+                            handleListResult()
                             binding.swipeRefreshLayout.isRefreshing = false
                             CountingIdlingResourceSingleton.decrement()
                         }
-                            CountingIdlingResourceSingleton.decrement()
-                        }
                     }
                 }
                 return true

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt

@@ -108,7 +108,7 @@ class LoginActivity :
 
     private fun goToMain() {
         CountingIdlingResourceSingleton.increment()
-        CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.Main).launch {
             repository.updateApiInformation()
             ACRA.errorReporter.putCustomData(
                 "SELFOSS_API_VERSION",
@@ -127,12 +127,8 @@ class LoginActivity :
         binding.urlView.error = getString(R.string.wrong_infos)
         binding.loginView.error = getString(R.string.wrong_infos)
         binding.passwordView.error = getString(R.string.wrong_infos)
-        binding.urlView.requestFocus()
-
-        showProgress(false)
     }
 
-    @Suppress("detekt:LongMethod")
     private fun attemptLogin() {
         // Reset errors.
         binding.urlView.error = null
@@ -164,12 +160,22 @@ class LoginActivity :
         repository.refreshLoginInformation(url, login, password)
 
         CountingIdlingResourceSingleton.increment()
-        CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.Main).launch {
             try {
                 repository.updateApiInformation()
+            } catch (e: Exception) {
+                if (e.message?.startsWith("No transformation found") == true) {
+                    Toast
+                        .makeText(
+                            applicationContext,
+                            R.string.application_selfoss_only,
+                            Toast.LENGTH_LONG,
+                        ).show()
+                    preferenceError()
+                    showProgress(false)
+                }
+            }
             val result = repository.login()
-                CountingIdlingResourceSingleton.increment()
-                launch(Dispatchers.Main) {
             if (result) {
                 val errorFetching = repository.checkIfFetchFails()
                 if (!errorFetching) {
@@ -180,26 +186,9 @@ class LoginActivity :
             } else {
                 preferenceError()
             }
+            showProgress(false)
             CountingIdlingResourceSingleton.decrement()
         }
-            } catch (e: Exception) {
-                CountingIdlingResourceSingleton.increment()
-                launch(Dispatchers.Main) {
-                    if (e.message?.startsWith("No transformation found") == true) {
-                        Toast
-                            .makeText(
-                                applicationContext,
-                                R.string.application_selfoss_only,
-                                Toast.LENGTH_LONG,
-                            ).show()
-                        preferenceError()
-                    }
-                    CountingIdlingResourceSingleton.decrement()
-                }
-            } finally {
-                CountingIdlingResourceSingleton.decrement()
-            }
-        }
     }
 
     private fun failLoginDetails(
@@ -311,7 +300,6 @@ class LoginActivity :
                     .withAboutSpecial2Description(AppSettingsService.BUG_URL)
                     .withAboutSpecial1("Project Page")
                     .withAboutSpecial1Description(AppSettingsService.SOURCE_URL)
-                    .withShowLoadingProgress(false)
                     .start(this)
                 true
             }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt

@@ -73,7 +73,7 @@ class MyApp :
                 ),
             )
 
-            CoroutineScope(Dispatchers.Default).launch {
+            CoroutineScope(Dispatchers.Main).launch {
                 connectivityService.networkAvailableProvider.collect { networkAvailable ->
                     val toastMessage =
                         if (networkAvailable) {

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt

@@ -27,7 +27,7 @@ class ReaderActivity :
     DIAware {
     private var currentItem: Int = 0
 
-    private var toolbarMenu: Menu? = null
+    private lateinit var toolbarMenu: Menu
 
     private lateinit var binding: ActivityReaderBinding
 
@@ -90,10 +90,8 @@ class ReaderActivity :
     }
 
     private fun updateStarIcon() {
-        if (toolbarMenu != null) {
         val isStarred = allItems.getOrNull(currentItem)?.starred ?: false
-            toolbarMenu!!.findItem(R.id.star)?.icon?.setTint(if (isStarred) Color.RED else Color.WHITE)
-        }
+        toolbarMenu.findItem(R.id.star)?.icon?.setTint(if (isStarred) Color.RED else Color.WHITE)
     }
 
     override fun onSaveInstanceState(oldInstanceState: Bundle) {
@@ -135,10 +133,8 @@ class ReaderActivity :
 
     private fun alignmentMenu() {
         val showJustify = appSettingsService.getActiveAllignment() == AppSettingsService.ALIGN_LEFT
-        if (toolbarMenu != null) {
-            toolbarMenu!!.findItem(R.id.align_left).isVisible = !showJustify
-            toolbarMenu!!.findItem(R.id.align_justify).isVisible = showJustify
-        }
+        toolbarMenu.findItem(R.id.align_left).isVisible = !showJustify
+        toolbarMenu.findItem(R.id.align_justify).isVisible = showJustify
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/SourcesActivity.kt

@@ -50,7 +50,6 @@ class SourcesActivity :
 
     override fun onResume() {
         super.onResume()
-        CountingIdlingResourceSingleton.increment()
         val mLayoutManager = LinearLayoutManager(this)
 
         var items: ArrayList<SelfossModel.SourceDetail>
@@ -58,10 +57,9 @@ class SourcesActivity :
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = mLayoutManager
 
-        CoroutineScope(Dispatchers.IO).launch {
-            val response = repository.getSourcesDetails()
         CountingIdlingResourceSingleton.increment()
-            launch(Dispatchers.Main) {
+        CoroutineScope(Dispatchers.Main).launch {
+            val response = repository.getSourcesDetails()
             if (response.isNotEmpty()) {
                 items = response
                 val mAdapter =
@@ -81,8 +79,6 @@ class SourcesActivity :
             }
             CountingIdlingResourceSingleton.decrement()
         }
-            CountingIdlingResourceSingleton.decrement()
-        }
 
         binding.fab.setOnClickListener {
             startActivity(Intent(this@SourcesActivity, UpsertSourceActivity::class.java))

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/UpsertSourceActivity.kt

@@ -9,7 +9,6 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivityUpsertSourceBinding
-import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
@@ -109,12 +108,9 @@ class UpsertSourceActivity :
             binding.progress.visibility = View.GONE
         }
 
-        CountingIdlingResourceSingleton.increment()
-        CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.Main).launch {
             try {
                 val items = repository.getSpouts()
-                CountingIdlingResourceSingleton.increment()
-                launch(Dispatchers.Main) {
                 if (items.isNotEmpty()) {
                     val itemsStrings = items.map { it.value.name }
                     for ((key, value) in items) {
@@ -139,12 +135,9 @@ class UpsertSourceActivity :
                 } else {
                     handleSpoutFailure()
                 }
-                    CountingIdlingResourceSingleton.decrement()
-                }
             } catch (e: NetworkUnavailableException) {
                 handleSpoutFailure(networkIssue = true)
             }
-            CountingIdlingResourceSingleton.decrement()
         }
     }
 
@@ -167,8 +160,7 @@ class UpsertSourceActivity :
             }
 
             else -> {
-                CountingIdlingResourceSingleton.increment()
-                CoroutineScope(Dispatchers.IO).launch {
+                CoroutineScope(Dispatchers.Main).launch {
                     val successfullyAddedSource =
                         if (existingSource != null) {
                             repository.updateSource(
@@ -186,8 +178,6 @@ class UpsertSourceActivity :
                                 binding.tags.text.toString(),
                             )
                         }
-                    CountingIdlingResourceSingleton.increment()
-                    launch(Dispatchers.Main) {
                     if (successfullyAddedSource) {
                         finish()
                     } else {
@@ -198,9 +188,6 @@ class UpsertSourceActivity :
                                 Toast.LENGTH_SHORT,
                             ).show()
                     }
-                        CountingIdlingResourceSingleton.decrement()
-                    }
-                    CountingIdlingResourceSingleton.decrement()
                 }
             }
         }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt

@@ -30,7 +30,7 @@ import org.kodein.di.instance
 
 class ItemCardAdapter(
     override val app: Activity,
-    override var items: ArrayList<SelfossModel.Item>,
+    override val items: ArrayList<SelfossModel.Item>,
     override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
     override lateinit var binding: CardItemBinding

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemListAdapter.kt

@@ -21,7 +21,7 @@ import org.kodein.di.instance
 
 class ItemListAdapter(
     override val app: Activity,
-    override var items: ArrayList<SelfossModel.Item>,
+    override val items: ArrayList<SelfossModel.Item>,
     override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
     override lateinit var binding: ListItemBinding

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemsAdapter.kt

@@ -21,7 +21,7 @@ import org.kodein.di.DIAware
 abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> :
     RecyclerView.Adapter<VH>(),
     DIAware {
-    abstract var items: ArrayList<SelfossModel.Item>
+    abstract val items: ArrayList<SelfossModel.Item>
     abstract val repository: Repository
     abstract val binding: ViewBinding
     abstract val appSettingsService: AppSettingsService
@@ -31,7 +31,8 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> :
     protected val c: Context get() = app.baseContext
 
     fun updateAllItems(items: ArrayList<SelfossModel.Item>) {
-        this.items = items
+        this.items.clear()
+        this.items.addAll(items)
         updateHomeItems(items)
         notifyDataSetChanged()
     }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt

@@ -12,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity
 import bou.amine.apps.readerforselfossv2.android.databinding.SourceListItemBinding
-import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
@@ -105,10 +104,8 @@ class SourcesListAdapter(
             source: SelfossModel.SourceDetail,
             position: Int,
         ) {
-            CountingIdlingResourceSingleton.increment()
             CoroutineScope(Dispatchers.IO).launch {
                 val successfullyDeletedSource = repository.deleteSource(source.id, source.title)
-                CountingIdlingResourceSingleton.increment()
                 launch(Dispatchers.Main) {
                     if (successfullyDeletedSource) {
                         items.removeAt(position)
@@ -122,9 +119,7 @@ class SourcesListAdapter(
                                 Toast.LENGTH_SHORT,
                             ).show()
                     }
-                    CountingIdlingResourceSingleton.decrement()
-                }
-                CountingIdlingResourceSingleton.decrement()
+                }
             }
         }
     }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt

@@ -14,7 +14,6 @@ import android.view.ViewGroup
 import bou.amine.apps.readerforselfossv2.android.HomeActivity
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding
-import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.glide.imageIntoViewTarget
 import bou.amine.apps.readerforselfossv2.android.utils.maybeIfContext
@@ -60,14 +59,12 @@ class FilterSheetFragment :
             )
 
         try {
-            CountingIdlingResourceSingleton.increment()
             CoroutineScope(Dispatchers.Main).launch {
                 handleTagChips()
                 handleSourceChips()
 
                 binding.progressBar2.visibility = GONE
                 binding.filterView.visibility = VISIBLE
-                CountingIdlingResourceSingleton.decrement()
             }
         } catch (e: IllegalStateException) {
             dismiss()

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt

@@ -124,7 +124,6 @@ class SettingsActivity :
                         LibsBuilder()
                             .withAboutIconShown(true)
                             .withAboutVersionShown(true)
-                            .withShowLoadingProgress(false)
                             .start(it)
                     }
                     true

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

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/Repository.kt

@@ -224,18 +224,6 @@ class Repository(
             appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
         val shouldFetch = if (!appSettingsService.isUpdateSourcesEnabled()) !fetchedSources else true
         if (shouldFetch && connectivityService.isNetworkAvailable()) {
-            sources = sourceDetails(isDatabaseEnabled)
-        } 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
@@ -244,6 +232,9 @@ class Repository(
                     resetDBSourcesWithData(sources)
                 }
             }
+        } else if (isDatabaseEnabled) {
+            sources = getDBSources().map { it.toView() } as ArrayList<SelfossModel.SourceDetail>
+        }
         return sources
     }
 
@@ -334,7 +325,7 @@ class Repository(
             _badgeUnread.value -= 1
         }
 
-        CoroutineScope(Dispatchers.Default).launch {
+        CoroutineScope(Dispatchers.Main).launch {
             updateDBItem(item)
         }
     }
@@ -345,7 +336,7 @@ class Repository(
             _badgeUnread.value += 1
         }
 
-        CoroutineScope(Dispatchers.Default).launch {
+        CoroutineScope(Dispatchers.Main).launch {
             updateDBItem(item)
         }
     }
@@ -356,7 +347,7 @@ class Repository(
             _badgeStarred.value += 1
         }
 
-        CoroutineScope(Dispatchers.Default).launch {
+        CoroutineScope(Dispatchers.Main).launch {
             updateDBItem(item)
         }
     }
@@ -367,7 +358,7 @@ class Repository(
             _badgeStarred.value -= 1
         }
 
-        CoroutineScope(Dispatchers.Default).launch {
+        CoroutineScope(Dispatchers.Main).launch {
             updateDBItem(item)
         }
     }
@@ -380,7 +371,6 @@ class Repository(
     ): Boolean {
         var response = false
         if (connectivityService.isNetworkAvailable()) {
-            fetchedSources = false
             response = api
                 .createSourceForVersion(
                     title,
@@ -402,7 +392,6 @@ class Repository(
     ): Boolean {
         var response = false
         if (connectivityService.isNetworkAvailable()) {
-            fetchedSources = false
             response = api.updateSourceForVersion(id, title, url, spout, tags).isSuccess == true
         }
 
@@ -417,7 +406,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

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt

@@ -32,7 +32,6 @@ import io.ktor.utils.io.charsets.Charsets
 import io.ktor.utils.io.core.toByteArray
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.IO
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 
@@ -83,7 +82,7 @@ class SelfossApi(
                 }
                 modifyRequest {
                     Napier.i("Will modify", tag = "HttpSend")
-                    CoroutineScope(Dispatchers.IO).launch {
+                    CoroutineScope(Dispatchers.Main).launch {
                         Napier.i("Will login", tag = "HttpSend")
                         login()
                         Napier.i("Did login", tag = "HttpSend")

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/ConnectivityService.kt

@@ -16,7 +16,7 @@ class ConnectivityService {
     fun start() {
         connectivity = Connectivity()
         connectivity.start()
-        CoroutineScope(Dispatchers.Default).launch {
+        CoroutineScope(Dispatchers.Main).launch {
             connectivity.statusUpdates.collect { status ->
                 when (status) {
                     is Connectivity.Status.Connected -> {