ci: Instrumentation tests coverage in ci.

Reviewed-on: #190

.editorconfig

@@ -0,0 +1,36 @@
+root = true
+
+[*]
+insert_final_newline = true
+
+[.editorconfig]
+insert_final_newline = false
+ij_kotlin_line_break_after_multiline_when_entry = false
+
+[*.{kt,kts}]
+#  Disable wildcard imports entirely
+ij_kotlin_name_count_to_use_star_import = 2147483647
+ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
+end_of_line = lf
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ij_kotlin_imports_layout = *, java.**, javax.**, kotlin.**, ^
+ij_kotlin_indent_before_arrow_on_new_line = false
+ij_kotlin_line_break_after_multiline_when_entry = true
+ij_kotlin_packages_to_use_import_on_demand = unset
+indent_size = 4
+indent_style = space
+ktlint_argument_list_wrapping_ignore_when_parameter_count_greater_or_equal_than = unset
+ktlint_chain_method_rule_force_multiline_when_chain_operator_count_greater_or_equal_than = 4
+ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 1
+ktlint_code_style = ktlint_official
+ktlint_enum_entry_name_casing = upper_or_camel_cases
+ktlint_function_naming_ignore_when_annotated_with = unset
+ktlint_function_signature_body_expression_wrapping = multiline
+ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2
+ktlint_ignore_back_ticked_identifier = false
+ktlint_property_naming_constant_naming = screaming_snake_case
+max_line_length = 140
+
+[**/build]
+ktlint = disabled

.gitea/workflows/assets/crowdin.yml

@@ -0,0 +1,10 @@
+project_id_env: CROWDIN_PROJECT_ID
+api_token_env: CROWDIN_PERSONAL_TOKEN
+base_path: "../../../"
+
+files:
+  - source: /androidApp/src/main/res/values/strings.xml
+    translation: /androidApp/src/main/res/values-%android_code%/%original_file_name%
+    translate_attributes: '0'
+    content_segmentation: '0'
+preserve_hierarchy: true

.gitea/workflows/common_build.yml

@@ -10,36 +10,52 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: "Check android app changes"
+        id: check-android-changes
+        uses: tj-actions/changed-files@v45
+        with:
+          files: |
+            androidApp/src/**
       - name: Fetch tags
+        if: steps.check-android-changes.outputs.any_modified == 'true'
         run: git fetch --tags -p
       - uses: actions/setup-java@v4
+        if: steps.check-android-changes.outputs.any_modified == 'true'
         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
+        if: steps.check-android-changes.outputs.any_modified == 'true'
       - name: Configure gradle...
+        if: steps.check-android-changes.outputs.any_modified == 'true'
         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
-      - uses: KengoTODA/actions-setup-docker-compose@v1
+      # TESTS ARE RUN LOCALLY
-        with:
+      #      - uses: KengoTODA/actions-setup-docker-compose@v1
-          version: "2.23.3"
+      #        with:
-      - name: run selfoss
+      #          version: "2.23.3"
-        run: |
+      #      - name: run selfoss
-          docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
+      #        run: |
+      #          docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
       - name: coverage
+        if: steps.check-android-changes.outputs.any_modified == 'true'
         run: |
           ./gradlew :koverHtmlReport
       - uses: actions/upload-artifact@v3
+        if: steps.check-android-changes.outputs.any_modified == 'true'
         with:
           name: coverage
           path: build/reports/kover/html
           retention-days: 1
           overwrite: true
           include-hidden-files: true
-      - name: Clean
+#      TESTS ARE RUN LOCALLY
-        if: always()
+#      - name: Clean
-        run: |
+#        if: always()
-          docker compose -f .gitea/workflows/assets/docker-compose.yml stop
+#        run: |
+#          docker compose -f .gitea/workflows/assets/docker-compose.yml stop

.gitea/workflows/common_coverage.yml

@@ -0,0 +1,47 @@
+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
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 29
+          arch: x86_64
+          script: ./gradlew androidApp:connectedAndroidTest
+      - 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

@@ -16,6 +16,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: master
       - name: Config git
         run: |
           git config --global user.email aminecmi+giteadrone@pm.me
@@ -50,7 +51,7 @@ jobs:
           followtags: true
           ssh_key: ${{ secrets.PRIVATE_KEY }}
           tags: true
-          branch: release
+          branch: master
       - name: copy file via ssh password
         uses: appleboy/scp-action@v0.1.7
         with:

.gitea/workflows/on_pr.yml

@@ -5,24 +5,89 @@ on:
       - master
 
 jobs:
-  Lint:
+  EspressoReports:
     runs-on: ubuntu-latest
-    steps:
+    uses: ./.gitea/workflows/common_coverage.yml
-      - name: Check out repository code
+#  Lint:
-        uses: actions/checkout@v4
+#    runs-on: ubuntu-latest
-      - uses: actions/setup-java@v4
+#    steps:
-        with:
+#      - name: Check out repository code
-          distribution: 'temurin'
+#        uses: actions/checkout@v4
-          java-version: '17'
+#      - uses: actions/setup-java@v4
-          cache: gradle
+#        with:
-      - name: Install klint
+#          distribution: 'temurin'
-        run: curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
+#          java-version: '17'
-      - name: Install detekt
+#          cache: gradle
-        run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.1/detekt-cli-1.23.1.zip && unzip detekt-cli-1.23.1.zip
+#      - name: Install klint
-      - name: Linting...
+#        run: curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.5.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
-        run: ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build' || true
+#      - name: Install detekt
-      - name: Detecting...
+#        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
-        run: ./detekt-cli-1.23.1/bin/detekt-cli --all-rules --excludes '**/shared/build/**/*.kt' || true
+#      - name: Linting...
-  build:
+#        run: ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build'
-    needs: Lint
+#      - name: Detecting...
-    uses: ./.gitea/workflows/common_build.yml
+#        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

.gitignore

@@ -324,3 +324,5 @@ crowdin.properties
 
 .kotlin/
 build-cache/
+
+act

CHANGELOG.md

@@ -1,3 +1,108 @@
+**v125030711
+
+- Merge pull request 'fix: initial status loading issues.' (#192) from connectivity into master
+- chore: check changes for translations and android.
+- fix: initial status loading issues.
+- Merge pull request 'chore: new connectivity dep. Closes #84.' (#189) from connectivity into master
+- chore: new connectivity dep. Closes #84.
+- Changelog for v125030681
+
+--------------------------------------------------------------------
+
+**v125030681
+
+- chore: do not send reports on simulators.
+- Merge pull request 'chore: do not send reports on simulators.' (#188) from chore-acra-simulator into master
+- chore: do not send reports on simulators.
+- Merge pull request 'fix: Url validation was not failing login. Added tests.' (#186) from fix-invalid-url into master
+- Merge pull request 'chore: crowding ci integration.' (#187) from chore-crowdin-ci into master
+- chore: we don't need to check if the url is valid in upsert screen.
+- fix: Url validation was not failing login. Added tests.
+- chore: crowding ci integration.
+- Show a confirmation dialog before deleting sources (#185)
+- Changelog for v125020581
+
+--------------------------------------------------------------------
+
+**v125020581
+
+- fix: url can be empty ?
+- Changelog for v125020471
+
+--------------------------------------------------------------------
+
+**v125020471
+
+- chore: no more docker-compose.
+- bump: gradle plugin.
+- Merge pull request 'fix: check index exists.' (#183) from fix-index into master
+- fix: check index exists.
+- Changelog for v125020411
+
+--------------------------------------------------------------------
+
+**v125020411
+
+- Merge pull request 'bump' (#182) from bump into master
+- chore: non transiant R classes.
+- Merge pull request 'fix: One more missing context.' (#181) from fix-one-more-context into master
+- bump
+- fix: One more missing context.
+
+--------------------------------------------------------------------
+
+**v125010241
+
+- Merge pull request 'fix: Link not opening.' (#178) from fix-open-link into master
+- refactor: context fragments issues.
+- logs: Context issues.
+- fix: Handle empty url issue, again.
+- fix: Link not opening.
+- Changelog for v125010201
+
+--------------------------------------------------------------------
+
+**v125010201
+
+- fix: Handle empty url issue.
+- Merge pull request 'Removed the floating bar.' (#177) from floating-bar into master
+- chore: changing actions in reader fragment.
+- Changelog for v125010131
+
+--------------------------------------------------------------------
+
+**v125010131
+
+- fix: reload the adapter when it's needed. Fixes #128. (#176)
+- feat: basic auth and images loading. Fixes #172. (#175)
+- Changelog for v125010111
+
+--------------------------------------------------------------------
+
+**v125010111
+
+- Debug trying to fix context issues. (#174)
+- Changelog for v125010031
+
+--------------------------------------------------------------------
+
+**v125010031
+
+- Merge pull request 'Bump dependencies' (#173) from upgarde into master
+- chore: "faster" action.
+- fastlane: icon change.
+- chore: ignoring a pixel issue.
+- test: fixed an ui test issue.
+- fix: center the loading thing.
+- test: items displaying.
+- bump: sqldelight.
+- bump: material, desugar jdk, jsoup, kodein, settings, napier, mock.
+- bump: androix and coroutines.
+- bump: ktor. Closes #67.
+- Changelog for v124123651
+
+--------------------------------------------------------------------
+
 **v124123651
 
 - Merge pull request 'Bugfixes' (#171) from bugfixes into master

androidApp/build.gradle.kts

@@ -12,8 +12,12 @@ plugins {
     id("app.cash.sqldelight") version "2.0.2"
 }
 
-fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
+fun Project.execWithOutput(
-    val result: String = ByteArrayOutputStream().use { outputStream ->
+    cmd: String,
+    ignore: Boolean = false,
+): String {
+    val result: String =
+        ByteArrayOutputStream().use { outputStream ->
             project.exec {
                 commandLine = cmd.split(" ")
                 standardOutput = outputStream
@@ -26,14 +30,20 @@ fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
 
 fun gitVersion(): String {
     val maybeTagOfCurrentCommit = execWithOutput("git -C ../ describe --contains HEAD", true)
-    val process = if (maybeTagOfCurrentCommit.isEmpty()) {
+    val process =
+        if (maybeTagOfCurrentCommit.isEmpty()) {
             println("No tag on current commit. Will take the latest one.")
             execWithOutput("git -C ../ for-each-ref refs/tags --sort=-refname --format='%(refname:short)' --count=1")
         } else {
             println("Tag found on current commit")
             execWithOutput("git -C ../ describe --contains HEAD")
         }
-    return process.replace("^0", "").replace("'", "").substring(1).replace("\\.", "").trim()
+    return process
+        .replace("^0", "")
+        .replace("'", "")
+        .substring(1)
+        .replace("\\.", "")
+        .trim()
 }
 
 fun versionCodeFromGit(): Int {
@@ -86,6 +96,7 @@ android {
         // tests
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["clearPackageData"] = "true"
+        testInstrumentationRunnerArguments["useTestStorageService"] = "true"
     }
     packaging {
         resources {
@@ -99,6 +110,8 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
         }
         getByName("debug") {
+            isTestCoverageEnabled = true
+            enableAndroidTestCoverage = true
         }
     }
     flavorDimensions.add("build")
@@ -116,7 +129,6 @@ android {
             isIncludeAndroidResources = true
         }
     }
-
 }
 
 dependencies {
@@ -156,7 +168,7 @@ dependencies {
     implementation("com.github.bumptech.glide:okhttp3-integration:4.16.0")
 
     // Themes
-    implementation("com.github.rubensousa:floatingtoolbar:1.5.1")
+    implementation("com.leinardi.android:speed-dial:3.3.0")
 
     // Pager
     implementation("me.relex:circleindicator:2.1.6")
@@ -180,9 +192,6 @@ dependencies {
 
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
 
-    // Network information
-    implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
-
     // SQLDELIGHT
     implementation("app.cash.sqldelight:android-driver:2.0.2")
 
@@ -191,14 +200,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:runner:1.7.0-alpha01")
-    androidTestImplementation("androidx.test:rules:1.6.1")
+    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: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.6.1")
+    testImplementation("androidx.test:core-ktx:1.7.0-alpha01")
 
     implementation("ch.acra:acra-http:$acraVersion")
     implementation("ch.acra:acra-toast:$acraVersion")
@@ -210,10 +220,11 @@ tasks.withType<Test> {
     useJUnit()
     testLogging {
         exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
-        events = setOf(
+        events =
+            setOf(
                 org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED,
                 org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED,
-            org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_ERROR
+                org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_ERROR,
             )
         showStandardStreams = true
     }

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

@@ -20,65 +20,72 @@ import org.hamcrest.Matchers.hasToString
 fun performLogin(someUrl: String? = null) {
     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 "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, openSettingItem: () -> Unit) {
+fun changeAndCancelSetting(
+    oldValue: String,
+    newValue: String,
+    openSettingItem: () -> Unit,
+) {
     openSettingItem()
     onView(
-        withId(android.R.id.edit)
+        withId(android.R.id.edit),
     ).perform(replaceText(newValue))
     onView(
-        withId(android.R.id.button2)
+        withId(android.R.id.button2),
     ).perform(click())
     openSettingItem()
     onView(
-        withId(android.R.id.edit)
+        withId(android.R.id.edit),
     ).check(matches(withText(oldValue)))
     onView(
-        withText(newValue)
+        withText(newValue),
     ).check(doesNotExist())
     onView(
-        withId(android.R.id.button2)
+        withId(android.R.id.button2),
     ).perform(click())
 }
 
-fun changeAndSaveSetting(oldValue: String, newValue: String, openSettingItem: () -> Unit) {
+fun changeAndSaveSetting(
+    oldValue: String,
+    newValue: String,
+    openSettingItem: () -> Unit,
+) {
     openSettingItem()
     onView(
-        withId(android.R.id.edit)
+        withId(android.R.id.edit),
     ).perform(replaceText(newValue))
     onView(
-        withId(android.R.id.button1)
+        withId(android.R.id.button1),
     ).perform(click())
     openSettingItem()
     onView(
-        withId(android.R.id.edit)
+        withId(android.R.id.edit),
     ).check(matches(withText(newValue)))
     if (oldValue.isNotEmpty()) {
         onView(
-            withText(oldValue)
+            withText(oldValue),
         ).check(doesNotExist())
     }
     onView(
-        withId(android.R.id.button2)
+        withId(android.R.id.button2),
     ).perform(click())
 }
 
 fun testPreferencesFromArray(
     context: Context,
     @ArrayRes arrayRes: Int,
-    openSettingItem: () -> Unit
+    openSettingItem: () -> Unit,
 ) {
     openSettingItem()
     context.resources.getStringArray(arrayRes).forEach { res ->
@@ -90,16 +97,21 @@ fun testPreferencesFromArray(
     }
 }
 
-fun testAddSourceWithUrl(url: String, sourceName: String) {
+fun testAddSourceWithUrl(
+    url: String,
+    sourceName: String,
+) {
     onView(withId(R.id.fab))
         .perform(click())
     onView(withId(R.id.nameInput))
-        .perform(click()).perform(typeTextIntoFocusedView(sourceName))
+        .perform(click())
+        .perform(typeTextIntoFocusedView(sourceName))
     onView(withId(R.id.sourceUri))
         .perform(click())
         .perform(typeTextIntoFocusedView(url))
     onView(withId(R.id.tags))
-        .perform(click()).perform(typeTextIntoFocusedView("tag1,tag2,tag3"))
+        .perform(click())
+        .perform(typeTextIntoFocusedView("tag1,tag2,tag3"))
     onView(withId(R.id.spoutsSpinner))
         .perform(click())
     onData(hasToString("RSS Feed")).perform(click())

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

@@ -25,38 +25,35 @@ import org.hamcrest.Matcher
 import org.hamcrest.Matchers
 import org.hamcrest.TypeSafeMatcher
 
-
+fun withError(
-fun withError(@StringRes id: Int): TypeSafeMatcher<View?> {
+    @StringRes id: Int,
+): TypeSafeMatcher<View?> {
     return object : TypeSafeMatcher<View?>() {
         override fun matchesSafely(view: View?): Boolean {
-            if (view == null) {
+            if (view != null && (view !is EditText || view.error == null)) {
-                return false
-            }
-            val context = view.context
-            if (view !is EditText) {
-                return false
-            }
-            if (view.error == null) {
                 return false
             }
+            val context = view!!.context
 
-            return view.error.toString() == context.getString(id)
+            return (view as EditText).error.toString() == context.getString(id)
         }
 
         override fun describeTo(description: Description?) {
+            // Nothing
         }
     }
 }
 
-fun isPopupWindow(): Matcher<Root> {
+fun isPopupWindow(): Matcher<Root> = isPlatformPopup()
-    return isPlatformPopup()
-}
 
-fun withDrawable(@DrawableRes id: Int) = object : TypeSafeMatcher<View>() {
+fun withDrawable(
+    @DrawableRes id: Int,
+) = object : TypeSafeMatcher<View>() {
     override fun describeTo(description: Description) {
         description.appendText("ImageView with drawable same as drawable with id $id")
     }
 
+    @Suppress("detekt:SwallowedException")
     override fun matchesSafely(view: View): Boolean {
         val context = view.context
         val expectedBitmap = context.getDrawable(id)!!.toBitmap()
@@ -68,43 +65,46 @@ fun withDrawable(@DrawableRes id: Int) = object : TypeSafeMatcher<View>() {
     }
 }
 
-fun hasBottombarItemText(@StringRes id: Int): Matcher<View>? {
+fun hasBottombarItemText(
-    return allOf(
+    @StringRes id: Int,
+): Matcher<View>? =
+    allOf(
         withResourceName("fixed_bottom_navigation_icon"),
         withParent(
             allOf(
                 withResourceName("fixed_bottom_navigation_icon_container"),
-                hasSibling(withText(id))
+                hasSibling(withText(id)),
+            ),
+        ),
     )
-        )
-    )
-}
 
-fun withSettingsCheckboxWidget(@StringRes id: Int): Matcher<View>? {
+fun withSettingsCheckboxWidget(
-    return allOf(
+    @StringRes id: Int,
+): Matcher<View>? =
+    allOf(
         withId(android.R.id.switch_widget),
         withParent(
-            withSettingsCheckboxFrame(id)
+            withSettingsCheckboxFrame(id),
+        ),
     )
-    )
-}
 
-fun withSettingsCheckboxFrame(@StringRes id: Int): Matcher<View>? {
+fun withSettingsCheckboxFrame(
-    return allOf(
+    @StringRes id: Int,
+): Matcher<View>? =
+    allOf(
         withId(android.R.id.widget_frame),
         hasSibling(
             allOf(
                 withClassName(Matchers.equalTo(RelativeLayout::class.java.name)),
                 withChild(
-                    withText(id)
+                    withText(id),
+                ),
+            ),
+        ),
     )
-            )
-        )
-    )
-}
 
 fun openMenu() {
     openActionBarOverflowOrOptionsMenu(
-        ApplicationProvider.getApplicationContext<Context>()
+        ApplicationProvider.getApplicationContext<Context>(),
     )
 }

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

@@ -23,7 +23,6 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class HomeActivityTest {
-
     @get:Rule
     val activityRule = ActivityScenarioRule(LoginActivity::class.java)
 
@@ -36,13 +35,13 @@ class HomeActivityTest {
     fun testMenu() {
         onView(withId(R.id.action_search)).check(matches(isDisplayed())).check(
             matches(
-                isClickable()
+                isClickable(),
-            )
+            ),
         )
         onView(withId(R.id.action_filter)).check(matches(isDisplayed())).check(
             matches(
-                isClickable()
+                isClickable(),
-            )
+            ),
         )
         openMenu()
         onView(withText(R.string.readAll)).check(matches(isDisplayed()))
@@ -57,19 +56,19 @@ class HomeActivityTest {
     fun testMenuActions() {
         onView(withId(R.id.action_search)).perform(click())
         onView(
-            withId(R.id.search_src_text)
+            withId(com.google.android.material.R.id.search_src_text),
         ).check(matches(isFocused()))
         onView(isRoot()).perform(ViewActions.pressBack())
 
         onView(withId(R.id.action_filter)).perform(click())
         onView(
-            withText(R.string.filter_item_sources)
+            withText(R.string.filter_item_sources),
         ).check(matches(isDisplayed()))
         onView(
-            withText(R.string.filter_item_tags)
+            withText(R.string.filter_item_tags),
         ).check(matches(isDisplayed()))
         onView(
-            withId(R.id.floatingActionButton2)
+            withId(R.id.floatingActionButton2),
         ).check(matches(isDisplayed()))
         onView(isRoot()).perform(ViewActions.pressBack())
 
@@ -107,14 +106,13 @@ class HomeActivityTest {
     fun testEmptyView() {
         onView(withId(R.id.emptyText)).check(matches(isDisplayed()))
         onView(
-            hasBottombarItemText(R.string.tab_new)
+            hasBottombarItemText(R.string.tab_new),
         ).check(matches(isDisplayed())).check(matches(isSelected()))
         onView(
-            hasBottombarItemText(R.string.tab_read)
+            hasBottombarItemText(R.string.tab_read),
         ).check(matches(isDisplayed())).check(matches(not(isSelected())))
         onView(
-            hasBottombarItemText(R.string.tab_favs)
+            hasBottombarItemText(R.string.tab_favs),
         ).check(matches(isDisplayed())).check(matches(not(isSelected())))
     }
-
 }

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

@@ -1,6 +1,5 @@
 package bou.amine.apps.readerforselfossv2.android
 
-import android.app.Activity
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.action.ViewActions.click
@@ -23,40 +22,37 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class LoginActivityTest {
-
     @get:Rule
     val activityRule = ActivityScenarioRule(LoginActivity::class.java)
 
-    private fun getActivity(): Activity? {
-        var activity: Activity? = null
-        activityRule.scenario.onActivity {
-            activity = it
-        }
-        return activity
-    }
-
     @Before
     fun registerIdlingResource() {
-        IdlingRegistry.getInstance()
+        IdlingRegistry
+            .getInstance()
             .register(CountingIdlingResourceSingleton.countingIdlingResource)
     }
 
     @After
     fun unregisterIdlingResource() {
-        IdlingRegistry.getInstance()
+        IdlingRegistry
+            .getInstance()
             .unregister(CountingIdlingResourceSingleton.countingIdlingResource)
     }
 
     @Test
     fun viewIsInitialized() {
         onView(withId(R.id.urlView)).check(matches(isDisplayed()))
-        onView(withId(R.id.selfSigned)).check(matches(isDisplayed())).check(matches(isNotChecked()))
+        onView(withId(R.id.selfSigned))
+            .check(matches(isDisplayed()))
+            .check(matches(isNotChecked()))
             .check(
-                matches(isClickable())
+                matches(isClickable()),
             )
-        onView(withId(R.id.withLogin)).check(matches(isDisplayed()))
+        onView(withId(R.id.withLogin))
-            .check(matches(isNotChecked())).check(
+            .check(matches(isDisplayed()))
-                matches(isClickable())
+            .check(matches(isNotChecked()))
+            .check(
+                matches(isClickable()),
             )
     }
 
@@ -64,9 +60,23 @@ class LoginActivityTest {
     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 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 multiError() {
         onView(withId(R.id.signInButton)).perform(click())

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

@@ -26,11 +26,9 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class SettingsActivityGeneralTest {
-
     @get:Rule
     val activityRule = ActivityScenarioRule(LoginActivity::class.java)
 
@@ -38,81 +36,77 @@ class SettingsActivityGeneralTest {
     fun init() {
         loginAndInitHome()
         openActionBarOverflowOrOptionsMenu(
-            ApplicationProvider.getApplicationContext()
+            ApplicationProvider.getApplicationContext(),
         )
         onView(withText(R.string.title_activity_settings)).perform(click())
         onView(withText(R.string.pref_header_general)).perform(click())
     }
 
+    @Suppress("detekt:LongMethod")
     @Test
     fun testGeneral() {
         onView(withText(R.string.pref_api_items_number_title)).check(matches(isDisplayed()))
         onView(
-            withSettingsCheckboxWidget(R.string.pref_general_infinite_loading_title)
+            withSettingsCheckboxWidget(R.string.pref_general_infinite_loading_title),
         ).check(
             matches(
                 allOf(
-                    isDisplayed(), not(isChecked())
+                    isDisplayed(),
-                )
+                    not(isChecked()),
-            )
+                ),
+            ),
         )
         onView(withText(R.string.pref_general_category_links)).check(matches(isDisplayed()))
         onView(withSettingsCheckboxWidget(R.string.pref_article_viewer_title)).check(
             matches(
                 allOf(
-                    isDisplayed(), isChecked()
+                    isDisplayed(),
-                )
+                    isChecked(),
-            )
+                ),
-        )
+            ),
-        onView(withSettingsCheckboxWidget(R.string.reader_static_bar_title)).check(
-            matches(
-                allOf(
-                    isDisplayed(), not(isChecked())
-                )
-            )
-        )
-        onView(withSettingsCheckboxFrame(R.string.reader_static_bar_title)).check(
-            matches(
-                isEnabled()
-            )
         )
         onView(withText(R.string.pref_general_category_displaying)).check(matches(isDisplayed()))
         onView(withSettingsCheckboxWidget(R.string.pref_switch_card_view_title)).check(
             matches(
                 allOf(
-                    isDisplayed(), not(isChecked())
+                    isDisplayed(),
-                )
+                    not(isChecked()),
-            )
+                ),
+            ),
         )
         onView(withSettingsCheckboxWidget(R.string.card_height_title)).check(
             matches(
                 allOf(
-                    isDisplayed(), not(isChecked())
+                    isDisplayed(),
-                )
+                    not(isChecked()),
-            )
+                ),
+            ),
         )
         onView(withSettingsCheckboxFrame(R.string.card_height_title)).check(
             matches(
-                not(isEnabled())
+                not(isEnabled()),
-            )
+            ),
         )
         onView(withSettingsCheckboxWidget(R.string.switch_unread_count_title)).check(
             matches(
                 allOf(
-                    isDisplayed(), isChecked()
+                    isDisplayed(),
-                )
+                    isChecked(),
-            )
+                ),
+            ),
         )
         onView(withId(R.id.settings)).perform(swipeUp())
         onView(withSettingsCheckboxWidget(R.string.display_all_counts_title)).check(
             matches(
                 allOf(
-                    isDisplayed(), not(isChecked())
+                    isDisplayed(),
-                )
+                    not(isChecked()),
-            )
+                ),
+            ),
         )
     }
 
+    @Suppress("detekt:ForbiddenComment")
     @Test
     fun testGeneralActionsNumberItems() {
         onView(withText(R.string.pref_api_items_number_title)).perform(click())
@@ -120,25 +114,25 @@ class SettingsActivityGeneralTest {
 
         // Value check
         onView(
-            withId(android.R.id.edit)
+            withId(android.R.id.edit),
         ).perform(replaceText("AVC"))
             .check(matches(withText("")))
         // TODO: should check message error. Not working for api level 30+
         onView(
-            withId(android.R.id.edit)
+            withId(android.R.id.edit),
         ).perform(replaceText("-1"))
             .check(matches(withText("")))
         // TODO: should check message error. Not working for api level 30+
         onView(
-            withId(android.R.id.edit)
+            withId(android.R.id.edit),
         ).perform(replaceText("300"))
             .check(matches(withText("")))
         onView(
-            withId(android.R.id.edit)
+            withId(android.R.id.edit),
         ).perform(typeTextIntoFocusedView("300"))
             .check(matches(withText("30")))
         onView(
-            withId(android.R.id.edit)
+            withId(android.R.id.edit),
         ).perform(replaceText("10"))
             .check(matches(withText("10")))
         onView(isRoot()).perform(ViewActions.pressBack())
@@ -154,19 +148,6 @@ class SettingsActivityGeneralTest {
 
     @Test
     fun testGeneralActionsCheckboxes() {
-        // article viewer settings
-        onView(withSettingsCheckboxFrame(R.string.reader_static_bar_title)).check(
-            matches(
-                isEnabled()
-            )
-        )
-        onView(withSettingsCheckboxWidget(R.string.pref_article_viewer_title)).perform(click())
-        onView(withSettingsCheckboxFrame(R.string.reader_static_bar_title)).check(
-            matches(
-                not(isEnabled())
-            )
-        )
-
         onView(withSettingsCheckboxFrame(R.string.card_height_title)).check(matches(not(isEnabled())))
         onView(withSettingsCheckboxWidget(R.string.pref_switch_card_view_title)).perform(click())
         onView(withSettingsCheckboxFrame(R.string.card_height_title)).check(matches(isEnabled()))

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

@@ -21,11 +21,9 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class SettingsActivityOfflineTest {
-
     @get:Rule
     val activityRule = ActivityScenarioRule(LoginActivity::class.java)
 
@@ -38,72 +36,79 @@ class SettingsActivityOfflineTest {
         }
         loginAndInitHome()
         openActionBarOverflowOrOptionsMenu(
-            ApplicationProvider.getApplicationContext()
+            ApplicationProvider.getApplicationContext(),
         )
         onView(withText(R.string.title_activity_settings)).perform(click())
         onView(withText(R.string.pref_header_offline)).perform(click())
     }
 
+    @Suppress("detekt:LongMethod")
     @Test
     fun testOffline() {
         onView(withSettingsCheckboxWidget(R.string.pref_switch_periodic_refresh)).check(
             matches(
                 allOf(
-                    isDisplayed(), not(isChecked())
+                    isDisplayed(),
-                )
+                    not(isChecked()),
-            )
+                ),
+            ),
         )
         onView(withSettingsCheckboxWidget(R.string.pref_switch_items_caching)).check(
             matches(
                 allOf(
-                    isDisplayed(), not(isChecked())
+                    isDisplayed(),
-                )
+                    not(isChecked()),
-            )
+                ),
+            ),
         )
         onView(withSettingsCheckboxFrame(R.string.pref_switch_items_caching)).check(
             matches(
-                isEnabled()
+                isEnabled(),
-            )
+            ),
         )
         onView(withText(R.string.pref_periodic_refresh_minutes_title)).check(
             matches(
-                allOf(isNotEnabled(), isDisplayed())
+                allOf(isNotEnabled(), isDisplayed()),
-            )
+            ),
         )
 
         onView(withSettingsCheckboxWidget(R.string.pref_switch_refresh_when_charging)).check(
             matches(
                 allOf(
-                    isDisplayed(), not(isChecked())
+                    isDisplayed(),
-                )
+                    not(isChecked()),
-            )
+                ),
+            ),
         )
         onView(withSettingsCheckboxFrame(R.string.pref_switch_refresh_when_charging)).check(
             matches(
-                isNotEnabled()
+                isNotEnabled(),
-            )
+            ),
         )
         onView(withSettingsCheckboxWidget(R.string.pref_switch_notify_new_items)).check(
             matches(
                 allOf(
-                    isDisplayed(), not(isChecked())
+                    isDisplayed(),
-                )
+                    not(isChecked()),
-            )
+                ),
+            ),
         )
         onView(withSettingsCheckboxFrame(R.string.pref_switch_notify_new_items)).check(
             matches(
-                isNotEnabled()
+                isNotEnabled(),
-            )
+            ),
         )
         onView(withSettingsCheckboxWidget(R.string.pref_switch_update_sources)).check(
             matches(
                 allOf(
-                    isDisplayed(), isChecked()
+                    isDisplayed(),
-                )
+                    isChecked(),
-            )
+                ),
+            ),
         )
     }
 
+    @Suppress("detekt:LongMethod")
     @Test
     fun testOfflineActions() {
         onView(withText(R.string.pref_switch_items_caching_off)).check(matches(isDisplayed()))
@@ -111,50 +116,50 @@ class SettingsActivityOfflineTest {
         onView(withText(R.string.pref_switch_items_caching_on)).check(matches(isDisplayed()))
         onView(withSettingsCheckboxFrame(R.string.pref_switch_items_caching)).check(
             matches(
-                isEnabled()
+                isEnabled(),
-            )
+            ),
         )
         onView(withText(R.string.pref_periodic_refresh_minutes_title)).check(
             matches(
-                isNotEnabled()
+                isNotEnabled(),
-            )
+            ),
         )
         onView(withSettingsCheckboxFrame(R.string.pref_switch_refresh_when_charging)).check(
             matches(
-                isNotEnabled()
+                isNotEnabled(),
-            )
+            ),
         )
         onView(withSettingsCheckboxFrame(R.string.pref_switch_notify_new_items)).check(
             matches(
-                isNotEnabled()
+                isNotEnabled(),
-            )
+            ),
         )
 
         onView(withText(R.string.pref_switch_periodic_refresh_off)).check(
             matches(
-                isDisplayed()
+                isDisplayed(),
-            )
+            ),
         )
         onView(withSettingsCheckboxWidget(R.string.pref_switch_periodic_refresh)).perform(click())
         onView(withText(R.string.pref_switch_periodic_refresh_on)).check(
             matches(
-                isDisplayed()
+                isDisplayed(),
-            )
+            ),
         )
         onView(withSettingsCheckboxFrame(R.string.pref_periodic_refresh_minutes_title)).check(
             matches(
-                isEnabled()
+                isEnabled(),
-            )
+            ),
         )
         onView(withSettingsCheckboxFrame(R.string.pref_switch_refresh_when_charging)).check(
             matches(
-                isEnabled()
+                isEnabled(),
-            )
+            ),
         )
         onView(withSettingsCheckboxFrame(R.string.pref_switch_notify_new_items)).check(
             matches(
-                isEnabled()
+                isEnabled(),
-            )
+            ),
         )
         changeAndCancelSetting("360", "123") {
             onView(withText(R.string.pref_periodic_refresh_minutes_title)).perform(click())

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

@@ -19,11 +19,9 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class SettingsActivityReaderTest {
-
     @get:Rule
     val activityRule = ActivityScenarioRule(LoginActivity::class.java)
 
@@ -36,7 +34,7 @@ class SettingsActivityReaderTest {
         }
         loginAndInitHome()
         openActionBarOverflowOrOptionsMenu(
-            ApplicationProvider.getApplicationContext()
+            ApplicationProvider.getApplicationContext(),
         )
         onView(withText(R.string.title_activity_settings)).perform(click())
         onView(withText(R.string.pref_header_viewer)).perform(click())
@@ -47,11 +45,12 @@ class SettingsActivityReaderTest {
         onView(withSettingsCheckboxFrame(R.string.pref_switch_actions_pager_scroll)).check(
             matches(
                 allOf(
-                    isDisplayed(), not(
+                    isDisplayed(),
-                        isChecked()
+                    not(
-                    )
+                        isChecked(),
-                )
+                    ),
-            )
+                ),
+            ),
         )
         onView(withText(R.string.pref_content_reader_font_size)).check(matches(isDisplayed()))
         onView(withText(R.string.settings_reader_font)).check(matches(isDisplayed()))
@@ -61,14 +60,14 @@ class SettingsActivityReaderTest {
     fun testReaderActions() {
         onView(withText(R.string.pref_switch_actions_pager_scroll_off)).check(
             matches(
-                isDisplayed()
+                isDisplayed(),
-            )
+            ),
         )
         onView(withSettingsCheckboxFrame(R.string.pref_switch_actions_pager_scroll)).perform(click())
         onView(withText(R.string.pref_switch_actions_pager_scroll_on)).check(
             matches(
-                isDisplayed()
+                isDisplayed(),
-            )
+            ),
         )
 
         onView(withText(R.string.pref_content_reader_font_size)).perform(click())

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

@@ -20,7 +20,6 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class SettingsActivityTest {
-
     @get:Rule
     val activityRule = ActivityScenarioRule(LoginActivity::class.java)
     lateinit var context: Context
@@ -35,10 +34,8 @@ class SettingsActivityTest {
         onView(withText(R.string.title_activity_settings)).perform(click())
     }
 
-
     @Test
     fun testAllSettings() {
-
         onView(withText(R.string.pref_header_general)).check(matches(isDisplayed()))
         onView(withText(R.string.pref_header_viewer)).check(matches(isDisplayed()))
         onView(withText(R.string.pref_header_offline)).check(matches(isDisplayed()))
@@ -48,14 +45,13 @@ class SettingsActivityTest {
             matches(
                 allOf(
                     isDisplayed(),
-                    not(isSelected())
+                    not(isSelected()),
-                )
+                ),
-            )
+            ),
         )
         onView(withText(R.string.action_about)).check(matches(isDisplayed()))
     }
 
-
     @Test
     fun testThemes() {
         testPreferencesFromArray(context, R.array.ModeTitles) {
@@ -63,7 +59,6 @@ class SettingsActivityTest {
         }
     }
 
-
     @Test
     fun testExperimentail() {
         onView(withText(R.string.pref_header_experimental)).perform(click())
@@ -75,13 +70,11 @@ class SettingsActivityTest {
         }
     }
 
-
     @Test
     fun testBugReports() {
         onView(withText(R.string.pref_switch_disable_acra)).perform(click())
     }
 
-
     @Test
     fun testLinks() {
         onView(withText(R.string.pref_header_links)).perform(click())
@@ -91,7 +84,6 @@ class SettingsActivityTest {
         onView(withText(R.string.translation)).check(matches(isDisplayed()))
     }
 
-
     @Test
     fun testAbout() {
         onView(withText(R.string.action_about)).perform(click())

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

@@ -41,11 +41,11 @@ class SourcesActivityTest {
     fun addSource() {
         testAddSourceWithUrl(
             "https://lorem-rss.herokuapp.com/feed?unit=year&interval=1&length=10",
-            sourceName
+            sourceName,
         )
     }
 
-
+    @Suppress("detekt:SwallowedException")
     @Test
     fun addSourceCheckContent() {
         testAddSourceWithUrl("https://news.google.com/rss?hl=en-US&gl=US&ceid=US:en", sourceName)
@@ -54,7 +54,7 @@ class SourcesActivityTest {
         onView(withText(R.string.menu_home_refresh)).perform(click())
         onView(withText(R.string.refresh_dialog_message)).check(matches(isDisplayed()))
         onView(
-            withId(android.R.id.button1)
+            withId(android.R.id.button1),
         ).perform(click())
         Thread.sleep(10000)
         onView(withId(R.id.swipeRefreshLayout)).perform(swipeDown())
@@ -71,10 +71,11 @@ class SourcesActivityTest {
     fun deleteTheCreatedSource() {
         onView(withText(sourceName)).check(matches(isDisplayed()))
         onView(withId(R.id.deleteBtn)).perform(click())
+        onView(withText(R.string.confirm_delete_title)).check(matches(isDisplayed()))
+        onView(withId(android.R.id.button1)).perform(click())
         onView(withText(sourceName)).check(doesNotExist())
     }
 
-
     private fun goToSources() {
         openMenu()
         onView(withText(R.string.menu_home_sources))

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

@@ -31,7 +31,7 @@ import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
 import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.maybeShow
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.removeBadge
-import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowser
+import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowserAsNewTask
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@@ -49,7 +49,12 @@ import org.kodein.di.instance
 import java.security.MessageDigest
 import java.util.concurrent.TimeUnit
 
-class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAware {
+private const val MIN_WIDTH_CARD_DP = 300
+
+class HomeActivity :
+    AppCompatActivity(),
+    SearchView.OnQueryTextListener,
+    DIAware {
     private var items: ArrayList<SelfossModel.Item> = ArrayList()
 
     private var elementsShown: ItemType = ItemType.UNREAD
@@ -171,7 +176,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                             getElementsAccordingToTab()
                         }
                     } else {
-                        Toast.makeText(
+                        Toast
+                            .makeText(
                                 this@HomeActivity,
                                 "Found null when swiping at positon $position.",
                                 Toast.LENGTH_LONG,
@@ -196,19 +202,23 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         }
     }
 
+    @Suppress("detekt:LongMethod")
     private fun handleBottomBar() {
         tabNewBadge =
             TextBadgeItem()
                 .setText("")
-                .setHideOnSelect(false).hide(false)
+                .setHideOnSelect(false)
+                .hide(false)
         tabArchiveBadge =
             TextBadgeItem()
                 .setText("")
-                .setHideOnSelect(false).hide(false)
+                .setHideOnSelect(false)
+                .hide(false)
         tabStarredBadge =
             TextBadgeItem()
                 .setText("")
-                .setHideOnSelect(false).hide(false)
+                .setHideOnSelect(false)
+                .hide(false)
 
         if (appSettingsService.isDisplayUnreadCountEnabled()) {
             lifecycleScope.launch {
@@ -236,14 +246,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             BottomNavigationItem(
                 R.drawable.ic_tab_fiber_new_black_24dp,
                 getString(R.string.tab_new),
-            )
+            ).setBadgeItem(tabNewBadge)
-                .setBadgeItem(tabNewBadge)
         val tabArchive =
             BottomNavigationItem(
                 R.drawable.ic_tab_archive_black_24dp,
                 getString(R.string.tab_read),
-            )
+            ).setBadgeItem(tabArchiveBadge)
-                .setBadgeItem(tabArchiveBadge)
         val tabStarred =
             BottomNavigationItem(
                 R.drawable.ic_tab_favorite_black_24dp,
@@ -277,7 +285,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
         handleBottomBarActions()
 
-        handleGDPRDialog(appSettingsService.settings.getBoolean("GDPR_shown", false))
+        handleGdprDialog(appSettingsService.settings.getBoolean("GDPR_shown", false))
 
         handleRecurringTask()
         CountingIdlingResourceSingleton.increment()
@@ -289,10 +297,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         getElementsAccordingToTab()
     }
 
-    private fun handleGDPRDialog(GDPRShown: Boolean) {
+    private fun handleGdprDialog(gdprShown: Boolean) {
         val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
         messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
-        if (!GDPRShown) {
+        if (!gdprShown) {
             val alertDialog = AlertDialog.Builder(this).create()
             alertDialog.setTitle(getString(R.string.gdpr_dialog_title))
             alertDialog.setMessage(getString(R.string.gdpr_dialog_message))
@@ -309,13 +317,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     private fun reloadLayoutManager() {
         val currentManager = binding.recyclerView.layoutManager
-        val layoutManager: RecyclerView.LayoutManager
 
-        // This will only update the layout manager if settings changed
+        fun gridLayoutManager() {
-        when (currentManager) {
+            val layoutManager =
-            is StaggeredGridLayoutManager ->
-                if (!appSettingsService.isCardViewEnabled()) {
-                    layoutManager =
                 GridLayoutManager(
                     this,
                     calculateNoOfColumns(),
@@ -323,9 +327,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             binding.recyclerView.layoutManager = layoutManager
         }
 
-            is GridLayoutManager ->
+        fun staggererdGridLayoutManager() {
-                if (appSettingsService.isCardViewEnabled()) {
+            var layoutManager =
-                    layoutManager =
                 StaggeredGridLayoutManager(
                     calculateNoOfColumns(),
                     StaggeredGridLayoutManager.VERTICAL,
@@ -335,24 +338,23 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             binding.recyclerView.layoutManager = layoutManager
         }
 
+        when (currentManager) {
+            is StaggeredGridLayoutManager ->
+                if (!appSettingsService.isCardViewEnabled()) {
+                    gridLayoutManager()
+                }
+
+            is GridLayoutManager ->
+                if (appSettingsService.isCardViewEnabled()) {
+                    staggererdGridLayoutManager()
+                }
+
             else ->
                 if (currentManager == null) {
                     if (!appSettingsService.isCardViewEnabled()) {
-                        layoutManager =
+                        gridLayoutManager()
-                            GridLayoutManager(
-                                this,
-                                calculateNoOfColumns(),
-                            )
-                        binding.recyclerView.layoutManager = layoutManager
                     } else {
-                        layoutManager =
+                        staggererdGridLayoutManager()
-                            StaggeredGridLayoutManager(
-                                calculateNoOfColumns(),
-                                StaggeredGridLayoutManager.VERTICAL,
-                            )
-                        layoutManager.gapStrategy =
-                            StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
-                        binding.recyclerView.layoutManager = layoutManager
                     }
                 }
         }
@@ -425,17 +427,17 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         binding.recyclerView.addOnScrollListener(recyclerViewScrollListener)
     }
 
-    private fun getLastVisibleItem(): Int {
+    private fun getLastVisibleItem(): Int =
-        return when (val manager = binding.recyclerView.layoutManager) {
+        when (val manager = binding.recyclerView.layoutManager) {
             is StaggeredGridLayoutManager ->
-                manager.findLastCompletelyVisibleItemPositions(
+                manager
+                    .findLastCompletelyVisibleItemPositions(
                         null,
                     ).last()
 
             is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition()
             else -> 0
         }
-    }
 
     private fun mayBeEmpty() =
         if (items.isEmpty()) {
@@ -477,8 +479,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     }
 
     private fun handleListResult(appendResults: Boolean = false) {
-        if (appendResults) {
         val oldManager = binding.recyclerView.layoutManager
+        if (appendResults) {
             firstVisible =
                 when (oldManager) {
                     is StaggeredGridLayoutManager ->
@@ -491,7 +493,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                 }
         }
 
-        if (recyclerAdapter == null) {
+        @Suppress("detekt:ComplexCondition")
+        if (recyclerAdapter == null ||
+            (
+                (recyclerAdapter is ItemListAdapter && appSettingsService.isCardViewEnabled()) ||
+                    (recyclerAdapter is ItemCardAdapter && !appSettingsService.isCardViewEnabled())
+            )
+        ) {
             if (appSettingsService.isCardViewEnabled()) {
                 recyclerAdapter =
                     ItemCardAdapter(
@@ -538,7 +546,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     private fun calculateNoOfColumns(): Int {
         val displayMetrics = resources.displayMetrics
         val dpWidth = displayMetrics.widthPixels / displayMetrics.density
-        return (dpWidth / 300).toInt()
+        return (dpWidth / MIN_WIDTH_CARD_DP).toInt()
     }
 
     override fun onQueryTextChange(p0: String?): Boolean {
@@ -577,7 +585,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         messageRes: Int,
         doFn: () -> Unit,
     ) {
-        AlertDialog.Builder(this@HomeActivity)
+        AlertDialog
+            .Builder(this@HomeActivity)
             .setMessage(messageRes)
             .setTitle(titleRes)
             .setPositiveButton(android.R.string.ok) { _, _ -> doFn() }
@@ -586,10 +595,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             .show()
     }
 
+    @Suppress("detekt:ReturnCount", "detekt:LongMethod")
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.issue_tracker -> {
-                baseContext.openUrlInBrowser(AppSettingsService.trackerUrl)
+                baseContext.openUrlInBrowserAsNewTask(AppSettingsService.BUG_URL)
                 return true
             }
 
@@ -606,14 +616,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                     CoroutineScope(Dispatchers.Main).launch {
                         val updatedRemote = repository.updateRemote()
                         if (updatedRemote) {
-                            Toast.makeText(
+                            Toast
+                                .makeText(
                                     this@HomeActivity,
                                     R.string.refresh_success_response,
                                     Toast.LENGTH_LONG,
-                            )
+                                ).show()
-                                .show()
                         } else {
-                            Toast.makeText(
+                            Toast
+                                .makeText(
                                     this@HomeActivity,
                                     R.string.refresh_failer_message,
                                     Toast.LENGTH_SHORT,
@@ -633,7 +644,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                         CoroutineScope(Dispatchers.Main).launch {
                             val success = repository.markAllAsRead(items)
                             if (success) {
-                                Toast.makeText(
+                                Toast
+                                    .makeText(
                                         this@HomeActivity,
                                         R.string.all_posts_read,
                                         Toast.LENGTH_SHORT,
@@ -642,7 +654,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
                                 getElementsAccordingToTab()
                             } else {
-                                Toast.makeText(
+                                Toast
+                                    .makeText(
                                         this@HomeActivity,
                                         R.string.all_posts_not_read,
                                         Toast.LENGTH_SHORT,
@@ -651,7 +664,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                             handleListResult()
                             binding.swipeRefreshLayout.isRefreshing = false
                             CountingIdlingResourceSingleton.decrement()
-
                         }
                     }
                 }
@@ -661,7 +673,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             R.id.action_disconnect -> {
                 needsConfirmation(
                     R.string.confirm_disconnect_title,
-                    R.string.confirm_disconnect_description
+                    R.string.confirm_disconnect_description,
                 ) {
                     runBlocking {
                         repository.logout()
@@ -702,7 +714,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     private fun handleRecurringTask() {
         if (appSettingsService.isPeriodicRefreshEnabled()) {
             val myConstraints =
-                Constraints.Builder()
+                Constraints
+                    .Builder()
                     .setRequiresBatteryNotLow(true)
                     .setRequiresCharging(appSettingsService.isRefreshWhenChargingOnlyEnabled())
                     .setRequiresStorageNotLow(true)
@@ -711,18 +724,18 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             val backgroundWork =
                 PeriodicWorkRequestBuilder<LoadingWorker>(
                     appSettingsService.getRefreshMinutes(),
-                    TimeUnit.MINUTES
+                    TimeUnit.MINUTES,
-                )
+                ).setConstraints(myConstraints)
-                    .setConstraints(myConstraints)
                     .addTag("selfoss-loading")
                     .build()
 
-            WorkManager.getInstance(
+            WorkManager
+                .getInstance(
                     baseContext,
                 ).enqueueUniquePeriodicWork(
                     "selfoss-loading",
                     ExistingPeriodicWorkPolicy.KEEP,
-                backgroundWork
+                    backgroundWork,
                 )
         }
     }

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

@@ -84,7 +84,9 @@ class ImageActivity : AppCompatActivity() {
         return super.onOptionsItemSelected(item)
     }
 
-    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
+    private inner class ScreenSlidePagerAdapter(
+        fa: FragmentActivity,
+    ) : FragmentStateAdapter(fa) {
         override fun getItemCount(): Int = allImages.size
 
         override fun createFragment(position: Int): Fragment = ImageFragment.newInstance(allImages[position])

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

@@ -30,7 +30,11 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
-class LoginActivity : AppCompatActivity(), DIAware {
+private const val MAX_INVALID_LOGIN_BEFORE_ALERT_DISPLAYED = 3
+
+class LoginActivity :
+    AppCompatActivity(),
+    DIAware {
     private var inValidCount: Int = 0
     private var isWithLogin = false
 
@@ -108,7 +112,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
             repository.updateApiInformation()
             ACRA.errorReporter.putCustomData(
                 "SELFOSS_API_VERSION",
-                appSettingsService.getApiVersion().toString()
+                appSettingsService.getApiVersion().toString(),
             )
             CountingIdlingResourceSingleton.decrement()
         }
@@ -132,13 +136,23 @@ class LoginActivity : AppCompatActivity(), DIAware {
         binding.passwordView.error = null
 
         // Store values at the time of the login attempt.
-        val url = binding.urlView.text.toString().trim()
+        val url =
-        val login = binding.loginView.text.toString().trim()
+            binding.urlView.text
-        val password = binding.passwordView.text.toString().trim()
+                .toString()
-
+                .trim()
-        failInvalidUrl(url)
+        val login =
-        failLoginDetails(password, login)
+            binding.loginView.text
+                .toString()
+                .trim()
+        val password =
+            binding.passwordView.text
+                .toString()
+                .trim()
 
+        val cancelUrl = failInvalidUrl(url)
+        if (cancelUrl) return
+        val cancelDetails = failLoginDetails(password, login)
+        if (cancelDetails) return
         showProgress(true)
 
         appSettingsService.updateSelfSigned(binding.selfSigned.isChecked)
@@ -151,7 +165,8 @@ class LoginActivity : AppCompatActivity(), DIAware {
                 repository.updateApiInformation()
             } catch (e: Exception) {
                 if (e.message?.startsWith("No transformation found") == true) {
-                    Toast.makeText(
+                    Toast
+                        .makeText(
                             applicationContext,
                             R.string.application_selfoss_only,
                             Toast.LENGTH_LONG,
@@ -179,7 +194,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
     private fun failLoginDetails(
         password: String,
         login: String,
-    ) {
+    ): Boolean {
         var lastFocusedView: View? = null
         var cancel = false
         if (isWithLogin) {
@@ -196,16 +211,17 @@ class LoginActivity : AppCompatActivity(), DIAware {
             }
         }
         maybeCancelAndFocusView(cancel, lastFocusedView)
+        return cancel
     }
 
-    private fun failInvalidUrl(url: String) {
+    private fun failInvalidUrl(url: String): Boolean {
         val focusView = binding.urlView
         var cancel = false
         if (url.isBaseUrlInvalid()) {
             cancel = true
             binding.urlView.error = getString(R.string.login_url_problem)
             inValidCount++
-            if (inValidCount == 3) {
+            if (inValidCount == MAX_INVALID_LOGIN_BEFORE_ALERT_DISPLAYED) {
                 val alertDialog = AlertDialog.Builder(this).create()
                 alertDialog.setTitle(getString(R.string.warning_wrong_url))
                 alertDialog.setMessage(getString(R.string.text_wrong_url))
@@ -218,6 +234,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
             }
         }
         maybeCancelAndFocusView(cancel, focusView)
+        return cancel
     }
 
     private fun maybeCancelAndFocusView(
@@ -270,7 +287,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
         return when (item.itemId) {
             R.id.issue_tracker -> {
                 val browserIntent =
-                    Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
+                    Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.BUG_URL))
                 startActivity(browserIntent)
                 return true
             }
@@ -280,9 +297,9 @@ class LoginActivity : AppCompatActivity(), DIAware {
                     .withAboutIconShown(true)
                     .withAboutVersionShown(true)
                     .withAboutSpecial2("Bug reports")
-                    .withAboutSpecial2Description(AppSettingsService.trackerUrl)
+                    .withAboutSpecial2Description(AppSettingsService.BUG_URL)
                     .withAboutSpecial1("Project Page")
-                    .withAboutSpecial1Description(AppSettingsService.sourceUrl)
+                    .withAboutSpecial1Description(AppSettingsService.SOURCE_URL)
                     .start(this)
                 true
             }

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

@@ -9,19 +9,17 @@ import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.multidex.MultiDexApplication
-import bou.amine.apps.readerforselfossv2.DI.networkModule
 import bou.amine.apps.readerforselfossv2.android.testing.TestingHelper
-import bou.amine.apps.readerforselfossv2.android.viewmodel.AppViewModel
 import bou.amine.apps.readerforselfossv2.dao.DriverFactory
 import bou.amine.apps.readerforselfossv2.dao.ReaderForSelfossDB
+import bou.amine.apps.readerforselfossv2.di.networkModule
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import com.github.ln_12.library.ConnectivityStatus
+import bou.amine.apps.readerforselfossv2.service.ConnectivityService
 import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import org.acra.ACRA
 import org.acra.ReportField
@@ -36,32 +34,29 @@ import org.kodein.di.bind
 import org.kodein.di.instance
 import org.kodein.di.singleton
 
-class MyApp : MultiDexApplication(), DIAware {
+class MyApp :
+    MultiDexApplication(),
+    DIAware {
     override val di by DI.lazy {
         bind<AppSettingsService>() with singleton { AppSettingsService(ACRA.isACRASenderServiceProcess() || TestingHelper().isUnitTest()) }
         import(networkModule)
         bind<DriverFactory>() with singleton { DriverFactory(applicationContext) }
         bind<ReaderForSelfossDB>() with singleton { ReaderForSelfossDB(driverFactory.createDriver()) }
+        bind<ConnectivityService>() with singleton { ConnectivityService() }
         bind<Repository>() with
             singleton {
                 Repository(
                     instance(),
                     instance(),
-                        isConnectionAvailable,
+                    instance(),
                     instance(),
                 )
             }
-        bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
-        bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
     }
 
     private val repository: Repository by instance()
-    private val viewModel: AppViewModel by instance()
-    private val connectivityStatus: ConnectivityStatus by instance()
     private val driverFactory: DriverFactory by instance()
-
+    private val connectivityService: ConnectivityService by instance()
-    // TODO: handle with the "previous" way
-    private val isConnectionAvailable: MutableStateFlow<Boolean> = MutableStateFlow(true)
 
     override fun onCreate() {
         super.onCreate()
@@ -74,13 +69,12 @@ class MyApp : MultiDexApplication(), DIAware {
 
             ProcessLifecycleOwner.get().lifecycle.addObserver(
                 AppLifeCycleObserver(
-                    connectivityStatus,
+                    connectivityService,
-                    repository,
                 ),
             )
 
             CoroutineScope(Dispatchers.Main).launch {
-                viewModel.networkAvailableProvider.collect { networkAvailable ->
+                connectivityService.networkAvailableProvider.collect { networkAvailable ->
                     val toastMessage =
                         if (networkAvailable) {
                             repository.handleDBActions()
@@ -89,7 +83,8 @@ class MyApp : MultiDexApplication(), DIAware {
                             R.string.network_connectivity_lost
                         }
 
-                    Toast.makeText(
+                    Toast
+                        .makeText(
                             applicationContext,
                             toastMessage,
                             Toast.LENGTH_SHORT,
@@ -105,6 +100,7 @@ class MyApp : MultiDexApplication(), DIAware {
         super.attachBaseContext(base)
 
         initAcra {
+            sendReportsInDevMode = false
             reportFormat = StringFormat.JSON
             reportContent =
                 listOf(
@@ -151,13 +147,13 @@ class MyApp : MultiDexApplication(), DIAware {
 
             val name = getString(R.string.notification_channel_sync)
             val importance = NotificationManager.IMPORTANCE_LOW
-            val mChannel = NotificationChannel(AppSettingsService.syncChannelId, name, importance)
+            val mChannel = NotificationChannel(AppSettingsService.SYNC_CHANNEL_ID, name, importance)
 
             val newItemsChannelname = getString(R.string.new_items_channel_sync)
             val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT
             val newItemsChannelmChannel =
                 NotificationChannel(
-                    AppSettingsService.newItemsChannelId,
+                    AppSettingsService.NEW_ITEMS_CHANNEL,
                     newItemsChannelname,
                     newItemsChannelimportance,
                 )
@@ -184,18 +180,15 @@ class MyApp : MultiDexApplication(), DIAware {
     }
 
     class AppLifeCycleObserver(
-        val connectivityStatus: ConnectivityStatus,
+        val connectivityService: ConnectivityService,
-        val repository: Repository,
     ) : DefaultLifecycleObserver {
         override fun onResume(owner: LifecycleOwner) {
             super.onResume(owner)
-            repository.connectionMonitored = true
+            connectivityService.start()
-            connectivityStatus.start()
         }
 
         override fun onPause(owner: LifecycleOwner) {
-            repository.connectionMonitored = false
+            connectivityService.stop()
-            connectivityStatus.stop()
             super.onPause(owner)
         }
     }

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

@@ -22,7 +22,9 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
-class ReaderActivity : AppCompatActivity(), DIAware {
+class ReaderActivity :
+    AppCompatActivity(),
+    DIAware {
     private var currentItem: Int = 0
 
     private lateinit var toolbarMenu: Menu
@@ -35,22 +37,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {
     private val repository: Repository by instance()
     private val appSettingsService: AppSettingsService by instance()
 
-    private fun showMenuItem(willAddToFavorite: Boolean) {
+    @Suppress("detekt:SwallowedException")
-        if (willAddToFavorite) {
-            toolbarMenu.findItem(R.id.star).icon?.setTint(Color.WHITE)
-        } else {
-            toolbarMenu.findItem(R.id.star).icon?.setTint(Color.RED)
-        }
-    }
-
-    private fun canFavorite() {
-        showMenuItem(true)
-    }
-
-    private fun canRemoveFromFavorite() {
-        showMenuItem(false)
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityReaderBinding.inflate(layoutInflater)
@@ -70,14 +57,21 @@ class ReaderActivity : AppCompatActivity(), DIAware {
             finish()
         }
 
-        try {
+        readItem()
-            readItem(allItems[currentItem])
-        } catch (e: IndexOutOfBoundsException) {
-            finish()
-        }
 
         binding.pager.adapter = ScreenSlidePagerAdapter(this)
         binding.pager.setCurrentItem(currentItem, false)
+
+        binding.pager.registerOnPageChangeCallback(
+            object : ViewPager2.OnPageChangeCallback() {
+                override fun onPageSelected(position: Int) {
+                    super.onPageSelected(position)
+                    currentItem = position
+                    updateStarIcon()
+                    readItem()
+                }
+            },
+        )
     }
 
     override fun onResume() {
@@ -86,21 +80,28 @@ class ReaderActivity : AppCompatActivity(), DIAware {
         binding.indicator.setViewPager(binding.pager)
     }
 
-    private fun readItem(item: SelfossModel.Item) {
+    private fun readItem() {
-        if (appSettingsService.isMarkOnScrollEnabled() && !appSettingsService.getPublicAccess()) {
+        val item = allItems.getOrNull(currentItem)
+        if (appSettingsService.isMarkOnScrollEnabled() && !appSettingsService.getPublicAccess() && item != null) {
             CoroutineScope(Dispatchers.IO).launch {
                 repository.markAsRead(item)
             }
         }
     }
 
+    private fun updateStarIcon() {
+        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) {
         super.onSaveInstanceState(oldInstanceState)
         oldInstanceState.clear()
     }
 
-    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) :
+    private inner class ScreenSlidePagerAdapter(
-        FragmentStateAdapter(fa) {
+        fa: FragmentActivity,
+    ) : FragmentStateAdapter(fa) {
         override fun getItemCount(): Int = allItems.size
 
         override fun createFragment(position: Int): Fragment = ArticleFragment.newInstance(allItems[position])
@@ -109,25 +110,26 @@ class ReaderActivity : AppCompatActivity(), DIAware {
     override fun onKeyDown(
         keyCode: Int,
         event: KeyEvent?,
-    ): Boolean {
+    ): Boolean =
-        return when (keyCode) {
+        when (keyCode) {
             KeyEvent.KEYCODE_VOLUME_DOWN -> {
                 val currentFragment =
                     supportFragmentManager.findFragmentByTag("f" + binding.pager.currentItem) as ArticleFragment
-                currentFragment.scrollDown()
+                currentFragment.volumeButtonScrollDown()
                 true
             }
+
             KeyEvent.KEYCODE_VOLUME_UP -> {
                 val currentFragment =
                     supportFragmentManager.findFragmentByTag("f" + binding.pager.currentItem) as ArticleFragment
-                currentFragment.scrollUp()
+                currentFragment.volumeButtonScrollUp()
                 true
             }
+
             else -> {
                 super.onKeyDown(keyCode, event)
             }
         }
-    }
 
     private fun alignmentMenu() {
         val showJustify = appSettingsService.getActiveAllignment() == AppSettingsService.ALIGN_LEFT
@@ -136,8 +138,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        val inflater = menuInflater
+        menuInflater.inflate(R.menu.reader_menu, menu)
-        inflater.inflate(R.menu.reader_menu, menu)
         toolbarMenu = menu
 
         alignmentMenu()
@@ -145,82 +146,50 @@ class ReaderActivity : AppCompatActivity(), DIAware {
         if (appSettingsService.getPublicAccess()) {
             menu.removeItem(R.id.star)
         } else {
-            if (allItems.isNotEmpty() && allItems[currentItem].starred) {
+            updateStarIcon()
-                canRemoveFromFavorite()
-            } else {
-                canFavorite()
-            }
-
-            binding.pager.registerOnPageChangeCallback(
-                object : ViewPager2.OnPageChangeCallback() {
-                    override fun onPageSelected(position: Int) {
-                        super.onPageSelected(position)
-
-                        if (allItems[position].starred) {
-                            canRemoveFromFavorite()
-                        } else {
-                            canFavorite()
-                        }
-                        readItem(allItems[position])
-                    }
-                },
-            )
         }
 
         return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        fun afterSave() {
-            allItems[binding.pager.currentItem] =
-                allItems[binding.pager.currentItem].toggleStar()
-            canRemoveFromFavorite()
-        }
-
-        fun afterUnsave() {
-            allItems[binding.pager.currentItem] = allItems[binding.pager.currentItem].toggleStar()
-            canFavorite()
-        }
-
         when (item.itemId) {
-            android.R.id.home -> {
+            android.R.id.home -> onBackPressedDispatcher.onBackPressed()
-                onBackPressedDispatcher.onBackPressed()
+            R.id.star -> toggleFavorite()
-                return true
+            R.id.align_left -> switchAlignmentSetting(AppSettingsService.ALIGN_LEFT)
-            }
+            R.id.align_justify -> switchAlignmentSetting(AppSettingsService.JUSTIFY)
-            R.id.star -> {
-                if (allItems[binding.pager.currentItem].starred) {
-                    CoroutineScope(Dispatchers.IO).launch {
-                        repository.unstarr(allItems[binding.pager.currentItem])
-                    }
-                    afterUnsave()
-                } else {
-                    CoroutineScope(Dispatchers.IO).launch {
-                        repository.starr(allItems[binding.pager.currentItem])
-                    }
-                    afterSave()
-                }
-            }
-            R.id.align_left -> {
-                switchAlignmentSetting(AppSettingsService.ALIGN_LEFT)
-                refreshFragment()
-            }
-            R.id.align_justify -> {
-                switchAlignmentSetting(AppSettingsService.JUSTIFY)
-                refreshFragment()
-            }
         }
         return super.onOptionsItemSelected(item)
     }
 
-    private fun switchAlignmentSetting(allignment: Int) {
+    private fun toggleFavorite() {
-        appSettingsService.changeAllignment(allignment)
+        val item = allItems.getOrNull(currentItem) ?: return
-        alignmentMenu()
+
+        val starred = item.starred
+
+        CoroutineScope(Dispatchers.IO).launch {
+            if (starred) {
+                repository.unstarr(item)
+            } else {
+                repository.starr(item)
+            }
         }
 
-    private fun refreshFragment() {
+        item.toggleStar()
-        finish()
+        updateStarIcon()
-        overridePendingTransition(0, 0)
+    }
-        startActivity(intent)
+
-        overridePendingTransition(0, 0)
+    private fun switchAlignmentSetting(alignment: Int) {
+        appSettingsService.changeAllignment(alignment)
+        alignmentMenu()
+
+        val fragmentManager = supportFragmentManager
+        val fragments = fragmentManager.fragments
+
+        for (fragment in fragments) {
+            if (fragment is ArticleFragment) {
+                fragment.refreshAlignment()
+            }
+        }
     }
 }

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

@@ -18,7 +18,9 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
-class SourcesActivity : AppCompatActivity(), DIAware {
+class SourcesActivity :
+    AppCompatActivity(),
+    DIAware {
     private lateinit var binding: ActivitySourcesBinding
 
     override val di by closestDI()
@@ -68,7 +70,8 @@ class SourcesActivity : AppCompatActivity(), DIAware {
                 binding.recyclerView.adapter = mAdapter
                 mAdapter.notifyDataSetChanged()
             } else {
-                Toast.makeText(
+                Toast
+                    .makeText(
                         this@SourcesActivity,
                         R.string.cant_get_sources,
                         Toast.LENGTH_SHORT,

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

@@ -9,11 +9,9 @@ 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.utils.isBaseUrlInvalid
 import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
-import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -21,7 +19,9 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
-class UpsertSourceActivity : AppCompatActivity(), DIAware {
+class UpsertSourceActivity :
+    AppCompatActivity(),
+    DIAware {
     private var existingSource: SelfossModel.SourceDetail? = null
     private var mSpoutsValue: String? = null
 
@@ -29,7 +29,6 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
 
     override val di by closestDI()
     private val repository: Repository by instance()
-    private val appSettingsService: AppSettingsService by instance()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -74,15 +73,10 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
 
     override fun onResume() {
         super.onResume()
-
-        val baseUrl = appSettingsService.getBaseUrl()
-        if (baseUrl.isEmpty() || baseUrl.isBaseUrlInvalid()) {
-            mustLoginToAddSource()
-        } else {
         handleSpoutsSpinner()
     }
-    }
 
+    @Suppress("detekt:SwallowedException")
     private fun handleSpoutsSpinner() {
         val spoutsKV = HashMap<String, String>()
         binding.spoutsSpinner.onItemSelectedListener =
@@ -105,7 +99,8 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
             }
 
         fun handleSpoutFailure(networkIssue: Boolean = false) {
-            Toast.makeText(
+            Toast
+                .makeText(
                     this@UpsertSourceActivity,
                     if (networkIssue) R.string.cant_get_spouts_no_network else R.string.cant_get_spouts,
                     Toast.LENGTH_SHORT,
@@ -153,13 +148,6 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
         }
     }
 
-    private fun mustLoginToAddSource() {
-        Toast.makeText(this, getString(R.string.addStringNoUrl), Toast.LENGTH_SHORT).show()
-        val i = Intent(this, LoginActivity::class.java)
-        startActivity(i)
-        finish()
-    }
-
     private fun handleSaveSource() {
         val url = binding.sourceUri.text.toString()
 
@@ -170,6 +158,7 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
             sourceDetailsUnavailable -> {
                 Toast.makeText(this, R.string.form_not_complete, Toast.LENGTH_SHORT).show()
             }
+
             else -> {
                 CoroutineScope(Dispatchers.Main).launch {
                     val successfullyAddedSource =
@@ -192,7 +181,8 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
                     if (successfullyAddedSource) {
                         finish()
                     } else {
-                        Toast.makeText(
+                        Toast
+                            .makeText(
                                 this@UpsertSourceActivity,
                                 R.string.cant_create_source,
                                 Toast.LENGTH_SHORT,

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

@@ -49,7 +49,10 @@ class ItemCardAdapter(
         return ViewHolder(binding)
     }
 
-    private fun handleClickListeners(holderBinding: CardItemBinding, position: Int) {
+    private fun handleClickListeners(
+        holderBinding: CardItemBinding,
+        position: Int,
+    ) {
         holderBinding.favButton.setOnClickListener {
             val item = items[position]
             if (item.starred) {
@@ -96,7 +99,8 @@ class ItemCardAdapter(
 
             binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = try {
+            binding.sourceTitleAndDate.text =
+                try {
                     itm.sourceAuthorAndDate()
                 } catch (e: Exception) {
                     e.sendSilentlyWithAcraWithName("ItemCardAdapter parse date")
@@ -114,16 +118,18 @@ class ItemCardAdapter(
                 binding.itemImage.setImageDrawable(null)
             } else {
                 binding.itemImage.visibility = View.VISIBLE
-                c.bitmapCenterCrop(itm.getThumbnail(repository.baseUrl), binding.itemImage)
+                c.bitmapCenterCrop(itm.getThumbnail(repository.baseUrl), binding.itemImage, appSettingsService)
             }
 
             if (itm.getIcon(repository.baseUrl).isEmpty()) {
                 binding.sourceImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
             } else {
-                c.circularDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage)
+                c.circularDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage, appSettingsService)
             }
         }
     }
 
-    inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root)
+    inner class ViewHolder(
+        val binding: CardItemBinding,
+    ) : RecyclerView.ViewHolder(binding.root)
 }

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

@@ -53,7 +53,8 @@ class ItemListAdapter(
 
             binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = try {
+            binding.sourceTitleAndDate.text =
+                try {
                     itm.sourceAuthorAndDate()
                 } catch (e: Exception) {
                     e.sendSilentlyWithAcraWithName("ItemListAdapter parse date")
@@ -64,13 +65,15 @@ class ItemListAdapter(
                 if (itm.getIcon(repository.baseUrl).isEmpty()) {
                     binding.itemImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
                 } else {
-                    c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
+                    c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage, appSettingsService)
                 }
             } else {
-                c.circularDrawable(itm.getThumbnail(repository.baseUrl), binding.itemImage)
+                c.circularDrawable(itm.getThumbnail(repository.baseUrl), binding.itemImage, appSettingsService)
             }
         }
     }
 
-    inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root)
+    inner class ViewHolder(
+        val binding: ListItemBinding,
+    ) : RecyclerView.ViewHolder(binding.root)
 }

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

@@ -18,7 +18,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.kodein.di.DIAware
 
-abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapter<VH>(), DIAware {
+abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> :
+    RecyclerView.Adapter<VH>(),
+    DIAware {
     abstract val items: ArrayList<SelfossModel.Item>
     abstract val repository: Repository
     abstract val binding: ViewBinding
@@ -45,8 +47,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                     app.findViewById(R.id.coordLayout),
                     R.string.marked_as_read,
                     Snackbar.LENGTH_LONG,
-                )
+                ).setAction(R.string.undo_string) {
-                .setAction(R.string.undo_string) {
                     unreadItemAtIndex(item, position, false)
                 }
 
@@ -66,8 +67,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                     app.findViewById(R.id.coordLayout),
                     R.string.marked_as_unread,
                     Snackbar.LENGTH_LONG,
-                )
+                ).setAction(R.string.undo_string) {
-                .setAction(R.string.undo_string) {
                     readItemAtIndex(item, position, false)
                 }
 
@@ -77,7 +77,10 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         s.show()
     }
 
-    protected fun handleLinkOpening(holderBinding: ViewBinding, position: Int) {
+    protected fun handleLinkOpening(
+        holderBinding: ViewBinding,
+        position: Int,
+    ) {
         holderBinding.root.setOnClickListener {
             repository.setReaderItems(items)
             c.openItemUrl(

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

@@ -6,9 +6,8 @@ import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.Toast
-import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity
@@ -16,6 +15,7 @@ import bou.amine.apps.readerforselfossv2.android.databinding.SourceListItemBindi
 import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import kotlinx.coroutines.CoroutineScope
@@ -29,68 +29,23 @@ import org.kodein.di.instance
 class SourcesListAdapter(
     private val app: Activity,
     private val items: ArrayList<SelfossModel.SourceDetail>,
-) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>(), DIAware {
+) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>(),
-    private val c: Context = app.baseContext
+    DIAware {
-    private lateinit var binding: SourceListItemBinding
-
     override val di: DI by closestDI(app)
-    private val repository: Repository by instance()
 
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int,
     ): ViewHolder {
-        binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        val binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return ViewHolder(binding.root)
+        return ViewHolder(binding)
     }
 
     override fun onBindViewHolder(
         holder: ViewHolder,
         position: Int,
     ) {
-        val itm = items[position]
+        holder.bind(items[position], position)
-
-        val deleteBtn: Button = holder.mView.findViewById(R.id.deleteBtn)
-
-        deleteBtn.setOnClickListener {
-            val (id, title) = items[position]
-            CoroutineScope(Dispatchers.IO).launch {
-                val successfullyDeletedSource = repository.deleteSource(id, title)
-                if (successfullyDeletedSource) {
-                    items.removeAt(position)
-                    notifyItemRemoved(position)
-                    notifyItemRangeChanged(position, itemCount)
-                } else {
-                    Toast.makeText(
-                        app,
-                        R.string.can_delete_source,
-                        Toast.LENGTH_SHORT,
-                    ).show()
-                }
-            }
-        }
-
-        holder.mView.setOnClickListener {
-            val source = items[position]
-
-            repository.setSelectedSource(source)
-            app.startActivity(Intent(app, UpsertSourceActivity::class.java))
-        }
-
-        if (itm.getIcon(repository.baseUrl).isEmpty()) {
-            binding.itemImage.setBackgroundAndText(itm.title.getHtmlDecoded())
-        } else {
-            c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
-        }
-
-        if (!itm.error.isNullOrBlank()) {
-            binding.errorText.visibility = View.VISIBLE
-            binding.errorText.text = itm.error
-        } else {
-            binding.errorText.visibility = View.GONE
-        }
-
-        binding.sourceTitle.text = itm.title.getHtmlDecoded()
     }
 
     override fun getItemId(position: Int) = position.toLong()
@@ -99,5 +54,73 @@ class SourcesListAdapter(
 
     override fun getItemCount(): Int = items.size
 
-    inner class ViewHolder(val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView)
+    inner class ViewHolder(
+        val binding: SourceListItemBinding,
+    ) : RecyclerView.ViewHolder(binding.root) {
+        private val context: Context = app.applicationContext
+        private val repository: Repository by instance()
+        private val appSettingsService: AppSettingsService by instance()
+
+        fun bind(
+            source: SelfossModel.SourceDetail,
+            position: Int,
+        ) {
+            binding.apply {
+                sourceTitle.text = source.title.getHtmlDecoded()
+                if (source.getIcon(repository.baseUrl).isEmpty()) {
+                    itemImage.setBackgroundAndText(source.title.getHtmlDecoded())
+                } else {
+                    context.circularDrawable(source.getIcon(repository.baseUrl), itemImage, appSettingsService)
+                }
+
+                errorText.apply {
+                    visibility = if (!source.error.isNullOrBlank()) View.VISIBLE else View.GONE
+                    text = source.error
+                }
+
+                deleteBtn.setOnClickListener { showDeleteConfirmationDialog(source, position) }
+
+                root.setOnClickListener {
+                    repository.setSelectedSource(source)
+                    app.startActivity(Intent(app, UpsertSourceActivity::class.java))
+                }
+            }
+        }
+
+        private fun showDeleteConfirmationDialog(
+            source: SelfossModel.SourceDetail,
+            position: Int,
+        ) {
+            AlertDialog
+                .Builder(app)
+                .setTitle(app.getString(R.string.confirm_delete_title))
+                .setMessage(app.getString(R.string.confirm_delete_message, source.title))
+                .setPositiveButton(android.R.string.ok) { _, _ -> deleteSource(source, position) }
+                .setNegativeButton(android.R.string.cancel, null)
+                .show()
+        }
+
+        private fun deleteSource(
+            source: SelfossModel.SourceDetail,
+            position: Int,
+        ) {
+            CoroutineScope(Dispatchers.IO).launch {
+                val successfullyDeletedSource = repository.deleteSource(source.id, source.title)
+                launch(Dispatchers.Main) {
+                    if (successfullyDeletedSource) {
+                        items.removeAt(position)
+                        notifyItemRemoved(position)
+                        notifyItemRangeChanged(position, itemCount)
+                    } else {
+                        Toast
+                            .makeText(
+                                app,
+                                R.string.can_delete_source,
+                                Toast.LENGTH_SHORT,
+                            ).show()
+                    }
+                }
+            }
+        }
+    }
 }

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

@@ -23,11 +23,15 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.kodein.di.DIAware
 import org.kodein.di.instance
-import java.util.*
+import java.util.Timer
 import kotlin.concurrent.schedule
 
-class LoadingWorker(val context: Context, params: WorkerParameters) :
+private const val NOTIFICATION_DELAY = 4000L
-    Worker(context, params),
+
+class LoadingWorker(
+    val context: Context,
+    params: WorkerParameters,
+) : Worker(context, params),
     DIAware {
     override val di by lazy { (applicationContext as MyApp).di }
     private val repository: Repository by instance()
@@ -40,12 +44,13 @@ class LoadingWorker(val context: Context, params: WorkerParameters) :
                     applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
                 val notification =
-                    NotificationCompat.Builder(applicationContext, AppSettingsService.syncChannelId)
+                    NotificationCompat
+                        .Builder(applicationContext, AppSettingsService.SYNC_CHANNEL_ID)
                         .setContentTitle(context.getString(R.string.loading_notification_title))
                         .setContentText(context.getString(R.string.loading_notification_text))
                         .setOngoing(true)
                         .setPriority(PRIORITY_LOW)
-                        .setChannelId(AppSettingsService.syncChannelId)
+                        .setChannelId(AppSettingsService.SYNC_CHANNEL_ID)
                         .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
 
                 notificationManager.notify(1, notification.build())
@@ -58,7 +63,7 @@ class LoadingWorker(val context: Context, params: WorkerParameters) :
                         handleNewItemsNotification(apiItems, notificationManager)
                     }
                 }
-                apiItems.map { it.preloadImages(context) }
+                apiItems.map { it.preloadImages(context, appSettingsService) }
             }
         }
         return Result.success()
@@ -87,28 +92,27 @@ class LoadingWorker(val context: Context, params: WorkerParameters) :
                     PendingIntent.getActivity(context, 0, intent, pflags)
 
                 val newItemsNotification =
-                    NotificationCompat.Builder(
+                    NotificationCompat
+                        .Builder(
                             applicationContext,
-                        AppSettingsService.newItemsChannelId,
+                            AppSettingsService.NEW_ITEMS_CHANNEL,
-                    )
+                        ).setContentTitle(context.getString(R.string.new_items_notification_title))
-                        .setContentTitle(context.getString(R.string.new_items_notification_title))
                         .setContentText(
                             context.getString(
                                 R.string.new_items_notification_text,
                                 newSize,
                             ),
-                        )
+                        ).setPriority(PRIORITY_DEFAULT)
-                        .setPriority(PRIORITY_DEFAULT)
+                        .setChannelId(AppSettingsService.NEW_ITEMS_CHANNEL)
-                        .setChannelId(AppSettingsService.newItemsChannelId)
                         .setContentIntent(pendingIntent)
                         .setAutoCancel(true)
                         .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
 
-                Timer("", false).schedule(4000) {
+                Timer("", false).schedule(NOTIFICATION_DELAY) {
                     notificationManager.notify(2, newItemsNotification.build())
                 }
             }
-            Timer("", false).schedule(4000) {
+            Timer("", false).schedule(NOTIFICATION_DELAY) {
                 notificationManager.cancel(1)
             }
         }

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

@@ -1,17 +1,15 @@
 package bou.amine.apps.readerforselfossv2.android.fragments
 
+import android.content.Context
 import android.content.Intent
-import android.content.res.ColorStateList
 import android.content.res.TypedArray
 import android.graphics.Bitmap
 import android.graphics.Typeface
-import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import android.util.TypedValue
+import android.util.TypedValue.DATA_NULL_UNDEFINED
 import android.view.GestureDetector
 import android.view.InflateException
 import android.view.LayoutInflater
-import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
@@ -21,7 +19,6 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.Fragment
 import bou.amine.apps.readerforselfossv2.android.ImageActivity
 import bou.amine.apps.readerforselfossv2.android.R
@@ -30,25 +27,27 @@ import bou.amine.apps.readerforselfossv2.android.model.ParecelableItem
 import bou.amine.apps.readerforselfossv2.android.model.toModel
 import bou.amine.apps.readerforselfossv2.android.model.toParcelable
 import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.utils.bottombar.addHomeMadeActionItem
+import bou.amine.apps.readerforselfossv2.android.utils.getColorFromAttr
+import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapFitCenter
 import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
+import bou.amine.apps.readerforselfossv2.android.utils.glide.getGlideImageForResource
 import bou.amine.apps.readerforselfossv2.android.utils.isUrlValid
+import bou.amine.apps.readerforselfossv2.android.utils.maybeIfContext
 import bou.amine.apps.readerforselfossv2.android.utils.openItemUrlInBrowserAsNewTask
-import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowser
+import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowserAsNewTask
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
 import bou.amine.apps.readerforselfossv2.model.MercuryModel
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.MercuryApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import bou.amine.apps.readerforselfossv2.service.ConnectivityService
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getImages
 import bou.amine.apps.readerforselfossv2.utils.getThumbnail
 import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString
-import com.bumptech.glide.Glide
+import com.leinardi.android.speeddial.SpeedDialView
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.request.RequestOptions
-import com.github.rubensousa.floatingtoolbar.FloatingToolbar
-import com.google.android.material.floatingactionbutton.FloatingActionButton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -63,28 +62,38 @@ import java.util.Locale
 import java.util.concurrent.ExecutionException
 
 private const val IMAGE_JPG = "image/jpg"
+private const val IMAGE_PNG = "image/png"
+private const val IMAGE_WEBP = "image/webp"
 
-class ArticleFragment : Fragment(), DIAware {
+private const val WHITE_COLOR_HEX = 0xFFFFFF
-    private var fontSize: Int = 16
+
+private const val DEFAULT_FONT_SIZE = 16
+
+class ArticleFragment :
+    Fragment(),
+    DIAware {
+    private var colorOnSurface: Int = 0
+    private var colorSurface: Int = 0
+    private var fontSize: Int = DEFAULT_FONT_SIZE
     private lateinit var item: SelfossModel.Item
-    private lateinit var url: String
+    private var url: String? = null
     private lateinit var contentText: String
     private lateinit var contentSource: String
     private lateinit var contentImage: String
     private lateinit var contentTitle: String
     private lateinit var allImages: ArrayList<String>
-    private lateinit var fab: FloatingActionButton
+    private lateinit var fab: SpeedDialView
     private lateinit var textAlignment: String
     private lateinit var binding: FragmentArticleBinding
 
     override val di: DI by closestDI()
     private val repository: Repository by instance()
     private val appSettingsService: AppSettingsService by instance()
+    private val connectivityService: ConnectivityService by instance()
 
     private var typeface: Typeface? = null
     private var resId: Int = 0
     private var font = ""
-    private var staticBar = false
 
     private val mercuryApi: MercuryApi by instance()
 
@@ -96,6 +105,7 @@ class ArticleFragment : Fragment(), DIAware {
         item = pi.toModel()
     }
 
+    @Suppress("detekt:LongMethod")
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -110,10 +120,14 @@ class ArticleFragment : Fragment(), DIAware {
                 e.sendSilentlyWithAcra()
             }
 
+            colorOnSurface = getColorFromAttr(com.google.android.material.R.attr.colorOnSurface)
+            colorSurface = getColorFromAttr(com.google.android.material.R.attr.colorSurface)
+
             contentText = item.content
             contentTitle = item.title.getHtmlDecoded()
             contentImage = item.getThumbnail(repository.baseUrl)
-            contentSource = try {
+            contentSource =
+                try {
                     item.sourceAuthorAndDate()
                 } catch (e: Exception) {
                     e.sendSilentlyWithAcraWithName("Article Fragment parse date")
@@ -122,23 +136,11 @@ class ArticleFragment : Fragment(), DIAware {
             allImages = item.getImages()
 
             fontSize = appSettingsService.getFontSize()
-            staticBar = appSettingsService.isStaticBarEnabled()
             font = appSettingsService.getFont()
 
             refreshAlignment()
 
-            fab = binding.fab
+            handleFloatingToolbar()
-
-            fab.backgroundTintList = ColorStateList.valueOf(resources.getColor(R.color.colorAccent))
-
-            fab.rippleColor = resources.getColor(R.color.colorAccentDark)
-
-            val floatingToolbar: FloatingToolbar = handleFloatingToolbar()
-
-            if (staticBar) {
-                fab.hide()
-                floatingToolbar.show()
-            }
 
             binding.source.text = contentSource
             if (typeface != null) {
@@ -146,37 +148,20 @@ class ArticleFragment : Fragment(), DIAware {
             }
 
             handleContent()
-
-            binding.nestedScrollView.setOnScrollChangeListener(
-                NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
-                    if (scrollY > oldScrollY) {
-                        floatingToolbar.hide()
-                        fab.hide()
-                    } else {
-                        if (staticBar) {
-                            floatingToolbar.show()
-                        } else {
-                            if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
-                        }
-                    }
-                },
-            )
         } catch (e: InflateException) {
             e.sendSilentlyWithAcraWithName("webview not available")
-            try {
+            maybeIfContext {
-                AlertDialog.Builder(requireContext())
+                AlertDialog
-                    .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
+                    .Builder(it)
-                    .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
+                    .setMessage(it.getString(R.string.webview_dialog_issue_message))
+                    .setTitle(it.getString(R.string.webview_dialog_issue_title))
                     .setPositiveButton(
                         android.R.string.ok,
                     ) { _, _ ->
                         appSettingsService.disableArticleViewer()
                         requireActivity().finish()
-                    }
+                    }.create()
-                    .create()
                     .show()
-            } catch (e: IllegalStateException) {
-                e.sendSilentlyWithAcraWithName("Context required is null")
             }
         }
 
@@ -185,8 +170,8 @@ class ArticleFragment : Fragment(), DIAware {
 
     private fun handleContent() {
         if (contentText.isEmptyOrNullOrNullString()) {
-            if (repository.isNetworkAvailable()) {
+            if (connectivityService.isNetworkAvailable() && url.isUrlValid()) {
-                getContentFromMercury()
+                getContentFromMercury(url!!)
             }
         } else {
             binding.titleView.text = contentTitle
@@ -198,82 +183,99 @@ class ArticleFragment : Fragment(), DIAware {
 
             if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
                 binding.imageView.visibility = View.VISIBLE
-                Glide
+                maybeIfContext { it.bitmapFitCenter(contentImage, binding.imageView, appSettingsService) }
-                    .with(requireContext())
-                    .asBitmap()
-                    .load(contentImage)
-                    .apply(RequestOptions.fitCenterTransform())
-                    .into(binding.imageView)
             } else {
                 binding.imageView.visibility = View.GONE
             }
         }
     }
 
-    private fun handleFloatingToolbar(): FloatingToolbar {
+    private fun handleFloatingToolbar() {
-        val floatingToolbar: FloatingToolbar = binding.floatingToolbar
+        fab = binding.speedDial
-        if (appSettingsService.getPublicAccess()) {
+        fab.mainFabClosedIconColor = colorOnSurface
-            floatingToolbar.setMenu(R.menu.reader_toolbar_no_read)
+        fab.mainFabOpenedIconColor = colorOnSurface
-        }
-        floatingToolbar.attachFab(fab)
 
-        floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent))
+        maybeIfContext { handleFloatingToolbarActionItems(it) }
 
-        floatingToolbar.setClickListener(
+        fab.setOnActionSelectedListener { actionItem ->
-            object : FloatingToolbar.ItemClickListener {
+            when (actionItem.id) {
-                override fun onItemClick(item: MenuItem) {
-                    when (item.itemId) {
                 R.id.share_action -> requireActivity().shareLink(url, contentTitle)
                 R.id.open_action -> requireActivity().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
                 R.id.unread_action ->
-                            try {
                     if (this@ArticleFragment.item.unread) {
                         CoroutineScope(Dispatchers.IO).launch {
                             repository.markAsRead(this@ArticleFragment.item)
                         }
                         this@ArticleFragment.item.unread = false
-                                    Toast.makeText(
+                        maybeIfContext {
-                                        requireContext(),
+                            Toast
+                                .makeText(
+                                    it,
                                     R.string.marked_as_read,
                                     Toast.LENGTH_LONG,
                                 ).show()
+                        }
                     } else {
                         CoroutineScope(Dispatchers.IO).launch {
                             repository.unmarkAsRead(this@ArticleFragment.item)
                         }
                         this@ArticleFragment.item.unread = true
-                                    Toast.makeText(
+                        maybeIfContext {
-                                        context,
+                            Toast
+                                .makeText(
+                                    it,
                                     R.string.marked_as_unread,
                                     Toast.LENGTH_LONG,
                                 ).show()
                         }
-                            } catch (e: IllegalStateException) {
-                                e.sendSilentlyWithAcraWithName("Context required is null")
                     }
 
                 else -> Unit
             }
+            false
+        }
     }
 
-                override fun onItemLongClick(item: MenuItem?) {
+    private fun handleFloatingToolbarActionItems(c: Context) {
-                    // We do nothing
+        fab.addHomeMadeActionItem(
-                }
+            R.id.share_action,
-            },
+            resources.getDrawable(R.drawable.ic_share_white_24dp),
+            R.string.reader_action_share,
+            colorOnSurface,
+            colorSurface,
+            c,
+        )
+        fab.addHomeMadeActionItem(
+            R.id.open_action,
+            resources.getDrawable(R.drawable.ic_open_in_browser_white_24dp),
+            R.string.reader_action_open,
+            colorOnSurface,
+            colorSurface,
+            c,
+        )
+        fab.addHomeMadeActionItem(
+            R.id.unread_action,
+            resources.getDrawable(R.drawable.ic_baseline_white_eye_24dp),
+            R.string.unmark,
+            colorOnSurface,
+            colorSurface,
+            c,
         )
-        return floatingToolbar
     }
 
-    private fun refreshAlignment() {
+    fun refreshAlignment() {
         textAlignment =
             when (appSettingsService.getActiveAllignment()) {
                 1 -> "justify"
                 2 -> "left"
                 else -> "justify"
             }
+
+        htmlToWebview()
     }
 
-    private fun getContentFromMercury() {
+    @Suppress("detekt:SwallowedException")
+    private fun getContentFromMercury(url: String) {
         binding.progressBar.visibility = View.VISIBLE
 
         CoroutineScope(Dispatchers.Main).launch {
@@ -311,17 +313,12 @@ class ArticleFragment : Fragment(), DIAware {
         }
     }
 
-    private fun handleLeadImage(lead_image_url: String?) {
+    private fun handleLeadImage(leadImageUrl: String?) {
-        if (!lead_image_url.isNullOrEmpty() && context != null) {
+        if (!leadImageUrl.isNullOrEmpty()) {
+            maybeIfContext {
                 binding.imageView.visibility = View.VISIBLE
-            Glide
+                it.bitmapFitCenter(leadImageUrl, binding.imageView, appSettingsService)
-                .with(requireContext())
+            }
-                .asBitmap()
-                .load(
-                    lead_image_url,
-                )
-                .apply(RequestOptions.fitCenterTransform())
-                .into(binding.imageView)
         } else {
             binding.imageView.visibility = View.GONE
         }
@@ -334,124 +331,121 @@ class ArticleFragment : Fragment(), DIAware {
                 override fun shouldOverrideUrlLoading(
                     view: WebView?,
                     url: String,
-                ): Boolean {
+                ): Boolean =
-                    return if (context != null && url.isUrlValid() && binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+                    if (url.isUrlValid() &&
-                        requireContext().openUrlInBrowser(url)
+                        binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
+                    ) {
+                        maybeIfContext { it.openUrlInBrowserAsNewTask(url) }
                         true
                     } else {
                         false
                     }
-                }
 
+                @Suppress("detekt:SwallowedException", "detekt:ReturnCount")
                 @Deprecated("Deprecated in Java")
                 override fun shouldInterceptRequest(
                     view: WebView,
                     url: String,
                 ): WebResourceResponse? {
-                    val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
+                    val (mime: String?, compression: Bitmap.CompressFormat) =
-                    if (url.lowercase(Locale.US).contains(".jpg") ||
+                        if (url
-                        url.lowercase(Locale.US)
+                                .lowercase(Locale.US)
-                            .contains(".jpeg")
+                                .contains(".jpg") ||
+                            url.lowercase(Locale.US).contains(".jpeg")
                         ) {
-                        try {
+                            Pair(IMAGE_JPG, Bitmap.CompressFormat.JPEG)
-                            val image =
-                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit()
-                                    .get()
-                            return WebResourceResponse(
-                                IMAGE_JPG,
-                                "UTF-8",
-                                getBitmapInputStream(image, Bitmap.CompressFormat.JPEG),
-                            )
-                        } catch (e: ExecutionException) {
-                            // Do nothing
-                        }
                         } else if (url.lowercase(Locale.US).contains(".png")) {
-                        try {
+                            Pair(IMAGE_PNG, Bitmap.CompressFormat.PNG)
-                            val image =
-                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit()
-                                    .get()
-                            return WebResourceResponse(
-                                IMAGE_JPG,
-                                "UTF-8",
-                                getBitmapInputStream(image, Bitmap.CompressFormat.PNG),
-                            )
-                        } catch (e: ExecutionException) {
-                            // Do nothing
-                        }
                         } else if (url.lowercase(Locale.US).contains(".webp")) {
-                        try {
+                            Pair(IMAGE_WEBP, Bitmap.CompressFormat.WEBP)
-                            val image =
+                        } else {
-                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit()
+                            return super.shouldInterceptRequest(view, url)
-                                    .get()
-                            return WebResourceResponse(
-                                IMAGE_JPG,
-                                "UTF-8",
-                                getBitmapInputStream(image, Bitmap.CompressFormat.WEBP),
-                            )
-                        } catch (e: ExecutionException) {
-                            // Do nothing
-                        }
                         }
 
+                    try {
+                        val image = view.getGlideImageForResource(url, appSettingsService)
+                        return WebResourceResponse(
+                            mime,
+                            "UTF-8",
+                            getBitmapInputStream(image, compression),
+                        )
+                    } catch (e: ExecutionException) {
                         return super.shouldInterceptRequest(view, url)
                     }
                 }
             }
+    }
 
+    @Suppress("detekt:LongMethod", "detekt:ImplicitDefaultLocale")
     private fun htmlToWebview() {
-        try {
+        maybeIfContext {
             val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
-            val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
+            val a: TypedArray = it.obtainStyledAttributes(resId, attrs)
 
             binding.webcontent.settings.standardFontFamily = a.getString(0)
+            ""
+        }
         binding.webcontent.visibility = View.VISIBLE
 
-            val colorOnSurface = TypedValue()
+        val colorSurfaceString =
-            requireContext().theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true)
+            String.format(
+                "#%06X",
+                WHITE_COLOR_HEX and (if (colorSurface != DATA_NULL_UNDEFINED) colorSurface else WHITE_COLOR_HEX),
+            )
 
-            val colorSurface = TypedValue()
+        val colorOnSurfaceString =
-            requireContext().theme.resolveAttribute(R.attr.colorSurface, colorSurface, true)
+            String.format(
+                "#%06X",
+                WHITE_COLOR_HEX and (if (colorOnSurface != DATA_NULL_UNDEFINED) colorOnSurface else 0),
+            )
 
         binding.webcontent.settings.useWideViewPort = true
         binding.webcontent.settings.loadWithOverviewMode = true
         binding.webcontent.settings.javaScriptEnabled = false
 
         handleImageLoading()
-
+        try {
             val gestureDetector =
                 GestureDetector(
                     activity,
                     object : GestureDetector.SimpleOnGestureListener() {
-                        override fun onSingleTapUp(e: MotionEvent): Boolean {
+                        override fun onSingleTapUp(e: MotionEvent): Boolean = performClick()
-                            return performClick()
-                        }
                     },
                 )
 
-            binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event) }
+            binding.webcontent.setOnTouchListener { _, event ->
+                gestureDetector.onTouchEvent(
+                    event,
+                )
+            }
+        } catch (e: IllegalStateException) {
+            e.sendSilentlyWithAcraWithName("Gesture detector issue ?")
+            return
+        }
 
         binding.webcontent.settings.layoutAlgorithm =
             WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
 
         var baseUrl: String? = null
-
         try {
-                val itemUrl = URL(url)
+            val itemUrl = URL(url.orEmpty())
             baseUrl = itemUrl.protocol + "://" + itemUrl.host
         } catch (e: MalformedURLException) {
-                e.sendSilentlyWithAcraWithName("htmlToWebview > $url")
+            e.sendSilentlyWithAcraWithName("htmlToWebview > ${url.orEmpty()}")
         }
 
-            val fontName =
+        val fontName: String =
+            maybeIfContext {
                 when (font) {
-                    getString(R.string.open_sans_font_id) -> "Open Sans"
+                    it.getString(R.string.open_sans_font_id) -> "Open Sans"
-                    getString(R.string.roboto_font_id) -> "Roboto"
+                    it.getString(R.string.roboto_font_id) -> "Roboto"
-                    getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
+                    it.getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
                     else -> ""
                 }
+            }?.toString().orEmpty()
 
         val fontLinkAndStyle =
-                if (font.isNotEmpty()) {
+            if (fontName.isNotEmpty()) {
                 """<link href="https://fonts.googleapis.com/css?family=${
                     fontName.replace(
                         " ",
@@ -467,7 +461,7 @@ class ArticleFragment : Fragment(), DIAware {
             } else {
                 ""
             }
-
+        try {
             binding.webcontent.loadDataWithBaseURL(
                 baseUrl,
                 """<html>
@@ -484,12 +478,12 @@ class ArticleFragment : Fragment(), DIAware {
                 |        color: ${
                     String.format(
                         "#%06X",
-                        0xFFFFFF and resources.getColor(R.color.colorAccent),
+                        WHITE_COLOR_HEX and (maybeIfContext { it.resources.getColor(R.color.colorAccent) } as Int),
                     )
                 } !important;
                 |      }
                 |      *:not(a) {
-                |        color: ${String.format("#%06X", 0xFFFFFF and colorOnSurface.data)};
+                |        color: $colorOnSurfaceString;
                 |      }
                 |      * {
                 |        font-size: ${fontSize}px;
@@ -497,26 +491,11 @@ class ArticleFragment : Fragment(), DIAware {
                 |        word-break: break-word;
                 |        overflow:hidden;
                 |        line-height: 1.5em;
-                |        background-color: ${
+                |        background-color: $colorSurfaceString;
-                    String.format(
-                        "#%06X",
-                        0xFFFFFF and colorSurface.data,
-                    )
-                };
                 |      }
                 |      body, html {
-                |        background-color: ${
+                |        background-color: $colorSurfaceString !important;
-                    String.format(
+                |        border-color: $colorSurfaceString  !important;
-                        "#%06X",
-                        0xFFFFFF and colorSurface.data,
-                    )
-                } !important;
-                |        border-color: ${
-                    String.format(
-                        "#%06X",
-                        0xFFFFFF and colorSurface.data,
-                    )
-                }  !important;
                 |        padding: 0 !important;
                 |        margin: 0 !important;
                 |      }
@@ -526,12 +505,7 @@ class ArticleFragment : Fragment(), DIAware {
                 |      pre, code {
                 |        white-space: pre-wrap;
                 |        width:100%;
-                |        background-color: ${
+                |        background-color: $colorSurfaceString;
-                    String.format(
-                        "#%06X",
-                        0xFFFFFF and colorSurface.data,
-                    )
-                };
                 |      }
                 |   </style>
                 |   $fontLinkAndStyle
@@ -545,26 +519,24 @@ class ArticleFragment : Fragment(), DIAware {
                 null,
             )
         } catch (e: IllegalStateException) {
-            e.sendSilentlyWithAcraWithName("Context required is null")
+            e.sendSilentlyWithAcraWithName("Context required is still null ?")
         }
     }
 
-    fun scrollDown() {
+    fun volumeButtonScrollDown() {
         val height = binding.nestedScrollView.measuredHeight
         binding.nestedScrollView.smoothScrollBy(0, height / 2)
     }
 
-    fun scrollUp() {
+    fun volumeButtonScrollUp() {
         val height = binding.nestedScrollView.measuredHeight
         binding.nestedScrollView.smoothScrollBy(0, -height / 2)
     }
 
     private fun openInBrowserAfterFailing() {
         binding.progressBar.visibility = View.GONE
-        try {
+        maybeIfContext {
-            requireContext().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
+            it.openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
-        } catch (e: IllegalStateException) {
-            e.sendSilentlyWithAcraWithName("Context required is null")
         }
     }
 
@@ -581,7 +553,8 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     fun performClick(): Boolean {
-        if (allImages != null && (
+        if (allImages != null &&
+            (
                 binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
                     binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
             )

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

@@ -1,6 +1,5 @@
 package bou.amine.apps.readerforselfossv2.android.fragments
 
-import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
@@ -16,11 +15,13 @@ 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.utils.acra.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.utils.glide.imageIntoViewTarget
+import bou.amine.apps.readerforselfossv2.android.utils.maybeIfContext
 import bou.amine.apps.readerforselfossv2.repository.Repository
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.getColorHexCode
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
-import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.ViewTarget
 import com.bumptech.glide.request.transition.Transition
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
@@ -33,10 +34,15 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.x.closestDI
 import org.kodein.di.instance
 
-class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
+private const val DRAWABLE_SIZE = 30
+
+class FilterSheetFragment :
+    BottomSheetDialogFragment(),
+    DIAware {
     private lateinit var binding: FilterFragmentBinding
     override val di: DI by closestDI()
     private val repository: Repository by instance()
+    private val appSettingsService: AppSettingsService by instance()
 
     private var selectedChip: Chip? = null
 
@@ -54,8 +60,8 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
 
         try {
             CoroutineScope(Dispatchers.Main).launch {
-                handleTagChips(requireContext())
+                handleTagChips()
-                handleSourceChips(requireContext())
+                handleSourceChips()
 
                 binding.progressBar2.visibility = GONE
                 binding.filterView.visibility = VISIBLE
@@ -73,16 +79,24 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
         return binding.root
     }
 
-    private suspend fun handleSourceChips(context: Context) {
+    private suspend fun handleSourceChips() {
         val sourceGroup = binding.sourcesGroup
 
         repository.getSourcesDetailsOrStats().forEachIndexed { _, source ->
-            val c = Chip(context)
+            val c: Chip? =
+                maybeIfContext {
+                    Chip(it)
+                } as Chip?
+
+            if (c == null) {
+                return
+            }
+
             c.ellipsize = TextUtils.TruncateAt.END
 
-            Glide.with(context)
+            maybeIfContext {
-                .load(source.getIcon(repository.baseUrl))
+                it.imageIntoViewTarget(
-                .into(
+                    source.getIcon(repository.baseUrl),
                     object : ViewTarget<Chip?, Drawable?>(c) {
                         override fun onResourceReady(
                             resource: Drawable,
@@ -95,7 +109,9 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
                             }
                         }
                     },
+                    appSettingsService,
                 )
+            }
 
             c.text = source.title.getHtmlDecoded()
 
@@ -131,13 +147,17 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
         }
     }
 
-    private suspend fun handleTagChips(context: Context) {
+    private suspend fun handleTagChips() {
         val tagGroup = binding.tagsGroup
 
         val tags = repository.getTags()
 
         tags.forEachIndexed { _, tag ->
-            val c = Chip(context)
+            val c: Chip? = maybeIfContext { Chip(it) } as Chip?
+            if (c == null) {
+                return
+            }
+
             c.ellipsize = TextUtils.TruncateAt.END
             c.text = tag.tag
 
@@ -153,8 +173,8 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
                         }
                     gd.setColor(gdColor)
                     gd.shape = GradientDrawable.RECTANGLE
-                    gd.setSize(30, 30)
+                    gd.setSize(DRAWABLE_SIZE, DRAWABLE_SIZE)
-                    gd.cornerRadius = 30F
+                    gd.cornerRadius = DRAWABLE_SIZE.toFloat()
                     c.chipIcon = gd
                 } catch (e: Exception) {
                     e.sendSilentlyWithAcraWithName("tags > GradientDrawable")

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

@@ -6,15 +6,21 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import bou.amine.apps.readerforselfossv2.android.databinding.FragmentImageBinding
-import com.bumptech.glide.Glide
+import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapWithCache
-import com.bumptech.glide.load.engine.DiskCacheStrategy
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import com.bumptech.glide.request.RequestOptions
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+import org.kodein.di.android.x.closestDI
+import org.kodein.di.instance
 
-class ImageFragment : Fragment() {
+class ImageFragment :
+    Fragment(),
+    DIAware {
+    override val di: DI by closestDI()
+    private val appSettingsService: AppSettingsService by instance()
     private lateinit var imageUrl: String
-    private val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
     private var _binding: FragmentImageBinding? = null
-    private val binding get() = _binding
+    val binding get() = _binding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -31,11 +37,7 @@ class ImageFragment : Fragment() {
         val view = binding?.root
 
         binding!!.photoView.visibility = View.VISIBLE
-        Glide.with(requireActivity())
+        requireActivity().bitmapWithCache(imageUrl, binding!!.photoView, appSettingsService)
-            .asBitmap()
-            .apply(glideOptions)
-            .load(imageUrl)
-            .into(binding!!.photoView)
 
         return view
     }

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

@@ -3,23 +3,21 @@ package bou.amine.apps.readerforselfossv2.android.model
 import android.content.Context
 import android.webkit.URLUtil
 import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.utils.glide.preloadImage
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.getImages
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.request.RequestOptions
 
-fun SelfossModel.Item.preloadImages(context: Context): Boolean {
+fun SelfossModel.Item.preloadImages(
+    context: Context,
+    appSettingsService: AppSettingsService,
+): Boolean {
     val imageUrls = this.getImages()
 
-    val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL).timeout(10000)
-
     try {
         for (url in imageUrls) {
             if (URLUtil.isValidUrl(url)) {
-                Glide.with(context).asBitmap()
+                context.preloadImage(url, appSettingsService)
-                    .apply(glideOptions)
-                    .load(url).submit()
             }
         }
     } catch (e: Error) {

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

@@ -17,12 +17,19 @@ import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySettingsBin
 import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowser
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService.Companion.API_ITEMS_NUMBER
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService.Companion.CURRENT_THEME
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService.Companion.READER_FONT_SIZE
 import com.mikepenz.aboutlibraries.LibsBuilder
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 
 private const val TITLE_TAG = "settingsActivityTitle"
 
+const val MAX_ITEMS_NUMBER = 200
+
+private const val MIN_ITEMS_NUMBER = 1
+
 class SettingsActivity :
     AppCompatActivity(),
     PreferenceFragmentCompat.OnPreferenceStartFragmentCallback,
@@ -61,15 +68,14 @@ class SettingsActivity :
         outState.putCharSequence(TITLE_TAG, title)
     }
 
-    override fun onSupportNavigateUp(): Boolean {
+    override fun onSupportNavigateUp(): Boolean =
-        return if (supportFragmentManager.popBackStackImmediate()) {
+        if (supportFragmentManager.popBackStackImmediate()) {
             supportActionBar?.title = getText(R.string.title_activity_settings)
             false
         } else {
             super.onBackPressed()
             true
         }
-    }
 
     override fun onPreferenceStartFragment(
         caller: PreferenceFragmentCompat,
@@ -78,7 +84,8 @@ class SettingsActivity :
         // Instantiate the new Fragment
         val args = pref.extras
         val fragment =
-            supportFragmentManager.fragmentFactory.instantiate(
+            supportFragmentManager.fragmentFactory
+                .instantiate(
                     classLoader,
                     pref.fragment.toString(),
                 ).apply {
@@ -86,7 +93,8 @@ class SettingsActivity :
                     setTargetFragment(caller, 0)
                 }
         // Replace the existing Fragment with the new Fragment
-        supportFragmentManager.beginTransaction()
+        supportFragmentManager
+            .beginTransaction()
             .replace(R.id.settings, fragment)
             .addToBackStack(null)
             .commit()
@@ -102,10 +110,10 @@ class SettingsActivity :
         ) {
             setPreferencesFromResource(R.xml.pref_main, rootKey)
 
-            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener =
+            preferenceManager.findPreference<Preference>(CURRENT_THEME)?.onPreferenceChangeListener =
                 Preference.OnPreferenceChangeListener { _, newValue ->
                     AppCompatDelegate.setDefaultNightMode(
-                        newValue.toString().toInt()
+                        newValue.toString().toInt(),
                     ) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
                     true
                 }
@@ -131,7 +139,7 @@ class SettingsActivity :
             setPreferencesFromResource(R.xml.pref_general, rootKey)
 
             val editTextPreference =
-                preferenceManager.findPreference<EditTextPreference>("prefer_api_items_number")
+                preferenceManager.findPreference<EditTextPreference>(API_ITEMS_NUMBER)
             editTextPreference?.setOnBindEditTextListener { editText ->
                 editText.inputType = InputType.TYPE_CLASS_NUMBER
                 editText.filters =
@@ -139,12 +147,13 @@ class SettingsActivity :
                         InputFilter { source, _, _, dest, _, _ ->
                             try {
                                 val input: Int = (dest.toString() + source.toString()).toInt()
-                                if (input in 1..200) return@InputFilter null
+                                if (input in MIN_ITEMS_NUMBER..MAX_ITEMS_NUMBER) return@InputFilter null
                             } catch (nfe: NumberFormatException) {
-                                Toast.makeText(
+                                Toast
+                                    .makeText(
                                         activity,
                                         R.string.items_number_should_be_number,
-                                    Toast.LENGTH_LONG
+                                        Toast.LENGTH_LONG,
                                     ).show()
                             }
                             ""
@@ -161,7 +170,7 @@ class SettingsActivity :
         ) {
             setPreferencesFromResource(R.xml.pref_viewer, rootKey)
 
-            val fontSize = preferenceManager.findPreference<EditTextPreference>("reader_font_size")
+            val fontSize = preferenceManager.findPreference<EditTextPreference>(READER_FONT_SIZE)
             fontSize?.setOnBindEditTextListener { editText ->
                 editText.inputType = InputType.TYPE_CLASS_NUMBER
                 editText.addTextChangedListener {
@@ -218,23 +227,6 @@ class SettingsActivity :
         }
     }
 
-    class ThemePreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
-            setPreferencesFromResource(R.xml.pref_theme, rootKey)
-
-            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener =
-                Preference.OnPreferenceChangeListener { _, newValue ->
-                    AppCompatDelegate.setDefaultNightMode(
-                        newValue.toString().toInt()
-                    ) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
-                    true
-                }
-        }
-    }
-
     class LinksPreferenceFragment : PreferenceFragmentCompat() {
         private fun openUrl(url: String) {
             context?.openUrlInBrowser(url)
@@ -248,19 +240,19 @@ class SettingsActivity :
 
             preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener =
                 Preference.OnPreferenceClickListener {
-                    openUrl(AppSettingsService.trackerUrl)
+                    openUrl(AppSettingsService.BUG_URL)
                     true
                 }
 
             preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener =
                 Preference.OnPreferenceClickListener {
-                    openUrl(AppSettingsService.sourceUrl)
+                    openUrl(AppSettingsService.SOURCE_URL)
                     false
                 }
 
             preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener =
                 Preference.OnPreferenceClickListener {
-                    openUrl(AppSettingsService.translationUrl)
+                    openUrl(AppSettingsService.TRANSLATION_URL)
                     false
                 }
         }

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

@@ -3,7 +3,6 @@ package bou.amine.apps.readerforselfossv2.android.testing
 import androidx.test.espresso.idling.CountingIdlingResource
 
 object CountingIdlingResourceSingleton {
-
     private const val RESOURCE = "GLOBAL"
 
     @JvmField

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

@@ -2,7 +2,6 @@ package bou.amine.apps.readerforselfossv2.android.testing
 
 import android.os.Build
 
-
 class TestingHelper {
     fun isUnitTest(): Boolean {
         var device = Build.DEVICE

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

@@ -2,23 +2,60 @@ package bou.amine.apps.readerforselfossv2.android.utils
 
 import android.content.Context
 import android.content.Intent
+import android.util.TypedValue
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+import androidx.fragment.app.Fragment
 import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
 
 fun Context.shareLink(
-    itemUrl: String,
+    itemUrl: String?,
     itemTitle: String,
 ) {
+    if (itemUrl.isUrlValid()) {
         val sendIntent = Intent()
         sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
         sendIntent.action = Intent.ACTION_SEND
-    sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl.toStringUriWithHttp())
+        sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl!!.toStringUriWithHttp())
         sendIntent.putExtra(Intent.EXTRA_SUBJECT, itemTitle)
         sendIntent.type = "text/plain"
         startActivity(
-        Intent.createChooser(
+            Intent
+                .createChooser(
                     sendIntent,
                     getString(R.string.share),
                 ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
         )
     }
+}
+
+@ColorInt
+fun Fragment.getColorFromAttr(
+    @AttrRes attrColor: Int,
+    resolveRefs: Boolean = true,
+): Int {
+    val typedValue = TypedValue()
+    maybeIfContextWithLog { this.requireContext().theme.resolveAttribute(attrColor, typedValue, resolveRefs) }
+    return typedValue.data
+}
+
+@Suppress("detekt:SwallowedException")
+fun Fragment.maybeIfContext(fn: (Context) -> Any): Any? {
+    try {
+        return fn(this.requireContext())
+    } catch (e: Exception) {
+        // Do nothing
+        return null
+    }
+}
+
+fun Fragment.maybeIfContextWithLog(fn: (Context) -> Any): Any? {
+    try {
+        return fn(this.requireContext())
+    } catch (e: Exception) {
+        e.sendSilentlyWithAcraWithName("Fragment context issue...")
+        return null
+    }
+}

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

@@ -59,7 +59,5 @@ class CircleImageView
             textView.text = text.toTextDrawableString()
         }
 
-        private fun colorFromIdentifier(key: String): Int {
+        private fun colorFromIdentifier(key: String): Int = colorScheme[abs(key.hashCode()) % colorScheme.size]
-            return colorScheme[abs(key.hashCode()) % colorScheme.size]
-        }
     }

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

@@ -15,18 +15,18 @@ import android.widget.Toast
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.ReaderActivity
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
-import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
+import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
-
 fun Context.openItemUrl(
     currentItem: Int,
-    linkDecoded: String,
+    linkDecoded: String?,
     articleViewer: Boolean,
     app: Activity,
 ) {
     if (!linkDecoded.isUrlValid()) {
-        Toast.makeText(
+        Toast
+            .makeText(
                 this,
                 this.getString(R.string.cant_open_invalid_url),
                 Toast.LENGTH_LONG,
@@ -37,13 +37,13 @@ fun Context.openItemUrl(
             intent.putExtra("currentItem", currentItem)
             app.startActivity(intent)
         } else {
-            this.openUrlInBrowserAsNewTask(linkDecoded)
+            this.openUrlInBrowserAsNewTask(linkDecoded!!)
         }
     }
 }
 
-fun String.isUrlValid(): Boolean =
+fun String?.isUrlValid(): Boolean =
-    this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
+    !this.isEmptyOrNullOrNullString() && this!!.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
 
 fun String.isBaseUrlInvalid(): Boolean {
     val baseUrl = this.toHttpUrlOrNull()
@@ -57,16 +57,17 @@ fun String.isBaseUrlInvalid(): Boolean {
 }
 
 fun Context.openItemUrlInBrowserAsNewTask(i: SelfossModel.Item) {
-    this.openUrlInBrowserAsNewTask(i.getLinkDecoded().toStringUriWithHttp())
+    this.openUrlInBrowserAsNewTask(i.getLinkDecoded())
 }
 
-fun Context.openUrlInBrowserAsNewTask(url: String) {
+fun Context.openUrlInBrowserAsNewTask(url: String?) {
-
+    if (url.isUrlValid()) {
         val intent = Intent(Intent.ACTION_VIEW)
         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
         intent.data = Uri.parse(url)
         this.mayBeStartActivity(intent)
     }
+}
 
 fun Context.openUrlInBrowser(url: String) {
     val intent = Intent(Intent.ACTION_VIEW)
@@ -74,13 +75,13 @@ fun Context.openUrlInBrowser(url: String) {
     this.mayBeStartActivity(intent)
 }
 
+@Suppress("detekt:SwallowedException")
 fun Context.mayBeStartActivity(intent: Intent) {
     try {
         this.startActivity(intent)
     } catch (e: ActivityNotFoundException) {
         Toast.makeText(this, getString(R.string.no_browser), Toast.LENGTH_SHORT).show()
     }
-
 }
 
 class LinkOnTouchListener : View.OnTouchListener {

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/acra/AcraReportingAdministrator.kt

@@ -8,22 +8,19 @@ import org.acra.config.CoreConfiguration
 import org.acra.config.ReportingAdministrator
 import org.acra.data.CrashReportData
 
-
 @AutoService(ReportingAdministrator::class)
 class AcraReportingAdministrator : ReportingAdministrator {
     override fun shouldStartCollecting(
         context: Context,
         config: CoreConfiguration,
-        reportBuilder: ReportBuilder
+        reportBuilder: ReportBuilder,
-    ): Boolean {
+    ): Boolean =
-        return reportBuilder.exception !is DeadSystemException && (reportBuilder.exception != null && reportBuilder.exception!!::class.simpleName != "CannotDeliverBroadcastException")
+        reportBuilder.exception !is DeadSystemException &&
-    }
+            (reportBuilder.exception != null && reportBuilder.exception!!::class.simpleName != "CannotDeliverBroadcastException")
 
     override fun shouldSendReport(
         context: Context,
         config: CoreConfiguration,
-        crashReportData: CrashReportData
+        crashReportData: CrashReportData,
-    ): Boolean {
+    ): Boolean = crashReportData.get("BRAND") != "redroid" && !crashReportData.get("PHONE_MODEL").toString().startsWith("sdk_gphone")
-        return crashReportData.get("BRAND") != "redroid"
-    }
 }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/bottombar/BottomBarUtils.kt

@@ -1,6 +1,13 @@
 package bou.amine.apps.readerforselfossv2.android.utils.bottombar
 
+import android.content.Context
+import android.graphics.drawable.Drawable
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import bou.amine.apps.readerforselfossv2.android.R
 import com.ashokvarma.bottomnavigation.TextBadgeItem
+import com.leinardi.android.speeddial.SpeedDialActionItem
+import com.leinardi.android.speeddial.SpeedDialView
 
 fun TextBadgeItem.removeBadge(): TextBadgeItem {
     this.setText("")
@@ -9,3 +16,25 @@ fun TextBadgeItem.removeBadge(): TextBadgeItem {
 }
 
 fun TextBadgeItem.maybeShow(): TextBadgeItem = if (this.isHidden) this.show() else this
+
+@Suppress("detekt:LongParameterList")
+fun SpeedDialView.addHomeMadeActionItem(
+    @IdRes actionId: Int,
+    actionIcon: Drawable,
+    @StringRes labelId: Int,
+    colorOnSurface: Int,
+    colorSurface: Int,
+    context: Context,
+) {
+    this.addActionItem(
+        SpeedDialActionItem
+            .Builder(actionId, actionIcon)
+            .setFabBackgroundColor(context.resources.getColor(R.color.colorAccent))
+            .setFabImageTintColor(colorOnSurface)
+            .setLabel(context.getString(labelId))
+            .setLabelClickable(false)
+            .setLabelBackgroundColor(colorOnSurface)
+            .setLabelColor(colorSurface)
+            .create(),
+    )
+}

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/glide/GlideUtils.kt

@@ -2,40 +2,135 @@ package bou.amine.apps.readerforselfossv2.android.utils.glide
 
 import android.content.Context
 import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.webkit.WebView
 import android.widget.ImageView
 import bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.load.model.LazyHeaders
 import com.bumptech.glide.request.RequestOptions
+import com.bumptech.glide.request.target.ViewTarget
+import com.google.android.material.chip.Chip
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
+import kotlin.io.encoding.Base64
+import kotlin.io.encoding.ExperimentalEncodingApi
+
+private const val PRELOAD_IMAGE_TIMEOUT = 10000
+
+@Suppress("detekt:ReturnCount")
+@OptIn(ExperimentalEncodingApi::class)
+fun String.toGlideUrl(appSettingsService: AppSettingsService): Any { // GlideUrl Or String
+    if (this.isEmptyOrNullOrNullString()) {
+        return ""
+    }
+    if (appSettingsService.getBasicUserName().isNotEmpty()) {
+        val authString = "${appSettingsService.getBasicUserName()}:${appSettingsService.getBasicPassword()}"
+        val authBuf = Base64.encode(authString.toByteArray(Charsets.UTF_8))
+
+        return GlideUrl(
+            this,
+            LazyHeaders
+                .Builder()
+                .addHeader("Authorization", "Basic $authBuf")
+                .build(),
+        )
+    } else {
+        return GlideUrl(
+            this,
+        )
+    }
+}
+
+fun WebView.getGlideImageForResource(
+    url: String,
+    appSettingsService: AppSettingsService,
+) = Glide
+    .with(this)
+    .asBitmap()
+    .apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL))
+    .load(url.toGlideUrl(appSettingsService))
+    .submit()
+    .get()
+
+fun Context.preloadImage(
+    url: String,
+    appSettingsService: AppSettingsService,
+) = Glide
+    .with(this)
+    .asBitmap()
+    .apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL).timeout(PRELOAD_IMAGE_TIMEOUT))
+    .load(url.toGlideUrl(appSettingsService))
+    .submit()
+
+fun Context.imageIntoViewTarget(
+    url: String,
+    target: ViewTarget<Chip?, Drawable?>,
+    appSettingsService: AppSettingsService,
+) = Glide
+    .with(this)
+    .load(url.toGlideUrl(appSettingsService))
+    .into(target)
+
+fun Context.bitmapWithCache(
+    url: String,
+    iv: ImageView,
+    appSettingsService: AppSettingsService,
+) = Glide
+    .with(this)
+    .asBitmap()
+    .apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL))
+    .load(url.toGlideUrl(appSettingsService))
+    .into(iv)
 
 fun Context.bitmapCenterCrop(
     url: String,
     iv: ImageView,
-) = Glide.with(this)
+    appSettingsService: AppSettingsService,
+) = Glide
+    .with(this)
     .asBitmap()
-    .load(url)
+    .load(url.toGlideUrl(appSettingsService))
     .apply(RequestOptions.centerCropTransform())
     .into(iv)
 
+fun Context.bitmapFitCenter(
+    url: String,
+    iv: ImageView,
+    appSettingsService: AppSettingsService,
+) = Glide
+    .with(this)
+    .asBitmap()
+    .load(url.toGlideUrl(appSettingsService))
+    .apply(RequestOptions.fitCenterTransform())
+    .into(iv)
+
 fun Context.circularDrawable(
     url: String,
     view: CircleImageView,
+    appSettingsService: AppSettingsService,
 ) {
     view.textView.text = ""
 
-    Glide.with(this)
+    Glide
-        .load(url)
+        .with(this)
+        .load(url.toGlideUrl(appSettingsService))
         .into(view.imageView)
 }
 
+private const val BITMAP_INPUT_STREAM_COMPRESSION_QUALITY = 80
+
 fun getBitmapInputStream(
     bitmap: Bitmap,
     compressFormat: Bitmap.CompressFormat,
 ): InputStream {
     val byteArrayOutputStream = ByteArrayOutputStream()
-    bitmap.compress(compressFormat, 80, byteArrayOutputStream)
+    bitmap.compress(compressFormat, BITMAP_INPUT_STREAM_COMPRESSION_QUALITY, byteArrayOutputStream)
     val bitmapData: ByteArray = byteArrayOutputStream.toByteArray()
     return ByteArrayInputStream(bitmapData)
 }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/network/NetworkUtils.kt

@@ -3,7 +3,6 @@ package bou.amine.apps.readerforselfossv2.android.utils.network
 import android.content.Context
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
-import android.os.Build
 import com.google.android.material.snackbar.Snackbar
 
 lateinit var s: Snackbar
@@ -11,9 +10,7 @@ lateinit var s: Snackbar
 fun isNetworkAccessible(context: Context): Boolean {
     val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+    val networkCapabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork) ?: return false
-        val network = connectivityManager.activeNetwork ?: return false
-        val networkCapabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
 
     return when {
         networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> true
@@ -22,8 +19,4 @@ fun isNetworkAccessible(context: Context): Boolean {
         networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
         else -> false
     }
-    } else {
-        val network = connectivityManager.activeNetworkInfo ?: return false
-        return network.isConnectedOrConnecting
-    }
 }

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

@@ -1,31 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.viewmodel
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import bou.amine.apps.readerforselfossv2.repository.Repository
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.launch
-
-class AppViewModel(private val repository: Repository) : ViewModel() {
-    private val _networkAvailableProvider = MutableSharedFlow<Boolean>()
-    val networkAvailableProvider = _networkAvailableProvider.asSharedFlow()
-    private var wasConnected = true
-
-    init {
-        viewModelScope.launch {
-            repository.isConnectionAvailable.collect { isConnected ->
-                if (repository.connectionMonitored) {
-                    if (isConnected && !wasConnected && repository.connectionMonitored) {
-                        _networkAvailableProvider.emit(true)
-                        wasConnected = true
-                    } else if (!isConnected && wasConnected && repository.connectionMonitored)
-                        {
-                            _networkAvailableProvider.emit(false)
-                            wasConnected = false
-                        }
-                }
-            }
-        }
-    }
-}

androidApp/src/main/res/layout/fragment_article.xml

@@ -71,35 +71,13 @@
 
     </androidx.core.widget.NestedScrollView>
 
-    <FrameLayout
+    <com.leinardi.android.speeddial.SpeedDialView
-        android:layout_width="match_parent"
+        android:id="@+id/speedDial"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start|bottom|end"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
-
-        <com.github.rubensousa.floatingtoolbar.FloatingToolbar
-            android:id="@+id/floatingToolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_gravity="bottom"
-            app:floatingMenu="@menu/reader_toolbar" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
+        android:layout_gravity="bottom|end"
-            android:layout_marginEnd="16dp"
+        app:layout_behavior="@string/speeddial_scrolling_view_snackbar_behavior"
-            android:layout_marginBottom="16dp"
+        app:sdMainFabClosedSrc="@drawable/ic_add_white_24dp" />
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:paddingBottom="@dimen/activity_vertical_margin"
-            android:src="@drawable/ic_add_white_24dp"
-            app:backgroundTint="?attr/colorAccent"
-            app:fabSize="mini"
-            app:rippleColor="?attr/colorAccentDark" />
-    </FrameLayout>
 
     <FrameLayout
         android:id="@+id/progressBar"
@@ -119,4 +97,5 @@
             android:progressTint="?attr/colorAccent" />
     </FrameLayout>
 
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

androidApp/src/main/res/menu/reader_toolbar.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/unread_action"
-        android:icon="@drawable/ic_baseline_white_eye_24dp"
-        android:title="@string/unmark"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/open_action"
-        android:icon="@drawable/ic_open_in_browser_white_24dp"
-        android:title="@string/reader_action_open"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/share_action"
-        android:icon="@drawable/ic_share_white_24dp"
-        android:title="@string/reader_action_share"
-        app:showAsAction="ifRoom" />
-
-</menu>

androidApp/src/main/res/values-ca-rES/strings.xml

@@ -24,7 +24,6 @@
     <string name="all_posts_not_read">"No s'han llegit totes les publicacions"</string>
     <string name="all_posts_read">"S'han llegit totes les publicacions"</string>
     <string name="undo_string">"Desfés"</string>
-    <string name="addStringNoUrl">"Inicieu la sessió per afegir fonts."</string>
     <string name="cant_get_sources">"No es pot obtenir la llista de fonts."</string>
     <string name="cant_create_source">"No es pot crear la font."</string>
     <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
@@ -106,11 +105,7 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
     <string name="remove_source">Remove source</string>
-    <string name="pref_theme_title">Light/Dark mode</string>
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
@@ -132,4 +127,6 @@
     <string name="action_about">"Quant a"</string>
     <string name="marked_as_read">"Element llegit"</string>
     <string name="marked_as_unread">"Item unread"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values-de-rDE/strings.xml

@@ -24,7 +24,6 @@
     <string name="all_posts_not_read">"Nicht alle Beiträge wurden gelesen"</string>
     <string name="all_posts_read">"Alle Beiträge wurden gelesen"</string>
     <string name="undo_string">"Rückgängig"</string>
-    <string name="addStringNoUrl">"Melde dich an um Quellen hinzuzufügen."</string>
     <string name="cant_get_sources">"Quellen können nicht abgerufen werden."</string>
     <string name="cant_create_source">"Quelle kann nicht gespeichert werden."</string>
     <string name="cant_get_spouts_no_network">"Fehler beim Laden der Spouts-Liste aufgrund von Netzwerkproblemen."</string>
@@ -106,11 +105,7 @@
     <string name="reader_text_align_left">Linksbündig</string>
     <string name="reader_text_align_justify">Blocksatz</string>
     <string name="settings_reader_font">Schriftgröße im Lesemodus</string>
-    <string name="reader_static_bar_title">Statische untere Leiste im Lesemodus</string>
-    <string name="reader_static_bar_on">Die untere Leiste wird dauerhaft angezeigt</string>
-    <string name="reader_static_bar_off">Die untere Leiste kann über einen schwebenden Button angezeigt werden</string>
     <string name="remove_source">Quelle entfernen</string>
-    <string name="pref_theme_title">Heller/Dunkler Modus</string>
     <string name="mode_dark">Dunkler Modus</string>
     <string name="mode_system">Systemeinstellungen übernehmen</string>
     <string name="mode_light">Heller Modus</string>
@@ -132,4 +127,6 @@
     <string name="action_about">"Über"</string>
     <string name="marked_as_read">"Artikel gelesen"</string>
     <string name="marked_as_unread">"Item unread"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values-es-rES/strings.xml

@@ -24,7 +24,6 @@
     <string name="all_posts_not_read">"No todas las publicaciones fueron leídas"</string>
     <string name="all_posts_read">"Todas las publicaciones fueron leídas"</string>
     <string name="undo_string">"Deshacer"</string>
-    <string name="addStringNoUrl">"Iniciar sesión para añadir fuentes."</string>
     <string name="cant_get_sources">"No se puede obtener la lista de fuentes."</string>
     <string name="cant_create_source">"No se puede crear la fuente."</string>
     <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
@@ -106,11 +105,7 @@
     <string name="reader_text_align_left">Alinear a la izquierda</string>
     <string name="reader_text_align_justify">Justificado</string>
     <string name="settings_reader_font">Modo lectura</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
     <string name="remove_source">Remove source</string>
-    <string name="pref_theme_title">Light/Dark mode</string>
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
@@ -132,4 +127,6 @@
     <string name="action_about">"Acerca de"</string>
     <string name="marked_as_read">"Artículo leído"</string>
     <string name="marked_as_unread">"Artículo no leído"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values-fr-rFR/strings.xml

@@ -24,7 +24,6 @@
     <string name="all_posts_not_read">"Tous les posts n'ont pas été lus"</string>
     <string name="all_posts_read">"Tous les posts sont lus"</string>
     <string name="undo_string">"Annuler"</string>
-    <string name="addStringNoUrl">"Identifiez-vous pour ajouter une source."</string>
     <string name="cant_get_sources">"Impossible de récupérer la liste des sources."</string>
     <string name="cant_create_source">"Impossible de créer la source."</string>
     <string name="cant_get_spouts_no_network">"Impossible d'obtenir la liste des spouts en raison d'un problème de réseau."</string>
@@ -106,11 +105,7 @@
     <string name="reader_text_align_left">Aligner à gauche</string>
     <string name="reader_text_align_justify">Justifier le texte</string>
     <string name="settings_reader_font">Police du lecteur d\'articles</string>
-    <string name="reader_static_bar_title">Barre statique pour le visionneur d\'articles</string>
-    <string name="reader_static_bar_on">La barre sera affichée</string>
-    <string name="reader_static_bar_off">La barre sera affichée grâce au bouton</string>
     <string name="remove_source">Supprimer la source</string>
-    <string name="pref_theme_title">Thème Clair/Sombre</string>
     <string name="mode_dark">Thème sombre</string>
     <string name="mode_system">Utiliser les paramètres système</string>
     <string name="mode_light">Thème clair</string>
@@ -132,4 +127,6 @@
     <string name="action_about">"À propos"</string>
     <string name="marked_as_read">"Marqué comme lu"</string>
     <string name="marked_as_unread">"Marqué comme non lu"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values-gl-rES/strings.xml

@@ -24,7 +24,6 @@
     <string name="all_posts_not_read">"Non se leron todas as publicacións"</string>
     <string name="all_posts_read">"Leronse todas as publicacións"</string>
     <string name="undo_string">"Desfacer"</string>
-    <string name="addStringNoUrl">"Accede pra engadir fontes."</string>
     <string name="cant_get_sources">"Non se pode obter a lista de fontes."</string>
     <string name="cant_create_source">"Non se pode crear unha fonte."</string>
     <string name="cant_get_spouts_no_network">"Non se pode obter a lista de spouts por mor dun erro de rede."</string>
@@ -106,11 +105,7 @@
     <string name="reader_text_align_left">Aliñar á esquerda</string>
     <string name="reader_text_align_justify">Xustificado</string>
     <string name="settings_reader_font">Modo lector</string>
-    <string name="reader_static_bar_title">Barra inferior estática na vista de artigos</string>
-    <string name="reader_static_bar_on">A barra inferior mostrarase sempre</string>
-    <string name="reader_static_bar_off">A barra inferior pode mostrarse a través do botón flotante</string>
     <string name="remove_source">Eliminar fonte</string>
-    <string name="pref_theme_title">Modo Claro/Escuro</string>
     <string name="mode_dark">Modo escuro</string>
     <string name="mode_system">Seguir axustes do sistema</string>
     <string name="mode_light">Modo claro</string>
@@ -132,4 +127,6 @@
     <string name="action_about">"Acerca de"</string>
     <string name="marked_as_read">"Elemento lido"</string>
     <string name="marked_as_unread">"Elemento non lido"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values-in-rID/strings.xml

@@ -24,7 +24,6 @@
     <string name="all_posts_not_read">"Semua pos belum dibaca"</string>
     <string name="all_posts_read">"Semua pos sudah dibaca"</string>
     <string name="undo_string">"Urung"</string>
-    <string name="addStringNoUrl">"Masuk untuk menambah sumber."</string>
     <string name="cant_get_sources">"Tidak bisa mendapatkan daftar sumber."</string>
     <string name="cant_create_source">"Tidak dapat membuat sumber."</string>
     <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
@@ -106,11 +105,7 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
     <string name="remove_source">Remove source</string>
-    <string name="pref_theme_title">Light/Dark mode</string>
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
@@ -132,4 +127,6 @@
     <string name="action_about">"Tentang"</string>
     <string name="marked_as_read">"Membaca item"</string>
     <string name="marked_as_unread">"Item unread"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values-it-rIT/strings.xml

@@ -24,7 +24,6 @@
     <string name="all_posts_not_read">"All posts weren't read"</string>
     <string name="all_posts_read">"Tutti i messaggi sono stati letti"</string>
     <string name="undo_string">"Annulla"</string>
-    <string name="addStringNoUrl">"Autenticati per aggiungere fonti."</string>
     <string name="cant_get_sources">"Can't get sources list."</string>
     <string name="cant_create_source">"Can't create source."</string>
     <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
@@ -106,11 +105,7 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
     <string name="remove_source">Remove source</string>
-    <string name="pref_theme_title">Light/Dark mode</string>
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
@@ -132,4 +127,6 @@
     <string name="action_about">"Informazioni"</string>
     <string name="marked_as_read">"Articolo letto"</string>
     <string name="marked_as_unread">"Item unread"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values-ko-rKR/strings.xml

@@ -24,7 +24,6 @@
     <string name="all_posts_not_read">"모든 게시물을 읽지 않았습니다."</string>
     <string name="all_posts_read">"모든 게시물을 읽었습니다."</string>
     <string name="undo_string">"실행 취소"</string>
-    <string name="addStringNoUrl">"로그인 소스를 추가 해야 합니다."</string>
     <string name="cant_get_sources">"소스 리스트를 얻을 수 없습니다."</string>
     <string name="cant_create_source">"소스를 만들 수 없습니다."</string>
     <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
@@ -106,11 +105,7 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
     <string name="remove_source">Remove source</string>
-    <string name="pref_theme_title">Light/Dark mode</string>
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
@@ -132,4 +127,6 @@
     <string name="action_about">"정보"</string>
     <string name="marked_as_read">"항목 읽기"</string>
     <string name="marked_as_unread">"Item unread"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values-nl-rNL/strings.xml

@@ -23,7 +23,7 @@
     <string name="wrong_infos">"Controleer de gegevens nogmaals."</string>
     <string name="all_posts_not_read">"Fout bij markeren als gelezen"</string>
     <string name="all_posts_read">"Alle artikelen gemarkeerd als gelezen"</string>
-    <string name="addStringNoUrl">"Login om bronnen toe te voegen"</string>
+    <string name="undo_string">"Ongedaan maken"</string>
     <string name="cant_get_sources">"Kan de lijst met bronnen niet ophalen"</string>
     <string name="cant_create_source">"Kan bron niet creëeren"</string>
     <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
@@ -105,11 +105,7 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
     <string name="remove_source">Remove source</string>
-    <string name="pref_theme_title">Light/Dark mode</string>
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
@@ -131,5 +127,6 @@
     <string name="action_about">"Over"</string>
     <string name="marked_as_read">"Artikel gelezen"</string>
     <string name="marked_as_unread">"Item unread"</string>
-    <string name="undo_string">"Ongedaan maken"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values-pt-rBR/strings.xml

@@ -24,7 +24,6 @@
     <string name="all_posts_not_read">"Nenhum post foi lido"</string>
     <string name="all_posts_read">"Todos os posts foram lidos"</string>
     <string name="undo_string">"Desfazer"</string>
-    <string name="addStringNoUrl">"Faça login para adicionar fontes."</string>
     <string name="cant_get_sources">"Não é possível obter a lista de fontes."</string>
     <string name="cant_create_source">"Não é possível criar fonte."</string>
     <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
@@ -106,11 +105,7 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
     <string name="remove_source">Remove source</string>
-    <string name="pref_theme_title">Light/Dark mode</string>
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
@@ -132,4 +127,6 @@
     <string name="action_about">"Sobre"</string>
     <string name="marked_as_read">"Item lido"</string>
     <string name="marked_as_unread">"Item unread"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values-pt-rPT/strings.xml

@@ -24,7 +24,6 @@
     <string name="all_posts_not_read">"Todas as postagens não foram lidas"</string>
     <string name="all_posts_read">"Todas as postagens foram lidas"</string>
     <string name="undo_string">"Desfazer"</string>
-    <string name="addStringNoUrl">"Logar para adicionar fontes."</string>
     <string name="cant_get_sources">"Não é possível obter a lista de fontes."</string>
     <string name="cant_create_source">"Não é possível criar a fonte."</string>
     <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
@@ -106,11 +105,7 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
     <string name="remove_source">Remove source</string>
-    <string name="pref_theme_title">Light/Dark mode</string>
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
@@ -132,4 +127,6 @@
     <string name="action_about">"Sobre"</string>
     <string name="marked_as_read">"Item lido"</string>
     <string name="marked_as_unread">"Item unread"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values-si-rLK/strings.xml

@@ -24,7 +24,6 @@
     <string name="all_posts_not_read">"All posts weren't read"</string>
     <string name="all_posts_read">"All posts were read"</string>
     <string name="undo_string">"Undo"</string>
-    <string name="addStringNoUrl">"Log in to add sources."</string>
     <string name="cant_get_sources">"Can't get sources list."</string>
     <string name="cant_create_source">"Can't create source."</string>
     <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
@@ -106,11 +105,7 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
     <string name="remove_source">Remove source</string>
-    <string name="pref_theme_title">Light/Dark mode</string>
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
@@ -132,4 +127,6 @@
     <string name="action_about">"මේ ගැන"</string>
     <string name="marked_as_read">"Item read"</string>
     <string name="marked_as_unread">"Item unread"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values-tr-rTR/strings.xml

@@ -24,7 +24,6 @@
     <string name="all_posts_not_read">"Tüm mesajlar okunmadı"</string>
     <string name="all_posts_read">"Tüm mesajlar okundu"</string>
     <string name="undo_string">"Geri al"</string>
-    <string name="addStringNoUrl">"Kaynakları eklemek için giriş yapın."</string>
     <string name="cant_get_sources">"Kaynakları listesi alınamıyor."</string>
     <string name="cant_create_source">"Kaynak oluşturulamıyor."</string>
     <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
@@ -106,11 +105,7 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
     <string name="remove_source">Remove source</string>
-    <string name="pref_theme_title">Light/Dark mode</string>
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
@@ -132,4 +127,6 @@
     <string name="action_about">"Hakkında"</string>
     <string name="marked_as_read">"Öğeleri oku"</string>
     <string name="marked_as_unread">"Item unread"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values-zh-rCN/strings.xml

@@ -24,7 +24,6 @@
     <string name="all_posts_not_read">"所有帖子都未读"</string>
     <string name="all_posts_read">"所有帖子已读"</string>
     <string name="undo_string">"撤销"</string>
-    <string name="addStringNoUrl">"登录以添加数据源。"</string>
     <string name="cant_get_sources">"无法获取数据列表。"</string>
     <string name="cant_create_source">"无法创建源数据。"</string>
     <string name="cant_get_spouts_no_network">"由于网络问题，无法获取 spouts 列表。"</string>
@@ -106,11 +105,7 @@
     <string name="reader_text_align_left">左对齐</string>
     <string name="reader_text_align_justify">左右对齐</string>
     <string name="settings_reader_font">阅读器字体</string>
-    <string name="reader_static_bar_title">文章查看器中的静态底部栏</string>
-    <string name="reader_static_bar_on">底部栏将始终显示</string>
-    <string name="reader_static_bar_off">底部栏可以通过浮动按钮显示</string>
     <string name="remove_source">删除源</string>
-    <string name="pref_theme_title">浅色/深色模式</string>
     <string name="mode_dark">深色模式</string>
     <string name="mode_system">遵循系统设置</string>
     <string name="mode_light">浅色模式</string>
@@ -132,4 +127,6 @@
     <string name="action_about">"关于我们"</string>
     <string name="marked_as_read">"已读"</string>
     <string name="marked_as_unread">"未读条目"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values-zh-rTW/strings.xml

@@ -24,7 +24,6 @@
     <string name="all_posts_not_read">"所有帖子都未读"</string>
     <string name="all_posts_read">"所有帖子已读"</string>
     <string name="undo_string">"撤销"</string>
-    <string name="addStringNoUrl">"登录以添加数据源。"</string>
     <string name="cant_get_sources">"无法获取数据列表。"</string>
     <string name="cant_create_source">"无法创建源数据。"</string>
     <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
@@ -106,11 +105,7 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
     <string name="remove_source">Remove source</string>
-    <string name="pref_theme_title">Light/Dark mode</string>
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
@@ -132,4 +127,6 @@
     <string name="action_about">"关于我们"</string>
     <string name="marked_as_read">"已读"</string>
     <string name="marked_as_unread">"未讀項目"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/values/ids.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="unread_action" type="id" />
+    <item name="open_action" type="id" />
+    <item name="share_action" type="id" />
+</resources>

androidApp/src/main/res/values/strings.xml

@@ -23,7 +23,6 @@
     <string name="all_posts_not_read">"All posts weren't read"</string>
     <string name="all_posts_read">"All posts were read"</string>
     <string name="undo_string">"Undo"</string>
-    <string name="addStringNoUrl">"Log in to add sources."</string>
     <string name="cant_get_sources">"Can't get sources list."</string>
     <string name="cant_create_source">"Can't create source."</string>
     <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
@@ -108,11 +107,7 @@
     <string name="source_code_pro_font_id" translatable="false">source_code_pro_medium</string>
     <string name="open_sans_font_id" translatable="false">open_sans</string>
     <string name="roboto_font_id" translatable="false">roboto</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
     <string name="remove_source">Remove source</string>
-    <string name="pref_theme_title">Light/Dark mode</string>
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
@@ -134,4 +129,6 @@
     <string name="action_about">"About"</string>
     <string name="marked_as_read">"Item read"</string>
     <string name="marked_as_unread">"Item unread"</string>
+    <string name="confirm_delete_title">Confirm Deletion</string>
+    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>

androidApp/src/main/res/xml/pref_general.xml

@@ -30,14 +30,6 @@
         android:summaryOn="@string/pref_article_viewer_on"
         android:title="@string/pref_article_viewer_title"
         app:iconSpaceReserved="false"/>
-    <SwitchPreference
-        android:defaultValue="false"
-        android:dependency="prefer_article_viewer"
-        android:key="reader_static_bar"
-        android:summaryOff="@string/reader_static_bar_off"
-        android:summaryOn="@string/reader_static_bar_on"
-        android:title="@string/reader_static_bar_title"
-        app:iconSpaceReserved="false"/>
 
     <PreferenceCategory
         android:title="@string/pref_general_category_displaying">

androidApp/src/main/res/xml/pref_theme.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <ListPreference
-        android:defaultValue="0"
-        android:entries="@array/ModeTitles"
-        android:entryValues="@array/ModeValues"
-        android:key="currentMode"
-        app:iconSpaceReserved="false"
-        android:title="@string/pref_theme_title"
-        app:useSimpleSummaryProvider="false" />
-</PreferenceScreen>

androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/android/tests/robolectric/Helpers.kt

@@ -1,3 +1,5 @@
+@file:Suppress("ktlint")
+/*
 package bou.amine.apps.readerforselfossv2.android.tests.robolectric
 
 import android.view.Menu
@@ -11,13 +13,18 @@ fun dialogMessage(): String {
     return latestDialog.findViewById<TextView>(android.R.id.message)?.text.toString()
 }
 
-fun Menu.assertClickable(@IdRes id: Int) {
+fun Menu.assertClickable(
+    @IdRes id: Int,
+) {
     this.assertVisible(id)
     val item = this.findItem(id)
     assertTrue(item.isEnabled)
 }
 
-fun Menu.assertVisible(@IdRes id: Int) {
+fun Menu.assertVisible(
+    @IdRes id: Int,
+) {
     val item = this.findItem(id)
     assertTrue(item.isVisible)
 }
+*/

androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/android/tests/robolectric/LoginActivityTest.kt

@@ -1,3 +1,5 @@
+@file:Suppress("ktlint")
+/*
 package bou.amine.apps.readerforselfossv2.android.tests.robolectric
 
 import android.widget.Button
@@ -11,10 +13,8 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.Robolectric
 
-
+@RunWith(RobotElectriqueRunner::class)
-@RunWith(RobotElectriqueRunnerclass::class)
 class LoginActivityTest {
-
     @Test
     fun login_shouldDisplay() {
         Robolectric.buildActivity(LoginActivity::class.java).use { controller ->
@@ -59,6 +59,7 @@ class LoginActivityTest {
         }
     }
 
+ */
 /* @Test
      fun connect() {
          Robolectric.buildActivity(LoginActivity::class.java).use { controller ->
@@ -74,4 +75,7 @@ class LoginActivityTest {
              assertEquals(expectedIntent.component, actual.component)
          }
      }*/
+/*
+
 }
+*/

androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/android/tests/robolectric/RobotElectriqueRunner.kt

@@ -1,12 +1,13 @@
+@file:Suppress("ktlint")
+/*
 package bou.amine.apps.readerforselfossv2.android.tests.robolectric
 
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-class RobotElectriqueRunnerclass(testClass: Class<*>?) :
+class RobotElectriqueRunner(
-    RobolectricTestRunner(testClass) {
+    testClass: Class<*>?,
-
+) : RobolectricTestRunner(testClass) {
-    override fun buildGlobalConfig(): Config {
+    override fun buildGlobalConfig(): Config = Config.Builder().setSdk(25, 30, 33).build()
-        return Config.Builder().setSdk(25, 30, 33).build()
-    }
 }
+*/

androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/tests/repository/RepositoryTest.kt

@@ -1,3 +1,5 @@
+@file:Suppress("detekt:LargeClass")
+
 package bou.amine.apps.readerforselfossv2.tests.repository
 
 import bou.amine.apps.readerforselfossv2.dao.ReaderForSelfossDB
@@ -9,6 +11,7 @@ import bou.amine.apps.readerforselfossv2.model.SuccessResponse
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.SelfossApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import bou.amine.apps.readerforselfossv2.service.ConnectivityService
 import bou.amine.apps.readerforselfossv2.utils.ItemType
 import bou.amine.apps.readerforselfossv2.utils.toView
 import io.mockk.clearAllMocks
@@ -22,7 +25,6 @@ import junit.framework.TestCase.assertFalse
 import junit.framework.TestCase.assertNotSame
 import junit.framework.TestCase.assertSame
 import junit.framework.TestCase.assertTrue
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
@@ -42,23 +44,20 @@ private const val FEED_URL = "https://test.com/feed"
 
 private const val TAGS = "Test, New"
 
+private const val NUMBER_ARTICLES = 100
+private const val NUMBER_UNREAD = 50
+private const val NUMBER_STARRED = 20
+
 class RepositoryTest {
     private val db = mockk<ReaderForSelfossDB>(relaxed = true)
     private val appSettingsService = mockk<AppSettingsService>()
     private val api = mockk<SelfossApi>()
-
+    private val connectivityService = mockk<ConnectivityService>()
-    private val NUMBER_ARTICLES = 100
-    private val NUMBER_UNREAD = 50
-    private val NUMBER_STARRED = 20
     private lateinit var repository: Repository
 
-    private fun initializeRepository(
+    private fun initializeRepository(isNetworkAvailable: Boolean = true) {
-        isConnectionAvailable: MutableStateFlow<Boolean> =
+        every { connectivityService.isNetworkAvailable() } returns isNetworkAvailable
-            MutableStateFlow(
+        repository = Repository(api, appSettingsService, connectivityService, db)
-                true,
-            ),
-    ) {
-        repository = Repository(api, appSettingsService, isConnectionAvailable, db)
 
         runBlocking {
             repository.updateApiInformation()
@@ -77,10 +76,11 @@ class RepositoryTest {
         coEvery { api.apiInformation() } returns
             StatusAndData(
                 success = true,
-                    data = SelfossModel.ApiInformation(
+                data =
+                    SelfossModel.ApiInformation(
                         "2.19-ba1e8e3",
                         "4.0.0",
-                        SelfossModel.ApiConfiguration(false, true)
+                        SelfossModel.ApiConfiguration(false, true),
                     ),
             )
         coEvery { api.stats() } returns
@@ -107,7 +107,7 @@ class RepositoryTest {
     fun instantiate_repository_without_api_version() {
         every { appSettingsService.getApiVersion() } returns -1
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
 
         coVerify(exactly = 0) { api.apiInformation() }
         coVerify(exactly = 0) { api.stats() }
@@ -135,10 +135,11 @@ class RepositoryTest {
         coEvery { api.apiInformation() } returns
             StatusAndData(
                 success = true,
-                    data = SelfossModel.ApiInformation(
+                data =
+                    SelfossModel.ApiInformation(
                         "2.19-ba1e8e3",
                         "4.0.0",
-                        SelfossModel.ApiConfiguration(true, true)
+                        SelfossModel.ApiConfiguration(true, true),
                     ),
             )
         every { appSettingsService.getUserName() } returns ""
@@ -155,10 +156,11 @@ class RepositoryTest {
         coEvery { api.apiInformation() } returns
             StatusAndData(
                 success = true,
-                    data = SelfossModel.ApiInformation(
+                data =
+                    SelfossModel.ApiInformation(
                         "2.19-ba1e8e3",
                         "4.0.0",
-                        SelfossModel.ApiConfiguration(true, true)
+                        SelfossModel.ApiConfiguration(true, true),
                     ),
             )
         every { appSettingsService.getUserName() } returns "username"
@@ -175,10 +177,11 @@ class RepositoryTest {
         coEvery { api.apiInformation() } returns
             StatusAndData(
                 success = true,
-                    data = SelfossModel.ApiInformation(
+                data =
+                    SelfossModel.ApiInformation(
                         "2.19-ba1e8e3",
                         "4.0.0",
-                        SelfossModel.ApiConfiguration(true, false)
+                        SelfossModel.ApiConfiguration(true, false),
                     ),
             )
         every { appSettingsService.getUserName() } returns ""
@@ -195,10 +198,11 @@ class RepositoryTest {
         coEvery { api.apiInformation() } returns
             StatusAndData(
                 success = true,
-                    data = SelfossModel.ApiInformation(
+                data =
+                    SelfossModel.ApiInformation(
                         "2.19-ba1e8e3",
                         "4.0.0",
-                        SelfossModel.ApiConfiguration(false, true)
+                        SelfossModel.ApiConfiguration(false, true),
                     ),
             )
         every { appSettingsService.getUserName() } returns ""
@@ -280,7 +284,7 @@ class RepositoryTest {
     fun get_newer_items_without_connectivity() {
         every { appSettingsService.isItemCachingEnabled() } returns true
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         runBlocking {
             repository.getNewerItems()
         }
@@ -307,7 +311,7 @@ class RepositoryTest {
 
         every { appSettingsService.isItemCachingEnabled() } returns true
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         repository.setTagFilter(SelfossModel.Tag("Test", "red", 3))
         runBlocking {
             repository.getNewerItems()
@@ -335,7 +339,7 @@ class RepositoryTest {
 
         every { appSettingsService.isItemCachingEnabled() } returns true
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         repository.setSourceFilter(
             SelfossModel.SourceDetail(
                 1,
@@ -450,7 +454,7 @@ class RepositoryTest {
 
         var success: Boolean
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         runBlocking {
             success = repository.reloadBadges()
         }
@@ -470,7 +474,7 @@ class RepositoryTest {
 
         var success: Boolean
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         runBlocking {
             success = repository.reloadBadges()
         }
@@ -565,7 +569,7 @@ class RepositoryTest {
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
         every { appSettingsService.isItemCachingEnabled() } returns true
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         var testTags: List<SelfossModel.Tag>
         runBlocking {
             testTags = repository.getTags()
@@ -583,7 +587,7 @@ class RepositoryTest {
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         var testTags: List<SelfossModel.Tag>
         runBlocking {
             testTags = repository.getTags()
@@ -600,7 +604,7 @@ class RepositoryTest {
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         every { appSettingsService.isItemCachingEnabled() } returns true
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         var testTags: List<SelfossModel.Tag>
         runBlocking {
             testTags = repository.getTags()
@@ -618,7 +622,7 @@ class RepositoryTest {
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         every { appSettingsService.isItemCachingEnabled() } returns false
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         var testTags: List<SelfossModel.Tag>
         runBlocking {
             testTags = repository.getTags()
@@ -768,7 +772,7 @@ class RepositoryTest {
     @Test
     fun get_sources_without_connection() {
         val (_, sourcesDB) = prepareSources()
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         var testSources: List<SelfossModel.Source>
         runBlocking {
             testSources = repository.getSourcesDetails()
@@ -785,7 +789,7 @@ class RepositoryTest {
 
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         var testSources: List<SelfossModel.Source>
         runBlocking {
             testSources = repository.getSourcesDetails()
@@ -802,7 +806,7 @@ class RepositoryTest {
 
         every { appSettingsService.isItemCachingEnabled() } returns true
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         var testSources: List<SelfossModel.Source>
         runBlocking {
             testSources = repository.getSourcesDetails()
@@ -819,7 +823,7 @@ class RepositoryTest {
 
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         var testSources: List<SelfossModel.Source>
         runBlocking {
             testSources = repository.getSourcesDetails()
@@ -891,7 +895,7 @@ class RepositoryTest {
         coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
             SuccessResponse(true)
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         var response: Boolean
         runBlocking {
             response =
@@ -948,7 +952,7 @@ class RepositoryTest {
     fun delete_source_without_connection() {
         coEvery { api.deleteSource(any()) } returns SuccessResponse(false)
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         var response: Boolean
         runBlocking {
             response = repository.deleteSource(5, "src")
@@ -1021,7 +1025,7 @@ class RepositoryTest {
                 data = "undocumented...",
             )
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         var response: Boolean
         runBlocking {
             response = repository.updateRemote()
@@ -1063,7 +1067,7 @@ class RepositoryTest {
     fun login_but_without_connection() {
         coEvery { api.login() } returns SuccessResponse(success = true)
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         var response: Boolean
         runBlocking {
             response = repository.login()
@@ -1143,7 +1147,7 @@ class RepositoryTest {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
             StatusAndData(success = false, data = generateTestApiItem())
 
-        initializeRepository(MutableStateFlow(false))
+        initializeRepository(false)
         prepareSearch()
         runBlocking {
             repository.tryToCacheItemsAndGetNewOnes()

androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/tests/repository/TestUtils.kt

@@ -3,8 +3,8 @@ package bou.amine.apps.readerforselfossv2.tests.repository
 import bou.amine.apps.readerforselfossv2.dao.ITEM
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 
-fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<ITEM> {
+fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<ITEM> =
-    return listOf(
+    listOf(
         ITEM(
             id = item.id,
             datetime = item.datetime,
@@ -20,10 +20,9 @@ fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<I
             author = item.author,
         ),
     )
-}
 
-fun generateTestApiItem(item: FakeItemParameters = FakeItemParameters()): List<SelfossModel.Item> {
+fun generateTestApiItem(item: FakeItemParameters = FakeItemParameters()): List<SelfossModel.Item> =
-    return listOf(
+    listOf(
         SelfossModel.Item(
             id = item.id.toInt(),
             datetime = item.datetime,
@@ -39,7 +38,6 @@ fun generateTestApiItem(item: FakeItemParameters = FakeItemParameters()): List<S
             author = item.author,
         ),
     )
-}
 
 class FakeItemParameters {
     var id = "20"

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     // trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("8.7.3").apply(false)
+    id("com.android.application").version("8.8.1").apply(false)
-    id("com.android.library").version("8.7.3").apply(false)
+    id("com.android.library").version("8.8.1").apply(false)
     id("org.jetbrains.kotlin.android").version("2.1.0").apply(false)
     kotlin("multiplatform").version("2.1.0").apply(false)
     id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)
@@ -16,7 +16,6 @@ allprojects {
     }
 }
 
-
 tasks.register("clean", Delete::class) {
     delete(layout.buildDirectory)
 }

detekt.yml

@@ -0,0 +1,786 @@
+build:
+  maxIssues: 0
+  excludeCorrectable: false
+  weights:
+  # complexity: 2
+  # LongParameterList: 1
+  # style: 1
+  # comments: 1
+
+config:
+  validation: true
+  warningsAsErrors: false
+  checkExhaustiveness: false
+  # when writing own rules with new properties, exclude the property path e.g.: 'my_rule_set,.*>.*>[my_property]'
+  excludes: ''
+
+processors:
+  active: true
+  exclude:
+    - 'DetektProgressListener'
+  # - 'KtFileCountProcessor'
+  # - 'PackageCountProcessor'
+  # - 'ClassCountProcessor'
+  # - 'FunctionCountProcessor'
+  # - 'PropertyCountProcessor'
+  # - 'ProjectComplexityProcessor'
+  # - 'ProjectCognitiveComplexityProcessor'
+  # - 'ProjectLLOCProcessor'
+  # - 'ProjectCLOCProcessor'
+  # - 'ProjectLOCProcessor'
+  # - 'ProjectSLOCProcessor'
+  # - 'LicenseHeaderLoaderExtension'
+
+console-reports:
+  active: true
+  exclude:
+    - 'ProjectStatisticsReport'
+    - 'ComplexityReport'
+    - 'NotificationReport'
+    - 'FindingsReport'
+    - 'FileBasedFindingsReport'
+  #  - 'LiteFindingsReport'
+
+output-reports:
+  active: true
+  exclude:
+  # - 'TxtOutputReport'
+  # - 'XmlOutputReport'
+  # - 'HtmlOutputReport'
+  # - 'MdOutputReport'
+  # - 'SarifOutputReport'
+
+comments:
+  active: true
+  AbsentOrWrongFileLicense:
+    active: false
+    licenseTemplateFile: 'license.template'
+    licenseTemplateIsRegex: false
+  CommentOverPrivateFunction:
+    active: false
+  CommentOverPrivateProperty:
+    active: false
+  DeprecatedBlockTag:
+    active: false
+  EndOfSentenceFormat:
+    active: false
+    endOfSentenceFormat: '([.?!][ \t\n\r\f<])|([.?!:]$)'
+  KDocReferencesNonPublicProperty:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+  OutdatedDocumentation:
+    active: false
+    matchTypeParameters: true
+    matchDeclarationsOrder: true
+    allowParamOnConstructorProperties: false
+  UndocumentedPublicClass:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    searchInNestedClass: true
+    searchInInnerClass: true
+    searchInInnerObject: true
+    searchInInnerInterface: true
+    searchInProtectedClass: false
+  UndocumentedPublicFunction:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    searchProtectedFunction: false
+  UndocumentedPublicProperty:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    searchProtectedProperty: false
+
+complexity:
+  active: true
+  CognitiveComplexMethod:
+    active: false
+    threshold: 15
+  ComplexCondition:
+    active: true
+    threshold: 4
+  ComplexInterface:
+    active: false
+    threshold: 10
+    includeStaticDeclarations: false
+    includePrivateDeclarations: false
+    ignoreOverloaded: false
+  CyclomaticComplexMethod:
+    active: true
+    threshold: 15
+    ignoreSingleWhenExpression: false
+    ignoreSimpleWhenEntries: false
+    ignoreNestingFunctions: false
+    nestingFunctions:
+      - 'also'
+      - 'apply'
+      - 'forEach'
+      - 'isNotNull'
+      - 'ifNull'
+      - 'let'
+      - 'run'
+      - 'use'
+      - 'with'
+  LabeledExpression:
+    active: false
+    ignoredLabels: [ ]
+  LargeClass:
+    active: true
+    threshold: 600
+  LongMethod:
+    active: true
+    threshold: 60
+  LongParameterList:
+    active: true
+    functionThreshold: 6
+    constructorThreshold: 7
+    ignoreDefaultParameters: false
+    ignoreDataClasses: true
+    ignoreAnnotatedParameter: [ ]
+  MethodOverloading:
+    active: false
+    threshold: 6
+  NamedArguments:
+    active: false
+    threshold: 3
+    ignoreArgumentsMatchingNames: false
+  NestedBlockDepth:
+    active: true
+    threshold: 4
+  NestedScopeFunctions:
+    active: false
+    threshold: 1
+    functions:
+      - 'kotlin.apply'
+      - 'kotlin.run'
+      - 'kotlin.with'
+      - 'kotlin.let'
+      - 'kotlin.also'
+  ReplaceSafeCallChainWithRun:
+    active: false
+  StringLiteralDuplication:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    threshold: 3
+    ignoreAnnotation: true
+    excludeStringsWithLessThan5Characters: true
+    ignoreStringsRegex: '$^'
+  TooManyFunctions:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**', '**/android/*Activity.kt', '**/fragments/*Fragment.kt' ]
+    thresholdInFiles: 11
+    thresholdInClasses: 11
+    thresholdInInterfaces: 11
+    thresholdInObjects: 11
+    thresholdInEnums: 11
+    ignoreDeprecated: false
+    ignorePrivate: false
+    ignoreOverridden: false
+    ignoreAnnotatedFunctions: [ ]
+
+coroutines:
+  active: true
+  GlobalCoroutineUsage:
+    active: false
+  InjectDispatcher:
+    active: true
+    dispatcherNames:
+      - 'IO'
+      - 'Default'
+      - 'Unconfined'
+  RedundantSuspendModifier:
+    active: true
+  SleepInsteadOfDelay:
+    active: true
+  SuspendFunSwallowedCancellation:
+    active: false
+  SuspendFunWithCoroutineScopeReceiver:
+    active: false
+  SuspendFunWithFlowReturnType:
+    active: true
+
+empty-blocks:
+  active: true
+  EmptyCatchBlock:
+    active: true
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  EmptyClassBlock:
+    active: true
+  EmptyDefaultConstructor:
+    active: true
+  EmptyDoWhileBlock:
+    active: true
+  EmptyElseBlock:
+    active: true
+  EmptyFinallyBlock:
+    active: true
+  EmptyForBlock:
+    active: true
+  EmptyFunctionBlock:
+    active: true
+    ignoreOverridden: false
+  EmptyIfBlock:
+    active: true
+  EmptyInitBlock:
+    active: true
+  EmptyKtFile:
+    active: true
+  EmptySecondaryConstructor:
+    active: true
+  EmptyTryBlock:
+    active: true
+  EmptyWhenBlock:
+    active: true
+  EmptyWhileBlock:
+    active: true
+
+exceptions:
+  active: true
+  ExceptionRaisedInUnexpectedLocation:
+    active: true
+    methodNames:
+      - 'equals'
+      - 'finalize'
+      - 'hashCode'
+      - 'toString'
+  InstanceOfCheckForException:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+  NotImplementedDeclaration:
+    active: false
+  ObjectExtendsThrowable:
+    active: false
+  PrintStackTrace:
+    active: true
+  RethrowCaughtException:
+    active: true
+  ReturnFromFinally:
+    active: true
+    ignoreLabeled: false
+  SwallowedException:
+    active: true
+    ignoredExceptionTypes:
+      - 'InterruptedException'
+      - 'MalformedURLException'
+      - 'NumberFormatException'
+      - 'ParseException'
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  ThrowingExceptionFromFinally:
+    active: true
+  ThrowingExceptionInMain:
+    active: false
+  ThrowingExceptionsWithoutMessageOrCause:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    exceptions:
+      - 'ArrayIndexOutOfBoundsException'
+      - 'Exception'
+      - 'IllegalArgumentException'
+      - 'IllegalMonitorStateException'
+      - 'IllegalStateException'
+      - 'IndexOutOfBoundsException'
+      - 'NullPointerException'
+      - 'RuntimeException'
+      - 'Throwable'
+  ThrowingNewInstanceOfSameException:
+    active: true
+  TooGenericExceptionCaught:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    exceptionNames:
+      - 'ArrayIndexOutOfBoundsException'
+      - 'Error'
+      - 'Exception'
+      - 'IllegalMonitorStateException'
+      - 'IndexOutOfBoundsException'
+      - 'NullPointerException'
+      - 'RuntimeException'
+      - 'Throwable'
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  TooGenericExceptionThrown:
+    active: true
+    exceptionNames:
+      - 'Error'
+      - 'Exception'
+      - 'RuntimeException'
+      - 'Throwable'
+
+naming:
+  active: true
+  BooleanPropertyNaming:
+    active: false
+    allowedPattern: '^(is|has|are)'
+  ClassNaming:
+    active: true
+    classPattern: '[A-Z][a-zA-Z0-9]*'
+  ConstructorParameterNaming:
+    active: true
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    privateParameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+  EnumNaming:
+    active: true
+    enumEntryPattern: '[A-Z][_a-zA-Z0-9]*'
+  ForbiddenClassName:
+    active: false
+    forbiddenName: [ ]
+  FunctionMaxLength:
+    active: false
+    maximumFunctionNameLength: 30
+  FunctionMinLength:
+    active: false
+    minimumFunctionNameLength: 3
+  FunctionNaming:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    functionPattern: '[a-z][a-zA-Z0-9]*'
+    excludeClassPattern: '$^'
+  FunctionParameterNaming:
+    active: true
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+  InvalidPackageDeclaration:
+    active: true
+    rootPackage: ''
+    requireRootInDeclaration: false
+  LambdaParameterNaming:
+    active: false
+    parameterPattern: '[a-z][A-Za-z0-9]*|_'
+  MatchingDeclarationName:
+    active: false # done in ktlint
+    mustBeFirst: true
+  MemberNameEqualsClassName:
+    active: true
+    ignoreOverridden: true
+  NoNameShadowing:
+    active: true
+  NonBooleanPropertyPrefixedWithIs:
+    active: false
+  ObjectPropertyNaming:
+    active: true
+    constantPattern: '[A-Za-z][_A-Za-z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
+  PackageNaming:
+    active: true
+    packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*'
+  TopLevelPropertyNaming:
+    active: true
+    constantPattern: '[A-Z][_A-Z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*'
+  VariableMaxLength:
+    active: false
+    maximumVariableNameLength: 64
+  VariableMinLength:
+    active: false
+    minimumVariableNameLength: 1
+  VariableNaming:
+    active: true
+    variablePattern: '[a-z][A-Za-z0-9]*'
+    privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+
+performance:
+  active: true
+  ArrayPrimitive:
+    active: true
+  CouldBeSequence:
+    active: false
+    threshold: 3
+  ForEachOnRange:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+  SpreadOperator:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+  UnnecessaryPartOfBinaryExpression:
+    active: false
+  UnnecessaryTemporaryInstantiation:
+    active: true
+
+potential-bugs:
+  active: true
+  AvoidReferentialEquality:
+    active: true
+    forbiddenTypePatterns:
+      - 'kotlin.String'
+  CastNullableToNonNullableType:
+    active: false
+  CastToNullableType:
+    active: false
+  Deprecation:
+    active: false
+  DontDowncastCollectionTypes:
+    active: false
+  DoubleMutabilityForCollection:
+    active: true
+    mutableTypes:
+      - 'kotlin.collections.MutableList'
+      - 'kotlin.collections.MutableMap'
+      - 'kotlin.collections.MutableSet'
+      - 'java.util.ArrayList'
+      - 'java.util.LinkedHashSet'
+      - 'java.util.HashSet'
+      - 'java.util.LinkedHashMap'
+      - 'java.util.HashMap'
+  ElseCaseInsteadOfExhaustiveWhen:
+    active: false
+    ignoredSubjectTypes: [ ]
+  EqualsAlwaysReturnsTrueOrFalse:
+    active: true
+  EqualsWithHashCodeExist:
+    active: true
+  ExitOutsideMain:
+    active: false
+  ExplicitGarbageCollectionCall:
+    active: true
+  HasPlatformType:
+    active: true
+  IgnoredReturnValue:
+    active: true
+    restrictToConfig: true
+    returnValueAnnotations:
+      - 'CheckResult'
+      - '*.CheckResult'
+      - 'CheckReturnValue'
+      - '*.CheckReturnValue'
+    ignoreReturnValueAnnotations:
+      - 'CanIgnoreReturnValue'
+      - '*.CanIgnoreReturnValue'
+    returnValueTypes:
+      - 'kotlin.sequences.Sequence'
+      - 'kotlinx.coroutines.flow.*Flow'
+      - 'java.util.stream.*Stream'
+    ignoreFunctionCall: [ ]
+  ImplicitDefaultLocale:
+    active: true
+  ImplicitUnitReturnType:
+    active: false
+    allowExplicitReturnType: true
+  InvalidRange:
+    active: true
+  IteratorHasNextCallsNextMethod:
+    active: true
+  IteratorNotThrowingNoSuchElementException:
+    active: true
+  LateinitUsage:
+    active: false
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+    ignoreOnClassesPattern: ''
+  MapGetWithNotNullAssertionOperator:
+    active: true
+  MissingPackageDeclaration:
+    active: false
+    excludes: [ '**/*.kts' ]
+  NullCheckOnMutableProperty:
+    active: false
+  NullableToStringCall:
+    active: false
+  PropertyUsedBeforeDeclaration:
+    active: false
+  UnconditionalJumpStatementInLoop:
+    active: false
+  UnnecessaryNotNullCheck:
+    active: false
+  UnnecessaryNotNullOperator:
+    active: true
+  UnnecessarySafeCall:
+    active: true
+  UnreachableCatchBlock:
+    active: true
+  UnreachableCode:
+    active: true
+  UnsafeCallOnNullableType:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**' ]
+  UnsafeCast:
+    active: true
+  UnusedUnaryOperator:
+    active: true
+  UselessPostfixExpression:
+    active: true
+  WrongEqualsTypeParameter:
+    active: true
+
+style:
+  active: true
+  AlsoCouldBeApply:
+    active: false
+  BracesOnIfStatements:
+    active: false
+    singleLine: 'never'
+    multiLine: 'always'
+  BracesOnWhenStatements:
+    active: false
+    singleLine: 'necessary'
+    multiLine: 'consistent'
+  CanBeNonNullable:
+    active: false
+  CascadingCallWrapping:
+    active: false
+    includeElvis: true
+  ClassOrdering:
+    active: false
+  CollapsibleIfStatements:
+    active: false
+  DataClassContainsFunctions:
+    active: false
+    conversionFunctionPrefix:
+      - 'to'
+    allowOperators: false
+  DataClassShouldBeImmutable:
+    active: false
+  DestructuringDeclarationWithTooManyEntries:
+    active: true
+    maxDestructuringEntries: 3
+  DoubleNegativeLambda:
+    active: false
+    negativeFunctions:
+      - reason: 'Use `takeIf` instead.'
+        value: 'takeUnless'
+      - reason: 'Use `all` instead.'
+        value: 'none'
+    negativeFunctionNameParts:
+      - 'not'
+      - 'non'
+  EqualsNullCall:
+    active: true
+  EqualsOnSignatureLine:
+    active: false
+  ExplicitCollectionElementAccessMethod:
+    active: false
+  ExplicitItLambdaParameter:
+    active: true
+  ExpressionBodySyntax:
+    active: false
+    includeLineWrapping: false
+  ForbiddenAnnotation:
+    active: false
+    annotations:
+      - reason: 'it is a java annotation. Use `Suppress` instead.'
+        value: 'java.lang.SuppressWarnings'
+      - reason: 'it is a java annotation. Use `kotlin.Deprecated` instead.'
+        value: 'java.lang.Deprecated'
+      - reason: 'it is a java annotation. Use `kotlin.annotation.MustBeDocumented` instead.'
+        value: 'java.lang.annotation.Documented'
+      - reason: 'it is a java annotation. Use `kotlin.annotation.Target` instead.'
+        value: 'java.lang.annotation.Target'
+      - reason: 'it is a java annotation. Use `kotlin.annotation.Retention` instead.'
+        value: 'java.lang.annotation.Retention'
+      - reason: 'it is a java annotation. Use `kotlin.annotation.Repeatable` instead.'
+        value: 'java.lang.annotation.Repeatable'
+      - reason: 'Kotlin does not support @Inherited annotation, see https://youtrack.jetbrains.com/issue/KT-22265'
+        value: 'java.lang.annotation.Inherited'
+  ForbiddenComment:
+    active: true
+    comments:
+      - reason: 'Forbidden FIXME todo marker in comment, please fix the problem.'
+        value: 'FIXME:'
+      - reason: 'Forbidden STOPSHIP todo marker in comment, please address the problem before shipping the code.'
+        value: 'STOPSHIP:'
+      - reason: 'Forbidden TODO todo marker in comment, please do the changes.'
+        value: 'TODO:'
+    allowedPatterns: ''
+  ForbiddenImport:
+    active: false
+    imports: [ ]
+    forbiddenPatterns: ''
+  ForbiddenMethodCall:
+    active: false
+    methods:
+      - reason: 'print does not allow you to configure the output stream. Use a logger instead.'
+        value: 'kotlin.io.print'
+      - reason: 'println does not allow you to configure the output stream. Use a logger instead.'
+        value: 'kotlin.io.println'
+  ForbiddenSuppress:
+    active: false
+    rules: [ ]
+  ForbiddenVoid:
+    active: true
+    ignoreOverridden: false
+    ignoreUsageInGenerics: false
+  FunctionOnlyReturningConstant:
+    active: true
+    ignoreOverridableFunction: true
+    ignoreActualFunction: true
+    excludedFunctions: [ ]
+  LoopWithTooManyJumpStatements:
+    active: true
+    maxJumpCount: 1
+  MagicNumber:
+    active: true
+    excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**', '**/*.kts' ]
+    ignoreNumbers:
+      - '-1'
+      - '0'
+      - '1'
+      - '2'
+    ignoreHashCodeFunction: true
+    ignorePropertyDeclaration: false
+    ignoreLocalVariableDeclaration: false
+    ignoreConstantDeclaration: true
+    ignoreCompanionObjectPropertyDeclaration: true
+    ignoreAnnotation: false
+    ignoreNamedArgument: true
+    ignoreEnums: false
+    ignoreRanges: false
+    ignoreExtensionFunctions: true
+  MandatoryBracesLoops:
+    active: false
+  MaxChainedCallsOnSameLine:
+    active: false
+    maxChainedCalls: 5
+  MaxLineLength:
+    active: false # done in ktlint
+    maxLineLength: 140 # default is 120. 140 to match ktlint
+    excludePackageStatements: true
+    excludeImportStatements: true
+    excludeCommentStatements: false
+    excludeRawStrings: true
+  MayBeConst:
+    active: true
+  ModifierOrder:
+    active: true
+  MultilineLambdaItParameter:
+    active: false
+  MultilineRawStringIndentation:
+    active: false
+    indentSize: 4
+    trimmingMethods:
+      - 'trimIndent'
+      - 'trimMargin'
+  NestedClassesVisibility:
+    active: true
+  NewLineAtEndOfFile:
+    active: false # done in ktlint
+  NoTabs:
+    active: false
+  NullableBooleanCheck:
+    active: false
+  ObjectLiteralToLambda:
+    active: true
+  OptionalAbstractKeyword:
+    active: true
+  OptionalUnit:
+    active: false
+  PreferToOverPairSyntax:
+    active: false
+  ProtectedMemberInFinalClass:
+    active: true
+  RedundantExplicitType:
+    active: false
+  RedundantHigherOrderMapUsage:
+    active: true
+  RedundantVisibilityModifierRule:
+    active: false
+  ReturnCount:
+    active: true
+    max: 2
+    excludedFunctions:
+      - 'equals'
+    excludeLabeled: false
+    excludeReturnFromLambda: true
+    excludeGuardClauses: false
+  SafeCast:
+    active: true
+  SerialVersionUIDInSerializableClass:
+    active: true
+  SpacingBetweenPackageAndImports:
+    active: false
+  StringShouldBeRawString:
+    active: false
+    maxEscapedCharacterCount: 2
+    ignoredCharacters: [ ]
+  ThrowsCount:
+    active: true
+    max: 2
+    excludeGuardClauses: false
+  TrailingWhitespace:
+    active: false
+  TrimMultilineRawString:
+    active: false
+    trimmingMethods:
+      - 'trimIndent'
+      - 'trimMargin'
+  UnderscoresInNumericLiterals:
+    active: false
+    acceptableLength: 4
+    allowNonStandardGrouping: false
+  UnnecessaryAbstractClass:
+    active: true
+  UnnecessaryAnnotationUseSiteTarget:
+    active: false
+  UnnecessaryApply:
+    active: true
+  UnnecessaryBackticks:
+    active: false
+  UnnecessaryBracesAroundTrailingLambda:
+    active: false
+  UnnecessaryFilter:
+    active: true
+  UnnecessaryInheritance:
+    active: true
+  UnnecessaryInnerClass:
+    active: false
+  UnnecessaryLet:
+    active: false
+  UnnecessaryParentheses:
+    active: false
+    allowForUnclearPrecedence: false
+  UntilInsteadOfRangeTo:
+    active: false
+  UnusedImports:
+    active: false
+  UnusedParameter:
+    active: true
+    allowedNames: 'ignored|expected'
+  UnusedPrivateClass:
+    active: true
+  UnusedPrivateMember:
+    active: true
+    allowedNames: ''
+  UnusedPrivateProperty:
+    active: true
+    allowedNames: '_|ignored|expected|serialVersionUID'
+    excludes: [ '**/build.gradle.kts' ]
+  UseAnyOrNoneInsteadOfFind:
+    active: true
+  UseArrayLiteralsInAnnotations:
+    active: true
+  UseCheckNotNull:
+    active: true
+  UseCheckOrError:
+    active: true
+  UseDataClass:
+    active: false
+    allowVars: false
+  UseEmptyCounterpart:
+    active: false
+  UseIfEmptyOrIfBlank:
+    active: false
+  UseIfInsteadOfWhen:
+    active: false
+    ignoreWhenContainingVariableDeclaration: false
+  UseIsNullOrEmpty:
+    active: true
+  UseLet:
+    active: false
+  UseOrEmpty:
+    active: true
+  UseRequire:
+    active: true
+  UseRequireNotNull:
+    active: true
+  UseSumOfInsteadOfFlatMapSize:
+    active: false
+  UselessCallOnNotNull:
+    active: true
+  UtilityClassWithPublicConstructor:
+    active: true
+  VarCouldBeVal:
+    active: true
+    ignoreLateinitVar: false
+  WildcardImport:
+    active: true
+    excludeImports:
+      - 'java.util.*'

fastlane/metadata/android/en-US/changelogs/v125010031.txt

@@ -0,0 +1,14 @@
+**v125010031**
+
+- Merge pull request 'Bump dependencies' (#173) from upgarde into master
+- chore: "faster" action.
+- fastlane: icon change.
+- chore: ignoring a pixel issue.
+- test: fixed an ui test issue.
+- fix: center the loading thing.
+- test: items displaying.
+- bump: sqldelight.
+- bump: material, desugar jdk, jsoup, kodein, settings, napier, mock.
+- bump: androix and coroutines.
+- bump: ktor. Closes #67.
+- Changelog for v124123651

fastlane/metadata/android/en-US/changelogs/v125010111.txt

@@ -0,0 +1,4 @@
+**v125010111**
+
+- Debug trying to fix context issues. (#174)
+- Changelog for v125010031

fastlane/metadata/android/en-US/changelogs/v125010131.txt

@@ -0,0 +1,5 @@
+**v125010131**
+
+- fix: reload the adapter when it's needed. Fixes #128. (#176)
+- feat: basic auth and images loading. Fixes #172. (#175)
+- Changelog for v125010111

fastlane/metadata/android/en-US/changelogs/v125010201.txt

@@ -0,0 +1,6 @@
+**v125010201**
+
+- fix: Handle empty url issue.
+- Merge pull request 'Removed the floating bar.' (#177) from floating-bar into master
+- chore: changing actions in reader fragment.
+- Changelog for v125010131

fastlane/metadata/android/en-US/changelogs/v125010241.txt

@@ -0,0 +1,8 @@
+**v125010241**
+
+- Merge pull request 'fix: Link not opening.' (#178) from fix-open-link into master
+- refactor: context fragments issues.
+- logs: Context issues.
+- fix: Handle empty url issue, again.
+- fix: Link not opening.
+- Changelog for v125010201

fastlane/metadata/android/en-US/changelogs/v125020411.txt

@@ -0,0 +1,7 @@
+**v125020411**
+
+- Merge pull request 'bump' (#182) from bump into master
+- chore: non transiant R classes.
+- Merge pull request 'fix: One more missing context.' (#181) from fix-one-more-context into master
+- bump
+- fix: One more missing context.

fastlane/metadata/android/en-US/changelogs/v125020471.txt

@@ -0,0 +1,7 @@
+**v125020471**
+
+- chore: no more docker-compose.
+- bump: gradle plugin.
+- Merge pull request 'fix: check index exists.' (#183) from fix-index into master
+- fix: check index exists.
+- Changelog for v125020411

fastlane/metadata/android/en-US/changelogs/v125020581.txt

@@ -0,0 +1,4 @@
+**v125020581**
+
+- fix: url can be empty ?
+- Changelog for v125020471

fastlane/metadata/android/en-US/changelogs/v125030681.txt

@@ -0,0 +1,12 @@
+**v125030681**
+
+- chore: do not send reports on simulators.
+- Merge pull request 'chore: do not send reports on simulators.' (#188) from chore-acra-simulator into master
+- chore: do not send reports on simulators.
+- Merge pull request 'fix: Url validation was not failing login. Added tests.' (#186) from fix-invalid-url into master
+- Merge pull request 'chore: crowding ci integration.' (#187) from chore-crowdin-ci into master
+- chore: we don't need to check if the url is valid in upsert screen.
+- fix: Url validation was not failing login. Added tests.
+- chore: crowding ci integration.
+- Show a confirmation dialog before deleting sources (#185)
+- Changelog for v125020581

fastlane/metadata/android/en-US/changelogs/v125030711.txt

@@ -0,0 +1,8 @@
+**v125030711**
+
+- Merge pull request 'fix: initial status loading issues.' (#192) from connectivity into master
+- chore: check changes for translations and android.
+- fix: initial status loading issues.
+- Merge pull request 'chore: new connectivity dep. Closes #84.' (#189) from connectivity into master
+- chore: new connectivity dep. Closes #84.
+- Changelog for v125030681

gradle.properties

@@ -18,8 +18,8 @@ kotlin.code.style=official
 #Android
 android.useAndroidX=true
 #android.nonTransitiveRClass=true
-android.enableJetifier=true
+android.enableJetifier=false
-android.nonTransitiveRClass=false
+android.nonTransitiveRClass=true
 #MPP
 kotlin.mpp.enableCInteropCommonization=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Nov 25 22:48:24 CET 2024
+#Sun Feb 09 14:44:52 CET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

shared/build.gradle.kts

@@ -4,7 +4,6 @@ object SqlDelight {
     const val runtime = "app.cash.sqldelight:runtime:2.0.2"
     const val android = "app.cash.sqldelight:android-driver:2.0.2"
     const val native = "app.cash.sqldelight:native-driver:2.0.2"
-
 }
 
 plugins {
@@ -55,6 +54,10 @@ kotlin {
 
                 // Sql
                 implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
+
+                // Connectivity
+                implementation("dev.jordond.connectivity:connectivity-core:1.2.0")
+                implementation("dev.jordond.connectivity:connectivity-device:1.2.0")
             }
         }
         val commonTest by getting {

shared/src/androidMain/kotlin/bou/amine/apps/readerforselfossv2/dao/DriverFactory.kt

@@ -4,12 +4,13 @@ import android.content.Context
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.driver.android.AndroidSqliteDriver
 
-actual class DriverFactory(private val context: Context) {
+actual class DriverFactory(
-    actual fun createDriver(): SqlDriver {
+    private val context: Context,
-        return AndroidSqliteDriver(
+) {
+    actual fun createDriver(): SqlDriver =
+        AndroidSqliteDriver(
             ReaderForSelfossDB.Schema,
             context,
-            "ReaderForSelfossV2-android.db"
+            "ReaderForSelfossV2-android.db",
         )
 }
-}

shared/src/androidMain/kotlin/bou/amine/apps/readerforselfossv2/rest/NetworkSSL.kt

@@ -8,16 +8,20 @@ class NaiveTrustManager : X509TrustManager {
     override fun checkClientTrusted(
         chain: Array<out X509Certificate>?,
         authType: String?,
-    ) {}
+    ) {
+        // Nothing
+    }
 
     override fun checkServerTrusted(
         chain: Array<out X509Certificate>?,
         authType: String?,
-    ) {}
+    ) {
+        // Nothing
+    }
 
     override fun getAcceptedIssuers(): Array<out X509Certificate> = arrayOf()
 }
 
-actual fun setupInsecureHTTPEngine(config: CIOEngineConfig) {
+actual fun setupInsecureHttpEngine(config: CIOEngineConfig) {
     config.https.trustManager = NaiveTrustManager()
 }

shared/src/androidMain/kotlin/bou/amine/apps/readerforselfossv2/utils/DateUtils.kt

@@ -1,9 +1,9 @@
 package bou.amine.apps.readerforselfossv2.utils
 
 import android.text.format.DateUtils
-import io.github.aakira.napier.Napier
+import kotlinx.datetime.Clock
-import kotlinx.datetime.*
 
+@Suppress("detekt:UtilityClassWithPublicConstructor")
 actual class DateUtils {
     actual companion object {
         actual fun parseRelativeDate(dateString: String): String {

shared/src/androidMain/kotlin/bou/amine/apps/readerforselfossv2/utils/ModelConverters.kt

@@ -4,46 +4,36 @@ import android.net.Uri
 import android.text.Html
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import org.jsoup.Jsoup
-import java.util.*
+import java.util.Locale
 
-actual fun String.getHtmlDecoded(): String {
+actual fun String.getHtmlDecoded(): String = Html.fromHtml(this).toString()
-    return Html.fromHtml(this).toString()
-}
 
-actual fun SelfossModel.Item.getIcon(baseUrl: String): String {
+actual fun SelfossModel.Item.getIcon(baseUrl: String): String = constructUrl(baseUrl, "favicons", icon)
-    return constructUrl(baseUrl, "favicons", icon)
-}
 
-actual fun SelfossModel.Item.getThumbnail(baseUrl: String): String {
+actual fun SelfossModel.Item.getThumbnail(baseUrl: String): String = constructUrl(baseUrl, "thumbnails", thumbnail)
-    return constructUrl(baseUrl, "thumbnails", thumbnail)
+
-}
+val IMAGE_EXTENSION_REGEXP = """\.(jpg|jpeg|png|webp)""".toRegex()
 
 actual fun SelfossModel.Item.getImages(): ArrayList<String> {
     val allImages = ArrayList<String>()
 
     for (image in Jsoup.parse(content).getElementsByTag("img")) {
         val url = image.attr("src")
-        if (url.lowercase(Locale.US).contains(".jpg") ||
+        if (IMAGE_EXTENSION_REGEXP.containsMatchIn(url.lowercase(Locale.US))) {
-            url.lowercase(Locale.US).contains(".jpeg") ||
-            url.lowercase(Locale.US).contains(".png") ||
-            url.lowercase(Locale.US).contains(".webp")
-        ) {
             allImages.add(url)
         }
     }
     return allImages
 }
 
-actual fun SelfossModel.Source.getIcon(baseUrl: String): String {
+actual fun SelfossModel.Source.getIcon(baseUrl: String): String = constructUrl(baseUrl, "favicons", icon)
-    return constructUrl(baseUrl, "favicons", icon)
-}
 
 actual fun constructUrl(
     baseUrl: String,
     path: String,
     file: String?,
-): String {
+): String =
-    return if (file == null || file == "null" || file.isEmpty()) {
+    if (file == null || file == "null" || file.isEmpty()) {
         ""
     } else {
         val baseUriBuilder = Uri.parse(baseUrl).buildUpon()
@@ -51,4 +41,3 @@ actual fun constructUrl(
 
         baseUriBuilder.toString()
     }
-}

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/di/Modules.kt

@@ -1,4 +1,4 @@
-package bou.amine.apps.readerforselfossv2.DI
+package bou.amine.apps.readerforselfossv2.di
 
 import bou.amine.apps.readerforselfossv2.rest.MercuryApi
 import bou.amine.apps.readerforselfossv2.rest.SelfossApi

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/MercuryModel.kt

@@ -1,13 +1,16 @@
+@file:Suppress("detekt:LongParameterList")
+
 package bou.amine.apps.readerforselfossv2.model
 
 import kotlinx.serialization.Serializable
 
 class MercuryModel {
+    @Suppress("detekt:ConstructorParameterNaming")
     @Serializable
     class ParsedContent(
         val title: String? = null,
         val content: String? = null,
-        val lead_image_url: String? = null, // NOSONAR
+        val lead_image_url: String? = null,
         val url: String? = null,
         val error: Boolean? = null,
         val message: String? = null,

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/ResultModel.kt

@@ -3,19 +3,20 @@ package bou.amine.apps.readerforselfossv2.model
 import kotlinx.serialization.Serializable
 
 @Serializable
-class SuccessResponse(val success: Boolean) {
+class SuccessResponse(
+    val success: Boolean,
+) {
     val isSuccess: Boolean
         get() = success
 }
 
-class StatusAndData<T>(val success: Boolean, val data: T? = null) {
+class StatusAndData<T>(
+    val success: Boolean,
+    val data: T? = null,
+) {
     companion object {
-        fun <T> succes(d: T): StatusAndData<T> {
+        fun <T> succes(d: T): StatusAndData<T> = StatusAndData(true, d)
-            return StatusAndData(true, d)
-        }
 
-        fun <T> error(): StatusAndData<T> {
+        fun <T> error(): StatusAndData<T> = StatusAndData(false)
-            return StatusAndData(false)
-        }
     }
 }

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt

@@ -1,3 +1,5 @@
+@file:Suppress("detekt:LongParameterList")
+
 package bou.amine.apps.readerforselfossv2.model
 
 import bou.amine.apps.readerforselfossv2.utils.DateUtils
@@ -18,6 +20,10 @@ import kotlinx.serialization.json.booleanOrNull
 import kotlinx.serialization.json.int
 import kotlinx.serialization.json.jsonPrimitive
 
+class ModelException(
+    message: String,
+) : Throwable(message)
+
 class SelfossModel {
     @Serializable
     data class Tag(
@@ -121,8 +127,8 @@ class SelfossModel {
         val tags: List<String>,
         val author: String? = null,
     ) {
-        fun getLinkDecoded(): String {
+        fun getLinkDecoded(): String? {
-            var stringUrl: String
+            var stringUrl: String?
             stringUrl =
                 if (link.contains("//news.google.com/news/") && link.contains("&amp;url=")) {
                     link.substringAfter("&amp;url=")
@@ -140,11 +146,7 @@ class SelfossModel {
                 stringUrl = "http:$stringUrl"
             }
 
-            if (stringUrl.isEmptyOrNullOrNullString()) {
+            return if (stringUrl.isEmptyOrNullOrNullString()) null else stringUrl
-                throw Exception("Link ${link} was translated to ${stringUrl}, but was empty. Handle this.")
-            }
-
-            return stringUrl
         }
 
         fun sourceAuthorAndDate(): String {
@@ -170,14 +172,13 @@ class SelfossModel {
         }
     }
 
-    // TODO: this seems to be super slow.
+    // this seems to be super slow.
     object TagsListSerializer : KSerializer<List<String>> {
-        override fun deserialize(decoder: Decoder): List<String> {
+        override fun deserialize(decoder: Decoder): List<String> =
-            return when (val json = ((decoder as JsonDecoder).decodeJsonElement())) {
+            when (val json = ((decoder as JsonDecoder).decodeJsonElement())) {
                 is JsonArray -> json.toList().map { it.toString().replace("^\"|\"$".toRegex(), "") }
                 else -> json.toString().split(",")
             }
-        }
 
         override val descriptor: SerialDescriptor
             get() = PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING)
@@ -188,7 +189,7 @@ class SelfossModel {
         ) {
             encoder.encodeCollection(
                 PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING),
-                value.size
+                value.size,
             ) { this.toString() }
         }
     }
@@ -204,9 +205,10 @@ class SelfossModel {
         }
 
         override val descriptor: SerialDescriptor
-            get() = PrimitiveSerialDescriptor(
+            get() =
+                PrimitiveSerialDescriptor(
                     "BooleanOrIntForSomeSelfossVersions",
-                PrimitiveKind.BOOLEAN
+                    PrimitiveKind.BOOLEAN,
                 )
 
         override fun serialize(

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

@@ -1,12 +1,24 @@
+@file:Suppress("detekt:TooManyFunctions")
+
 package bou.amine.apps.readerforselfossv2.repository
 
-import bou.amine.apps.readerforselfossv2.dao.*
+import bou.amine.apps.readerforselfossv2.dao.ACTION
+import bou.amine.apps.readerforselfossv2.dao.DriverFactory
+import bou.amine.apps.readerforselfossv2.dao.ITEM
+import bou.amine.apps.readerforselfossv2.dao.ReaderForSelfossDB
+import bou.amine.apps.readerforselfossv2.dao.SOURCE
+import bou.amine.apps.readerforselfossv2.dao.TAG
 import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.model.StatusAndData
 import bou.amine.apps.readerforselfossv2.rest.SelfossApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import bou.amine.apps.readerforselfossv2.utils.*
+import bou.amine.apps.readerforselfossv2.service.ConnectivityService
+import bou.amine.apps.readerforselfossv2.utils.ItemType
+import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
+import bou.amine.apps.readerforselfossv2.utils.toEntity
+import bou.amine.apps.readerforselfossv2.utils.toParsedDate
+import bou.amine.apps.readerforselfossv2.utils.toView
 import io.github.aakira.napier.Napier
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -14,14 +26,15 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
+private const val MAX_ITEMS_NUMBER = 200
+
 class Repository(
     private val api: SelfossApi,
     private val appSettingsService: AppSettingsService,
-    val isConnectionAvailable: MutableStateFlow<Boolean>,
+    private val connectivityService: ConnectivityService,
     private val db: ReaderForSelfossDB,
 ) {
     var items = ArrayList<SelfossModel.Item>()
-    var connectionMonitored = false
 
     var baseUrl = appSettingsService.getBaseUrl()
 
@@ -50,7 +63,7 @@ class Repository(
 
     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error()
-        if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             fetchedItems =
                 api.getItems(
                     displayedItems.type,
@@ -89,7 +102,7 @@ class Repository(
 
     suspend fun getOlderItems(): ArrayList<SelfossModel.Item> {
         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error()
-        if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             val offset = items.size
             fetchedItems =
                 api.getItems(
@@ -109,7 +122,7 @@ class Repository(
     }
 
     private suspend fun getMaxItemsForBackground(itemType: ItemType): List<SelfossModel.Item> {
-        return if (isNetworkAvailable()) {
+        return if (connectivityService.isNetworkAvailable()) {
             val items =
                 api.getItems(
                     itemType.type,
@@ -118,7 +131,7 @@ class Repository(
                     null,
                     null,
                     null,
-                    200,
+                    MAX_ITEMS_NUMBER,
                 )
             return if (items.success && items.data != null) {
                 items.data
@@ -130,9 +143,10 @@ class Repository(
         }
     }
 
+    @Suppress("detekt:ForbiddenComment")
     suspend fun reloadBadges(): Boolean {
         var success = false
-        if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             val response = api.stats()
             if (response.success && response.data != null) {
                 _badgeUnread.value = response.data.unread ?: 0
@@ -154,7 +168,7 @@ class Repository(
     suspend fun getTags(): List<SelfossModel.Tag> {
         val isDatabaseEnabled =
             appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
-        return if (isNetworkAvailable() && !fetchedTags) {
+        return if (connectivityService.isNetworkAvailable() && !fetchedTags) {
             val apiTags = api.tags()
             if (apiTags.success && apiTags.data != null && isDatabaseEnabled) {
                 resetDBTagsWithData(apiTags.data)
@@ -170,8 +184,8 @@ class Repository(
         }
     }
 
-    suspend fun getSpouts(): Map<String, SelfossModel.Spout> {
+    suspend fun getSpouts(): Map<String, SelfossModel.Spout> =
-        return if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             val spouts = api.spouts()
             if (spouts.success && spouts.data != null) {
                 spouts.data
@@ -181,14 +195,13 @@ class Repository(
         } else {
             throw NetworkUnavailableException()
         }
-    }
 
     suspend fun getSourcesDetailsOrStats(): ArrayList<SelfossModel.Source> {
         var sources = ArrayList<SelfossModel.Source>()
         val isDatabaseEnabled =
             appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
         val shouldFetch = if (!appSettingsService.isUpdateSourcesEnabled()) !fetchedSources else true
-        if (shouldFetch && isNetworkAvailable()) {
+        if (shouldFetch && connectivityService.isNetworkAvailable()) {
             if (appSettingsService.getPublicAccess()) {
                 val apiSources = api.sourcesStats()
                 if (apiSources.success && apiSources.data != null) {
@@ -210,7 +223,7 @@ class Repository(
         val isDatabaseEnabled =
             appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
         val shouldFetch = if (!appSettingsService.isUpdateSourcesEnabled()) !fetchedSources else true
-        if (shouldFetch && isNetworkAvailable()) {
+        if (shouldFetch && connectivityService.isNetworkAvailable()) {
             val apiSources = api.sourcesDetailed()
             if (apiSources.success && apiSources.data != null) {
                 fetchedSources = true
@@ -234,14 +247,13 @@ class Repository(
         return success
     }
 
-    private suspend fun markAsReadById(id: Int): Boolean {
+    private suspend fun markAsReadById(id: Int): Boolean =
-        return if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             api.markAsRead(id.toString()).isSuccess
         } else {
             insertDBAction(id.toString(), read = true)
             true
         }
-    }
 
     suspend fun unmarkAsRead(item: SelfossModel.Item): Boolean {
         val success = unmarkAsReadById(item.id)
@@ -252,14 +264,13 @@ class Repository(
         return success
     }
 
-    private suspend fun unmarkAsReadById(id: Int): Boolean {
+    private suspend fun unmarkAsReadById(id: Int): Boolean =
-        return if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             api.unmarkAsRead(id.toString()).isSuccess
         } else {
             insertDBAction(id.toString(), unread = true)
             true
         }
-    }
 
     suspend fun starr(item: SelfossModel.Item): Boolean {
         val success = starrById(item.id)
@@ -270,14 +281,13 @@ class Repository(
         return success
     }
 
-    private suspend fun starrById(id: Int): Boolean {
+    private suspend fun starrById(id: Int): Boolean =
-        return if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             api.starr(id.toString()).isSuccess
         } else {
             insertDBAction(id.toString(), starred = true)
             true
         }
-    }
 
     suspend fun unstarr(item: SelfossModel.Item): Boolean {
         val success = unstarrById(item.id)
@@ -288,19 +298,19 @@ class Repository(
         return success
     }
 
-    private suspend fun unstarrById(id: Int): Boolean {
+    private suspend fun unstarrById(id: Int): Boolean =
-        return if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             api.unstarr(id.toString()).isSuccess
         } else {
             insertDBAction(id.toString(), starred = true)
             true
         }
-    }
 
     suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
         var success = false
 
-        if (isNetworkAvailable() && api.markAllAsRead(items.map { it.id.toString() }).isSuccess) {
+        if (connectivityService.isNetworkAvailable() && api.markAllAsRead(items.map { it.id.toString() }).isSuccess
+        ) {
             success = true
             for (item in items) {
                 markAsReadLocally(item)
@@ -360,8 +370,9 @@ class Repository(
         tags: String,
     ): Boolean {
         var response = false
-        if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
-            response = api.createSourceForVersion(
+            response = api
+                .createSourceForVersion(
                     title,
                     url,
                     spout,
@@ -380,7 +391,7 @@ class Repository(
         tags: String,
     ): Boolean {
         var response = false
-        if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             response = api.updateSourceForVersion(id, title, url, spout, tags).isSuccess == true
         }
 
@@ -392,13 +403,13 @@ class Repository(
         title: String,
     ): Boolean {
         var success = false
-        if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             val response = api.deleteSource(id)
             success = response.isSuccess
         }
 
         // We filter on success or if the network isn't available
-        if (success || !isNetworkAvailable()) {
+        if (success || !connectivityService.isNetworkAvailable()) {
             items = ArrayList(items.filter { it.sourcetitle != title })
             setReaderItems(items)
             db.itemsQueries.deleteItemsWhereSource(title)
@@ -407,22 +418,21 @@ class Repository(
         return success
     }
 
-    suspend fun updateRemote(): Boolean {
+    suspend fun updateRemote(): Boolean =
-        return if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             api.update().data.equals("finished")
         } else {
             false
         }
-    }
 
     suspend fun login(): Boolean {
         var result = false
-        if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             try {
                 val response = api.login()
                 result = response.isSuccess == true
             } catch (cause: Throwable) {
-                Napier.e("login failed", cause, tag = "RepositoryImpl.login")
+                Napier.e("login failed", cause, tag = "Repository.login")
             }
         }
         return result
@@ -430,13 +440,13 @@ class Repository(
 
     suspend fun checkIfFetchFails(): Boolean {
         var fetchFailed = true
-        if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             try {
                 // Trying to fetch one item, and check someone is trying to use the app with
                 // a random rss feed, that would throw a NoTransformationFoundException
                 fetchFailed = !api.getItemsWithoutCatch().success
             } catch (e: Throwable) {
-                Napier.e("checkIfFetchFails failed", e, tag = "RepositoryImpl.shouldBeSelfossInstance")
+                Napier.e("checkIfFetchFails failed", e, tag = "Repository.shouldBeSelfossInstance")
             }
         }
 
@@ -444,14 +454,14 @@ class Repository(
     }
 
     suspend fun logout() {
-        if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             try {
                 val response = api.logout()
                 if (!response.isSuccess) {
-                    Napier.e("Couldn't logout.", tag = "RepositoryImpl.logout")
+                    Napier.e("Couldn't logout.", tag = "Repository.logout")
                 }
             } catch (cause: Throwable) {
-                Napier.e("logout failed", cause, tag = "RepositoryImpl.logout")
+                Napier.e("logout failed", cause, tag = "Repository.logout")
             }
             appSettingsService.clearAll()
         } else {
@@ -472,7 +482,7 @@ class Repository(
     suspend fun updateApiInformation() {
         val apiMajorVersion = appSettingsService.getApiVersion()
 
-        if (isNetworkAvailable()) {
+        if (connectivityService.isNetworkAvailable()) {
             val fetchedInformation = api.apiInformation()
             if (fetchedInformation.success && fetchedInformation.data != null) {
                 if (fetchedInformation.data.getApiMajorVersion() != apiMajorVersion) {
@@ -491,8 +501,6 @@ class Repository(
         }
     }
 
-    fun isNetworkAvailable() = isConnectionAvailable.value && !offlineOverride
-
     private fun getDBActions(): List<ACTION> = db.actionsQueries.actions().executeAsList()
 
     private fun deleteDBAction(action: ACTION) = db.actionsQueries.deleteAction(action.id)
@@ -555,6 +563,7 @@ class Repository(
             item.id.toString(),
         )
 
+    @Suppress("detekt:SwallowedException")
     suspend fun tryToCacheItemsAndGetNewOnes(): List<SelfossModel.Item> {
         try {
             val newItems = getMaxItemsForBackground(ItemType.UNREAD)
@@ -578,16 +587,19 @@ class Repository(
                         markAsReadById(action.articleid.toInt()),
                         action,
                     )
+
                 action.unread ->
                     doAndReportOnFail(
                         unmarkAsReadById(action.articleid.toInt()),
                         action,
                     )
+
                 action.starred ->
                     doAndReportOnFail(
                         starrById(action.articleid.toInt()),
                         action,
                     )
+
                 action.unstarred ->
                     doAndReportOnFail(
                         unstarrById(action.articleid.toInt()),
@@ -618,9 +630,7 @@ class Repository(
         _readerItems = readerItems
     }
 
-    fun getReaderItems(): ArrayList<SelfossModel.Item> {
+    fun getReaderItems(): ArrayList<SelfossModel.Item> = _readerItems
-        return _readerItems
-    }
 
     fun migrate(driverFactory: DriverFactory) {
         ReaderForSelfossDB.Schema.migrate(driverFactory.createDriver(), 0, 1)
@@ -634,7 +644,5 @@ class Repository(
         _selectedSource = null
     }
 
-    fun getSelectedSource(): SelfossModel.SourceDetail? {
+    fun getSelectedSource(): SelfossModel.SourceDetail? = _selectedSource
-        return _selectedSource
-    }
 }

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

@@ -17,8 +17,8 @@ import kotlinx.serialization.json.Json
 class MercuryApi {
     var client = createHttpClient()
 
-    private fun createHttpClient(): HttpClient {
+    private fun createHttpClient(): HttpClient =
-        return HttpClient {
+        HttpClient {
             install(HttpCache)
             install(ContentNegotiation) {
                 json(
@@ -40,7 +40,6 @@ class MercuryApi {
             }
             expectSuccess = false
         }
-    }
 
     suspend fun query(url: String): StatusAndData<MercuryModel.ParsedContent> =
         bodyOrFailure(

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

@@ -3,23 +3,28 @@ package bou.amine.apps.readerforselfossv2.rest
 import bou.amine.apps.readerforselfossv2.model.StatusAndData
 import bou.amine.apps.readerforselfossv2.model.SuccessResponse
 import io.github.aakira.napier.Napier
-import io.ktor.client.*
+import io.ktor.client.HttpClient
-import io.ktor.client.call.*
+import io.ktor.client.call.body
-import io.ktor.client.request.*
+import io.ktor.client.request.HttpRequestBuilder
-import io.ktor.client.request.forms.*
+import io.ktor.client.request.delete
-import io.ktor.client.statement.*
+import io.ktor.client.request.forms.submitForm
-import io.ktor.http.*
+import io.ktor.client.request.get
+import io.ktor.client.request.post
+import io.ktor.client.request.url
+import io.ktor.client.statement.HttpResponse
+import io.ktor.http.HttpStatusCode
+import io.ktor.http.Parameters
+import io.ktor.http.isSuccess
 
-suspend fun responseOrSuccessIf404(r: HttpResponse?): SuccessResponse {
+suspend fun responseOrSuccessIf404(r: HttpResponse?): SuccessResponse =
-    return if (r != null && r.status === HttpStatusCode.NotFound) {
+    if (r != null && r.status === HttpStatusCode.NotFound) {
         SuccessResponse(true)
     } else {
         maybeResponse(r)
     }
-}
 
-suspend fun maybeResponse(r: HttpResponse?): SuccessResponse {
+suspend fun maybeResponse(r: HttpResponse?): SuccessResponse =
-    return if (r != null && r.status.isSuccess()) {
+    if (r != null && r.status.isSuccess()) {
         r.body()
     } else {
         if (r != null) {
@@ -27,8 +32,8 @@ suspend fun maybeResponse(r: HttpResponse?): SuccessResponse {
         }
         SuccessResponse(false)
     }
-}
 
+@Suppress("detekt:SwallowedException")
 suspend inline fun <reified T> bodyOrFailure(r: HttpResponse?): StatusAndData<T> {
     try {
         return if (r != null && r.status.isSuccess()) {

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

@@ -1,3 +1,5 @@
+@file:Suppress("detekt:TooManyFunctions", "detekt:LongParameterList", "detekt:LargeClass")
+
 package bou.amine.apps.readerforselfossv2.rest
 
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
@@ -33,16 +35,20 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 
-expect fun setupInsecureHTTPEngine(config: CIOEngineConfig)
+expect fun setupInsecureHttpEngine(config: CIOEngineConfig)
 
-class SelfossApi(private val appSettingsService: AppSettingsService) {
+private const val VERSION_WHERE_POST_LOGIN_SHOULD_WORK = 5
+
+class SelfossApi(
+    private val appSettingsService: AppSettingsService,
+) {
     var client = createHttpClient()
 
     fun createHttpClient() =
         HttpClient(CIO) {
             if (appSettingsService.getSelfSigned()) {
                 engine {
-                    setupInsecureHTTPEngine(this)
+                    setupInsecureHttpEngine(this)
                 }
             }
             install(HttpCache)
@@ -105,12 +111,14 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
 
     private fun hasLoginInfo() =
         appSettingsService.getUserName().isNotEmpty() &&
-                appSettingsService.getPassword()
+            appSettingsService
+                .getPassword()
                 .isNotEmpty()
 
     suspend fun login(): SuccessResponse =
         if (appSettingsService.getUserName().isNotEmpty() &&
-            appSettingsService.getPassword()
+            appSettingsService
+                .getPassword()
                 .isNotEmpty()
         ) {
             if (shouldHavePostLogin()) {
@@ -127,8 +135,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             client.tryToGet(url("/login")) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -150,8 +160,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             client.tryToPost(url("/login")) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -168,8 +180,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             },
         )
 
-    private fun shouldHaveNewLogout() =
+    private fun shouldHaveNewLogout() = appSettingsService.getApiVersion() >= VERSION_WHERE_POST_LOGIN_SHOULD_WORK // We are missing 4.1.0
-        appSettingsService.getApiVersion() >= 5 // We are missing 4.1.0
 
     suspend fun logout(): SuccessResponse =
         if (shouldHaveNewLogout()) {
@@ -181,8 +192,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
     private suspend fun maybeLogoutIfAvailable() =
         responseOrSuccessIf404(
             client.tryToGet(url("/logout")) {
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -202,8 +215,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
     private suspend fun doLogout() =
         maybeResponse(
             client.tryToDelete(url("/api/session/current")) {
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -242,8 +257,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 parameter("updatedsince", updatedSince)
                 parameter("items", items ?: appSettingsService.getItemsNumber())
                 parameter("offset", offset)
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -269,8 +286,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 }
                 parameter("type", "all")
                 parameter("items", 1)
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -294,8 +313,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -319,8 +340,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -344,8 +367,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -369,8 +394,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -394,8 +421,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -419,8 +448,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -440,8 +471,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
     suspend fun apiInformation(): StatusAndData<SelfossModel.ApiInformation> =
         bodyOrFailure(
             client.tryToGet(url("/api/about")) {
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -465,8 +498,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -490,8 +525,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -515,8 +552,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -540,8 +579,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -571,8 +612,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                         ids.map { append("ids[]", it) }
                     },
                 block = {
-                    if (appSettingsService.getBasicUserName()
+                    if (appSettingsService
-                            .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                            .getBasicUserName()
+                            .isNotEmpty() &&
+                        appSettingsService.getBasicPassword().isNotEmpty()
                     ) {
                         headers {
                             append(
@@ -625,8 +668,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     append(tagsParamName, tags)
                 },
             block = {
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -680,8 +725,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     append(tagsParamName, tags)
                 },
             block = {
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(
@@ -705,8 +752,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
+                if (appSettingsService
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
+                        .getBasicUserName()
+                        .isNotEmpty() &&
+                    appSettingsService.getBasicPassword().isNotEmpty()
                 ) {
                     headers {
                         append(

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

@@ -1,3 +1,5 @@
+@file:Suppress("detekt:TooManyFunctions")
+
 package bou.amine.apps.readerforselfossv2.service
 
 import com.russhwolf.settings.Settings