fix: Connectivity toast message was causing issues.

Changelog for v125030901
Merge pull request 'fix-reload' (#195 ) from fix-reload into master
2025-04-08 20:31:29 +02:00 · 2025-03-31 18:44:08 +00:00 · 2025-03-31 18:25:33 +00:00 · 2025-03-30 21:57:36 +02:00 · 2025-03-30 21:57:36 +02:00 · 2025-03-30 19:50:50 +00:00
34 changed files with 838 additions and 258 deletions
--- a/.gitea/workflows/on_called_build.yml
+++ b/.gitea/workflows/on_called_build.yml
@@ -6,8 +6,7 @@ jobs:
  BuildAndTestAndCoverage:
    runs-on: ubuntu-latest
    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: "Check android app changes"
@@ -16,6 +15,9 @@ 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
@@ -24,7 +26,6 @@ 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
@@ -34,14 +35,7 @@ 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 # 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
+        run: ./gradlew build -x testReleaseUnitTest -x testDebugUnitTest -x testGithubConfigReleaseUnitTest -x testGithubConfigDebugUnitTest
      - name: coverage
        if: steps.check-android-changes.outputs.any_modified == 'true'
        run: |
@@ -54,8 +48,3 @@ 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
--- a/.gitea/workflows/on_merge_on_release.yml
+++ b/.gitea/workflows/on_merge_on_release.yml
@@ -1,4 +1,4 @@
-name: Create tag
+name: Realease
 on:
  push:
    branches:
@@ -7,7 +7,7 @@ on:

 jobs:
  build:
-    uses: ./.gitea/workflows/common_build.yml
+    uses: ./.gitea/workflows/on_called_build.yml
  createTagAndChangelog:
    runs-on: ubuntu-latest
    needs: build
@@ -86,7 +86,6 @@ jobs:
        with:
          distribution: 'temurin'
          java-version: '17'
-          cache: gradle
      - name: Setup Android SDK
        uses: android-actions/setup-android@v3
      - name: Configure gradle...
--- a/.gitea/workflows/on_pr.yml
+++ b/.gitea/workflows/on_pr.yml
@@ -1,12 +1,11 @@
-name: Check PR code
+name: PR
 on:
  pull_request:
    branches:
      - master
-      - chore-crowdin-ci

 jobs:
-  Lint:
+  PR:
    runs-on: ubuntu-latest
    steps:
      - name: Check out repository code
@@ -15,7 +14,6 @@ jobs:
        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
@@ -38,7 +36,7 @@ jobs:
          files: |
            androidApp/src/main/res/values/strings.xml
      - name: upload translation sources
-        if: steps.check-api-changes.outputs.any_modified == 'true'
+        if: steps.check-translations-changes.outputs.any_modified == 'true'
        uses: crowdin/github-action@v2
        with:
          config: './.gitea/workflows/assets/crowdin.yml'
@@ -51,10 +49,10 @@ jobs:
          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'
+        if: steps.check-translations-changes.outputs.any_modified == 'true'
        run: sleep 10s
      - name: download translations
-        if: steps.check-api-changes.outputs.any_modified == 'true'
+        if: steps.check-translations-changes.outputs.any_modified == 'true'
        uses: crowdin/github-action@v2
        with:
          config: './.gitea/workflows/assets/crowdin.yml'
@@ -67,18 +65,18 @@ jobs:
          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'
+        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-api-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.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-api-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.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
@@ -88,4 +86,4 @@ jobs:
          branch: ${{ github.head_ref || github.ref_name }}
  build:
    needs: Lint
-    uses: ./.gitea/workflows/common_build.yml
+    uses: ./.gitea/workflows/on_called_build.yml
--- a/.gitea/workflows/on_pr_test.yml
+++ b/.gitea/workflows/on_pr_test.yml
@@ -0,0 +1,67 @@
+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
--- a/.gitea/workflows/on_push.yml
+++ b/.gitea/workflows/on_push.yml
@@ -1,4 +1,4 @@
-name: Check master code
+name: Master
 on:
  push:
    branches:
@@ -6,4 +6,4 @@ on:

 jobs:
  build:
-    uses: ./.gitea/workflows/common_build.yml
+    uses: ./.gitea/workflows/on_called_build.yml
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+**v125030901
+
+- Merge pull request 'fix-reload' (#195) from fix-reload into master
+- fix: Infinite scroll needs loading stats.
+- fix: do not reload items on resume.
+- Merge pull request 'tests' (#193) from tests into master
+- ci: Instrumentation tests coverage in ci.
+- ci: Instrumentation tests coverage in ci.
+- ci: Instrumentation tests coverage in ci.
+- chore: better handling of coroutine dispatchers.
+- ci: Instrumentation tests coverage in ci.
+- chore: comment robolectric tests for now.
+- fix: Fixed source deletion test.
+- Merge pull request 'Fix alignment changes resetting reader article position' (#190) from davidoskky/ReaderForSelfoss-multiplatform:alignment into master
+- Refactor star icon handling
+- Don't restart activity changing alignment
+- Changelog for v125030711
+
+--------------------------------------------------------------------
+
 **v125030711

 - Merge pull request 'fix: initial status loading issues.' (#192) from connectivity into master
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
    id("com.mikepenz.aboutlibraries.plugin")
    id("org.jetbrains.kotlinx.kover")
    id("app.cash.sqldelight") version "2.0.2"
+    jacoco
 }

 fun Project.execWithOutput(
@@ -64,6 +65,15 @@ fun versionNameFromGit(): String {
    return gitVersion()
 }

+val exclusions =
+    listOf(
+        "**/R.class",
+        "**/R\$*.class",
+        "**/BuildConfig.*",
+        "**/Manifest*.*",
+        "**/*Test*.*",
+    )
+
 android {
    compileOptions {
        isCoreLibraryDesugaringEnabled = true
@@ -95,7 +105,7 @@ android {

        // tests
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArguments["clearPackageData"] = "true"
+        testInstrumentationRunnerArguments["useTestStorageService"] = "true"
    }
    packaging {
        resources {
@@ -109,6 +119,44 @@ android {
            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
        }
        getByName("debug") {
+            isTestCoverageEnabled = true
+            enableAndroidTestCoverage = true
+            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")
@@ -121,7 +169,6 @@ android {
    namespace = "bou.amine.apps.readerforselfossv2.android"
    testOptions {
        animationsDisabled = true
-        execution = "ANDROIDX_TEST_ORCHESTRATOR"
        unitTests {
            isIncludeAndroidResources = true
        }
@@ -154,8 +201,8 @@ dependencies {
    implementation("androidx.multidex:multidex:2.0.1")

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

    // Material-ish things
    implementation("com.ashokvarma.android:bottom-navigation-bar:2.2.0")
@@ -197,14 +244,15 @@ 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.6.2")
-    androidTestImplementation("androidx.test:rules:1.6.1")
+    androidTestImplementation("androidx.test:runner:1.7.0-alpha01")
+    androidTestImplementation("androidx.test:rules:1.7.0-alpha01")
    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.5.1")
+    androidTestUtil("androidx.test.services:test-services:1.6.0-alpha02")
    testImplementation("org.robolectric:robolectric:4.14.1")
-    testImplementation("androidx.test:core-ktx:1.6.1")
+    testImplementation("androidx.test:core-ktx:1.7.0-alpha01")
+    androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")

    implementation("ch.acra:acra-http:$acraVersion")
    implementation("ch.acra:acra-toast:$acraVersion")
@@ -224,9 +272,16 @@ tasks.withType<Test> {
            )
        showStandardStreams = true
    }
+    if (this.name == "connectedAndroidTest") {
+        configure<JacocoTaskExtension> {
+            isIncludeNoLocationClasses = true
+            excludes = listOf("jdk.internal.*")
+        }
+    }
 }

 aboutLibraries {
+    excludeFields = arrayOf("generated")
    offlineMode = true
    fetchRemoteLicense = false
    fetchRemoteFunding = false
@@ -235,3 +290,30 @@ aboutLibraries {
    duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
    duplicationRule = com.mikepenz.aboutlibraries.plugin.DuplicateRule.GROUP
 }
+
+val clearScreenshotsTask =
+    tasks.register<Exec>("clearScreenshots") {
+        println("AMINE : clear")
+        commandLine = listOf("adb", "shell", "rm", "-r", "/storage/emulated/0/Pictures/selfoss_tests/screenshots/*")
+    }
+
+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")
+    }
+
+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())
+
+    finalizedBy(clearScreenshotsTask)
+
+    doFirst {
+        reportsDirectory.mkdirs()
+    }
+}
--- 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,13 +15,17 @@ 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.runner.RunWith
+import org.junit.runners.MethodSorters

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

@@ -40,7 +44,7 @@ class LoginActivityTest {
    }

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

    @Test
-    fun urlError() {
+    fun `2-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 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() {
+    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 multiError() {
+    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`() {
        onView(withId(R.id.signInButton)).perform(click())
        onView(withId(R.id.signInButton)).perform(click())
        onView(withId(R.id.signInButton)).perform(click())
@@ -86,8 +89,10 @@ class LoginActivityTest {
    }

    @Test
-    fun connect() {
+    fun `6-connect`() {
        performLogin()
        onView(withText(R.string.gdpr_dialog_title)).check(matches(isDisplayed()))
+        onView(withText("OK")).perform(click())
+        checkHomeLoadingDone()
    }
 }
--- 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
@@ -1,6 +1,7 @@
 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
@@ -14,21 +15,29 @@ 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.runner.RunWith
+import org.junit.runners.MethodSorters

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

    @Before
-    fun init() {
-        loginAndInitHome()
+    fun registerIdlingResource() {
+        IdlingRegistry
+            .getInstance()
+            .register(CountingIdlingResourceSingleton.countingIdlingResource)
+        checkHomeLoadingDone()
    }

    @Test
--- 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
@@ -2,14 +2,17 @@ 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
@@ -19,9 +22,11 @@ import org.junit.runner.RunWith

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

    @Before
@@ -29,7 +34,9 @@ class SettingsActivityTest {
        activityRule.scenario.onActivity { activity ->
            context = activity.window.context
        }
-        loginAndInitHome()
+        IdlingRegistry
+            .getInstance()
+            .register(CountingIdlingResourceSingleton.countingIdlingResource)
        openMenu()
        onView(withText(R.string.title_activity_settings)).perform(click())
    }
@@ -68,6 +75,9 @@ class SettingsActivityTest {
        changeAndSaveSetting("", "10") {
            onView(withText(R.string.pref_api_timeout)).perform(click())
        }
+        changeAndSaveSetting("", "60") {
+            onView(withText(R.string.pref_api_timeout)).perform(click())
+        }
    }

    @Test
@@ -87,6 +97,7 @@ class SettingsActivityTest {
    @Test
    fun testAbout() {
        onView(withText(R.string.action_about)).perform(click())
+        onView(isRoot()).perform(waitUntilShown("ACRA", 30000))
        onView(withText("ACRA")).check(matches(isDisplayed()))
    }
 }
--- 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
@@ -3,6 +3,7 @@ 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
@@ -19,22 +20,29 @@ 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.runner.RunWith
+import org.junit.runners.MethodSorters

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

    @Before
    fun init() {
-        loginAndInitHome()
+        IdlingRegistry
+            .getInstance()
+            .register(CountingIdlingResourceSingleton.countingIdlingResource)
        openActionBarOverflowOrOptionsMenu(
            ApplicationProvider.getApplicationContext(),
        )
--- 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,29 +1,34 @@
 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.Espresso.openActionBarOverflowOrOptionsMenu
+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
 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.runner.RunWith

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

    lateinit var context: Context

@@ -32,14 +37,17 @@ class SettingsActivityReaderTest {
        activityRule.scenario.onActivity { activity ->
            context = activity.window.context
        }
-        loginAndInitHome()
-        openActionBarOverflowOrOptionsMenu(
-            ApplicationProvider.getApplicationContext(),
-        )
-        onView(withText(R.string.title_activity_settings)).perform(click())
+        IdlingRegistry
+            .getInstance()
+            .register(CountingIdlingResourceSingleton.countingIdlingResource)
        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/6-SettingsActivityOfflineTest.kt
+++ b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/6-SettingsActivityOfflineTest.kt
@@ -1,31 +1,36 @@
 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.Espresso.openActionBarOverflowOrOptionsMenu
+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
 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.runner.RunWith

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

    lateinit var context: Context

@@ -34,14 +39,17 @@ class SettingsActivityOfflineTest {
        activityRule.scenario.onActivity { activity ->
            context = activity.window.context
        }
-        loginAndInitHome()
-        openActionBarOverflowOrOptionsMenu(
-            ApplicationProvider.getApplicationContext(),
-        )
-        onView(withText(R.string.title_activity_settings)).perform(click())
+        IdlingRegistry
+            .getInstance()
+            .register(CountingIdlingResourceSingleton.countingIdlingResource)
        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/7-SourcesActivityTest.kt
+++ b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/7-SourcesActivityTest.kt
@@ -2,6 +2,7 @@ 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
@@ -14,6 +15,7 @@ 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
@@ -21,19 +23,22 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import java.util.UUID

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

    lateinit var sourceName: String

    @Before
    fun init() {
+        IdlingRegistry
+            .getInstance()
+            .register(CountingIdlingResourceSingleton.countingIdlingResource)
        sourceName = UUID.randomUUID().toString().substring(0, 15)

-        loginAndInitHome()
        goToSources()
    }

@@ -75,10 +80,4 @@ class SourcesActivityTest {
        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/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
+++ b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
@@ -1,7 +1,12 @@
 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
 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
@@ -9,29 +14,39 @@ 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.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.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 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 "http://10.0.2.2:8888",
+            if (!someUrl.isNullOrEmpty()) someUrl else DEFAULT_URL,
        ),
    )
    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,
@@ -97,6 +112,12 @@ fun testPreferencesFromArray(
    }
 }

+fun goToSources() {
+    openMenu()
+    onView(withText(R.string.menu_home_sources))
+        .perform(click())
+}
+
 fun testAddSourceWithUrl(
    url: String,
    sourceName: String,
@@ -119,3 +140,93 @@ fun testAddSourceWithUrl(
        .perform(click())
    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.
+        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 const val OTHER_EXCEPTION = "System Ul isn't responding"
+
+        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 ->
+
+                takeScreenshot()
+                if (error.message!!.contains(OTHER_EXCEPTION)) {
+                    handleAnrDialogue()
+                } else if (error.message!!.contains(rootViewWithoutFocusExceptionMsg) &&
+                    anrCount < 20
+                ) {
+                    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)
+                }
+            }
+        }
+    }
+}
+
+@Suppress("detekt:NestedBlockDepth")
+fun takeScreenshot() {
+    try {
+        val bitmap = getInstrumentation().uiAutomation.takeScreenshot()
+
+        val folder =
+            File(
+                File(
+                    getExternalStoragePublicDirectory(DIRECTORY_PICTURES),
+                    "selfoss_tests",
+                ).absolutePath,
+                "screenshots",
+            )
+        if (!folder.exists()) {
+            folder.mkdirs()
+        }
+
+        var out: BufferedOutputStream? = null
+        val size = folder.list().size + 1
+        try {
+            out = BufferedOutputStream(FileOutputStream(folder.path + "/" + size + ".png"))
+            bitmap.compress(Bitmap.CompressFormat.PNG, 100, out)
+            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)
+    }
+}
--- a/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/Helpers.kt
+++ b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/Helpers.kt
@@ -8,22 +8,32 @@ 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,
@@ -44,6 +54,86 @@ 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(
--- a/androidApp/src/debug/AndroidManifest.xml
+++ b/androidApp/src/debug/AndroidManifest.xml
@@ -0,0 +1,87 @@
+<?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>
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
@@ -104,7 +104,7 @@ class HomeActivity :

        if (appSettingsService.isItemCachingEnabled()) {
            CountingIdlingResourceSingleton.increment()
-            CoroutineScope(Dispatchers.Main).launch {
+            CoroutineScope(Dispatchers.IO).launch {
                repository.tryToCacheItemsAndGetNewOnes()
                CountingIdlingResourceSingleton.decrement()
            }
@@ -120,12 +120,9 @@ class HomeActivity :
        binding.swipeRefreshLayout.setOnRefreshListener {
            repository.offlineOverride = false
            lastFetchDone = false
-            CountingIdlingResourceSingleton.increment()
-            CoroutineScope(Dispatchers.Main).launch {
-                getElementsAccordingToTab()
-                binding.swipeRefreshLayout.isRefreshing = false
-                CountingIdlingResourceSingleton.decrement()
-            }
+            items.clear()
+            getElementsAccordingToTab()
+            binding.swipeRefreshLayout.isRefreshing = false
        }

        val swipeDirs =
@@ -289,7 +286,7 @@ class HomeActivity :

        handleRecurringTask()
        CountingIdlingResourceSingleton.increment()
-        CoroutineScope(Dispatchers.Main).launch {
+        CoroutineScope(Dispatchers.IO).launch {
            repository.handleDBActions()
            CountingIdlingResourceSingleton.decrement()
        }
@@ -462,19 +459,28 @@ class HomeActivity :
        appendResults: Boolean,
        itemType: ItemType,
    ) {
-        CountingIdlingResourceSingleton.increment()
-        CoroutineScope(Dispatchers.Main).launch {
+        @Suppress("detekt:ComplexCondition")
+        if ((appendResults && items.size > 0) || (!appendResults && items.size == 0)) {
+            CountingIdlingResourceSingleton.increment()
            binding.swipeRefreshLayout.isRefreshing = true
-            repository.displayedItems = itemType
-            items =
-                if (appendResults) {
-                    repository.getOlderItems()
-                } else {
-                    repository.getNewerItems()
+            CoroutineScope(Dispatchers.IO).launch {
+                repository.displayedItems = itemType
+                items =
+                    if (appendResults) {
+                        repository.getOlderItems()
+                    } else {
+                        repository.getNewerItems()
+                    }
+                CountingIdlingResourceSingleton.increment()
+                launch(Dispatchers.Main) {
+                    binding.swipeRefreshLayout.isRefreshing = false
+                    handleListResult()
+                    CountingIdlingResourceSingleton.decrement()
                }
-            binding.swipeRefreshLayout.isRefreshing = false
+                CountingIdlingResourceSingleton.decrement()
+            }
+        } else {
            handleListResult()
-            CountingIdlingResourceSingleton.decrement()
        }
    }

@@ -534,7 +540,10 @@ class HomeActivity :
    }

    private fun reloadBadges() {
-        if (appSettingsService.isDisplayUnreadCountEnabled() || appSettingsService.isDisplayAllCountEnabled()) {
+        if (appSettingsService.isInfiniteLoadingEnabled() ||
+            appSettingsService.isDisplayUnreadCountEnabled() ||
+            appSettingsService.isDisplayAllCountEnabled()
+        ) {
            CountingIdlingResourceSingleton.increment()
            CoroutineScope(Dispatchers.IO).launch {
                repository.reloadBadges()
@@ -613,22 +622,26 @@ 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.Main).launch {
+                    CoroutineScope(Dispatchers.IO).launch {
                        val updatedRemote = repository.updateRemote()
-                        if (updatedRemote) {
-                            Toast
-                                .makeText(
-                                    this@HomeActivity,
-                                    R.string.refresh_success_response,
-                                    Toast.LENGTH_LONG,
-                                ).show()
-                        } else {
-                            Toast
-                                .makeText(
-                                    this@HomeActivity,
-                                    R.string.refresh_failer_message,
-                                    Toast.LENGTH_SHORT,
-                                ).show()
+                        CountingIdlingResourceSingleton.increment()
+                        launch(Dispatchers.Main) {
+                            if (updatedRemote) {
+                                Toast
+                                    .makeText(
+                                        this@HomeActivity,
+                                        R.string.refresh_success_response,
+                                        Toast.LENGTH_LONG,
+                                    ).show()
+                            } else {
+                                Toast
+                                    .makeText(
+                                        this@HomeActivity,
+                                        R.string.refresh_failer_message,
+                                        Toast.LENGTH_SHORT,
+                                    ).show()
+                            }
+                            CountingIdlingResourceSingleton.decrement()
                        }
                        CountingIdlingResourceSingleton.decrement()
                    }
@@ -639,30 +652,33 @@ class HomeActivity :
            R.id.readAll -> {
                if (elementsShown == ItemType.UNREAD) {
                    needsConfirmation(R.string.readAll, R.string.markall_dialog_message) {
-                        binding.swipeRefreshLayout.isRefreshing = true
                        CountingIdlingResourceSingleton.increment()
-                        CoroutineScope(Dispatchers.Main).launch {
+                        binding.swipeRefreshLayout.isRefreshing = true
+                        CoroutineScope(Dispatchers.IO).launch {
                            val success = repository.markAllAsRead(items)
-                            if (success) {
-                                Toast
-                                    .makeText(
-                                        this@HomeActivity,
-                                        R.string.all_posts_read,
-                                        Toast.LENGTH_SHORT,
-                                    ).show()
-                                tabNewBadge.removeBadge()
+                            CountingIdlingResourceSingleton.increment()
+                            launch(Dispatchers.Main) {
+                                if (success) {
+                                    Toast
+                                        .makeText(
+                                            this@HomeActivity,
+                                            R.string.all_posts_read,
+                                            Toast.LENGTH_SHORT,
+                                        ).show()
+                                    tabNewBadge.removeBadge()

-                                getElementsAccordingToTab()
-                            } else {
-                                Toast
-                                    .makeText(
-                                        this@HomeActivity,
-                                        R.string.all_posts_not_read,
-                                        Toast.LENGTH_SHORT,
-                                    ).show()
+                                    getElementsAccordingToTab()
+                                } else {
+                                    Toast
+                                        .makeText(
+                                            this@HomeActivity,
+                                            R.string.all_posts_not_read,
+                                            Toast.LENGTH_SHORT,
+                                        ).show()
+                                }
+                                binding.swipeRefreshLayout.isRefreshing = false
+                                CountingIdlingResourceSingleton.decrement()
                            }
-                            handleListResult()
-                            binding.swipeRefreshLayout.isRefreshing = false
                            CountingIdlingResourceSingleton.decrement()
                        }
                    }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt
@@ -108,7 +108,7 @@ class LoginActivity :

    private fun goToMain() {
        CountingIdlingResourceSingleton.increment()
-        CoroutineScope(Dispatchers.Main).launch {
+        CoroutineScope(Dispatchers.IO).launch {
            repository.updateApiInformation()
            ACRA.errorReporter.putCustomData(
                "SELFOSS_API_VERSION",
@@ -127,8 +127,12 @@ 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
@@ -160,34 +164,41 @@ class LoginActivity :
        repository.refreshLoginInformation(url, login, password)

        CountingIdlingResourceSingleton.increment()
-        CoroutineScope(Dispatchers.Main).launch {
+        CoroutineScope(Dispatchers.IO).launch {
            try {
                repository.updateApiInformation()
+                val result = repository.login()
+                CountingIdlingResourceSingleton.increment()
+                launch(Dispatchers.Main) {
+                    if (result) {
+                        val errorFetching = repository.checkIfFetchFails()
+                        if (!errorFetching) {
+                            goToMain()
+                        } else {
+                            preferenceError()
+                        }
+                    } else {
+                        preferenceError()
+                    }
+                    CountingIdlingResourceSingleton.decrement()
+                }
            } 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)
+                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()
            }
-            val result = repository.login()
-            if (result) {
-                val errorFetching = repository.checkIfFetchFails()
-                if (!errorFetching) {
-                    goToMain()
-                } else {
-                    preferenceError()
-                }
-            } else {
-                preferenceError()
-            }
-            showProgress(false)
-            CountingIdlingResourceSingleton.decrement()
        }
    }

@@ -300,6 +311,7 @@ class LoginActivity :
                    .withAboutSpecial2Description(AppSettingsService.BUG_URL)
                    .withAboutSpecial1("Project Page")
                    .withAboutSpecial1Description(AppSettingsService.SOURCE_URL)
+                    .withShowLoadingProgress(false)
                    .start(this)
                true
            }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt
@@ -73,7 +73,7 @@ class MyApp :
                ),
            )

-            CoroutineScope(Dispatchers.Main).launch {
+            CoroutineScope(Dispatchers.Default).launch {
                connectivityService.networkAvailableProvider.collect { networkAvailable ->
                    val toastMessage =
                        if (networkAvailable) {
@@ -82,13 +82,14 @@ class MyApp :
                        } else {
                            R.string.network_connectivity_lost
                        }
-
-                    Toast
-                        .makeText(
-                            applicationContext,
-                            toastMessage,
-                            Toast.LENGTH_SHORT,
-                        ).show()
+                    launch(Dispatchers.Main) {
+                        Toast
+                            .makeText(
+                                applicationContext,
+                                toastMessage,
+                                Toast.LENGTH_SHORT,
+                            ).show()
+                    }
                }
            }
        }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt
@@ -27,7 +27,7 @@ class ReaderActivity :
    DIAware {
    private var currentItem: Int = 0

-    private lateinit var toolbarMenu: Menu
+    private var toolbarMenu: Menu? = null

    private lateinit var binding: ActivityReaderBinding

@@ -90,8 +90,10 @@ class ReaderActivity :
    }

    private fun updateStarIcon() {
-        val isStarred = allItems.getOrNull(currentItem)?.starred ?: false
-        toolbarMenu.findItem(R.id.star)?.icon?.setTint(if (isStarred) Color.RED else Color.WHITE)
+        if (toolbarMenu != null) {
+            val isStarred = allItems.getOrNull(currentItem)?.starred ?: false
+            toolbarMenu!!.findItem(R.id.star)?.icon?.setTint(if (isStarred) Color.RED else Color.WHITE)
+        }
    }

    override fun onSaveInstanceState(oldInstanceState: Bundle) {
@@ -133,8 +135,10 @@ class ReaderActivity :

    private fun alignmentMenu() {
        val showJustify = appSettingsService.getActiveAllignment() == AppSettingsService.ALIGN_LEFT
-        toolbarMenu.findItem(R.id.align_left).isVisible = !showJustify
-        toolbarMenu.findItem(R.id.align_justify).isVisible = showJustify
+        if (toolbarMenu != null) {
+            toolbarMenu!!.findItem(R.id.align_left).isVisible = !showJustify
+            toolbarMenu!!.findItem(R.id.align_justify).isVisible = showJustify
+        }
    }

    override fun onCreateOptionsMenu(menu: Menu): Boolean {
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/SourcesActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/SourcesActivity.kt
@@ -50,6 +50,7 @@ class SourcesActivity :

    override fun onResume() {
        super.onResume()
+        CountingIdlingResourceSingleton.increment()
        val mLayoutManager = LinearLayoutManager(this)

        var items: ArrayList<SelfossModel.SourceDetail>
@@ -57,25 +58,28 @@ class SourcesActivity :
        binding.recyclerView.setHasFixedSize(true)
        binding.recyclerView.layoutManager = mLayoutManager

-        CountingIdlingResourceSingleton.increment()
-        CoroutineScope(Dispatchers.Main).launch {
+        CoroutineScope(Dispatchers.IO).launch {
            val response = repository.getSourcesDetails()
-            if (response.isNotEmpty()) {
-                items = response
-                val mAdapter =
-                    SourcesListAdapter(
-                        this@SourcesActivity,
-                        items,
-                    )
-                binding.recyclerView.adapter = mAdapter
-                mAdapter.notifyDataSetChanged()
-            } else {
-                Toast
-                    .makeText(
-                        this@SourcesActivity,
-                        R.string.cant_get_sources,
-                        Toast.LENGTH_SHORT,
-                    ).show()
+            CountingIdlingResourceSingleton.increment()
+            launch(Dispatchers.Main) {
+                if (response.isNotEmpty()) {
+                    items = response
+                    val mAdapter =
+                        SourcesListAdapter(
+                            this@SourcesActivity,
+                            items,
+                        )
+                    binding.recyclerView.adapter = mAdapter
+                    mAdapter.notifyDataSetChanged()
+                } else {
+                    Toast
+                        .makeText(
+                            this@SourcesActivity,
+                            R.string.cant_get_sources,
+                            Toast.LENGTH_SHORT,
+                        ).show()
+                }
+                CountingIdlingResourceSingleton.decrement()
            }
            CountingIdlingResourceSingleton.decrement()
        }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/UpsertSourceActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/UpsertSourceActivity.kt
@@ -9,6 +9,7 @@ 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
@@ -108,36 +109,42 @@ class UpsertSourceActivity :
            binding.progress.visibility = View.GONE
        }

-        CoroutineScope(Dispatchers.Main).launch {
+        CountingIdlingResourceSingleton.increment()
+        CoroutineScope(Dispatchers.IO).launch {
            try {
                val items = repository.getSpouts()
-                if (items.isNotEmpty()) {
-                    val itemsStrings = items.map { it.value.name }
-                    for ((key, value) in items) {
-                        spoutsKV[value.name] = key
+                CountingIdlingResourceSingleton.increment()
+                launch(Dispatchers.Main) {
+                    if (items.isNotEmpty()) {
+                        val itemsStrings = items.map { it.value.name }
+                        for ((key, value) in items) {
+                            spoutsKV[value.name] = key
+                        }
+
+                        binding.progress.visibility = View.GONE
+                        binding.formContainer.visibility = View.VISIBLE
+
+                        val spinnerArrayAdapter =
+                            ArrayAdapter(
+                                this@UpsertSourceActivity,
+                                android.R.layout.simple_spinner_item,
+                                itemsStrings,
+                            )
+                        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                        binding.spoutsSpinner.adapter = spinnerArrayAdapter
+
+                        if (existingSource != null) {
+                            initFields(items)
+                        }
+                    } else {
+                        handleSpoutFailure()
                    }
-
-                    binding.progress.visibility = View.GONE
-                    binding.formContainer.visibility = View.VISIBLE
-
-                    val spinnerArrayAdapter =
-                        ArrayAdapter(
-                            this@UpsertSourceActivity,
-                            android.R.layout.simple_spinner_item,
-                            itemsStrings,
-                        )
-                    spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-                    binding.spoutsSpinner.adapter = spinnerArrayAdapter
-
-                    if (existingSource != null) {
-                        initFields(items)
-                    }
-                } else {
-                    handleSpoutFailure()
+                    CountingIdlingResourceSingleton.decrement()
                }
            } catch (e: NetworkUnavailableException) {
                handleSpoutFailure(networkIssue = true)
            }
+            CountingIdlingResourceSingleton.decrement()
        }
    }

@@ -160,7 +167,8 @@ class UpsertSourceActivity :
            }

            else -> {
-                CoroutineScope(Dispatchers.Main).launch {
+                CountingIdlingResourceSingleton.increment()
+                CoroutineScope(Dispatchers.IO).launch {
                    val successfullyAddedSource =
                        if (existingSource != null) {
                            repository.updateSource(
@@ -178,16 +186,21 @@ class UpsertSourceActivity :
                                binding.tags.text.toString(),
                            )
                        }
-                    if (successfullyAddedSource) {
-                        finish()
-                    } else {
-                        Toast
-                            .makeText(
-                                this@UpsertSourceActivity,
-                                R.string.cant_create_source,
-                                Toast.LENGTH_SHORT,
-                            ).show()
+                    CountingIdlingResourceSingleton.increment()
+                    launch(Dispatchers.Main) {
+                        if (successfullyAddedSource) {
+                            finish()
+                        } else {
+                            Toast
+                                .makeText(
+                                    this@UpsertSourceActivity,
+                                    R.string.cant_create_source,
+                                    Toast.LENGTH_SHORT,
+                                ).show()
+                        }
+                        CountingIdlingResourceSingleton.decrement()
                    }
+                    CountingIdlingResourceSingleton.decrement()
                }
            }
        }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt
+++ b/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 val items: ArrayList<SelfossModel.Item>,
+    override var items: ArrayList<SelfossModel.Item>,
    override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
    override lateinit var binding: CardItemBinding
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemListAdapter.kt
+++ b/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 val items: ArrayList<SelfossModel.Item>,
+    override var items: ArrayList<SelfossModel.Item>,
    override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
    override lateinit var binding: ListItemBinding
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemsAdapter.kt
+++ b/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 val items: ArrayList<SelfossModel.Item>
+    abstract var items: ArrayList<SelfossModel.Item>
    abstract val repository: Repository
    abstract val binding: ViewBinding
    abstract val appSettingsService: AppSettingsService
@@ -31,8 +31,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> :
    protected val c: Context get() = app.baseContext

    fun updateAllItems(items: ArrayList<SelfossModel.Item>) {
-        this.items.clear()
-        this.items.addAll(items)
+        this.items = items
        updateHomeItems(items)
        notifyDataSetChanged()
    }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt
@@ -12,6 +12,7 @@ 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
@@ -104,8 +105,10 @@ 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)
@@ -119,7 +122,9 @@ class SourcesListAdapter(
                                Toast.LENGTH_SHORT,
                            ).show()
                    }
+                    CountingIdlingResourceSingleton.decrement()
                }
+                CountingIdlingResourceSingleton.decrement()
            }
        }
    }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
@@ -14,6 +14,7 @@ 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
@@ -59,12 +60,14 @@ 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()
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt
@@ -124,6 +124,7 @@ class SettingsActivity :
                        LibsBuilder()
                            .withAboutIconShown(true)
                            .withAboutVersionShown(true)
+                            .withShowLoadingProgress(false)
                            .start(it)
                    }
                    true
--- a/fastlane/metadata/android/en-US/changelogs/v125030901.txt
+++ b/fastlane/metadata/android/en-US/changelogs/v125030901.txt
@@ -0,0 +1,17 @@
+**v125030901**
+
+- Merge pull request 'fix-reload' (#195) from fix-reload into master
+- fix: Infinite scroll needs loading stats.
+- fix: do not reload items on resume.
+- Merge pull request 'tests' (#193) from tests into master
+- ci: Instrumentation tests coverage in ci.
+- ci: Instrumentation tests coverage in ci.
+- ci: Instrumentation tests coverage in ci.
+- chore: better handling of coroutine dispatchers.
+- ci: Instrumentation tests coverage in ci.
+- chore: comment robolectric tests for now.
+- fix: Fixed source deletion test.
+- Merge pull request 'Fix alignment changes resetting reader article position' (#190) from davidoskky/ReaderForSelfoss-multiplatform:alignment into master
+- Refactor star icon handling
+- Don't restart activity changing alignment
+- Changelog for v125030711
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,3 +27,4 @@ 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/repository/Repository.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/Repository.kt
@@ -224,16 +224,25 @@ class Repository(
            appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
        val shouldFetch = if (!appSettingsService.isUpdateSourcesEnabled()) !fetchedSources else true
        if (shouldFetch && connectivityService.isNetworkAvailable()) {
-            val apiSources = api.sourcesDetailed()
-            if (apiSources.success && apiSources.data != null) {
-                fetchedSources = true
-                sources = apiSources.data
-                if (isDatabaseEnabled) {
-                    resetDBSourcesWithData(sources)
-                }
-            }
+            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
+            sources = apiSources.data
+            if (isDatabaseEnabled) {
+                resetDBSourcesWithData(sources)
+            }
        }
        return sources
    }
@@ -325,7 +334,7 @@ class Repository(
            _badgeUnread.value -= 1
        }

-        CoroutineScope(Dispatchers.Main).launch {
+        CoroutineScope(Dispatchers.Default).launch {
            updateDBItem(item)
        }
    }
@@ -336,7 +345,7 @@ class Repository(
            _badgeUnread.value += 1
        }

-        CoroutineScope(Dispatchers.Main).launch {
+        CoroutineScope(Dispatchers.Default).launch {
            updateDBItem(item)
        }
    }
@@ -347,7 +356,7 @@ class Repository(
            _badgeStarred.value += 1
        }

-        CoroutineScope(Dispatchers.Main).launch {
+        CoroutineScope(Dispatchers.Default).launch {
            updateDBItem(item)
        }
    }
@@ -358,7 +367,7 @@ class Repository(
            _badgeStarred.value -= 1
        }

-        CoroutineScope(Dispatchers.Main).launch {
+        CoroutineScope(Dispatchers.Default).launch {
            updateDBItem(item)
        }
    }
@@ -371,6 +380,7 @@ class Repository(
    ): Boolean {
        var response = false
        if (connectivityService.isNetworkAvailable()) {
+            fetchedSources = false
            response = api
                .createSourceForVersion(
                    title,
@@ -392,6 +402,7 @@ class Repository(
    ): Boolean {
        var response = false
        if (connectivityService.isNetworkAvailable()) {
+            fetchedSources = false
            response = api.updateSourceForVersion(id, title, url, spout, tags).isSuccess == true
        }

@@ -406,6 +417,7 @@ 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
@@ -32,6 +32,7 @@ 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

@@ -82,7 +83,7 @@ class SelfossApi(
                }
                modifyRequest {
                    Napier.i("Will modify", tag = "HttpSend")
-                    CoroutineScope(Dispatchers.Main).launch {
+                    CoroutineScope(Dispatchers.IO).launch {
                        Napier.i("Will login", tag = "HttpSend")
                        login()
                        Napier.i("Did login", tag = "HttpSend")
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/ConnectivityService.kt
+++ b/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.Main).launch {
+        CoroutineScope(Dispatchers.Default).launch {
            connectivity.statusUpdates.collect { status ->
                when (status) {
                    is Connectivity.Status.Connected -> {
Author	SHA1	Message	Date
Amine	a602f7adf2	fix: Connectivity toast message was causing issues. All checks were successful PR / translations (pull_request) Successful in 1m47s Details PR / PR (pull_request) Successful in 2m10s Details PR / build (pull_request) Successful in 17m42s Details PR test / integrationTests (pull_request) Successful in 43m23s Details Master / build (push) Successful in 10m45s Details Realease / build (push) Successful in 4m37s Details Realease / createTagAndChangelog (push) Successful in 44s Details Realease / release (push) Successful in 7m4s Details	2025-04-08 20:31:29 +02:00
giteadrone	cf6ef51edf	Changelog for v125030901	2025-03-31 18:44:08 +00:00
Amine Bouabdallaoui	0b7f832573	Merge pull request 'fix-reload' (#195 ) from fix-reload into master All checks were successful Master / build (push) Successful in 11m29s Details Realease / build (push) Successful in 5m52s Details Realease / createTagAndChangelog (push) Successful in 45s Details Realease / release (push) Successful in 7m23s Details Reviewed-on: #195	2025-03-31 18:25:33 +00:00
Amine	22c966bf16	fix: Infinite scroll needs loading stats. All checks were successful PR / translations (pull_request) Successful in 31s Details PR / PR (pull_request) Successful in 41s Details PR / build (pull_request) Successful in 16m2s Details PR test / integrationTests (pull_request) Successful in 43m44s Details	2025-03-30 21:57:36 +02:00
Amine	bdf2bb8b31	fix: do not reload items on resume.	2025-03-30 21:57:36 +02:00
Amine Bouabdallaoui	ceae91206d	Merge pull request 'tests' (#193 ) from tests into master All checks were successful Master / build (push) Successful in 12m5s Details Reviewed-on: #193	2025-03-30 19:50:50 +00:00
Amine	11c0e744dc	ci: Instrumentation tests coverage in ci. All checks were successful PR / PR (pull_request) Successful in 1m1s Details PR / translations (pull_request) Successful in 1m0s Details PR / build (pull_request) Successful in 21m57s Details PR test / integrationTests (pull_request) Successful in 50m51s Details	2025-03-30 20:23:15 +02:00
Amine	7374e95b0e	ci: Instrumentation tests coverage in ci. Some checks failed Check PR code / translations (pull_request) Successful in 1m5s Details Check PR code / Lint (pull_request) Successful in 1m8s Details Check PR code / build (pull_request) Successful in 18m22s Details Check PR code / RunIntegrationTests (pull_request) Has been cancelled Details	2025-03-27 18:44:44 +01:00
Amine	8a7743a6fb	ci: Instrumentation tests coverage in ci. All checks were successful Check PR code / BuildAndTestAndCoverage (pull_request) Successful in 41m45s Details	2025-03-26 19:05:48 +01:00
Amine	1b2e9edc8c	chore: better handling of coroutine dispatchers. All checks were successful Check PR code / BuildAndTestAndCoverage (pull_request) Successful in 30m26s Details	2025-03-25 12:42:43 +01:00
Amine	7c65a63315	ci: Instrumentation tests coverage in ci. All checks were successful Check PR code / BuildAndTestAndCoverage (pull_request) Successful in 34m46s Details	2025-03-24 23:09:51 +01:00