Testing

.drone.yml

@@ -3,151 +3,21 @@ type: docker
 name: test
 
 steps:
-  - name: Lint
-    failure: ignore
-    image: mingc/android-build-box:latest
-    commands:
-      - echo "---------------------------------------------------------"
-      - echo "Install linters..."
-      - curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
-      - 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
-      - echo "---------------------------------------------------------"
-      - echo "Linting..."
-      - ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build' || true
-      - echo "---------------------------------------------------------"
-      - echo "Detecting..."
-      - ./detekt-cli-1.23.1/bin/detekt-cli --all-rules --excludes '**/shared/build/**/*.kt' || true
-      - echo "---------------------------------------------------------"
-    command_timeout: 1m
   - name: BuildAndTest
     image: mingc/android-build-box:latest
     commands:
       - echo "---------------------------------------------------------"
       - echo "Configure gradle..."
-      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
+      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
       - echo "---------------------------------------------------------"
-      - echo "Configure java..."
+      - echo "Building..."
-      - . ~/.bash_profile
+      - ./gradlew build -x test
-      - jenv global 17.0
-      - java --version
-      - date
       - echo "---------------------------------------------------------"
-      - echo "Building and testing..."
+      - cat androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt
-      - ./gradlew build
-      - echo "---------------------------------------------------------"
-trigger:
-  event:
-    - push
-    - pull_request
-
----
-kind: pipeline
-type: docker
-name: Publish
-
-steps:
-  - name: createTagAndChangelog
-    image: ubuntu:latest
-    commands:
-      - apt-get update && apt-get install -y git
-      - git fetch --tags -p
-      - PREV=$(git describe --tags --abbrev=0)
-      - ./build.sh --publish --from-ci
-      - VER=$(git describe --tags --abbrev=0)
-      - CHANGELOG=$(git log $PREV..HEAD --pretty="- %s")
-      - echo "**$VER**\n\n$CHANGELOG\n\n--------------------------------------------------------------------\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
-      - git add CHANGELOG.md
-      - git commit -m "Changelog for $VER [CI SKIP]"
     environment:
       TZ: Europe/Paris
-
-  - name: git-push
-    image: appleboy/drone-git-push
-    settings:
-      branch: master
-      remote:
-        from_secret: remoteUrl
-      followtags: true
-      ssh_key:
-        from_secret: privateKey
-      skip_verify: true
-
-  - name: scpFiles
-    image: appleboy/drone-scp
-    settings:
-      host: amine-bouabdallaoui.fr
-      username: ubuntu
-      key:
-        from_secret: privateKey
-      port: 22
-      target: /home/ubuntu/
-      source: version.txt
-
-  - name: deploy
-    image: appleboy/drone-ssh
-    settings:
-      host: amine-bouabdallaoui.fr
-      user: ubuntu
-      key:
-        from_secret: privateKey
-      command_timeout: 2m
-      script:
-        - cd /home/ubuntu && sudo rm -rf /var/www/amine/version.txt && sudo chown www-data:www-data ./version.txt && sudo mv version.txt /var/www/amine/
-
-trigger:
-  event:
-    - promote
-  target:
-    - production
-
----
-kind: pipeline
-type: docker
-name: Release
-
-steps:
-  - name: build
-    image: mingc/android-build-box:latest
-    commands:
-      - echo "---------------------------------------------------------"
-      - echo "Fetch tags..."
-      - git fetch --tags
-      - echo "---------------------------------------------------------"
-      - echo "Configure gradle..."
-      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
-      - echo "---------------------------------------------------------"
-      - echo "Generate APK"
-      - ./gradlew :androidApp:assembleGithubConfigRelease
-      - echo "---------------------------------------------------------"
-      - echo "Get Key"
-      - wget https://amine-bouabdallaoui.fr/key
-      - echo "---------------------------------------------------------"
-      - echo "Zipalign"
-      - $ANDROID_HOME/build-tools/31.0.0/zipalign -f -v 4 androidApp/build/outputs/apk/githubConfig/release/androidApp-githubConfig-release-unsigned.apk androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
-      - echo "---------------------------------------------------------"
-      - echo "Sign"
-      - $ANDROID_HOME/build-tools/31.0.0/apksigner sign -v --out signed.apk --ks ./key --ks-key-alias $YOUR_KEY_ALIAS --ks-pass pass:$YOUR_KEYSTORE_PASSWORD --v1-signing-enabled true --v2-signing-enabled true androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
-      - echo "---------------------------------------------------------"
-      - echo "Verify"
-      - $ANDROID_HOME/build-tools/31.0.0/apksigner verify signed.apk
-    environment:
-      TZ: Europe/Paris
-      YOUR_KEYSTORE_PASSWORD:
-        from_secret: keyPass
-      YOUR_KEY_ALIAS:
-        from_secret: keyAlias
-
-  - name: gitea_release
-    image: plugins/gitea-release
-    settings:
-      api_key:
-        from_secret: giteaAPI
-      base_url: https://gitea.amine-bouabdallaoui.fr
-      files: signed.apk
-
   - name: notify
     image: drillster/drone-email
-    failure: ignore
     settings:
       host:
         from_secret: smtpHOST
@@ -167,4 +37,5 @@ steps:
       attachment: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt
 trigger:
   event:
-    - tag
+    - push
+    - pull_request

.github/CONTRIBUTING.md

@@ -10,7 +10,7 @@ Please read the guidelines before contributing, and follow them (or try to) when
 
 There are many ways to contribute to this project, you could [translate the app](https://crowdin.com/project/readerforselfoss), report bugs, request missing features, suggest enhancements and changes to existing ones. You also can improve the README with useful tips that could help the other users.
 
-You can fork the repository, and [help me solve some issues](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues)
+You can fork the repository, and [help me solve some issues](https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues)
 
 ### What I can't help you with.
 

CHANGELOG.md

@@ -1,157 +1,3 @@
-**v124041081**
-
-- chore: comment.
-- fix: Last time fixing the parsing date hack before moving it to os version.
-- Changelog for v124030731 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124030731**
-
-- fix: Basic auth and password can have non whitspace characters. Fixes 142.
-- Changelog for v124020451 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124020451**
-
-- fix: Fixed handling of position in card adapter.
-- Changelog for v124010301 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124010301**
-
-- fix: This may fix the oom errors.
-- Changelog for v124010191 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124010191**
-
-- fix: moving listeners.
-- chore: removed a useless log.
-- Changelog for v124010032 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124010032**
-
-- fix: Another date format thing.
-- Changelog for v124010031 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124010031**
-
-- fix: Checking if selfoss instance.
-- fix: handle three characters lenght hexcode colors.
-- Changelog for v123113311 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123113311**
-
-- chore: Source tracker url in the menu.
-- fix: Handle kodein proguard rules.
-- Changelog for v123102961 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123102961**
-
-- chore: domain changes.
-- Changelog for v123102852 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123102852**
-
-- chore: lint cleaning.
-- Changelog for v123102841 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123102841**
-
-- chore: cleaning ci steps and upgrading dependencies.
-- feat: Self signed ssl support.
-- Changelog for v123061811 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123061811**
-
-- feat: Added confirmation dialog for disconnect item menu.
-- Changelog for v123061651 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123061651**
-
-- i18n: Translation update.
-- i18n: Translation update.
-- i18n: Translation update.
-- fix: avoid trying to open invalid image urls.
-- Changelog for v123051471 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123051471**
-
-- fix: images could be null.
-- fix: Check if color is not empty before parsing it.
-- chore: Removed unused log.
-- Changelog for v123051331 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123051331**
-
-- fix: illegal input.
-- Changelog for v123051321 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123051321**
-
-- debug: Debug null context.
-- Changelog for v123051301 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123051301**
-
-- feat: Basic auth from url. Fixes #142 (#143)
-- debug: Debug index out of bound exception.
-- Changelog for v123051211 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123051211**
-
-- fix: Sometimes url isn't even defined.
-- Changelog for v123041021 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123041021**
-
-- fix: 'Enable Core Library Desugaring to support older Android versions' (#138) from davidoskky/ReaderForSelfoss-multiplatform:desugaring into master
-- Enable Core Library Desugaring to support older Android versions
-- Changelog for v123030851 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123030851**
-
-- chore: replace textDrawable library (#136)
-- refactor: Remove slow login check. Closes #135.
-- ci: send the mapping file after a release.
-- Changelog for v123030751 [CI SKIP]
-
---------------------------------------------------------------------
-
 **v123030751**
 
 - debug: added a lot to pinpoint the url issue.

README.md

@@ -1,4 +1,4 @@
-# ReaderForSelfoss-multiplatform [![Build Status](https://build.amine-bouabdallaoui.fr/api/badges/Louvorg/ReaderForSelfoss-multiplatform/status.svg)](https://build.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform)
+# ReaderForSelfoss-multiplatform [![Build Status](https://build.amine-louveau.fr/api/badges/Louvorg/ReaderForSelfoss-multiplatform/status.svg)](https://build.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform)
 
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/readerforselfoss/localized.svg)](https://crowdin.com/project/readerforselfoss)
 
@@ -22,15 +22,15 @@ If you are a user, you can still create new issues. I'll fix them when I can.
 
 1. **You'll have to have a Selfoss instance running.** You'll find everything you need to install it [here](https://selfoss.aditu.de/).
 
-2. Check the [Contribution guide](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md).
+2. Check the [Contribution guide](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md).
 
-3. Build the project by following [these steps](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide)
+3. Build the project by following [these steps](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide)
 
 ## Useful links
 
-- [Check what changed](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md)
+- [Check what changed](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md)
-- [See what I'm doing](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/projects/1)
+- [See what I'm doing](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/projects/1)
-- [Create an issue, or request a new feature](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/issues)
+- [Create an issue, or request a new feature](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/issues)
 - [Help translation the app](https://crowdin.com/project/readerforselfoss)
 
 ## Contributors (V1) (Alphabetical order) ❤️

androidApp/build.gradle.kts

@@ -8,15 +8,15 @@ plugins {
     kotlin("android")
     kotlin("kapt")
     id("com.mikepenz.aboutlibraries.plugin")
-    id("org.jetbrains.kotlinx.kover")
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
 
 fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
-    val result: String = ByteArrayOutputStream().use { outputStream ->
+    var result: String = ByteArrayOutputStream().use { outputStream ->
         project.exec {
             commandLine = cmd.split(" ")
             standardOutput = outputStream
-            isIgnoreExitValue = ignore
+            isIgnoreExitValue = ignore ?: false
         }
         outputStream.toString()
     }
@@ -24,8 +24,9 @@ fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
 }
 
 fun gitVersion(): String {
+    var process = ""
     val maybeTagOfCurrentCommit = execWithOutput("git -C ../ describe --contains HEAD", true)
-    val process = if (maybeTagOfCurrentCommit.isEmpty()) {
+    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 {
@@ -55,24 +56,24 @@ fun versionNameFromGit(): String {
 
 android {
     compileOptions {
-        isCoreLibraryDesugaringEnabled = true
         // Flag to enable support for the new language APIs
-        sourceCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     // For Kotlin projects
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "11"
     }
-    compileSdk = 34
+    compileSdk = 33
+    buildToolsVersion = "33.0.0"
     buildFeatures {
         viewBinding = true
     }
     defaultConfig {
         applicationId = "bou.amine.apps.readerforselfossv2.android"
-        minSdk = 25
+        minSdk = 21
-        targetSdk = 34
+        targetSdk = 33
         versionCode = versionCodeFromGit()
         versionName = versionNameFromGit()
 
@@ -85,7 +86,7 @@ android {
         // tests
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    packaging {
+    packagingOptions {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
@@ -111,28 +112,26 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
-
     implementation(project(":shared"))
-    implementation("com.google.android.material:material:1.9.0")
+    implementation("com.google.android.material:material:1.5.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
 
-    implementation("androidx.preference:preference-ktx:1.2.1")
+    implementation("androidx.preference:preference-ktx:1.1.1")
 
     implementation(fileTree(mapOf("include" to listOf("*.jar"), "dir" to "libs")))
 
     // Android Support
-    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("com.google.android.material:material:1.9.0")
+    implementation("com.google.android.material:material:1.5.0")
-    implementation("androidx.recyclerview:recyclerview:1.3.1")
+    implementation("androidx.recyclerview:recyclerview:1.3.0-alpha01")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("androidx.vectordrawable:vectordrawable:1.2.0-beta01")
+    implementation("androidx.vectordrawable:vectordrawable:1.2.0-alpha02")
     implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.annotation:annotation:1.7.0")
+    implementation("androidx.annotation:annotation:1.3.0")
-    implementation("androidx.work:work-runtime-ktx:2.8.1")
+    implementation("androidx.work:work-runtime-ktx:2.7.1")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("org.jsoup:jsoup:1.15.4")
+    implementation("org.jsoup:jsoup:1.14.3")
 
     //multidex
     implementation("androidx.multidex:multidex:2.0.1")
@@ -143,6 +142,7 @@ dependencies {
 
     // Material-ish things
     implementation("com.ashokvarma.android:bottom-navigation-bar:2.2.0")
+    implementation("com.amulyakhare:com.amulyakhare.textdrawable:1.0.1")
 
     // glide
     kapt("com.github.bumptech.glide:compiler:4.15.0")
@@ -153,7 +153,7 @@ dependencies {
 
     // Pager
     implementation("me.relex:circleindicator:2.1.6")
-    implementation("androidx.viewpager2:viewpager2:1.1.0-beta02")
+    implementation("androidx.viewpager2:viewpager2:1.1.0-beta01")
 
     //Dependency Injection
     implementation("org.kodein.di:kodein-di:7.14.0")
@@ -169,7 +169,7 @@ dependencies {
     //PhotoView
     implementation("com.github.chrisbanes:PhotoView:2.3.0")
 
-    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.core:core-ktx:1.8.0")
 
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
 
@@ -182,7 +182,7 @@ dependencies {
     //test
     testImplementation("junit:junit:4.13.2")
     testImplementation("io.mockk:mockk:1.12.0")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 
     implementation("ch.acra:acra-http:$acraVersion")

androidApp/proguard-rules.pro

@@ -55,7 +55,6 @@
 # maybe remove later ?
 -keep class * extends androidx.fragment.app.Fragment
 
--dontwarn org.slf4j.impl.StaticLoggerBinder
 
 # Keep `Companion` object fields of serializable classes.
 # This avoids serializer lookup through `getDeclaredClasses` as done for named companion objects.
@@ -86,12 +85,3 @@
 
 -dontwarn io.mockk.**
 -keep class io.mockk.** { *; }
-
-
-
-# Kodein
--keep, allowobfuscation, allowoptimization class org.kodein.type.TypeReference
--keep, allowobfuscation, allowoptimization class org.kodein.type.JVMAbstractTypeToken$Companion$WrappingTest
-
--keep, allowobfuscation, allowoptimization class * extends org.kodein.type.TypeReference
--keep, allowobfuscation, allowoptimization class * extends org.kodein.type.JVMAbstractTypeToken$Companion$WrappingTest

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

@@ -1,7 +1,6 @@
 package bou.amine.apps.readerforselfossv2.android
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
@@ -44,7 +43,9 @@ import org.kodein.di.instance
 import java.security.MessageDigest
 import java.util.concurrent.TimeUnit
 
+
 class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAware {
+
     private var items: ArrayList<SelfossModel.Item> = ArrayList()
 
     private var elementsShown: ItemType = ItemType.UNREAD
@@ -62,8 +63,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     private var fromTabShortcut: Boolean = false
 
-    private val settingsLauncher =
+    private val settingsLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
         appSettingsService.refreshUserSettings()
     }
 
@@ -71,6 +71,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     private val repository : Repository by instance()
     private val appSettingsService : AppSettingsService by instance()
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHomeBinding.inflate(layoutInflater)
@@ -91,6 +92,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
         handleSwipeRefreshLayout()
 
+
         if (appSettingsService.isItemCachingEnabled()) {
             CoroutineScope(Dispatchers.Main).launch {
                 repository.tryToCacheItemsAndGetNewOnes()
@@ -102,7 +104,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         binding.swipeRefreshLayout.setColorSchemeResources(
             R.color.refresh_progress_1,
             R.color.refresh_progress_2,
-            R.color.refresh_progress_3,
+            R.color.refresh_progress_3
         )
         binding.swipeRefreshLayout.setOnRefreshListener {
             repository.offlineOverride = false
@@ -113,8 +115,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             }
         }
 
-        val swipeDirs =
+        val swipeDirs = if (appSettingsService.getPublicAccess()) {
-            if (appSettingsService.getPublicAccess()) {
             0
         } else {
             ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
@@ -123,31 +124,28 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         val simpleItemTouchCallback =
             object : ItemTouchHelper.SimpleCallback(
                 0,
-                swipeDirs,
+                swipeDirs
             ) {
                 override fun getSwipeDirs(
                     recyclerView: RecyclerView,
-                    viewHolder: RecyclerView.ViewHolder,
+                    viewHolder: RecyclerView.ViewHolder
                 ): Int =
                     if (elementsShown == ItemType.STARRED) {
                         0
                     } else {
                         super.getSwipeDirs(
                             recyclerView,
-                            viewHolder,
+                            viewHolder
                         )
                     }
 
                 override fun onMove(
                     recyclerView: RecyclerView,
                     viewHolder: RecyclerView.ViewHolder,
-                    target: RecyclerView.ViewHolder,
+                    target: RecyclerView.ViewHolder
                 ): Boolean = false
 
-                override fun onSwiped(
+                override fun onSwiped(viewHolder: RecyclerView.ViewHolder, swipeDir: Int) {
-                    viewHolder: RecyclerView.ViewHolder,
-                    swipeDir: Int,
-                ) {
                     val position = viewHolder.bindingAdapterPosition
                     val i = items.elementAtOrNull(position)
 
@@ -164,7 +162,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                         Toast.makeText(
                             this@HomeActivity,
                             "Found null when swiping at positon $position.",
-                            Toast.LENGTH_LONG,
+                            Toast.LENGTH_LONG
                         ).show()
                     }
                 }
@@ -173,10 +171,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         ItemTouchHelper(simpleItemTouchCallback).attachToRecyclerView(binding.recyclerView)
     }
 
-    private fun updateBottomBarBadgeCount(
+    private fun updateBottomBarBadgeCount(badge: TextBadgeItem, count: Int) {
-        badge: TextBadgeItem,
-        count: Int,
-    ) {
         if (count > 0) {
             badge
                 .setText(count.toString())
@@ -187,16 +182,14 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     }
 
     private fun handleBottomBar() {
-        tabNewBadge =
+
-            TextBadgeItem()
+        tabNewBadge = TextBadgeItem()
             .setText("")
             .setHideOnSelect(false).hide(false)
-        tabArchiveBadge =
+        tabArchiveBadge = TextBadgeItem()
-            TextBadgeItem()
             .setText("")
             .setHideOnSelect(false).hide(false)
-        tabStarredBadge =
+        tabStarredBadge = TextBadgeItem()
-            TextBadgeItem()
             .setText("")
             .setHideOnSelect(false).hide(false)
 
@@ -225,19 +218,19 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         val tabNew =
             BottomNavigationItem(
                 R.drawable.ic_tab_fiber_new_black_24dp,
-                getString(R.string.tab_new),
+                getString(R.string.tab_new)
             )
                 .setBadgeItem(tabNewBadge)
         val tabArchive =
             BottomNavigationItem(
                 R.drawable.ic_tab_archive_black_24dp,
-                getString(R.string.tab_read),
+                getString(R.string.tab_read)
             )
                 .setBadgeItem(tabArchiveBadge)
         val tabStarred =
             BottomNavigationItem(
                 R.drawable.ic_tab_favorite_black_24dp,
-                getString(R.string.tab_favs),
+                getString(R.string.tab_favs)
             ).setActiveColorResource(R.color.pink)
                 .setBadgeItem(tabStarredBadge)
 
@@ -278,6 +271,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         getElementsAccordingToTab()
     }
 
+
     private fun handleGDPRDialog(GDPRShown: Boolean) {
         val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
         messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
@@ -287,7 +281,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             alertDialog.setMessage(getString(R.string.gdpr_dialog_message))
             alertDialog.setButton(
                 AlertDialog.BUTTON_NEUTRAL,
-                "OK",
+                "OK"
             ) { dialog, _ ->
                 appSettingsService.settings.putBoolean("GDPR_shown", true)
                 dialog.dismiss()
@@ -304,19 +298,17 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         when (currentManager) {
             is StaggeredGridLayoutManager ->
                 if (!appSettingsService.isCardViewEnabled()) {
-                    layoutManager =
+                    layoutManager = GridLayoutManager(
-                        GridLayoutManager(
                         this,
-                            calculateNoOfColumns(),
+                        calculateNoOfColumns()
                     )
                     binding.recyclerView.layoutManager = layoutManager
                 }
             is GridLayoutManager ->
                 if (appSettingsService.isCardViewEnabled()) {
-                    layoutManager =
+                    layoutManager = StaggeredGridLayoutManager(
-                        StaggeredGridLayoutManager(
                         calculateNoOfColumns(),
-                            StaggeredGridLayoutManager.VERTICAL,
+                        StaggeredGridLayoutManager.VERTICAL
                     )
                     layoutManager.gapStrategy =
                             StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
@@ -325,17 +317,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             else ->
                 if (currentManager == null) {
                     if (!appSettingsService.isCardViewEnabled()) {
-                        layoutManager =
+                        layoutManager = GridLayoutManager(
-                            GridLayoutManager(
                             this,
-                                calculateNoOfColumns(),
+                            calculateNoOfColumns()
                         )
                         binding.recyclerView.layoutManager = layoutManager
                     } else {
-                        layoutManager =
+                        layoutManager = StaggeredGridLayoutManager(
-                            StaggeredGridLayoutManager(
                             calculateNoOfColumns(),
-                                StaggeredGridLayoutManager.VERTICAL,
+                            StaggeredGridLayoutManager.VERTICAL
                         )
                         layoutManager.gapStrategy =
                                 StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
@@ -346,11 +336,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     }
 
     private fun handleBottomBarActions() {
-        binding.bottomBar.setTabSelectedListener(
+        binding.bottomBar.setTabSelectedListener(object : BottomNavigationBar.OnTabSelectedListener {
-            object : BottomNavigationBar.OnTabSelectedListener {
             override fun onTabUnselected(position: Int) = Unit
 
             override fun onTabReselected(position: Int) {
+
                 when (val layoutManager = binding.recyclerView.adapter) {
                     is StaggeredGridLayoutManager ->
                         if (layoutManager.findFirstCompletelyVisibleItemPositions(null)[0] == 0) {
@@ -378,8 +368,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
                 fetchOnEmptyList()
             }
-            },
+        })
-        )
     }
 
     fun fetchOnEmptyList() {
@@ -389,13 +378,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     }
 
     private fun handleInfiniteScroll() {
-        recyclerViewScrollListener =
+        recyclerViewScrollListener = object : RecyclerView.OnScrollListener() {
-            object : RecyclerView.OnScrollListener() {
+            override fun onScrolled(localRecycler: RecyclerView, dx: Int, dy: Int) {
-                override fun onScrolled(
-                    localRecycler: RecyclerView,
-                    dx: Int,
-                    dy: Int,
-                ) {
                 if (dy > 0) {
                     val lastVisibleItem = getLastVisibleItem()
 
@@ -412,9 +396,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     private fun getLastVisibleItem() : Int {
         return when (val manager = binding.recyclerView.layoutManager) {
-            is StaggeredGridLayoutManager ->
+            is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions(
-                manager.findLastCompletelyVisibleItemPositions(
+                null
-                    null,
             ).last()
             is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition()
             else -> 0
@@ -428,9 +411,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             binding.emptyText.visibility = View.GONE
         }
 
-    fun getElementsAccordingToTab(appendResults: Boolean = false) {
+    fun getElementsAccordingToTab(
-        offset =
+        appendResults: Boolean = false
-            if (appendResults && items.size > 0) {
+    ) {
+        offset = if (appendResults && items.size > 0) {
             items.size - 1
         } else {
             0
@@ -440,15 +424,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         getItems(appendResults, elementsShown)
     }
 
-    private fun getItems(
+    private fun getItems(appendResults: Boolean, itemType: ItemType) {
-        appendResults: Boolean,
-        itemType: ItemType,
-    ) {
         CoroutineScope(Dispatchers.Main).launch {
             binding.swipeRefreshLayout.isRefreshing = true
             repository.displayedItems = itemType
-            items =
+            items = if (appendResults) {
-                if (appendResults) {
                 repository.getOlderItems()
             } else {
                 repository.getNewerItems()
@@ -461,8 +441,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     private fun handleListResult(appendResults: Boolean = false) {
         if (appendResults) {
             val oldManager = binding.recyclerView.layoutManager
-            firstVisible =
+            firstVisible = when (oldManager) {
-                when (oldManager) {
                 is StaggeredGridLayoutManager ->
                     oldManager.findFirstCompletelyVisibleItemPositions(null).last()
                 is GridLayoutManager ->
@@ -492,8 +471,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                 binding.recyclerView.addItemDecoration(
                     DividerItemDecoration(
                         this@HomeActivity,
-                        DividerItemDecoration.VERTICAL,
+                        DividerItemDecoration.VERTICAL
-                    ),
+                    )
                 )
             }
             binding.recyclerView.adapter = recyclerAdapter
@@ -550,11 +529,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         return true
     }
 
-    private fun needsConfirmation(
+    private fun needsConfirmation(titleRes: Int, messageRes: Int, doFn: () -> Unit) {
-        titleRes: Int,
-        messageRes: Int,
-        doFn: () -> Unit,
-    ) {
         AlertDialog.Builder(this@HomeActivity)
             .setMessage(messageRes)
             .setTitle(titleRes)
@@ -566,11 +541,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.issue_tracker -> {
-                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
-                startActivity(browserIntent)
-                return true
-            }
             R.id.action_filter -> {
                 val filterSheetFragment = FilterSheetFragment()
                 filterSheetFragment.show(supportFragmentManager, FilterSheetFragment.TAG)
@@ -584,15 +554,14 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                         if (updatedRemote) {
                             Toast.makeText(
                                 this@HomeActivity,
-                                R.string.refresh_success_response,
+                                R.string.refresh_success_response, Toast.LENGTH_LONG
-                                Toast.LENGTH_LONG,
                             )
                                 .show()
                         } else {
                             Toast.makeText(
                                 this@HomeActivity,
                                 R.string.refresh_failer_message,
-                                Toast.LENGTH_SHORT,
+                                Toast.LENGTH_SHORT
                             ).show()
                         }
                     }
@@ -610,7 +579,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                                 Toast.makeText(
                                     this@HomeActivity,
                                     R.string.all_posts_read,
-                                    Toast.LENGTH_SHORT,
+                                    Toast.LENGTH_SHORT
                                 ).show()
                                 tabNewBadge.removeBadge()
 
@@ -619,7 +588,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                                 Toast.makeText(
                                     this@HomeActivity,
                                     R.string.all_posts_not_read,
-                                    Toast.LENGTH_SHORT,
+                                    Toast.LENGTH_SHORT
                                 ).show()
                             }
                             handleListResult()
@@ -630,14 +599,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                 return true
             }
             R.id.action_disconnect -> {
-                needsConfirmation(R.string.confirm_disconnect_title, R.string.confirm_disconnect_description) {
                 runBlocking {
                     repository.logout()
                 }
                 val intent = Intent(this, LoginActivity::class.java)
                 this.startActivity(intent)
                 finish()
-                }
                 return true
             }
             R.id.action_settings -> {
@@ -666,8 +633,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     private fun handleRecurringTask() {
         if (appSettingsService.isPeriodicRefreshEnabled()) {
-            val myConstraints =
+            val myConstraints = Constraints.Builder()
-                Constraints.Builder()
                 .setRequiresBatteryNotLow(true)
                 .setRequiresCharging(appSettingsService.isRefreshWhenChargingOnlyEnabled())
                 .setRequiresStorageNotLow(true)
@@ -679,9 +645,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                     .addTag("selfoss-loading")
                     .build()
 
-            WorkManager.getInstance(
+            WorkManager.getInstance(baseContext).enqueueUniquePeriodicWork("selfoss-loading", ExistingPeriodicWorkPolicy.KEEP, backgroundWork)
-                baseContext,
-            ).enqueueUniquePeriodicWork("selfoss-loading", ExistingPeriodicWorkPolicy.KEEP, backgroundWork)
         }
     }
 }
+

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

@@ -32,41 +32,24 @@ class ImageActivity : AppCompatActivity() {
         binding.pager.adapter = ScreenSlidePagerAdapter(this)
         binding.pager.setCurrentItem(position, false)
 
-        val transitionListener =
+        val transitionListener = object : MotionLayout.TransitionListener {
-            object : MotionLayout.TransitionListener {
+            override fun onTransitionStarted(motionLayout: MotionLayout?, startId: Int, endId: Int) {
-                override fun onTransitionStarted(
+                // Nothing
-                    motionLayout: MotionLayout?,
+            }
-                    startId: Int,
+
-                    endId: Int,
+            override fun onTransitionChange(motionLayout: MotionLayout?, startId: Int, endId: Int, progress: Float
             ) {
                 // Nothing
             }
 
-                override fun onTransitionChange(
+            override fun onTransitionCompleted(motionLayout: MotionLayout?, currentId: Int) {
-                    motionLayout: MotionLayout?,
-                    startId: Int,
-                    endId: Int,
-                    progress: Float,
-                ) {
-                    // Nothing
-                }
-
-                override fun onTransitionCompleted(
-                    motionLayout: MotionLayout?,
-                    currentId: Int,
-                ) {
                 if (motionLayout?.currentState == binding.root.endState) {
                     onBackPressedDispatcher.onBackPressed()
                     overridePendingTransition(0, 0)
                 }
             }
 
-                override fun onTransitionTrigger(
+            override fun onTransitionTrigger(motionLayout: MotionLayout?, triggerId: Int, positive: Boolean, progress: Float) {
-                    motionLayout: MotionLayout?,
-                    triggerId: Int,
-                    positive: Boolean,
-                    progress: Float,
-                ) {
                 // Nothing
             }
         }
@@ -85,6 +68,7 @@ class ImageActivity : AppCompatActivity() {
     }
 
     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

@@ -4,7 +4,6 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.Menu
@@ -29,7 +28,9 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
+
 class LoginActivity : AppCompatActivity(), DIAware {
+
     private var inValidCount: Int = 0
     private var isWithLogin = false
 
@@ -39,6 +40,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
     private val repository: Repository by instance()
     private val appSettingsService: AppSettingsService by instance()
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -55,7 +57,29 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
         if (appSettingsService.getBaseUrl().isNotEmpty()) {
             showProgress(true)
+            // This should be reverted when "old" users connected with a non-selfoss rss
+            // are handled. Revert to "simple" way.
+            CoroutineScope(Dispatchers.Main).launch {
+                try {
+                    val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance()
+                    if (!errorFetching && !displaySelfossOnly) {
                         goToMain()
+                    } else {
+                        showProgress(false)
+                        if (displaySelfossOnly) {
+                            Toast.makeText(
+                                applicationContext,
+                                R.string.application_selfoss_only,
+                                Toast.LENGTH_LONG
+                            ).show()
+                        }
+                        repository.logout()
+                    }
+                } catch (e: Throwable) {
+                    repository.logout()
+                    showProgress(false)
+                }
+            }
         }
 
         handleActions()
@@ -67,6 +91,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
     }
 
     private fun handleActions() {
+
         binding.passwordView.setOnEditorActionListener(
             TextView.OnEditorActionListener { _, id, _ ->
                 if (id == R.id.loginView || id == EditorInfo.IME_NULL) {
@@ -74,7 +99,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
                     return@OnEditorActionListener true
                 }
                 false
-            },
+            }
         )
 
         binding.signInButton.setOnClickListener { attemptLogin() }
@@ -95,7 +120,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
             alertDialog.setMessage(getString(R.string.base_url_error))
             alertDialog.setButton(
                 AlertDialog.BUTTON_NEUTRAL,
-                "OK",
+                "OK"
             ) { dialog, _ -> dialog.dismiss() }
             alertDialog.show()
         }
@@ -120,6 +145,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
     }
 
     private fun attemptLogin() {
+
         // Reset errors.
         binding.urlView.error = null
         binding.loginView.error = null
@@ -135,30 +161,22 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
         showProgress(true)
 
-        appSettingsService.updateSelfSigned(binding.selfSigned.isChecked)
-
         repository.refreshLoginInformation(url, login, password)
 
         CoroutineScope(Dispatchers.Main).launch {
-            try {
+            val result = repository.login()
-                repository.updateApiInformation()
+            if (result) {
-            } catch (e: Exception) {
+                val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance()
-                if (e.message?.startsWith("No transformation found") == true) {
+                if (!errorFetching && !displaySelfossOnly) {
+                    goToMain()
+                } else {
+                    if (displaySelfossOnly) {
                         Toast.makeText(
                             applicationContext,
                             R.string.application_selfoss_only,
-                        Toast.LENGTH_LONG,
+                            Toast.LENGTH_LONG
                         ).show()
-                    preferenceError()
-                    showProgress(false)
                     }
-            }
-            val result = repository.login()
-            if (result) {
-                val errorFetching = repository.checkIfFetchFails()
-                if (!errorFetching) {
-                    goToMain()
-                } else {
                     preferenceError()
                 }
             } else {
@@ -170,7 +188,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
     private fun failLoginDetails(
         password: String,
-        login: String,
+        login: String
     ) {
         var lastFocusedView: View? = null
         var cancel = false
@@ -203,7 +221,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
                 alertDialog.setMessage(getString(R.string.text_wrong_url))
                 alertDialog.setButton(
                     AlertDialog.BUTTON_NEUTRAL,
-                    "OK",
+                    "OK"
                 ) { dialog, _ -> dialog.dismiss() }
                 alertDialog.show()
                 inValidCount = 0
@@ -212,10 +230,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
         maybeCancelAndFocusView(cancel, focusView)
     }
 
-    private fun maybeCancelAndFocusView(
+    private fun maybeCancelAndFocusView(cancel: Boolean, focusView: View?) {
-        cancel: Boolean,
-        focusView: View?,
-    ) {
         if (cancel) {
             focusView?.requestFocus()
         }
@@ -229,13 +244,12 @@ class LoginActivity : AppCompatActivity(), DIAware {
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
-                if (show) 0F else 1F,
+                if (show) 0F else 1F
-            ).setListener(
+            ).setListener(object : AnimatorListenerAdapter() {
-                object : AnimatorListenerAdapter() {
                 override fun onAnimationEnd(animation: Animator) {
                     binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE
                 }
-                },
+            }
             )
 
         binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
@@ -243,13 +257,12 @@ class LoginActivity : AppCompatActivity(), DIAware {
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
-                if (show) 1F else 0F,
+                if (show) 1F else 0F
-            ).setListener(
+            ).setListener(object : AnimatorListenerAdapter() {
-                object : AnimatorListenerAdapter() {
                 override fun onAnimationEnd(animation: Animator) {
                     binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
                 }
-                },
+            }
             )
     }
 
@@ -260,17 +273,10 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
-            R.id.issue_tracker -> {
-                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
-                startActivity(browserIntent)
-                return true
-            }
             R.id.about -> {
                 LibsBuilder()
                     .withAboutIconShown(true)
                     .withAboutVersionShown(true)
-                    .withAboutSpecial2("Bug reports").withAboutSpecial2Description(AppSettingsService.trackerUrl)
-                    .withAboutSpecial1("Project Page").withAboutSpecial1Description(AppSettingsService.sourceUrl)
                     .start(this)
                 true
             }

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

@@ -8,6 +8,7 @@ import bou.amine.apps.readerforselfossv2.android.databinding.ActivityMainBinding
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)

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

@@ -32,18 +32,18 @@ import org.acra.sender.HttpSender
 import org.kodein.di.*
 
 class MyApp : MultiDexApplication(), DIAware {
+
     override val di by DI.lazy {
         bind<AppSettingsService>() with singleton { AppSettingsService(ACRA.isACRASenderServiceProcess()) }
         import(networkModule)
         bind<DriverFactory>() with singleton { DriverFactory(applicationContext) }
         bind<ReaderForSelfossDB>() with singleton { ReaderForSelfossDB(driverFactory.createDriver()) }
-        bind<Repository>() with
+        bind<Repository>() with singleton {
-            singleton {
             Repository(
                 instance(),
                 instance(),
                 isConnectionAvailable,
-                    instance(),
+                instance()
             )
         }
         bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
@@ -70,14 +70,13 @@ class MyApp : MultiDexApplication(), DIAware {
             ProcessLifecycleOwner.get().lifecycle.addObserver(
                 AppLifeCycleObserver(
                     connectivityStatus,
-                    repository,
+                    repository
-                ),
+                )
             )
 
             CoroutineScope(Dispatchers.Main).launch {
                 viewModel.networkAvailableProvider.collect { networkAvailable ->
-                    val toastMessage =
+                    val toastMessage = if (networkAvailable) {
-                        if (networkAvailable) {
                         repository.handleDBActions()
                         R.string.network_connectivity_retrieved
                     } else {
@@ -87,7 +86,7 @@ class MyApp : MultiDexApplication(), DIAware {
                     Toast.makeText(
                         applicationContext,
                         toastMessage,
-                        Toast.LENGTH_SHORT,
+                        Toast.LENGTH_SHORT
                     ).show()
                 }
             }
@@ -101,8 +100,7 @@ class MyApp : MultiDexApplication(), DIAware {
 
         initAcra {
             reportFormat = StringFormat.JSON
-            reportContent =
+            reportContent = listOf(
-                listOf(
                 ReportField.REPORT_ID,
                 ReportField.INSTALLATION_ID,
                 ReportField.APP_VERSION_CODE,
@@ -123,7 +121,7 @@ class MyApp : MultiDexApplication(), DIAware {
                 ReportField.USER_COMMENT,
                 ReportField.USER_CRASH_DATE,
                 ReportField.USER_EMAIL,
-                    ReportField.CUSTOM_DATA,
+                ReportField.CUSTOM_DATA
             )
             toast {
                 //required
@@ -132,7 +130,7 @@ class MyApp : MultiDexApplication(), DIAware {
             }
             httpSender {
                 uri =
-                    "https://bugs.amine-bouabdallaoui.fr/report" // best guess, you may need to adjust this
+                    "https://bugs.amine-louveau.fr/report" /*best guess, you may need to adjust this*/
                 basicAuthLogin = "qMEscjj89Gwt6cPR"
                 basicAuthPassword = "Yo58QFlGzFaWlBzP"
                 httpMethod = HttpSender.Method.POST
@@ -150,11 +148,10 @@ class MyApp : MultiDexApplication(), DIAware {
 
             val newItemsChannelname = getString(R.string.new_items_channel_sync)
             val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT
-            val newItemsChannelmChannel =
+            val newItemsChannelmChannel = NotificationChannel(
-                NotificationChannel(
                 AppSettingsService.newItemsChannelId,
                 newItemsChannelname,
-                    newItemsChannelimportance,
+                newItemsChannelimportance
             )
 
             notificationManager.createNotificationChannel(mChannel)
@@ -166,11 +163,9 @@ class MyApp : MultiDexApplication(), DIAware {
         val oldHandler = Thread.getDefaultUncaughtExceptionHandler()
 
         Thread.setDefaultUncaughtExceptionHandler { thread, e ->
-            if (e is NoClassDefFoundError &&
+            if (e is NoClassDefFoundError && e.stackTrace.asList().any {
-                e.stackTrace.asList().any {
                     it.toString().contains("android.view.ViewDebug")
-                }
+                }) {
-            ) {
                 // Nothing
             } else {
                 oldHandler.uncaughtException(thread, e)
@@ -180,8 +175,9 @@ class MyApp : MultiDexApplication(), DIAware {
 
     class AppLifeCycleObserver(
         val connectivityStatus: ConnectivityStatus,
-        val repository: Repository,
+        val repository: Repository
     ) : DefaultLifecycleObserver {
+
         override fun onResume(owner: LifecycleOwner) {
             super.onResume(owner)
             repository.connectionMonitored = true

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

@@ -23,6 +23,7 @@ import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
 class ReaderActivity : AppCompatActivity(), DIAware {
+
     private var currentItem: Int = 0
 
     private lateinit var toolbarMenu: Menu
@@ -70,11 +71,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {
             finish()
         }
 
-        try {
         readItem(allItems[currentItem])
-        } catch (e: IndexOutOfBoundsException) {
-            finish()
-        }
 
         binding.pager.adapter = ScreenSlidePagerAdapter(this)
         binding.pager.setCurrentItem(currentItem, false)
@@ -101,15 +98,15 @@ class ReaderActivity : AppCompatActivity(), DIAware {
 
     private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) :
         FragmentStateAdapter(fa) {
+
         override fun getItemCount(): Int = allItems.size
 
-        override fun createFragment(position: Int): Fragment = ArticleFragment.newInstance(allItems[position])
+        override fun createFragment(position: Int): Fragment =
+            ArticleFragment.newInstance(allItems[position])
+
     }
 
-    override fun onKeyDown(
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        keyCode: Int,
-        event: KeyEvent?,
-    ): Boolean {
         return when (keyCode) {
             KeyEvent.KEYCODE_VOLUME_DOWN -> {
                 val currentFragment =
@@ -151,8 +148,10 @@ class ReaderActivity : AppCompatActivity(), DIAware {
                 canFavorite()
             }
 
+
             binding.pager.registerOnPageChangeCallback(
                 object : ViewPager2.OnPageChangeCallback() {
+
                     override fun onPageSelected(position: Int) {
                         super.onPageSelected(position)
 
@@ -163,7 +162,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {
                         }
                         readItem(allItems[position])
                     }
-                },
+                }
             )
         }
 

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

@@ -18,6 +18,7 @@ import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
 class SourcesActivity : AppCompatActivity(), DIAware {
+
     private lateinit var binding: ActivitySourcesBinding
 
     override val di by closestDI()
@@ -57,10 +58,8 @@ class SourcesActivity : AppCompatActivity(), DIAware {
             val response = repository.getSourcesDetails()
             if (response.isNotEmpty()) {
                 items = response
-                val mAdapter =
+                val mAdapter = SourcesListAdapter(
-                    SourcesListAdapter(
+                    this@SourcesActivity, items
-                        this@SourcesActivity,
-                        items,
                 )
                 binding.recyclerView.adapter = mAdapter
                 mAdapter.notifyDataSetChanged()
@@ -68,7 +67,7 @@ class SourcesActivity : AppCompatActivity(), DIAware {
                 Toast.makeText(
                     this@SourcesActivity,
                     R.string.cant_get_sources,
-                    Toast.LENGTH_SHORT,
+                    Toast.LENGTH_SHORT
                 ).show()
             }
         }

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

@@ -21,7 +21,9 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
+
 class UpsertSourceActivity : AppCompatActivity(), DIAware {
+
     private var existingSource: SelfossModel.SourceDetail? = null
     private var mSpoutsValue: String? = null
 
@@ -56,6 +58,7 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
         supportActionBar?.setDisplayShowHomeEnabled(true)
         supportActionBar?.title = resources.getString(title)
 
+
         maybeGetDetailsFromIntentSharing(intent)
 
         binding.saveBtn.setOnClickListener {
@@ -85,14 +88,8 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
 
     private fun handleSpoutsSpinner() {
         val spoutsKV = HashMap<String, String>()
-        binding.spoutsSpinner.onItemSelectedListener =
+        binding.spoutsSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(adapterView: AdapterView<*>, view: View?, i: Int, l: Long) {
-                override fun onItemSelected(
-                    adapterView: AdapterView<*>,
-                    view: View?,
-                    i: Int,
-                    l: Long,
-                ) {
                 if (view != null) {
                     val spoutName = (view as TextView).text.toString()
                     mSpoutsValue = spoutsKV[spoutName]
@@ -104,11 +101,12 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
             }
         }
 
+
         fun handleSpoutFailure(networkIssue: Boolean = false) {
             Toast.makeText(
                 this@UpsertSourceActivity,
                 if (networkIssue) R.string.cant_get_spouts_no_network else R.string.cant_get_spouts,
-                Toast.LENGTH_SHORT,
+                Toast.LENGTH_SHORT
             ).show()
             binding.progress.visibility = View.GONE
         }
@@ -129,7 +127,7 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
                         ArrayAdapter(
                             this@UpsertSourceActivity,
                             android.R.layout.simple_spinner_item,
-                            itemsStrings,
+                            itemsStrings
                         )
                     spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
                     binding.spoutsSpinner.adapter = spinnerArrayAdapter
@@ -146,7 +144,9 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
         }
     }
 
-    private fun maybeGetDetailsFromIntentSharing(intent: Intent) {
+    private fun maybeGetDetailsFromIntentSharing(
+        intent: Intent
+    ) {
         if (Intent.ACTION_SEND == intent.action && "text/plain" == intent.type) {
             binding.sourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
             binding.nameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
@@ -172,14 +172,13 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
             }
             else -> {
                 CoroutineScope(Dispatchers.Main).launch {
-                    val successfullyAddedSource =
+                    val successfullyAddedSource = if (existingSource != null) {
-                        if (existingSource != null) {
                         repository.updateSource(
                             existingSource!!.id,
                             binding.nameInput.text.toString(),
                             url,
                             mSpoutsValue!!,
-                                binding.tags.text.toString(),
+                            binding.tags.text.toString()
                         )
                     } else {
                         repository.createSource(
@@ -195,7 +194,7 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
                         Toast.makeText(
                             this@UpsertSourceActivity,
                             R.string.cant_create_source,
-                            Toast.LENGTH_SHORT,
+                            Toast.LENGTH_SHORT
                         ).show()
                     }
                 }

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

@@ -9,10 +9,10 @@ import android.widget.ImageView.ScaleType
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.CardItemBinding
-import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
 import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
 import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
 import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
 import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
@@ -22,6 +22,8 @@ import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import bou.amine.apps.readerforselfossv2.utils.getThumbnail
+import com.amulyakhare.textdrawable.TextDrawable
+import com.amulyakhare.textdrawable.util.ColorGenerator
 import com.bumptech.glide.Glide
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -33,10 +35,10 @@ import org.kodein.di.instance
 class ItemCardAdapter(
     override val app: Activity,
     override var items: ArrayList<SelfossModel.Item>,
-    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit,
+    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
-    private lateinit var binding: CardItemBinding
     private val c: Context = app.baseContext
+    private val generator: ColorGenerator = ColorGenerator.MATERIAL
     private val imageMaxHeight: Int =
         c.resources.getDimension(R.dimen.card_image_max_height).toInt()
 
@@ -44,61 +46,14 @@ class ItemCardAdapter(
     override val repository: Repository by instance()
     override val appSettingsService: AppSettingsService by instance()
 
-    override fun onCreateViewHolder(
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        parent: ViewGroup,
+        val binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        viewType: Int,
-    ): ViewHolder {
-        binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(binding)
     }
 
-    private fun handleClickListeners(position: Int) {
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        binding.favButton.setOnClickListener {
-            val item = items[position]
-            if (item.starred) {
-                CoroutineScope(Dispatchers.IO).launch {
-                    repository.unstarr(item)
-                }
-                binding.favButton.isSelected = false
-            } else {
-                CoroutineScope(Dispatchers.IO).launch {
-                    repository.starr(item)
-                }
-                binding.favButton.isSelected = true
-            }
-        }
-
-        binding.shareBtn.setOnClickListener {
-            val item = items[position]
-            c.shareLink(item.getLinkDecoded(), item.title.getHtmlDecoded())
-        }
-
-        binding.browserBtn.setOnClickListener {
-            c.openInBrowserAsNewTask(items[position])
-        }
-    }
-
-    private fun handleLinkOpening(position: Int) {
-        binding.root.setOnClickListener {
-            repository.setReaderItems(items)
-            c.openItemUrl(
-                position,
-                items[position].getLinkDecoded(),
-                appSettingsService.isArticleViewerEnabled(),
-                app,
-            )
-        }
-    }
-
-    override fun onBindViewHolder(
-        holder: ViewHolder,
-        position: Int,
-    ) {
         with(holder) {
-            val itm = items[holder.bindingAdapterPosition]
+            val itm = items[position]
-
-            handleClickListeners(holder.bindingAdapterPosition)
-            handleLinkOpening(holder.bindingAdapterPosition)
 
             binding.favButton.isSelected = itm.starred
             if (appSettingsService.getPublicAccess()) {
@@ -111,12 +66,7 @@ class ItemCardAdapter(
 
             binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = try {
+            binding.sourceTitleAndDate.text = itm.sourceAuthorAndDate()
-                itm.sourceAuthorAndDate()
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("ItemCardAdapter parse date")
-                itm.sourceAuthorOnly()
-            }
 
             if (!appSettingsService.isFullHeightCardsEnabled()) {
                 binding.itemImage.maxHeight = imageMaxHeight
@@ -133,9 +83,16 @@ class ItemCardAdapter(
             }
 
             if (itm.getIcon(repository.baseUrl).isEmpty()) {
-                binding.sourceImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
+                val color = generator.getColor(itm.title.getHtmlDecoded())
+
+                val drawable =
+                    TextDrawable
+                        .builder()
+                        .round()
+                        .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
+                binding.sourceImage.setImageDrawable(drawable)
             } else {
-                c.circularDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage)
+                c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage)
             }
         }
     }
@@ -144,5 +101,49 @@ class ItemCardAdapter(
         return items.size
     }
 
-    inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root)
+    inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root) {
+        init {
+            handleClickListeners()
+            handleLinkOpening()
+        }
+
+        private fun handleClickListeners() {
+
+            binding.favButton.setOnClickListener {
+                val item = items[bindingAdapterPosition]
+                if (item.starred) {
+                    CoroutineScope(Dispatchers.IO).launch {
+                        repository.unstarr(item)
+                    }
+                    binding.favButton.isSelected = false
+                } else {
+                    CoroutineScope(Dispatchers.IO).launch {
+                        repository.starr(item)
+                    }
+                    binding.favButton.isSelected = true
+                }
+            }
+
+            binding.shareBtn.setOnClickListener {
+                val item = items[bindingAdapterPosition]
+                c.shareLink(item.getLinkDecoded(), item.title.getHtmlDecoded())
+            }
+
+            binding.browserBtn.setOnClickListener {
+                c.openInBrowserAsNewTask(items[bindingAdapterPosition])
+            }
+        }
+
+        private fun handleLinkOpening() {
+            binding.root.setOnClickListener {
+                repository.setReaderItems(items)
+                c.openItemUrl(
+                    bindingAdapterPosition,
+                    items[bindingAdapterPosition].getLinkDecoded(),
+                    appSettingsService.isArticleViewerEnabled(),
+                    app
+                )
+            }
+        }
+    }
 }

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

@@ -7,9 +7,10 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.ListItemBinding
-import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
 import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
 import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
@@ -17,6 +18,8 @@ import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import bou.amine.apps.readerforselfossv2.utils.getThumbnail
+import com.amulyakhare.textdrawable.TextDrawable
+import com.amulyakhare.textdrawable.util.ColorGenerator
 import org.kodein.di.DI
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
@@ -24,39 +27,23 @@ import org.kodein.di.instance
 class ItemListAdapter(
     override val app: Activity,
     override var items: ArrayList<SelfossModel.Item>,
-    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit,
+    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
-    private lateinit var binding: ListItemBinding
+    private val generator: ColorGenerator = ColorGenerator.MATERIAL
     private val c: Context = app.baseContext
 
     override val di: DI by closestDI(app)
     override val repository : Repository by instance()
     override val appSettingsService : AppSettingsService by instance()
 
-    override fun onCreateViewHolder(
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        parent: ViewGroup,
+        val binding = ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        viewType: Int,
-    ): ViewHolder {
-        binding = ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(binding)
     }
 
-    override fun onBindViewHolder(
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder: ViewHolder,
-        position: Int,
-    ) {
         with(holder) {
-            val itm = items[holder.bindingAdapterPosition]
+            val itm = items[position]
-
-            binding.root.setOnClickListener {
-                repository.setReaderItems(items)
-                c.openItemUrl(
-                    holder.bindingAdapterPosition,
-                    items[holder.bindingAdapterPosition].getLinkDecoded(),
-                    appSettingsService.isArticleViewerEnabled(),
-                    app,
-                )
-            }
 
             binding.title.text = itm.title.getHtmlDecoded()
 
@@ -64,26 +51,47 @@ class ItemListAdapter(
 
             binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = try {
+            binding.sourceTitleAndDate.text = itm.sourceAuthorAndDate()
-                itm.sourceAuthorAndDate()
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("ItemListAdapter parse date")
-                itm.sourceAuthorOnly()
-            }
 
             if (itm.getThumbnail(repository.baseUrl).isEmpty()) {
+
                 if (itm.getIcon(repository.baseUrl).isEmpty()) {
-                    binding.itemImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
+                    val color = generator.getColor(itm.title.getHtmlDecoded())
+
+                    val drawable =
+                            TextDrawable
+                                    .builder()
+                                    .round()
+                                    .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
+
+                    binding.itemImage.setImageDrawable(drawable)
                 } else {
-                    c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
+                    c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
                 }
             } else {
-                c.circularDrawable(itm.getThumbnail(repository.baseUrl), binding.itemImage)
+                c.bitmapCenterCrop(itm.getThumbnail(repository.baseUrl), binding.itemImage)
             }
         }
     }
 
     override fun getItemCount(): Int = items.size
 
-    inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root)
+    inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root) {
+
+        init {
+            handleLinkOpening()
+        }
+
+        private fun handleLinkOpening() {
+            binding.root.setOnClickListener {
+                repository.setReaderItems(items)
+                c.openItemUrl(
+                    bindingAdapterPosition,
+                    items[bindingAdapterPosition].getLinkDecoded(),
+                    appSettingsService.isArticleViewerEnabled(),
+                    app
+                )
+            }
+        }
+    }
 }

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

@@ -28,16 +28,12 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         updateItems(this.items)
     }
 
-    private fun unmarkSnackbar(
+    private fun unmarkSnackbar(item: SelfossModel.Item, position: Int) {
-        item: SelfossModel.Item,
+        val s = Snackbar
-        position: Int,
-    ) {
-        val s =
-            Snackbar
             .make(
                 app.findViewById(R.id.coordLayout),
                 R.string.marked_as_read,
-                    Snackbar.LENGTH_LONG,
+                Snackbar.LENGTH_LONG
             )
             .setAction(R.string.undo_string) {
                 unreadItemAtIndex(item, position, false)
@@ -49,16 +45,12 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         s.show()
     }
 
-    private fun markSnackbar(
+    private fun markSnackbar(item: SelfossModel.Item, position: Int) {
-        item: SelfossModel.Item,
+        val s = Snackbar
-        position: Int,
-    ) {
-        val s =
-            Snackbar
             .make(
                 app.findViewById(R.id.coordLayout),
                 R.string.marked_as_unread,
-                    Snackbar.LENGTH_LONG,
+                Snackbar.LENGTH_LONG
             )
             .setAction(R.string.undo_string) {
                 readItemAtIndex(item, position, false)
@@ -78,18 +70,13 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         }
     }
 
-    private fun readItemAtIndex(
+    private fun readItemAtIndex(item: SelfossModel.Item, position: Int, showSnackbar: Boolean = true) {
-        item: SelfossModel.Item,
-        position: Int,
-        showSnackbar: Boolean = true,
-    ) {
         CoroutineScope(Dispatchers.IO).launch {
             repository.markAsRead(item)
         }
         if (repository.displayedItems == ItemType.UNREAD) {
             items.remove(item)
             notifyItemRemoved(position)
-            notifyItemRangeChanged(position, itemCount)
             updateItems(items)
         } else {
             notifyItemChanged(position)
@@ -99,13 +86,10 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         }
     }
 
-    private fun unreadItemAtIndex(
+    private fun unreadItemAtIndex(item: SelfossModel.Item, position: Int, showSnackbar: Boolean = true) {
-        item: SelfossModel.Item,
-        position: Int,
-        showSnackbar: Boolean = true,
-    ) {
         CoroutineScope(Dispatchers.IO).launch {
             repository.unmarkAsRead(item)
+
         }
         notifyItemChanged(position)
         if (showSnackbar) {
@@ -113,13 +97,11 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         }
     }
 
-    fun addItemAtIndex(
+    fun addItemAtIndex(item: SelfossModel.Item, position: Int) {
-        item: SelfossModel.Item,
-        position: Int,
-    ) {
         items.add(position, item)
         notifyItemInserted(position)
         updateItems(items)
+
     }
 
     fun addItemsAtEnd(newItems: List<SelfossModel.Item>) {
@@ -127,5 +109,6 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         items.addAll(newItems)
         notifyItemRangeInserted(oldSize, newItems.size)
         updateItems(items)
+
     }
 }

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

@@ -10,14 +10,17 @@ import android.widget.Button
 import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
-import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity
+import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.SourceListItemBinding
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
+import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
+import com.amulyakhare.textdrawable.TextDrawable
+import com.amulyakhare.textdrawable.util.ColorGenerator
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -28,59 +31,34 @@ import org.kodein.di.instance
 
 class SourcesListAdapter(
     private val app: Activity,
-    private val items: ArrayList<SelfossModel.SourceDetail>,
+    private val items: ArrayList<SelfossModel.SourceDetail>
 ) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>(), DIAware {
     private val c: Context = app.baseContext
+    private val generator: ColorGenerator = ColorGenerator.MATERIAL
     private lateinit var binding: SourceListItemBinding
 
     override val di: DI by closestDI(app)
     private val repository : Repository by instance()
 
-    override fun onCreateViewHolder(
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        parent: ViewGroup,
-        viewType: Int,
-    ): ViewHolder {
         binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(binding.root)
     }
 
-    override fun onBindViewHolder(
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder: ViewHolder,
-        position: Int,
-    ) {
         val itm = items[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())
+            val color = generator.getColor(itm.title.getHtmlDecoded())
+
+            val drawable =
+                TextDrawable
+                    .builder()
+                    .round()
+                    .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
+            binding.itemImage.setImageDrawable(drawable)
         } else {
-            c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
+            c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
         }
 
         if (!itm.error.isNullOrBlank()) {
@@ -99,5 +77,41 @@ class SourcesListAdapter(
 
     override fun getItemCount(): Int = items.size
 
-    inner class ViewHolder(val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView)
+    inner class ViewHolder(private val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
+
+        init {
+            handleClickListeners()
+        }
+
+        private fun handleClickListeners() {
+
+            val deleteBtn: Button = mView.findViewById(R.id.deleteBtn)
+
+            deleteBtn.setOnClickListener {
+                val (id, title) = items[bindingAdapterPosition]
+                CoroutineScope(Dispatchers.IO).launch {
+                    val successfullyDeletedSource = repository.deleteSource(id, title)
+                    if (successfullyDeletedSource) {
+                        items.removeAt(bindingAdapterPosition)
+                        notifyItemRemoved(bindingAdapterPosition)
+                        notifyItemRangeChanged(bindingAdapterPosition, itemCount)
+                    } else {
+                        Toast.makeText(
+                            app,
+                            R.string.can_delete_source,
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                }
+            }
+
+            mView.setOnClickListener {
+                val source = items[bindingAdapterPosition]
+
+                repository.setSelectedSource(source)
+                app.startActivity(Intent(app, UpsertSourceActivity::class.java))
+
+            }
+        }
+    }
 }

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

@@ -26,15 +26,16 @@ import org.kodein.di.instance
 import java.util.*
 import kotlin.concurrent.schedule
 
-class LoadingWorker(val context: Context, params: WorkerParameters) :
+class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params),
-    Worker(context, params),
     DIAware {
+
     override val di by lazy { (applicationContext as MyApp).di }
     private val repository: Repository by instance()
     private val appSettingsService: AppSettingsService by instance()
 
     override fun doWork(): Result {
         if (appSettingsService.isPeriodicRefreshEnabled() && isNetworkAccessible(context)) {
+
             CoroutineScope(Dispatchers.IO).launch {
                 val notificationManager =
                     applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -66,19 +67,19 @@ class LoadingWorker(val context: Context, params: WorkerParameters) :
 
     private fun handleNewItemsNotification(
         newItems: List<SelfossModel.Item>?,
-        notificationManager: NotificationManager,
+        notificationManager: NotificationManager
     ) {
         CoroutineScope(Dispatchers.IO).launch {
             val apiItems = newItems.orEmpty()
 
+
             val newSize = apiItems.filter { it.unread }.size
             if (newSize > 0) {
-                val intent =
+
-                    Intent(context, MainActivity::class.java).apply {
+                val intent = Intent(context, MainActivity::class.java).apply {
                     flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                 }
-                val pflags =
+                val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     PendingIntent.FLAG_IMMUTABLE
                 } else {
                     0
@@ -89,14 +90,14 @@ class LoadingWorker(val context: Context, params: WorkerParameters) :
                 val newItemsNotification =
                     NotificationCompat.Builder(
                         applicationContext,
-                        AppSettingsService.newItemsChannelId,
+                        AppSettingsService.newItemsChannelId
                     )
                         .setContentTitle(context.getString(R.string.new_items_notification_title))
                         .setContentText(
                             context.getString(
                                 R.string.new_items_notification_text,
-                                newSize,
+                                newSize
-                            ),
+                            )
                         )
                         .setPriority(PRIORITY_DEFAULT)
                         .setChannelId(AppSettingsService.newItemsChannelId)

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

@@ -27,11 +27,11 @@ import bou.amine.apps.readerforselfossv2.android.model.toModel
 import bou.amine.apps.readerforselfossv2.android.model.toParcelable
 import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
-import bou.amine.apps.readerforselfossv2.android.utils.isUrlValid
 import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
 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.model.StatusAndData
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.MercuryApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@@ -52,10 +52,12 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.x.closestDI
 import org.kodein.di.instance
 import java.net.MalformedURLException
+import java.net.SocketTimeoutException
 import java.net.URL
 import java.util.*
 import java.util.concurrent.ExecutionException
 
+
 private const val IMAGE_JPG = "image/jpg"
 
 class ArticleFragment : Fragment(), DIAware {
@@ -82,6 +84,7 @@ class ArticleFragment : Fragment(), DIAware {
 
     private val mercuryApi: MercuryApi by instance()
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -93,7 +96,7 @@ class ArticleFragment : Fragment(), DIAware {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?,
+        savedInstanceState: Bundle?
     ): View {
         try {
             binding = FragmentArticleBinding.inflate(inflater, container, false)
@@ -102,12 +105,7 @@ class ArticleFragment : Fragment(), DIAware {
             contentText = item.content
             contentTitle = item.title.getHtmlDecoded()
             contentImage = item.getThumbnail(repository.baseUrl)
-            contentSource = try {
+            contentSource = item.sourceAuthorAndDate()
-                item.sourceAuthorAndDate()
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("Article Fragment parse date")
-                item.sourceAuthorOnly()
-            }
             allImages = item.getImages()
 
             fontSize = appSettingsService.getFontSize()
@@ -148,8 +146,9 @@ class ArticleFragment : Fragment(), DIAware {
                             if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
                         }
                     }
-                },
+                }
             )
+
         } catch (e: InflateException) {
             e.sendSilentlyWithAcraWithName("webview not available")
             if (context != null) {
@@ -157,7 +156,7 @@ class ArticleFragment : Fragment(), DIAware {
                     .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
                     .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
                     .setPositiveButton(
-                        android.R.string.ok,
+                        android.R.string.ok
                     ) { _, _ ->
                         appSettingsService.disableArticleViewer()
                         requireActivity().finish()
@@ -212,8 +211,7 @@ class ArticleFragment : Fragment(), DIAware {
                     when (item.itemId) {
                         R.id.share_action -> requireActivity().shareLink(url, contentTitle)
                         R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
-                        R.id.unread_action ->
+                        R.id.unread_action -> if (context != null) {
-                            if (context != null) {
                             if (this@ArticleFragment.item.unread) {
                                 CoroutineScope(Dispatchers.IO).launch {
                                     repository.markAsRead(this@ArticleFragment.item)
@@ -222,7 +220,7 @@ class ArticleFragment : Fragment(), DIAware {
                                 Toast.makeText(
                                     context,
                                     R.string.marked_as_read,
-                                        Toast.LENGTH_LONG,
+                                    Toast.LENGTH_LONG
                                 ).show()
                             } else {
                                 CoroutineScope(Dispatchers.IO).launch {
@@ -232,7 +230,7 @@ class ArticleFragment : Fragment(), DIAware {
                                 Toast.makeText(
                                     context,
                                     R.string.marked_as_unread,
-                                        Toast.LENGTH_LONG,
+                                    Toast.LENGTH_LONG
                                 ).show()
                             }
                         }
@@ -243,14 +241,13 @@ class ArticleFragment : Fragment(), DIAware {
                 override fun onItemLongClick(item: MenuItem?) {
                     // We do nothing
                 }
-            },
+            }
         )
         return floatingToolbar
     }
 
     private fun refreshAlignment() {
-        textAlignment =
+        textAlignment = when (appSettingsService.getActiveAllignment()) {
-            when (appSettingsService.getActiveAllignment()) {
             1 -> "justify"
             2 -> "left"
             else -> "justify"
@@ -263,46 +260,41 @@ class ArticleFragment : Fragment(), DIAware {
         CoroutineScope(Dispatchers.Main).launch {
             try {
                 val response = mercuryApi.query(url)
-                if (response.success && response.data != null) {
+                if (response.success && response.data != null && !response.data?.content.isNullOrEmpty()) {
-                    handleMercuryData(response.data!!)
+                    binding.titleView.text = response.data!!.title.orEmpty()
-                } else {
-                    openInBrowserAfterFailing()
-                }
-            } catch (e: Exception) {
-                openInBrowserAfterFailing()
-            }
-        }
-    }
-
-    private fun handleMercuryData(data: MercuryModel.ParsedContent) {
-        if (data.error == true || data.failed == true) {
-            openInBrowserAfterFailing()
-        } else {
-            binding.titleView.text = data.title.orEmpty()
                     if (typeface != null) {
                         binding.titleView.typeface = typeface
                     }
-            URL(data.url)
+                    URL(response.data!!.url)
-            url = data.url!!
+                    url = response.data!!.url
 
-            contentText = data.content.orEmpty()
+                    contentText = response.data!!.content.orEmpty()
                     htmlToWebview()
 
-            handleLeadImage(data?.lead_image_url)
+                    handleLeadImage(response)
 
                     binding.nestedScrollView.scrollTo(0, 0)
                     binding.progressBar.visibility = View.GONE
+                } else {
+                    openInBrowserAfterFailing()
+                }
+            } catch (e: SocketTimeoutException) {
+                openInBrowserAfterFailing()
+            } catch (e: Exception) {
+                e.sendSilentlyWithAcraWithName("getContentFromMercury > $url")
+                openInBrowserAfterFailing()
+            }
         }
     }
 
-    private fun handleLeadImage(lead_image_url: String?) {
+    private fun handleLeadImage(response: StatusAndData<MercuryModel.ParsedContent>) {
-        if (!lead_image_url.isNullOrEmpty() && context != null) {
+        if (!response.data?.lead_image_url.isNullOrEmpty() && context != null) {
             binding.imageView.visibility = View.VISIBLE
             Glide
                 .with(requireContext())
                 .asBitmap()
                 .load(
-                    lead_image_url,
+                    response.data!!.lead_image_url.orEmpty()
                 )
                 .apply(RequestOptions.fitCenterTransform())
                 .into(binding.imageView)
@@ -312,14 +304,10 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     private fun handleImageLoading() {
-        binding.webcontent.webViewClient =
+        binding.webcontent.webViewClient = object : WebViewClient() {
-            object : WebViewClient() {
             @Deprecated("Deprecated in Java")
-                override fun shouldOverrideUrlLoading(
+            override fun shouldOverrideUrlLoading(view: WebView?, url: String): Boolean {
-                    view: WebView?,
+                return if (context != null && binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-                    url: String,
-                ): Boolean {
-                    return if (context != null && url.isUrlValid() && binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
                     try {
                         requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
                     } catch (e: ActivityNotFoundException) {
@@ -332,13 +320,9 @@ class ArticleFragment : Fragment(), DIAware {
             }
 
             @Deprecated("Deprecated in Java")
-                override fun shouldInterceptRequest(
+            override fun shouldInterceptRequest(view: WebView, url: String): WebResourceResponse? {
-                    view: WebView,
-                    url: String,
-                ): WebResourceResponse? {
                 val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
-                    if (url.lowercase(Locale.US).contains(".jpg") ||
+                if (url.lowercase(Locale.US).contains(".jpg") || url.lowercase(Locale.US)
-                        url.lowercase(Locale.US)
                         .contains(".jpeg")
                 ) {
                     try {
@@ -347,7 +331,7 @@ class ArticleFragment : Fragment(), DIAware {
                         return WebResourceResponse(
                             IMAGE_JPG,
                             "UTF-8",
-                                getBitmapInputStream(image, Bitmap.CompressFormat.JPEG),
+                            getBitmapInputStream(image, Bitmap.CompressFormat.JPEG)
                         )
                     } catch (e: ExecutionException) {
                         // Do nothing
@@ -359,7 +343,7 @@ class ArticleFragment : Fragment(), DIAware {
                         return WebResourceResponse(
                             IMAGE_JPG,
                             "UTF-8",
-                                getBitmapInputStream(image, Bitmap.CompressFormat.PNG),
+                            getBitmapInputStream(image, Bitmap.CompressFormat.PNG)
                         )
                     } catch (e: ExecutionException) {
                         // Do nothing
@@ -371,7 +355,7 @@ class ArticleFragment : Fragment(), DIAware {
                         return WebResourceResponse(
                             IMAGE_JPG,
                             "UTF-8",
-                                getBitmapInputStream(image, Bitmap.CompressFormat.WEBP),
+                            getBitmapInputStream(image, Bitmap.CompressFormat.WEBP)
                         )
                     } catch (e: ExecutionException) {
                         // Do nothing
@@ -388,6 +372,7 @@ class ArticleFragment : Fragment(), DIAware {
             val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
             val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
 
+
             binding.webcontent.settings.standardFontFamily = a.getString(0)
             binding.webcontent.visibility = View.VISIBLE
 
@@ -404,14 +389,11 @@ class ArticleFragment : Fragment(), DIAware {
             handleImageLoading()
 
             val gestureDetector =
-                GestureDetector(
+                GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
-                    activity,
-                    object : GestureDetector.SimpleOnGestureListener() {
                     override fun onSingleTapUp(e: MotionEvent): Boolean {
                         return performClick()
                     }
-                    },
+                })
-                )
 
             binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event) }
 
@@ -427,20 +409,18 @@ class ArticleFragment : Fragment(), DIAware {
                 e.sendSilentlyWithAcraWithName("htmlToWebview > $url")
             }
 
-            val fontName =
+            val fontName = when (font) {
-                when (font) {
                 getString(R.string.open_sans_font_id) -> "Open Sans"
                 getString(R.string.roboto_font_id) -> "Roboto"
                 getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
                 else -> ""
             }
 
-            val fontLinkAndStyle =
+            val fontLinkAndStyle = if (font.isNotEmpty()) {
-                if (font.isNotEmpty()) {
                 """<link href="https://fonts.googleapis.com/css?family=${
                     fontName.replace(
                         " ",
-                            "+",
+                        "+"
                     )
                 }" rel="stylesheet">
                 |<style>
@@ -469,7 +449,7 @@ class ArticleFragment : Fragment(), DIAware {
                 |        color: ${
                     String.format(
                         "#%06X",
-                        0xFFFFFF and resources.getColor(R.color.colorAccent),
+                        0xFFFFFF and resources.getColor(R.color.colorAccent)
                     )
                 } !important;
                 |      }
@@ -485,7 +465,7 @@ class ArticleFragment : Fragment(), DIAware {
                 |        background-color: ${
                     String.format(
                         "#%06X",
-                        0xFFFFFF and colorSurface.data,
+                        0xFFFFFF and colorSurface.data
                     )
                 };
                 |      }
@@ -493,13 +473,13 @@ class ArticleFragment : Fragment(), DIAware {
                 |        background-color: ${
                     String.format(
                         "#%06X",
-                        0xFFFFFF and colorSurface.data,
+                        0xFFFFFF and colorSurface.data
                     )
                 } !important;
                 |        border-color: ${
                     String.format(
                         "#%06X",
-                        0xFFFFFF and colorSurface.data,
+                        0xFFFFFF and colorSurface.data
                     )
                 }  !important;
                 |        padding: 0 !important;
@@ -514,7 +494,7 @@ class ArticleFragment : Fragment(), DIAware {
                 |        background-color: ${
                     String.format(
                         "#%06X",
-                        0xFFFFFF and colorSurface.data,
+                        0xFFFFFF and colorSurface.data
                     )
                 };
                 |      }
@@ -523,11 +503,10 @@ class ArticleFragment : Fragment(), DIAware {
                 |</head>
                 |<body>
                 |   $contentText
-                |</body>
+                |</body>""".trimMargin(),
-                """.trimMargin(),
                 "text/html",
                 "utf-8",
-                null,
+                null
             )
         }
     }
@@ -544,17 +523,15 @@ class ArticleFragment : Fragment(), DIAware {
 
     private fun openInBrowserAfterFailing() {
         binding.progressBar.visibility = View.GONE
-        if (context != null) {
+        requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
-            requireContext().openInBrowserAsNewTask(this@ArticleFragment.item)
-        } else {
-            Exception("openInBrowserAfterFailing context is null").sendSilentlyWithAcraWithName("openInBrowserAfterFailing > $context")
-        }
     }
 
     companion object {
         private const val ARG_ITEMS = "items"
 
-        fun newInstance(item: SelfossModel.Item): ArticleFragment {
+        fun newInstance(
+            item: SelfossModel.Item
+        ): ArticleFragment {
             val fragment = ArticleFragment()
             val args = Bundle()
             args.putParcelable(ARG_ITEMS, item.toParcelable())
@@ -564,11 +541,10 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     fun performClick(): Boolean {
-        if (allImages != null && (
+        if (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
-                binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
             binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
-            )
         ) {
+
             val position: Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
 
             val intent = Intent(activity, ImageActivity::class.java)
@@ -579,4 +555,6 @@ class ArticleFragment : Fragment(), DIAware {
         }
         return false
     }
+
+
 }

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

@@ -17,7 +17,6 @@ import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding
 import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.repository.Repository
-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
@@ -33,7 +32,9 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.x.closestDI
 import org.kodein.di.instance
 
+
 class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
+
     private lateinit var binding: FilterFragmentBinding
     override val di: DI by closestDI()
     private val repository: Repository by instance()
@@ -43,17 +44,18 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?,
+        savedInstanceState: Bundle?
     ): View {
         binding =
             FilterFragmentBinding.inflate(
                 inflater,
                 container,
-                false,
+                false
             )
 
         val context: Context? = context
 
+
         if (context == null) {
             dismiss()
             Exception("FilterSheetFragment context is null").sendSilentlyWithAcraWithName("FilterSheetFragment > onCreateView")
@@ -75,20 +77,21 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
         return binding.root
     }
 
-    private suspend fun handleSourceChips(context: Context) {
+    private suspend fun handleSourceChips(
+        context: Context
+    ) {
         val sourceGroup = binding.sourcesGroup
 
-        repository.getSourcesDetailsOrStats().forEachIndexed { _, source ->
+        repository.getSourcesDetailsOrStats().forEach { source ->
             val c = Chip(context)
             c.ellipsize = TextUtils.TruncateAt.END
 
             Glide.with(context)
                 .load(source.getIcon(repository.baseUrl))
-                .into(
+                .into(object : ViewTarget<Chip?, Drawable?>(c) {
-                    object : ViewTarget<Chip?, Drawable?>(c) {
                     override fun onResourceReady(
                         resource: Drawable,
-                            transition: Transition<in Drawable?>?,
+                        transition: Transition<in Drawable?>?
                     ) {
                         try {
                             c.chipIcon = resource
@@ -96,8 +99,8 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
                             e.sendSilentlyWithAcraWithName("sources > onResourceReady")
                         }
                     }
-                    },
+
-                )
+                })
 
             c.text = source.title.getHtmlDecoded()
 
@@ -118,6 +121,7 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
                 repository.setTagFilter(null)
             }
 
+
             if (repository.sourceFilter.value?.equals(source) == true) {
                 c.isCloseIconVisible = true
                 selectedChip = c
@@ -133,24 +137,24 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
         }
     }
 
-    private suspend fun handleTagChips(context: Context) {
+    private suspend fun handleTagChips(
+        context: Context,
+    ) {
         val tagGroup = binding.tagsGroup
 
         val tags = repository.getTags()
 
-        tags.forEachIndexed { _, tag ->
+        tags.forEach { tag ->
             val c = Chip(context)
             c.ellipsize = TextUtils.TruncateAt.END
             c.text = tag.tag
 
-            if (tag.color.isNotEmpty()) {
             try {
                 val gd = GradientDrawable()
-                    val gdColor =
+                val gdColor = try {
-                        try {
+                    Color.parseColor(tag.color)
-                            Color.parseColor(tag.getColorHexCode())
                 } catch (e: IllegalArgumentException) {
-                            e.sendSilentlyWithAcraWithName("color issue " + tag.color + " / " + tag.getColorHexCode())
+                    e.sendSilentlyWithAcraWithName("color issue " + tag.color)
                     resources.getColor(R.color.colorPrimary)
                 }
                 gd.setColor(gdColor)
@@ -161,7 +165,6 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
             } catch (e: Exception) {
                 e.sendSilentlyWithAcraWithName("tags > GradientDrawable")
             }
-            }
 
             c.setOnCloseIconClickListener {
                 (it as Chip).isCloseIconVisible = false
@@ -192,4 +195,6 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
     companion object {
         const val TAG = "FilterModalBottomSheet"
     }
+
+
 }

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

@@ -11,6 +11,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
 
 class ImageFragment : Fragment() {
+
     private lateinit var imageUrl : String
     private val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
     private var _binding: FragmentImageBinding? = null
@@ -22,11 +23,7 @@ class ImageFragment : Fragment() {
         imageUrl = requireArguments().getString("imageUrl")!!
     }
 
-    override fun onCreateView(
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View? {
         _binding = FragmentImageBinding.inflate(inflater, container, false)
         val view = binding?.root
 
@@ -48,7 +45,9 @@ class ImageFragment : Fragment() {
     companion object {
         private const val ARG_IMAGE = "imageUrl"
 
-        fun newInstance(imageUrl: String): ImageFragment {
+        fun newInstance(
+                imageUrl : String
+        ): ImageFragment {
             val fragment = ImageFragment()
             val args = Bundle()
             args.putString(ARG_IMAGE, imageUrl)

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

@@ -14,6 +14,7 @@ fun SelfossModel.Item.preloadImages(context: Context): Boolean {
 
     val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL).timeout(10000)
 
+
     try {
         for (url in imageUrls) {
             if ( URLUtil.isValidUrl(url)) {

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

@@ -17,9 +17,8 @@ fun SelfossModel.Item.toParcelable(): ParecelableItem =
         this.link,
         this.sourcetitle,
         this.tags.joinToString(","),
-        this.author,
+        this.author
     )
-
 fun ParecelableItem.toModel() : SelfossModel.Item =
     SelfossModel.Item(
         this.id,
@@ -33,9 +32,8 @@ fun ParecelableItem.toModel(): SelfossModel.Item =
         this.link,
         this.sourcetitle,
         this.tags.split(","),
-        this.author,
+        this.author
     )
-
 data class ParecelableItem(
     val id: Int,
     val datetime: String,
@@ -48,14 +46,13 @@ data class ParecelableItem(
     val link: String,
     val sourcetitle: String,
     val tags: String,
-    val author: String?,
+    val author: String?
 ) : Parcelable {
+
     companion object {
         @JvmField
-        val CREATOR: Parcelable.Creator<ParecelableItem> =
+        val CREATOR: Parcelable.Creator<ParecelableItem> = object : Parcelable.Creator<ParecelableItem> {
-            object : Parcelable.Creator<ParecelableItem> {
             override fun createFromParcel(source: Parcel): ParecelableItem = ParecelableItem(source)
-
             override fun newArray(size: Int): Array<ParecelableItem?> = arrayOfNulls(size)
         }
     }
@@ -72,15 +69,12 @@ data class ParecelableItem(
         link = source.readString().orEmpty(),
         sourcetitle = source.readString().orEmpty(),
         tags = source.readString().orEmpty(),
-        author = source.readString().orEmpty(),
+        author = source.readString().orEmpty()
     )
 
     override fun describeContents() = 0
 
-    override fun writeToParcel(
+    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest: Parcel,
-        flags: Int,
-    ) {
         dest.writeInt(id)
         dest.writeString(datetime)
         dest.writeString(title)

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

@@ -24,10 +24,8 @@ import org.kodein.di.android.closestDI
 
 private const val TITLE_TAG = "settingsActivityTitle"
 
-class SettingsActivity :
+class SettingsActivity : AppCompatActivity(),
-    AppCompatActivity(),
+        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, DIAware {
-    PreferenceFragmentCompat.OnPreferenceStartFragmentCallback,
-    DIAware {
     override val di by closestDI()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -74,14 +72,13 @@ class SettingsActivity :
 
     override fun onPreferenceStartFragment(
             caller: PreferenceFragmentCompat,
-        pref: Preference,
+            pref: Preference
     ): Boolean {
         // Instantiate the new Fragment
         val args = pref.extras
-        val fragment =
+        val fragment = supportFragmentManager.fragmentFactory.instantiate(
-            supportFragmentManager.fragmentFactory.instantiate(
                 classLoader,
-                pref.fragment.toString(),
+                pref.fragment
         ).apply {
             arguments = args
             setTargetFragment(caller, 0)
@@ -97,20 +94,15 @@ class SettingsActivity :
     }
 
     class MainPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_main, rootKey)
 
-            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener =
+            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                Preference.OnPreferenceChangeListener { _, newValue ->
                 AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
                 true
             }
 
-            preferenceManager.findPreference<Preference>("action_about")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("action_about")?.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
-                Preference.OnPreferenceClickListener { _ ->
                 context?.let {
                     LibsBuilder()
                         .withAboutIconShown(true)
@@ -123,17 +115,13 @@ class SettingsActivity :
     }
 
     class GeneralPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_general, rootKey)
 
             val editTextPreference = preferenceManager.findPreference<EditTextPreference>("prefer_api_items_number")
             editTextPreference?.setOnBindEditTextListener { editText ->
                 editText.inputType = InputType.TYPE_CLASS_NUMBER
-                editText.filters =
+                editText.filters = arrayOf(
-                    arrayOf(
                         InputFilter { source, _, _, dest, _, _ ->
                             try {
                                 val input: Int = (dest.toString() + source.toString()).toInt()
@@ -143,42 +131,26 @@ class SettingsActivity :
                                 Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
                             }
                             ""
-                        },
+                        }
                 )
             }
         }
     }
 
     class ArticleViewerPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_viewer, rootKey)
 
             val fontSize = preferenceManager.findPreference<EditTextPreference>("reader_font_size")
             fontSize?.setOnBindEditTextListener { editText ->
                 editText.inputType = InputType.TYPE_CLASS_NUMBER
-                editText.addTextChangedListener {
+                editText.addTextChangedListener { object : TextWatcher {
-                    object : TextWatcher {
+                    override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
-                        override fun beforeTextChanged(
-                            charSequence: CharSequence,
-                            i: Int,
-                            i1: Int,
-                            i2: Int,
-                        ) {
                         // We do nothing
                     }
-
+                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
-                        override fun onTextChanged(
-                            charSequence: CharSequence,
-                            i: Int,
-                            i1: Int,
-                            i2: Int,
-                        ) {
                         // We do nothing
                     }
-
                     override fun afterTextChanged(editable: Editable) {
                         try {
                             editText.textSize = editable.toString().toInt().toFloat()
@@ -186,10 +158,8 @@ class SettingsActivity :
                             e.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > afterTextChanged")
                         }
                     }
-                    }
+                } }
-                }
+                editText.filters = arrayOf(
-                editText.filters =
-                    arrayOf(
                         InputFilter { source, _, _, dest, _, _ ->
                             try {
                                 val input = (dest.toString() + source.toString()).toInt()
@@ -198,30 +168,23 @@ class SettingsActivity :
                                 nfe.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > filters")
                             }
                             ""
-                        },
+                        }
                 )
             }
         }
     }
 
     class OfflinePreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_offline, rootKey)
         }
     }
 
     class ThemePreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_theme, rootKey)
 
-            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener =
+            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                Preference.OnPreferenceChangeListener { _, newValue ->
                 AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
                 true
             }
@@ -234,26 +197,20 @@ class SettingsActivity :
             startActivity(browserIntent)
         }
 
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_links, rootKey)
 
-            preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                Preference.OnPreferenceClickListener {
                 openUrl(Uri.parse(AppSettingsService.trackerUrl))
                 true
             }
 
-            preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                Preference.OnPreferenceClickListener {
                 openUrl(Uri.parse(AppSettingsService.sourceUrl))
                 false
             }
 
-            preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                Preference.OnPreferenceClickListener {
                 openUrl(Uri.parse(AppSettingsService.translationUrl))
                 false
             }
@@ -261,10 +218,7 @@ class SettingsActivity :
     }
 
     class ExperimentalPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_experimental, rootKey)
         }
     }

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

@@ -5,10 +5,7 @@ import android.content.Intent
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
 
-fun Context.shareLink(
+fun Context.shareLink(itemUrl: String, itemTitle: String) {
-    itemUrl: String,
-    itemTitle: String,
-) {
     val sendIntent = Intent()
     sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
     sendIntent.action = Intent.ACTION_SEND
@@ -18,7 +15,7 @@ fun Context.shareLink(
     startActivity(
         Intent.createChooser(
             sendIntent,
-            getString(R.string.share),
+            getString(R.string.share)
-        ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
+        ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
     )
 }

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

@@ -1,65 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.utils
-
-import android.content.Context
-import android.graphics.drawable.GradientDrawable
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.RelativeLayout
-import android.widget.TextView
-import bou.amine.apps.readerforselfossv2.android.R
-import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
-import com.google.android.material.imageview.ShapeableImageView
-import kotlin.math.abs
-
-class CircleImageView
-    @JvmOverloads
-    constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0,
-    ) : RelativeLayout(context, attrs, defStyleAttr) {
-        val view: View
-        val imageView: ShapeableImageView
-        val textView: TextView
-
-        private val colorScheme =
-            listOf(
-                -0x1a8c8d,
-                -0xf9d6e,
-                -0x459738,
-                -0x6a8a33,
-                -0x867935,
-                -0x9b4a0a,
-                -0xb03c09,
-                -0xb22f1f,
-                -0xb24954,
-                -0x7e387c,
-                -0x512a7f,
-                -0x759b,
-                -0x2b1ea9,
-                -0x2ab1,
-                -0x48b3,
-                -0x5e7781,
-                -0x6f5b52,
-            )
-
-        init {
-            view = LayoutInflater.from(context).inflate(R.layout.circle_image_view, this, true)
-            imageView = view.findViewById(R.id.circleImage)
-            textView = view.findViewById(R.id.circleText)
-        }
-
-        fun setBackgroundAndText(text: String) {
-            val circleDrawable = GradientDrawable()
-            val color = colorFromIdentifier(text)
-            circleDrawable.setColor(color)
-            imageView.setImageDrawable(circleDrawable)
-
-            textView.text = text.toTextDrawableString()
-        }
-
-        private fun colorFromIdentifier(key: String): Int {
-            return colorScheme[abs(key.hashCode()) % colorScheme.size]
-        }
-    }

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

@@ -21,13 +21,14 @@ fun Context.openItemUrl(
     currentItem: Int,
     linkDecoded: String,
     articleViewer: Boolean,
-    app: Activity,
+    app: Activity
 ) {
+
     if (!linkDecoded.isUrlValid()) {
         Toast.makeText(
             this,
             this.getString(R.string.cant_open_invalid_url),
-            Toast.LENGTH_LONG,
+            Toast.LENGTH_LONG
         ).show()
     } else {
         if (articleViewer) {
@@ -43,7 +44,8 @@ fun Context.openItemUrl(
     }
 }
 
-fun String.isUrlValid(): Boolean = this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
+fun String.isUrlValid(): Boolean =
+    this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
 
 fun String.isBaseUrlInvalid(): Boolean {
     val baseUrl = this.toHttpUrlOrNull()
@@ -64,10 +66,7 @@ fun Context.openInBrowserAsNewTask(i: SelfossModel.Item) {
 }
 
 class LinkOnTouchListener : View.OnTouchListener {
-    override fun onTouch(
+    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
-        v: View?,
-        event: MotionEvent?,
-    ): Boolean {
         var ret = false
         val widget: TextView = v as TextView
         val text: CharSequence = widget.text

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

@@ -8,4 +8,5 @@ fun TextBadgeItem.removeBadge(): TextBadgeItem {
     return this
 }
 
-fun TextBadgeItem.maybeShow(): TextBadgeItem = if (this.isHidden) this.show() else this
+fun TextBadgeItem.maybeShow(): TextBadgeItem =
+    if (this.isHidden) this.show() else this

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

@@ -3,37 +3,38 @@ package bou.amine.apps.readerforselfossv2.android.utils.glide
 import android.content.Context
 import android.graphics.Bitmap
 import android.widget.ImageView
-import bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
+import com.bumptech.glide.request.target.BitmapImageViewTarget
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
 
-fun Context.bitmapCenterCrop(
+fun Context.bitmapCenterCrop(url: String, iv: ImageView) =
-    url: String,
+    Glide.with(this)
-    iv: ImageView,
-) = Glide.with(this)
         .asBitmap()
         .load(url)
         .apply(RequestOptions.centerCropTransform())
         .into(iv)
 
-fun Context.circularDrawable(
+fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
-    url: String,
-    view: CircleImageView,
-) {
-    view.textView.text = ""
-
     Glide.with(this)
+        .asBitmap()
         .load(url)
-        .into(view.imageView)
+        .apply(RequestOptions.centerCropTransform())
+        .into(object : BitmapImageViewTarget(iv) {
+            override fun setResource(resource: Bitmap?) {
+                val circularBitmapDrawable = RoundedBitmapDrawableFactory.create(
+                    resources,
+                    resource
+                )
+                circularBitmapDrawable.isCircular = true
+                iv.setImageDrawable(circularBitmapDrawable)
             }
+        })
 
-fun getBitmapInputStream(
+fun getBitmapInputStream(bitmap:Bitmap,compressFormat: Bitmap.CompressFormat): InputStream {
-    bitmap: Bitmap,
-    compressFormat: Bitmap.CompressFormat,
-): InputStream {
     val byteArrayOutputStream = ByteArrayOutputStream()
     bitmap.compress(compressFormat, 80, byteArrayOutputStream)
     val bitmapData: ByteArray = byteArrayOutputStream.toByteArray()

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

@@ -19,8 +19,7 @@ class AppViewModel(private val repository: Repository) : ViewModel() {
                     if (isConnected && !wasConnected && repository.connectionMonitored) {
                         _networkAvailableProvider.emit(true)
                         wasConnected = true
-                    } else if (!isConnected && wasConnected && repository.connectionMonitored)
+                    } else if (!isConnected && wasConnected && repository.connectionMonitored){
-                        {
                         _networkAvailableProvider.emit(false)
                         wasConnected = false
                     }

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

@@ -51,13 +51,6 @@
                 android:maxLines="1"
                 android:minHeight="48dp" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/selfSigned"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/disable_ssl"
-                android:textAlignment="viewStart" />
-
             <com.google.android.material.switchmaterial.SwitchMaterial
                 android:id="@+id/withLogin"
                 android:layout_width="match_parent"

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

@@ -39,7 +39,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/itemImage">
 
-            <bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
+            <ImageView
                 android:id="@+id/sourceImage"
                 android:layout_width="40dp"
                 android:layout_height="40dp"

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

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <com.google.android.material.imageview.ShapeableImageView
-        android:id="@+id/circleImage"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        app:shapeAppearanceOverlay="@style/circleImageView"
-        app:srcCompat="@drawable/background_splash" />
-
-    <TextView
-        android:id="@+id/circleText"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:ellipsize="none"
-        android:gravity="center"
-        android:singleLine="true"
-        android:textColor="@color/white"
-        android:textIsSelectable="false"
-        android:textSize="20sp"
-        android:typeface="normal" />
-</RelativeLayout>

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
+    <ImageView
         android:id="@+id/itemImage"
         android:layout_width="46dp"
         android:layout_height="46dp"

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

@@ -25,7 +25,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0" />
 
-    <bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
+    <ImageView
         android:id="@+id/itemImage"
         android:layout_width="36dp"
         android:layout_height="36dp"

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

@@ -36,12 +36,6 @@
         android:orderInCategory="101"
         android:title="@string/menu_home_refresh" />
 
-    <item
-        android:id="@+id/issue_tracker"
-        app:showAsAction="never"
-        android:orderInCategory="103"
-        android:title="@string/issue_tracker_link" />
-
     <item android:id="@+id/action_disconnect"
           android:title="@string/action_disconnect"
           android:orderInCategory="104"

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

@@ -3,13 +3,6 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
-
-    <item
-        android:id="@+id/issue_tracker"
-        app:showAsAction="never"
-        android:orderInCategory="101"
-        android:title="@string/issue_tracker_link" />
-
     <item android:id="@+id/about"
           android:title="@string/action_about"
           android:orderInCategory="102"

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

@@ -128,7 +128,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -128,7 +128,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -128,7 +128,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-fa-rIR/strings.xml

@@ -128,7 +128,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -128,7 +128,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -33,8 +33,8 @@
     <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>
+    <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
-    <string name="cant_get_spouts">"Non se pode obter a lista de spoits. Pode que haxa algún problema coa api."</string>
+    <string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
     <string name="form_not_complete">"O formulario non está completo"</string>
     <string name="pref_header_links">"Ligazóns"</string>
     <string name="issue_tracker_link">"Rastrexador de Incidencias"</string>
@@ -116,19 +116,16 @@
     <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="pref_theme_title">Light/Dark mode</string>
-    <string name="mode_dark">Modo escuro</string>
+    <string name="mode_dark">Dark mode</string>
-    <string name="mode_system">Seguir axustes do sistema</string>
+    <string name="mode_system">Follow the system setting</string>
-    <string name="mode_light">Modo claro</string>
+    <string name="mode_light">Light mode</string>
-    <string name="gdpr_dialog_title">A aplicación non comparte ningún dato persoal seu.</string>
+    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[O envío de informes de erros está habilitado. Pode deshabilitarse dende a páxina de axustes. Ten en conta que os informes de erros son esenciais para o desenvolvemento da aplicación.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
-    <string name="crash_toast_text">Ocurriu un erro. Enviando os detalles o desenvolvedor.</string>
+    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
-    <string name="pref_switch_disable_acra">"Deshabilitar o reporte automático de erros. "</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
-    <string name="menu_home_filter">Filtros</string>
+    <string name="menu_home_filter">Filters</string>
-    <string name="application_selfoss_only">Esta aplicación só funciona cunha instancia de Selfoss, e con ningún outro filtro RSS.</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -90,7 +90,7 @@
     <string name="pref_switch_items_caching">Save items for offline use</string>
     <string name="pref_switch_update_sources">Check for new sources and tags</string>
     <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
-    <string name="network_connectivity_lost">"Koneksi jaringan hilang"</string>
+    <string name="network_connectivity_lost">"Network connection lost"</string>
     <string name="network_connectivity_retrieved">"Network connection is now available"</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
@@ -128,7 +128,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -128,7 +128,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -128,7 +128,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+</resources>

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

@@ -128,7 +128,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -128,7 +128,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -128,7 +128,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -128,7 +128,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -128,7 +128,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -125,10 +125,7 @@
     <string name="crash_toast_text">发生崩溃。请将细节发送给开发人员。</string>
     <string name="pref_switch_disable_acra">"禁用自动错误报告 "</string>
     <string name="menu_home_filter">筛选器</string>
-    <string name="application_selfoss_only">此应用只适用于 Selfoss 实例，不适用于其他 RSS 。</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">源</string>
+    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">更新源</string>
+    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -128,7 +128,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -6,7 +6,6 @@
     <string name="error_invalid_password">"Password not long enough"</string>
     <string name="error_field_required">"Field required"</string>
     <string name="prompt_url">"Url"</string>
-    <string name="disable_ssl">"Disable SSL"</string>
     <string name="withLoginSwitch">"Login required ?"</string>
     <string name="login_url_problem">"Oops. You may need to add a \"/\" at the end of the url."</string>
     <string name="prompt_login">"Username"</string>
@@ -132,6 +131,4 @@
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
     <string name="menu_home_sources">Sources</string>
     <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>

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

@@ -32,10 +32,4 @@
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowIsTranslucent">true</item>
     </style>
-
-    <style name="circleImageView" parent="">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">50%</item>
-    </style>
-
 </resources>

androidApp/src/test/kotlin/DatesTest.kt

@@ -8,59 +8,39 @@ import kotlinx.datetime.toInstant
 import org.junit.Test
 
 class DatesTest {
-    private val newVersionDateVariant =     "2022-12-24T17:00:08+00"
-    private val newVersionDate =            "2013-04-07T13:43:00+01:00"
-    private val newVersionDate2 =            "2013-04-07T13:43:00-01:00"
-    private val oldVersionDate =            "2013-05-07 13:46:00"
-    private val oldVersionDateVariant =     "2021-03-21 10:32:00.000000"
 
+    private val v3Date = "2013-04-07T13:43:00+01:00"
+    private val v4Date = "2013-04-07 13:43:00"
+    private val bug1Date = "2022-12-24T17:00:08+00"
 
     @Test
-    fun new_version_date_should_be_parsed() {
+    fun v3_date_should_be_parsed() {
-        val date = DateUtils.parseDate(newVersionDate)
+        val date = DateUtils.parseDate(v3Date)
+        val expected =
+            LocalDateTime(2013, 4, 7, 14, 43, 0, 0).toInstant(TimeZone.currentSystemDefault())
+                .toEpochMilliseconds()
+
+        assertEquals(date, expected)
+    }
+
+    @Test
+    fun v4_date_should_be_parsed() {
+        val date = DateUtils.parseDate(v4Date)
         val expected =
             LocalDateTime(2013, 4, 7, 13, 43, 0, 0).toInstant(TimeZone.currentSystemDefault())
                 .toEpochMilliseconds()
 
-        assertEquals(expected, date)
+        assertEquals(date, expected)
-    }
-    @Test
-    fun new_version_date2_should_be_parsed() {
-        val date = DateUtils.parseDate(newVersionDate2)
-        val expected =
-            LocalDateTime(2013, 4, 7, 13, 43, 0, 0).toInstant(TimeZone.currentSystemDefault())
-                .toEpochMilliseconds()
-
-        assertEquals(expected, date)
     }
 
     @Test
-    fun old_version_date_should_be_parsed() {
+    fun bug1_date_should_be_parsed() {
-        val date = DateUtils.parseDate(oldVersionDate)
+        val date = DateUtils.parseDate(bug1Date)
         val expected =
-            LocalDateTime(2013, 5, 7, 13, 46, 0, 0).toInstant(TimeZone.currentSystemDefault())
+            LocalDateTime(2022, 12, 24, 18, 0, 8, 0).toInstant(TimeZone.currentSystemDefault())
                 .toEpochMilliseconds()
 
-        assertEquals(expected, date)
+        assertEquals(date, expected)
     }
 
-    @Test
-    fun old_version_variant_date_should_be_parsed() {
-        val date = DateUtils.parseDate(oldVersionDateVariant)
-        val expected =
-            LocalDateTime(2021, 3, 21, 10, 32, 0, 0).toInstant(TimeZone.currentSystemDefault())
-                .toEpochMilliseconds()
-
-        assertEquals(expected, date)
-    }
-
-    @Test
-    fun new_version_variant_date_should_be_parsed() {
-        val date = DateUtils.parseDate(newVersionDateVariant)
-        val expected =
-            LocalDateTime(2022, 12, 24, 17, 0, 8, 0).toInstant(TimeZone.currentSystemDefault())
-                .toEpochMilliseconds()
-
-        assertEquals(expected, date)
-    }
 }

androidApp/src/test/kotlin/RepositoryTest.kt

@@ -42,11 +42,11 @@ class RepositoryTest {
     private val NUMBER_STARRED = 20
     private lateinit var repository: Repository
 
+
     private fun initializeRepository(
-        isConnectionAvailable: MutableStateFlow<Boolean> =
+        isConnectionAvailable: MutableStateFlow<Boolean> = MutableStateFlow(
-            MutableStateFlow(
+            true
-                true,
+        )
-            ),
     ) {
         repository = Repository(api, appSettingsService, isConnectionAvailable, db)
 
@@ -64,15 +64,13 @@ class RepositoryTest {
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
 
-        coEvery { api.apiInformation() } returns
+        coEvery { api.apiInformation() } returns StatusAndData(
-            StatusAndData(
             success = true,
-                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true)),
+            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true))
         )
-        coEvery { api.stats() } returns
+        coEvery { api.stats() } returns StatusAndData(
-            StatusAndData(
             success = true,
-                data = SelfossModel.Stats(NUMBER_ARTICLES, NUMBER_UNREAD, NUMBER_STARRED),
+            data = SelfossModel.Stats(NUMBER_ARTICLES, NUMBER_UNREAD, NUMBER_STARRED)
         )
 
         every { db.itemsQueries.deleteItemsWhereSource(any()) } returns Unit
@@ -118,10 +116,9 @@ class RepositoryTest {
     @Test
     fun get_public_access() {
         every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns
+        coEvery { api.apiInformation() } returns StatusAndData(
-            StatusAndData(
             success = true,
-                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true)),
+            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true))
         )
         every { appSettingsService.getUserName() } returns ""
 
@@ -134,10 +131,9 @@ class RepositoryTest {
     @Test
     fun get_public_access_username_not_empty() {
         every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns
+        coEvery { api.apiInformation() } returns StatusAndData(
-            StatusAndData(
             success = true,
-                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true)),
+            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true))
         )
         every { appSettingsService.getUserName() } returns "username"
 
@@ -150,10 +146,9 @@ class RepositoryTest {
     @Test
     fun get_public_access_no_auth() {
         every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns
+        coEvery { api.apiInformation() } returns StatusAndData(
-            StatusAndData(
             success = true,
-                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, false)),
+            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, false))
         )
         every { appSettingsService.getUserName() } returns ""
 
@@ -166,10 +161,9 @@ class RepositoryTest {
     @Test
     fun get_public_access_disabled() {
         every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns
+        coEvery { api.apiInformation() } returns StatusAndData(
-            StatusAndData(
             success = true,
-                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true)),
+            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true))
         )
         every { appSettingsService.getUserName() } returns ""
 
@@ -188,7 +182,7 @@ class RepositoryTest {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
                 StatusAndData(
                     success = true,
-                data = generateTestApiItem(itemParameters),
+                    data = generateTestApiItem(itemParameters)
                 )
 
         initializeRepository()
@@ -270,7 +264,7 @@ class RepositoryTest {
         itemParameter3.tags = "Other, Tag"
         itemParameter3.id = "3"
         coEvery { db.itemsQueries.items().executeAsList() } returns generateTestDBItems(
-            itemParameter1,
+            itemParameter1
         ) +
                 generateTestDBItems(itemParameter2) +
                 generateTestDBItems(itemParameter3)
@@ -298,7 +292,7 @@ class RepositoryTest {
         itemParameter3.sourcetitle = "Other"
         itemParameter3.id = "3"
         coEvery { db.itemsQueries.items().executeAsList() } returns generateTestDBItems(
-            itemParameter1,
+            itemParameter1
         ) +
                 generateTestDBItems(itemParameter2) +
                 generateTestDBItems(itemParameter3)
@@ -306,8 +300,7 @@ class RepositoryTest {
         every { appSettingsService.isItemCachingEnabled() } returns true
 
         initializeRepository(MutableStateFlow(false))
-        repository.setSourceFilter(
+        repository.setSourceFilter(SelfossModel.SourceDetail(
-            SelfossModel.SourceDetail(
             1,
             "Test",
             null,
@@ -315,9 +308,8 @@ class RepositoryTest {
             SPOUT,
             "",
             IMAGE_URL,
-                SelfossModel.SourceParams("url"),
+            SelfossModel.SourceParams("url")
-            ),
+        ))
-        )
         runBlocking {
             repository.getNewerItems()
         }
@@ -600,15 +592,13 @@ class RepositoryTest {
     }
 
     private fun prepareTags(): Pair<List<SelfossModel.Tag>, List<TAG>> {
-        val tags =
+        val tags = listOf(
-            listOf(
             SelfossModel.Tag("test", "red", 6),
-                SelfossModel.Tag("second", "yellow", 0),
+            SelfossModel.Tag("second", "yellow", 0)
         )
-        val tagsDB =
+        val tagsDB = listOf(
-            listOf(
             TAG("test_DB", "red", 6),
-                TAG("second_DB", "yellow", 0),
+            TAG("second_DB", "yellow", 0)
         )
 
         coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
@@ -631,8 +621,7 @@ class RepositoryTest {
     }
 
     private fun prepareSources(): Pair<ArrayList<SelfossModel.SourceDetail>, List<SOURCE>> {
-        val sources =
+        val sources = arrayListOf(
-            arrayListOf(
             SelfossModel.SourceDetail(
                 1,
                 "First source",
@@ -641,7 +630,7 @@ class RepositoryTest {
                 SPOUT,
                 "",
                 IMAGE_URL_2,
-                    SelfossModel.SourceParams("url"),
+                SelfossModel.SourceParams("url")
             ),
             SelfossModel.SourceDetail(
                 2,
@@ -651,11 +640,10 @@ class RepositoryTest {
                 SPOUT,
                 "",
                 IMAGE_URL,
-                    SelfossModel.SourceParams("url"),
+                SelfossModel.SourceParams("url")
-                ),
             )
-        val sourcesDB =
+        )
-            listOf(
+        val sourcesDB = listOf(
             SOURCE(
                 "1",
                 "First DB source",
@@ -663,7 +651,7 @@ class RepositoryTest {
                 SPOUT,
                 "",
                 IMAGE_URL_2,
-                    "url",
+                "url"
             ),
             SOURCE(
                 "2",
@@ -672,8 +660,8 @@ class RepositoryTest {
                 SPOUT,
                 "",
                 IMAGE_URL,
-                    "url",
+                "url"
-                ),
+            )
         )
 
         coEvery { api.sourcesDetailed() } returns StatusAndData(success = true, data = sources)
@@ -808,8 +796,7 @@ class RepositoryTest {
         initializeRepository()
         var response: Boolean
         runBlocking {
-            response =
+            response = repository.createSource(
-                repository.createSource(
                 "test",
                 FEED_URL,
                 SPOUT,
@@ -836,12 +823,11 @@ class RepositoryTest {
         initializeRepository()
         var response: Boolean
         runBlocking {
-            response =
+            response = repository.createSource(
-                repository.createSource(
                 "test",
                 FEED_URL,
                 SPOUT,
-                    TAGS,
+                TAGS
             )
         }
 
@@ -850,7 +836,7 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
-                any(),
+                any()
             )
         }
         assertSame(false, response)
@@ -864,12 +850,11 @@ class RepositoryTest {
         initializeRepository(MutableStateFlow(false))
         var response: Boolean
         runBlocking {
-            response =
+            response = repository.createSource(
-                repository.createSource(
                 "test",
                 FEED_URL,
                 SPOUT,
-                    TAGS,
+                TAGS
             )
         }
 
@@ -931,10 +916,9 @@ class RepositoryTest {
 
     @Test
     fun update_remote() {
-        coEvery { api.update() } returns
+        coEvery { api.update() } returns StatusAndData(
-            StatusAndData(
             success = true,
-                data = "finished",
+            data = "finished"
         )
 
         initializeRepository()
@@ -949,10 +933,9 @@ class RepositoryTest {
 
     @Test
     fun update_remote_but_response_fails() {
-        coEvery { api.update() } returns
+        coEvery { api.update() } returns StatusAndData(
-            StatusAndData(
             success = false,
-                data = "unallowed access",
+            data = "unallowed access"
         )
 
         initializeRepository()
@@ -967,10 +950,9 @@ class RepositoryTest {
 
     @Test
     fun update_remote_with_unallowed_access() {
-        coEvery { api.update() } returns
+        coEvery { api.update() } returns StatusAndData(
-            StatusAndData(
             success = true,
-                data = "unallowed access",
+            data = "unallowed access"
         )
 
         initializeRepository()
@@ -985,10 +967,9 @@ class RepositoryTest {
 
     @Test
     fun update_remote_without_connection() {
-        coEvery { api.update() } returns
+        coEvery { api.update() } returns StatusAndData(
-            StatusAndData(
             success = true,
-                data = "undocumented...",
+            data = "undocumented..."
         )
 
         initializeRepository(MutableStateFlow(false))
@@ -1056,7 +1037,7 @@ class RepositoryTest {
             appSettingsService.refreshLoginInformation(
                 BASE_URL,
                 "login",
-                "password",
+                "password"
             )
         }
     }
@@ -1076,10 +1057,9 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
-                any(),
+                any()
             )
-        } returnsMany
+        } returnsMany listOf(
-            listOf(
             StatusAndData(success = true, data = generateTestApiItem(itemParameter1)),
             StatusAndData(success = true, data = generateTestApiItem(itemParameter2)),
             StatusAndData(success = true, data = generateTestApiItem(itemParameter1)),
@@ -1133,8 +1113,8 @@ class RepositoryTest {
                 SPOUT,
                 "",
                 IMAGE_URL_2,
-                SelfossModel.SourceParams("url"),
+                SelfossModel.SourceParams("url")
-            ),
+            )
         )
         repository.searchFilter = "search"
     }

androidApp/src/test/kotlin/TestUtils.kt

@@ -3,6 +3,7 @@ package bou.amine.apps.readerforselfossv2.repository
 import bou.amine.apps.readerforselfossv2.dao.ITEM
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 
+
 fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<ITEM> {
     return listOf(
         ITEM(
@@ -17,8 +18,8 @@ fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<I
             link = item.link,
             sourcetitle = item.sourcetitle,
             tags = item.tags,
-            author = item.author,
+            author = item.author
-        ),
+        )
     )
 }
 
@@ -36,8 +37,8 @@ fun generateTestApiItem(item: FakeItemParameters = FakeItemParameters()): List<S
             link = item.link,
             sourcetitle = item.sourcetitle,
             tags = item.tags.split(','),
-            author = item.author,
+            author = item.author
-        ),
+        )
     )
 }
 

build.gradle.kts

@@ -1,24 +1,26 @@
 buildscript {
     dependencies {
         // SqlDelight
-        classpath("com.squareup.sqldelight:gradle-plugin:1.5.5")
+        classpath("com.squareup.sqldelight:gradle-plugin:1.5.4")
     }
 }
 
 plugins {
     //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("8.1.2").apply(false)
+    id("com.android.application").version("7.4.0").apply(false)
-    id("com.android.library").version("8.1.2").apply(false)
+    id("com.android.library").version("7.4.0").apply(false)
-    id("org.jetbrains.kotlin.android").version("1.9.10").apply(false)
+    kotlin("android").version("1.7.20").apply(false)
-    kotlin("multiplatform").version("1.9.10").apply(false)
+    kotlin("multiplatform").version("1.7.20").apply(false)
     id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)
-    id("org.jetbrains.kotlinx.kover").version("0.6.1").apply(true)
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
 
 allprojects {
     repositories {
+        // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
         google()
         mavenCentral()
+        jcenter()
         maven { url = uri("https://www.jitpack.io") }
     }
 }

docs/index.html

@@ -68,9 +68,9 @@ redirect_from: "/ReaderforSelfoss-multiplatform/"
             <div id="links">
 
 
-                <a class="github-button" href="https://gitea.amine-bouabdallaoui.fr/Louvorg/readerforselfoss-multiplatform" data-size="large" aria-label="Star aminecmi/readerforselfoss-multiplatform on GitHub">Star</a>
+                <a class="github-button" href="https://gitea.amine-louveau.fr/Louvorg/readerforselfoss-multiplatform" data-size="large" aria-label="Star aminecmi/readerforselfoss-multiplatform on GitHub">Star</a>
             </div>
-            <meta itemprop="url" content="https://gitea.amine-bouabdallaoui.fr/Louvorg/readerforselfoss-multiplatform">
+            <meta itemprop="url" content="https://gitea.amine-louveau.fr/Louvorg/readerforselfoss-multiplatform">
             <meta itemprop="applicationCategory" content="News & Magazines">
         </div>
     </body>

gradle.properties

@@ -13,16 +13,24 @@
 #Tue Mar 22 16:50:00 CET 2022
 #Gradle
 org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+
 #Kotlin
 kotlin.code.style=official
+
 #Android
 android.useAndroidX=true
+kotlin.native.enableDependencyPropagation=false
 #android.nonTransitiveRClass=true
 android.enableJetifier=true
-android.nonTransitiveRClass=false
+
+
 #MPP
 kotlin.mpp.enableCInteropCommonization=true
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+
+
 org.gradle.parallel=true
 org.gradle.caching=true
 ignoreGitVersion=false
 kotlin.native.cacheKind.iosX64=none
+pushCache=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jul 13 11:41:19 CEST 2023
+#Mon Jan 23 20:47:46 CET 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -1,5 +1,8 @@
+val pushCache: String by settings
+
 pluginManagement {
     repositories {
+        // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
         google()
         gradlePluginPortal()
         mavenCentral()
@@ -8,11 +11,23 @@ pluginManagement {
 
 dependencyResolutionManagement {
     repositories {
+        // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
         google()
         mavenCentral()
     }
 }
 
+
+buildCache {
+    remote<HttpBuildCache> {
+        url = uri("http://18.0.0.7:3071/cache/")
+        isAllowInsecureProtocol = true
+        isAllowUntrustedServer = true
+        isUseExpectContinue = true
+        isPush = (pushCache == "true")
+    }
+}
+
 rootProject.name = "ReaderForSelfossV2"
 include(":androidApp")
 include(":shared")

shared/build.gradle.kts

@@ -1,5 +1,3 @@
-val ktorVersion = "2.3.2"
-
 object SqlDelight {
     const val runtime = "com.squareup.sqldelight:runtime:1.5.4"
     const val android = "com.squareup.sqldelight:android-driver:1.5.4"
@@ -11,12 +9,12 @@ plugins {
     kotlin("multiplatform")
     id("com.android.library")
     id("com.squareup.sqldelight")
-    kotlin("plugin.serialization") version "1.9.0"
+    kotlin("plugin.serialization") version "1.4.10"
-    id("org.jetbrains.kotlinx.kover")
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
 
 kotlin {
-    androidTarget()
+    android()
 
     listOf(
         iosX64(),
@@ -31,18 +29,16 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("io.ktor:ktor-client-core:$ktorVersion")
+                implementation("io.ktor:ktor-client-core:2.1.1")
-                implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
+                implementation("io.ktor:ktor-client-content-negotiation:2.1.1")
-                implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
+                implementation("io.ktor:ktor-serialization-kotlinx-json:2.1.1")
-                implementation("io.ktor:ktor-client-logging:$ktorVersion")
+                implementation("io.ktor:ktor-client-logging:2.1.1")
-                implementation("io.ktor:ktor-client-auth:$ktorVersion")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
-                implementation("io.ktor:ktor-client-cio:$ktorVersion")
+                implementation("io.ktor:ktor-client-auth:2.1.1")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
+                implementation("org.jsoup:jsoup:1.14.3")
-
-                implementation("org.jsoup:jsoup:1.15.4")
 
                 //Dependency Injection
-                implementation("org.kodein.di:kodein-di:7.14.0")
+                implementation("org.kodein.di:kodein-di:7.12.0")
 
                 //Settings
                 implementation("com.russhwolf:multiplatform-settings-no-arg:1.0.0-RC")
@@ -62,15 +58,14 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                implementation("com.squareup.okhttp3:okhttp:4.11.0")
+                implementation("io.ktor:ktor-client-okhttp:2.1.1")
-                implementation("io.ktor:ktor-client-okhttp:2.2.4")
                 implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 
                 // Sql
                 implementation(SqlDelight.android)
             }
         }
-        val androidUnitTest by getting {
+        val androidTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
                 implementation("junit:junit:4.13.2")
@@ -103,14 +98,15 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 32
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
-        minSdk = 25
+        minSdk = 21
+        targetSdk = 32
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
     namespace = "bou.amine.apps.readerforselfossv2"
 }

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

@@ -1,23 +0,0 @@
-package bou.amine.apps.readerforselfossv2.rest
-
-import io.ktor.client.engine.cio.CIOEngineConfig
-import java.security.cert.X509Certificate
-import javax.net.ssl.X509TrustManager
-
-class NaiveTrustManager : X509TrustManager {
-    override fun checkClientTrusted(
-        chain: Array<out X509Certificate>?,
-        authType: String?,
-    ) {}
-
-    override fun checkServerTrusted(
-        chain: Array<out X509Certificate>?,
-        authType: String?,
-    ) {}
-
-    override fun getAcceptedIssuers(): Array<out X509Certificate> = arrayOf()
-}
-
-actual fun setupInsecureHTTPEngine(config: CIOEngineConfig) {
-    config.https.trustManager = NaiveTrustManager()
-}

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

@@ -1,45 +1,32 @@
 package bou.amine.apps.readerforselfossv2.utils
 
 import android.text.format.DateUtils
-import io.github.aakira.napier.Napier
 import kotlinx.datetime.*
 
+
 actual class DateUtils {
     actual companion object {
-        // Possible formats are
-        // yyyy-mm-dd hh:mm:ss format
-        private val oldVersionFormat = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}(.()\\d*)?".toRegex()
-
-        // yyyy-MM-dd'T'HH:mm:ss[.SSS]XXX (RFC3339)
-        private val newVersionFormat = "(\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2})[+-](\\d{2}(:\\d{2})?)?".toRegex()
-
-        // TODO: do not fix any more issues here. Move everything to plateform specific code.
         actual fun parseDate(dateString: String): Long {
-            var isoDateString: String =
+            return try {
-                try {
+                Instant.parse(dateString).toEpochMilliseconds()
-                    if (dateString.matches(oldVersionFormat)) {
-                        dateString.replace(" ", "T")
-                    } else if (dateString.matches(newVersionFormat)) {
-                        newVersionFormat.find(dateString)?.groups?.get(1)?.value ?: throw Exception("Couldn't parse $dateString")
-                    } else {
-                        throw Exception("Unrecognized format for $dateString")
-                    }
             } catch (e: Exception) {
-                    throw Exception("parseDate failed for $dateString", e)
+                var str = dateString.replace(" ", "T")
+                if (str.matches("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\+\\d{2}".toRegex())) {
+                    str = str.split("+")[0]
+                }
+                LocalDateTime.parse(str).toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds()
             }
-
-            return LocalDateTime.parse(isoDateString).toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds()
         }
 
         actual fun parseRelativeDate(dateString: String): String {
+
             val date = parseDate(dateString)
 
-            return " " +
+            return " " + DateUtils.getRelativeTimeSpanString(
-                DateUtils.getRelativeTimeSpanString(
                 date,
                 Clock.System.now().toEpochMilliseconds(),
                 DateUtils.MINUTE_IN_MILLIS,
-                    DateUtils.FORMAT_ABBREV_RELATIVE,
+                DateUtils.FORMAT_ABBREV_RELATIVE
             )
         }
     }

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

@@ -26,8 +26,8 @@ actual fun SelfossModel.Item.getImages(): ArrayList<String> {
         if (url.lowercase(Locale.US).contains(".jpg") ||
             url.lowercase(Locale.US).contains(".jpeg") ||
             url.lowercase(Locale.US).contains(".png") ||
-            url.lowercase(Locale.US).contains(".webp")
+            url.lowercase(Locale.US).contains(".webp"))
-        ) {
+        {
             allImages.add(url)
         }
     }
@@ -38,11 +38,7 @@ actual fun SelfossModel.Source.getIcon(baseUrl: String): String {
     return constructUrl(baseUrl, "favicons", icon)
 }
 
-actual fun constructUrl(
+actual fun constructUrl(baseUrl: String, path: String, file: String?): String {
-    baseUrl: String,
-    path: String,
-    file: String?,
-): String {
     return if (file == null || file == "null" || file.isEmpty()) {
         ""
     } else {

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/DI/modules.kt

@@ -2,6 +2,7 @@ package bou.amine.apps.readerforselfossv2.DI
 
 import bou.amine.apps.readerforselfossv2.rest.MercuryApi
 import bou.amine.apps.readerforselfossv2.rest.SelfossApi
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import org.kodein.di.DI
 import org.kodein.di.bind
 import org.kodein.di.instance

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

@@ -3,14 +3,12 @@ package bou.amine.apps.readerforselfossv2.model
 import kotlinx.serialization.Serializable
 
 class MercuryModel {
+
     @Serializable
     class ParsedContent(
-        val title: String? = null,
+        val title: String?,
-        val content: String? = null,
+        val content: String?,
-        val lead_image_url: String? = null, // NOSONAR
+        val lead_image_url: String?, // NOSONAR
-        val url: String? = null,
+        val url: String
-        val error: Boolean? = null,
-        val message: String? = null,
-        val failed: Boolean? = null,
     )
 }

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

@@ -13,31 +13,32 @@ import kotlinx.serialization.encoding.encodeCollection
 import kotlinx.serialization.json.*
 
 class SelfossModel {
+
     @Serializable
     data class Tag(
         val tag: String,
         val color: String,
-        val unread: Int,
+        val unread: Int
     )
 
     @Serializable
     class Stats(
         val total: Int,
-        val unread: Int? = null,
+        val unread: Int?,
-        val starred: Int? = null,
+        val starred: Int?
     )
 
     @Serializable
     data class Spout(
         val name: String,
-        val description: String,
+        val description: String
     )
 
     @Serializable
     data class ApiInformation(
-        val version: String? = null,
+        val version: String?,
-        val apiversion: String? = null,
+        val apiversion: String?,
-        val configuration: ApiConfiguration? = null,
+        val configuration: ApiConfiguration?
     ) {
         fun getApiMajorVersion(): Int {
             var versionNumber = 0
@@ -53,9 +54,9 @@ class SelfossModel {
     @Serializable
     data class ApiConfiguration(
         @Serializable(with = BooleanSerializer::class)
-        val publicMode: Boolean? = null,
+        val publicMode: Boolean?,
         @Serializable(with = BooleanSerializer::class)
-        val authEnabled: Boolean? = null,
+        val authEnabled: Boolean?
     ) {
         fun isAuthEnabled() = authEnabled ?: true
 
@@ -74,9 +75,9 @@ class SelfossModel {
     data class SourceStats(
         override val id: Int,
         override var title: String,
-        override var unread: Int? = null,
+        override var unread: Int?,
         override var error: String? = null,
-        override var icon: String? = null,
+        override var icon: String? = null
         ) : Source
 
     @Serializable
@@ -85,18 +86,17 @@ class SelfossModel {
         override var title: String,
         override var unread: Int? = null,
         @Serializable(with = TagsListSerializer::class)
-        var tags: List<String>? = null,
+        var tags: List<String>?,
-        var spout: String? = null,
+        var spout: String?,
-        override var error: String? = null,
+        override var error: String?,
-        override var icon: String? = null,
+        override var icon: String?,
-        var params: SourceParams? = null,
+        var params: SourceParams?
     ) : Source
 
     @Serializable
     data class SourceParams(
-        val url: String? = null,
+        val url: String? = null
     )
-
     @Serializable
     data class Item(
         val id: Int,
@@ -107,18 +107,17 @@ class SelfossModel {
         var unread: Boolean,
         @Serializable(with = BooleanSerializer::class)
         var starred: Boolean,
-        val thumbnail: String? = null,
+        val thumbnail: String?,
-        val icon: String? = null,
+        val icon: String?,
         val link: String,
         val sourcetitle: String,
         @Serializable(with = TagsListSerializer::class)
         val tags: List<String>,
-        val author: String? = null,
+        val author: String?
     ) {
         fun getLinkDecoded(): String {
             var stringUrl: String
-            stringUrl =
+            stringUrl = if (link.contains("//news.google.com/news/") && link.contains("&amp;url=")) {
-                if (link.contains("//news.google.com/news/") && link.contains("&amp;url=")) {
                 link.substringAfter("&amp;url=")
             } else {
                 this.link.replace("&amp;", "&")
@@ -146,20 +145,13 @@ class SelfossModel {
             return txt
         }
 
-        fun sourceAuthorOnly(): String {
-            var txt = this.sourcetitle.getHtmlDecoded()
-            if (!this.author.isNullOrBlank()) {
-                txt += " (by ${this.author}) "
-            }
-            return txt
-        }
-
         fun toggleStar(): Item {
             this.starred = !this.starred
             return this
         }
     }
 
+
     // TODO: this seems to be super slow.
     object TagsListSerializer : KSerializer<List<String>> {
         override fun deserialize(decoder: Decoder): List<String> {
@@ -167,15 +159,13 @@ class SelfossModel {
                 is JsonArray -> json.toList().map { it.toString().replace("^\"|\"$".toRegex(), "") }
                 else -> json.toString().split(",")
             }
+
         }
 
         override val descriptor: SerialDescriptor
             get() = PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING)
 
-        override fun serialize(
+        override fun serialize(encoder: Encoder, value: List<String>) {
-            encoder: Encoder,
-            value: List<String>,
-        ) {
             encoder.encodeCollection(PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING), value.size) { this.toString() }
         }
     }
@@ -193,10 +183,7 @@ class SelfossModel {
         override val descriptor: SerialDescriptor
             get() = PrimitiveSerialDescriptor("b", PrimitiveKind.BOOLEAN)
 
-        override fun serialize(
+        override fun serialize(encoder: Encoder, value: Boolean) {
-            encoder: Encoder,
-            value: Boolean,
-        ) {
             TODO("Not yet implemented")
         }
     }

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

@@ -8,6 +8,7 @@ import bou.amine.apps.readerforselfossv2.rest.SelfossApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.*
 import io.github.aakira.napier.Napier
+import io.ktor.client.call.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -18,8 +19,9 @@ class Repository(
     private val api: SelfossApi,
     private val appSettingsService: AppSettingsService,
     val isConnectionAvailable: MutableStateFlow<Boolean>,
-    private val db: ReaderForSelfossDB,
+    private val db: ReaderForSelfossDB
 ) {
+
     var items = ArrayList<SelfossModel.Item>()
     var connectionMonitored = false
 
@@ -51,18 +53,16 @@ class Repository(
     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error()
         if (isNetworkAvailable()) {
-            fetchedItems =
+            fetchedItems = api.getItems(
-                api.getItems(
                 displayedItems.type,
                 offset = 0,
                 tagFilter.value?.tag,
                 sourceFilter.value?.id?.toLong(),
                 searchFilter,
-                    null,
+                null
             )
         } else if (appSettingsService.isItemCachingEnabled()) {
-            var dbItems =
+            var dbItems = getDBItems().filter {
-                getDBItems().filter {
                 displayedItems == ItemType.ALL ||
                         (it.unread && displayedItems == ItemType.UNREAD) ||
                         (it.starred && displayedItems == ItemType.STARRED)
@@ -75,9 +75,8 @@ class Repository(
             }
             val itemsList = ArrayList(dbItems.map { it.toView() })
             itemsList.sortByDescending { DateUtils.parseDate(it.datetime) }
-            fetchedItems =
+            fetchedItems = StatusAndData.succes(
-                StatusAndData.succes(
+                itemsList
-                    itemsList,
             )
         }
 
@@ -91,14 +90,13 @@ class Repository(
         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error()
         if (isNetworkAvailable()) {
             val offset = items.size
-            fetchedItems =
+            fetchedItems = api.getItems(
-                api.getItems(
                 displayedItems.type,
                 offset,
                 tagFilter.value?.tag,
                 sourceFilter.value?.id?.toLong(),
                 searchFilter,
-                    null,
+                null
             )
         } // When using the db cache, we load everything the first time, so there should be nothing more to load.
 
@@ -110,15 +108,14 @@ class Repository(
 
     private suspend fun getMaxItemsForBackground(itemType: ItemType): List<SelfossModel.Item> {
         return if (isNetworkAvailable()) {
-            val items =
+            val items = api.getItems(
-                api.getItems(
                 itemType.type,
                 0,
                 null,
                 null,
                 null,
                 null,
-                    200,
+                200
             )
             return if (items.success && items.data != null) {
                 items.data
@@ -377,7 +374,7 @@ class Repository(
         title: String,
         url: String,
         spout: String,
-        tags: String,
+        tags: String
     ): Boolean {
         var response = false
         if (isNetworkAvailable()) {
@@ -387,10 +384,7 @@ class Repository(
         return response
     }
 
-    suspend fun deleteSource(
+    suspend fun deleteSource(id: Int, title: String): Boolean {
-        id: Int,
-        title: String,
-    ): Boolean {
         var success = false
         if (isNetworkAvailable()) {
             val response = api.deleteSource(id)
@@ -422,25 +416,28 @@ class Repository(
                 val response = api.login()
                 result = response.isSuccess == true
             } catch (cause: Throwable) {
-                Napier.e("login failed", cause, tag = "RepositoryImpl.login")
+                Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.login")
             }
         }
         return result
     }
 
-    suspend fun checkIfFetchFails(): Boolean {
+    suspend fun shouldBeSelfossInstance(): Pair<Boolean, Boolean> {
         var fetchFailed = true
+        var showSelfossOnlyModal = false
         if (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: NoTransformationFoundException) {
+                showSelfossOnlyModal = true
             } catch (e: Throwable) {
-                Napier.e("checkIfFetchFails failed", e, tag = "RepositoryImpl.shouldBeSelfossInstance")
+                Napier.e(e.stackTraceToString(), tag = "RepositoryImpl.shouldBeSelfossInstance")
             }
         }
 
-        return fetchFailed
+        return Pair(fetchFailed, showSelfossOnlyModal)
     }
 
     suspend fun logout() {
@@ -451,7 +448,7 @@ class Repository(
                     Napier.e("Couldn't logout.", tag = "RepositoryImpl.logout")
                 }
             } catch (cause: Throwable) {
-                Napier.e("logout failed", cause, tag = "RepositoryImpl.logout")
+                Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.logout")
             }
             appSettingsService.clearAll()
         } else {
@@ -459,11 +456,7 @@ class Repository(
         }
     }
 
-    fun refreshLoginInformation(
+    fun refreshLoginInformation(url: String, login: String, password: String) {
-        url: String,
-        login: String,
-        password: String,
-    ) {
         appSettingsService.refreshLoginInformation(url, login, password)
         baseUrl = url
         api.refreshLoginInformation()
@@ -481,10 +474,9 @@ class Repository(
                 // Check if we're accessing the instance in public mode
                 // This happens when auth and public mode are enabled but
                 // no credentials are provided to login
-                if (appSettingsService.getUserName().isEmpty() &&
+                if (appSettingsService.getUserName().isEmpty()
-                    fetchedInformation.data.getApiConfiguration().isAuthEnabled() &&
+                    && fetchedInformation.data.getApiConfiguration().isAuthEnabled()
-                    fetchedInformation.data.getApiConfiguration().isPublicModeEnabled()
+                    && fetchedInformation.data.getApiConfiguration().isPublicModeEnabled()) {
-                ) {
                     appSettingsService.updatePublicAccess(true)
                 }
             }
@@ -493,9 +485,11 @@ class Repository(
 
     fun isNetworkAvailable() = isConnectionAvailable.value && !offlineOverride
 
-    private fun getDBActions(): List<ACTION> = db.actionsQueries.actions().executeAsList()
+    private fun getDBActions(): List<ACTION> =
+        db.actionsQueries.actions().executeAsList()
 
-    private fun deleteDBAction(action: ACTION) = db.actionsQueries.deleteAction(action.id)
+    private fun deleteDBAction(action: ACTION) =
+        db.actionsQueries.deleteAction(action.id)
 
     private fun getDBTags(): List<TAG> = db.tagsQueries.tags().executeAsList()
 
@@ -536,8 +530,9 @@ class Repository(
         read: Boolean = false,
         unread: Boolean = false,
         starred: Boolean = false,
-        unstarred: Boolean = false,
+        unstarred: Boolean = false
-    ) = db.actionsQueries.insertAction(articleid, read, unread, starred, unstarred)
+    ) =
+        db.actionsQueries.insertAction(articleid, read, unread, starred, unstarred)
 
     private fun updateDBItem(item: SelfossModel.Item) =
         db.itemsQueries.updateItem(
@@ -552,7 +547,7 @@ class Repository(
             item.sourcetitle,
             item.tags.joinToString(","),
             item.author,
-            item.id.toString(),
+            item.id.toString()
         )
 
     suspend fun tryToCacheItemsAndGetNewOnes(): List<SelfossModel.Item> {
@@ -569,38 +564,32 @@ class Repository(
     }
 
     suspend fun handleDBActions() {
+
         val actions: List<ACTION> = getDBActions()
 
         actions.forEach { action ->
             when {
-                action.read ->
+                action.read -> doAndReportOnFail(
-                    doAndReportOnFail(
                     markAsReadById(action.articleid.toInt()),
-                        action,
+                    action
                 )
-                action.unread ->
+                action.unread -> doAndReportOnFail(
-                    doAndReportOnFail(
                     unmarkAsReadById(action.articleid.toInt()),
-                        action,
+                    action
                 )
-                action.starred ->
+                action.starred -> doAndReportOnFail(
-                    doAndReportOnFail(
                     starrById(action.articleid.toInt()),
-                        action,
+                    action
                 )
-                action.unstarred ->
+                action.unstarred -> doAndReportOnFail(
-                    doAndReportOnFail(
                     unstarrById(action.articleid.toInt()),
-                        action,
+                    action
                 )
             }
         }
     }
 
-    private fun doAndReportOnFail(
+    private fun doAndReportOnFail(result: Boolean, action: ACTION) {
-        result: Boolean,
-        action: ACTION,
-    ) {
         if (result) {
             deleteDBAction(action)
         }

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

@@ -11,23 +11,21 @@ import io.ktor.serialization.kotlinx.json.*
 import kotlinx.serialization.json.Json
 
 class MercuryApi() {
+
     var client = createHttpClient()
 
     private fun createHttpClient(): HttpClient {
         return HttpClient {
             install(ContentNegotiation) {
                 install(HttpCache)
-                json(
+                json(Json {
-                    Json {
                     prettyPrint = true
                     isLenient = true
                     ignoreUnknownKeys = true
-                    },
+                })
-                )
             }
             install(Logging) {
-                logger =
+                logger = object : Logger {
-                    object : Logger {
                     override fun log(message: String) {
                         Napier.d(message, tag = "LogMercuryCalls")
                     }
@@ -39,9 +37,7 @@ class MercuryApi() {
     }
 
     suspend fun query(url: String): StatusAndData<MercuryModel.ParsedContent> =
-        bodyOrFailure(
+        bodyOrFailure(client.get("https://amine-louveau.fr/parser.php") {
-            client.get("https://amine-bouabdallaoui.fr/parser.php") {
             parameter("link", url)
-            },
+        })
-        )
 }

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

@@ -10,6 +10,7 @@ import io.ktor.client.request.forms.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 
+
 suspend fun responseOrSuccessIf404(r: HttpResponse?): SuccessResponse {
     return if (r != null && r.status === HttpStatusCode.NotFound) {
         SuccessResponse(true)
@@ -39,7 +40,7 @@ suspend inline fun <reified T> bodyOrFailure(r: HttpResponse?): StatusAndData<T>
 
 inline fun tryToRequest(
     requestType: String,
-    fn: () -> HttpResponse,
+    fn: () -> HttpResponse
 ): HttpResponse? {
     var response: HttpResponse? = null
     try {
@@ -52,42 +53,26 @@ inline fun tryToRequest(
 
 suspend inline fun HttpClient.tryToGet(
     urlString: String,
-    crossinline block: HttpRequestBuilder.() -> Unit = {},
+    crossinline block: HttpRequestBuilder.() -> Unit = {}
-): HttpResponse? =
+): HttpResponse? = tryToRequest("Get") { return this.get { url(urlString); block() } }
-    tryToRequest("Get") {
+
-        return this.get {
-            url(urlString)
-            block()
-        }
-    }
 
 suspend inline fun HttpClient.tryToPost(
     urlString: String,
-    block: HttpRequestBuilder.() -> Unit = {},
+    block: HttpRequestBuilder.() -> Unit = {}
-): HttpResponse? =
+): HttpResponse? = tryToRequest("Post") { return this.post { url(urlString); block() } }
-    tryToRequest("Post") {
-        return this.post {
-            url(urlString)
-            block()
-        }
-    }
 
 suspend inline fun HttpClient.tryToDelete(
     urlString: String,
-    block: HttpRequestBuilder.() -> Unit = {},
+    block: HttpRequestBuilder.() -> Unit = {}
-): HttpResponse? =
+): HttpResponse? = tryToRequest("Delete") { return this.delete { url(urlString); block() } }
-    tryToRequest("Delete") {
+
-        return this.delete {
-            url(urlString)
-            block()
-        }
-    }
 
 suspend fun HttpClient.tryToSubmitForm(
     url: String,
     formParameters: Parameters = Parameters.Empty,
     encodeInQuery: Boolean = false,
-    block: HttpRequestBuilder.() -> Unit = {},
+    block: HttpRequestBuilder.() -> Unit = {}
 ): HttpResponse? =
     tryToRequest("SubmitForm") {
         return this.submitForm(formParameters, encodeInQuery) {

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

@@ -5,60 +5,37 @@ import bou.amine.apps.readerforselfossv2.model.StatusAndData
 import bou.amine.apps.readerforselfossv2.model.SuccessResponse
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import io.github.aakira.napier.Napier
-import io.ktor.client.HttpClient
+import io.ktor.client.*
-import io.ktor.client.engine.cio.CIO
+import io.ktor.client.plugins.*
-import io.ktor.client.engine.cio.CIOEngineConfig
+import io.ktor.client.plugins.cache.*
-import io.ktor.client.plugins.HttpRequestRetry
+import io.ktor.client.plugins.contentnegotiation.*
-import io.ktor.client.plugins.HttpTimeout
+import io.ktor.client.plugins.cookies.*
-import io.ktor.client.plugins.auth.providers.BasicAuthCredentials
+import io.ktor.client.plugins.logging.*
-import io.ktor.client.plugins.cache.HttpCache
+import io.ktor.client.request.*
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.statement.*
-import io.ktor.client.plugins.cookies.HttpCookies
+import io.ktor.http.*
-import io.ktor.client.plugins.logging.LogLevel
+import io.ktor.serialization.kotlinx.json.*
-import io.ktor.client.plugins.logging.Logger
-import io.ktor.client.plugins.logging.Logging
-import io.ktor.client.request.get
-import io.ktor.client.request.headers
-import io.ktor.client.request.parameter
-import io.ktor.client.statement.HttpResponse
-import io.ktor.http.HttpHeaders
-import io.ktor.http.HttpStatusCode
-import io.ktor.http.Parameters
-import io.ktor.serialization.kotlinx.json.json
-import io.ktor.util.encodeBase64
-import io.ktor.utils.io.charsets.Charsets
-import io.ktor.utils.io.core.toByteArray
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 
-expect fun setupInsecureHTTPEngine(config: CIOEngineConfig)
-
 class SelfossApi(private val appSettingsService: AppSettingsService) {
+
     var client = createHttpClient()
 
-    fun createHttpClient() =
+    private fun createHttpClient(): HttpClient {
-        HttpClient(CIO) {
+        val client = HttpClient {
-            if (appSettingsService.getSelfSigned()) {
-                engine {
-                    setupInsecureHTTPEngine(this)
-                }
-            }
             install(ContentNegotiation) {
                 install(HttpCache)
-                json(
+                json(Json {
-                    Json {
                     prettyPrint = true
                     isLenient = true
                     ignoreUnknownKeys = true
-                        explicitNulls = false
+                })
-                    },
-                )
             }
             install(Logging) {
-                logger =
+                logger = object : Logger {
-                    object : Logger {
                     override fun log(message: String) {
                         Napier.d(message, tag = "LogApiCalls")
                     }
@@ -78,7 +55,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     Napier.i("Will modify", tag = "HttpSend")
                     CoroutineScope(Dispatchers.Main).launch {
                         Napier.i("Will login", tag = "HttpSend")
-                        login()
+                        this@SelfossApi.login()
                         Napier.i("Did login", tag = "HttpSend")
                     }
                 }
@@ -86,31 +63,25 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             expectSuccess = false
         }
 
-    fun url(path: String) = "${appSettingsService.getBaseUrl()}$path"
+        return client
+    }
+
+    fun url(path: String) =
+        "${appSettingsService.getBaseUrl()}$path"
 
     fun refreshLoginInformation() {
         appSettingsService.refreshApiSettings()
         client = createHttpClient()
     }
 
-    fun constructBasicAuthValue(credentials: BasicAuthCredentials): String {
-        val authString = "${credentials.username}:${credentials.password}"
-        val authBuf = authString.toByteArray(Charsets.UTF_8).encodeBase64()
-
-        return "Basic $authBuf"
-    }
-
     // Api version was introduces after the POST login, so when there is a version, it should be available
     private fun shouldHavePostLogin() = appSettingsService.getApiVersion() != -1
-
     private fun hasLoginInfo() =
-        appSettingsService.getUserName().isNotEmpty() &&
+        appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword()
-            appSettingsService.getPassword()
             .isNotEmpty()
 
     suspend fun login(): SuccessResponse =
-        if (appSettingsService.getUserName().isNotEmpty() &&
+        if (appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword()
-            appSettingsService.getPassword()
                 .isNotEmpty()
         ) {
             if (shouldHavePostLogin()) {
@@ -122,49 +93,18 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             SuccessResponse(true)
         }
 
-    private suspend fun getLogin() =
+    private suspend fun getLogin() = maybeResponse(client.tryToGet(url("/login")) {
-        maybeResponse(
-            client.tryToGet(url("/login")) {
         parameter("username", appSettingsService.getUserName())
         parameter("password", appSettingsService.getPassword())
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+    })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
-    private suspend fun postLogin() =
+    private suspend fun postLogin() = maybeResponse(client.tryToPost(url("/login")) {
-        maybeResponse(
-            client.tryToPost(url("/login")) {
         parameter("username", appSettingsService.getUserName())
         parameter("password", appSettingsService.getPassword())
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+    })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
-    private fun shouldHaveNewLogout() = appSettingsService.getApiVersion() >= 5 // We are missing 4.1.0
+    private fun shouldHaveNewLogout() =
+        appSettingsService.getApiVersion() >= 5 // We are missing 4.1.0
 
     suspend fun logout(): SuccessResponse =
         if (shouldHaveNewLogout()) {
@@ -174,42 +114,9 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         }
 
     private suspend fun maybeLogoutIfAvailable() =
-        responseOrSuccessIf404(
+        responseOrSuccessIf404(client.tryToGet(url("/logout")))
-            client.tryToGet(url("/logout")) {
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
-    private suspend fun doLogout() =
+    private suspend fun doLogout() = maybeResponse(client.tryToDelete(url("/api/session/current")))
-        maybeResponse(
-            client.tryToDelete(url("/api/session/current")) {
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun getItems(
         type: String,
@@ -218,10 +125,9 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         source: Long?,
         search: String?,
         updatedSince: String?,
-        items: Int? = null,
+        items: Int? = null
     ): StatusAndData<List<SelfossModel.Item>> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/items")) {
-            client.tryToGet(url("/items")) {
             if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
@@ -233,325 +139,112 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             parameter("updatedsince", updatedSince)
             parameter("items", items ?: appSettingsService.getItemsNumber())
             parameter("offset", offset)
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+        })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun getItemsWithoutCatch(): StatusAndData<List<SelfossModel.Item>> =
-        bodyOrFailure(
+        bodyOrFailure(client.get(url("/items")) {
-            client.get(url("/items")) {
             if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
             }
             parameter("type", "all")
             parameter("items", 1)
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+        })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun stats(): StatusAndData<SelfossModel.Stats> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/stats")) {
-            client.tryToGet(url("/stats")) {
             if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
             }
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+        })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun tags(): StatusAndData<List<SelfossModel.Tag>> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/tags")) {
-            client.tryToGet(url("/tags")) {
             if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
             }
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+        })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun update(): StatusAndData<String> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/update")) {
-            client.tryToGet(url("/update")) {
             if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
             }
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+        })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun spouts(): StatusAndData<Map<String, SelfossModel.Spout>> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/sources/spouts")) {
-            client.tryToGet(url("/sources/spouts")) {
             if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
             }
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+        })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun sourcesStats(): StatusAndData<ArrayList<SelfossModel.SourceStats>> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/sources/stats")) {
-            client.tryToGet(url("/sources/stats")) {
             if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
             }
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+        })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun sourcesDetailed(): StatusAndData<ArrayList<SelfossModel.SourceDetail>> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/sources/list")) {
-            client.tryToGet(url("/sources/list")) {
             if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
             }
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+        })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun apiInformation(): StatusAndData<SelfossModel.ApiInformation> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/api/about")))
-            client.tryToGet(url("/api/about")) {
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun markAsRead(id: String): SuccessResponse =
-        maybeResponse(
+        maybeResponse(client.tryToPost(url("/mark/$id")) {
-            client.tryToPost(url("/mark/$id")) {
             if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
             }
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+        })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun unmarkAsRead(id: String): SuccessResponse =
-        maybeResponse(
+        maybeResponse(client.tryToPost(url("/unmark/$id")) {
-            client.tryToPost(url("/unmark/$id")) {
             if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
             }
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+        })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun starr(id: String): SuccessResponse =
-        maybeResponse(
+        maybeResponse(client.tryToPost(url("/starr/$id")) {
-            client.tryToPost(url("/starr/$id")) {
             if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
             }
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+        })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun unstarr(id: String): SuccessResponse =
-        maybeResponse(
+        maybeResponse(client.tryToPost(url("/unstarr/$id")) {
-            client.tryToPost(url("/unstarr/$id")) {
             if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
             }
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+        })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun markAllAsRead(ids: List<String>): SuccessResponse =
-        maybeResponse(
+        maybeResponse(client.tryToSubmitForm(
-            client.tryToSubmitForm(
             url = url("/mark"),
-                formParameters =
+            formParameters = Parameters.build {
-                    Parameters.build {
                 if (!shouldHavePostLogin()) {
                     append("username", appSettingsService.getUserName())
                     append("password", appSettingsService.getPassword())
                 }
                 ids.map { append("ids[]", it) }
-                    },
-                block = {
-                    if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                        headers {
-                            append(
-                                HttpHeaders.Authorization,
-                                constructBasicAuthValue(
-                                    BasicAuthCredentials(
-                                        username = appSettingsService.getBasicUserName(),
-                                        password = appSettingsService.getBasicPassword(),
-                                    ),
-                                ),
-                            )
             }
-                    }
+        ))
-                },
-            ),
-        )
 
     suspend fun createSourceForVersion(
         title: String,
@@ -564,7 +257,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 createSource("tags[]", title, url, spout, tags)
             } else {
                 createSource("tags", title, url, spout, tags)
-            },
+            }
         )
 
     private suspend fun createSource(
@@ -572,12 +265,11 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         title: String,
         url: String,
         spout: String,
-        tags: String,
+        tags: String
     ): HttpResponse? =
         client.tryToSubmitForm(
             url = url("/source"),
-            formParameters =
+            formParameters = Parameters.build {
-                Parameters.build {
                 if (!shouldHavePostLogin()) {
                     append("username", appSettingsService.getUserName())
                     append("password", appSettingsService.getPassword())
@@ -586,22 +278,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 append("url", url)
                 append("spout", spout)
                 append(tagsParamName, tags)
-                },
-            block = {
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
             }
-                }
-            },
         )
 
     suspend fun updateSourceForVersion(
@@ -609,14 +286,14 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         title: String,
         url: String,
         spout: String,
-        tags: String,
+        tags: String
     ): SuccessResponse =
         maybeResponse(
             if (appSettingsService.getApiVersion() > 1) {
                 updateSource(id, "tags[]", title, url, spout, tags)
             } else {
                 updateSource(id, "tags", title, url, spout, tags)
-            },
+            }
         )
 
     private suspend fun updateSource(
@@ -629,8 +306,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
     ): HttpResponse? =
         client.tryToSubmitForm(
             url = url("/source/$id"),
-            formParameters =
+            formParameters = Parameters.build {
-                Parameters.build {
                 if (!shouldHavePostLogin()) {
                     append("username", appSettingsService.getUserName())
                     append("password", appSettingsService.getPassword())
@@ -639,44 +315,14 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 append("url", url)
                 append("spout", spout)
                 append(tagsParamName, tags)
-                },
-            block = {
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
             }
-                }
-            },
         )
 
     suspend fun deleteSource(id: Int): SuccessResponse =
-        maybeResponse(
+        maybeResponse(client.tryToDelete(url("/source/$id")) {
-            client.tryToDelete(url("/source/$id")) {
             if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
             }
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+        })
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 }

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

@@ -13,93 +13,58 @@ class ACRASettings : Settings {
         // Nothing
     }
 
-    override fun getBoolean(
+    override fun getBoolean(key: String, defaultValue: Boolean): Boolean = false
-        key: String,
-        defaultValue: Boolean,
-    ): Boolean = false
 
     override fun getBooleanOrNull(key: String): Boolean? = null
 
-    override fun getDouble(
+    override fun getDouble(key: String, defaultValue: Double): Double = 0.0
-        key: String,
-        defaultValue: Double,
-    ): Double = 0.0
 
     override fun getDoubleOrNull(key: String): Double? = null
 
-    override fun getFloat(
+    override fun getFloat(key: String, defaultValue: Float): Float = 0.0F
-        key: String,
-        defaultValue: Float,
-    ): Float = 0.0F
 
     override fun getFloatOrNull(key: String): Float? = null
 
-    override fun getInt(
+    override fun getInt(key: String, defaultValue: Int): Int = 0
-        key: String,
-        defaultValue: Int,
-    ): Int = 0
 
     override fun getIntOrNull(key: String): Int? = null
 
-    override fun getLong(
+    override fun getLong(key: String, defaultValue: Long): Long = 0
-        key: String,
-        defaultValue: Long,
-    ): Long = 0
 
     override fun getLongOrNull(key: String): Long? = null
 
-    override fun getString(
+    override fun getString(key: String, defaultValue: String): String = "0"
-        key: String,
-        defaultValue: String,
-    ): String = "0"
 
     override fun getStringOrNull(key: String): String? = null
 
     override fun hasKey(key: String): Boolean = false
 
-    override fun putBoolean(
+    override fun putBoolean(key: String, value: Boolean) {
-        key: String,
-        value: Boolean,
-    ) {
         // Nothing
     }
 
-    override fun putDouble(
+    override fun putDouble(key: String, value: Double) {
-        key: String,
-        value: Double,
-    ) {
         // Nothing
     }
 
-    override fun putFloat(
+    override fun putFloat(key: String, value: Float) {
-        key: String,
-        value: Float,
-    ) {
         // Nothing
     }
 
-    override fun putInt(
+    override fun putInt(key: String, value: Int) {
-        key: String,
-        value: Int,
-    ) {
         // Nothing
     }
 
-    override fun putLong(
+    override fun putLong(key: String, value: Long) {
-        key: String,
-        value: Long,
-    ) {
         // Nothing
     }
 
-    override fun putString(
+    override fun putString(key: String, value: String) {
-        key: String,
-        value: String,
-    ) {
         // Nothing
     }
 
     override fun remove(key: String) {
         // Nothing
     }
+
 }

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

@@ -3,22 +3,14 @@ package bou.amine.apps.readerforselfossv2.service
 import com.russhwolf.settings.Settings
 
 class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
-    val settings: Settings =
+    val settings: Settings = if (acraSenderServiceProcess) { ACRASettings() } else { Settings() }
-        if (acraSenderServiceProcess) {
-            ACRASettings()
-        } else {
-            Settings()
-        }
 
     // Api related
     private var _apiVersion: Int = -1
     private var _publicAccess: Boolean? = null
-    private var _selfSigned: Boolean? = null
     private var _baseUrl: String = ""
     private var _userName: String = ""
-    private var _basicUserName: String = ""
     private var _password: String = ""
-    private var _basicPassword: String = ""
 
     // User settings related
     private var _itemsCaching: Boolean? = null
@@ -43,6 +35,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     private var _font: String = ""
     private var _theme: Int? = null
 
+
     init {
         refreshApiSettings()
         refreshUserSettings()
@@ -56,6 +49,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         return _apiVersion
     }
 
+
     fun updateApiVersion(apiMajorVersion: Int) {
         settings.putInt(API_VERSION_MAJOR, apiMajorVersion)
         refreshApiVersion()
@@ -81,22 +75,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         _publicAccess = settings.getBoolean(API_PUBLIC_ACCESS, false)
     }
 
-    fun getSelfSigned(): Boolean {
-        if (_selfSigned == null) {
-            refreshSelfSigned()
-        }
-        return _selfSigned!!
-    }
-
-    fun updateSelfSigned(selfSigned: Boolean) {
-        settings.putBoolean(API_SELF_SIGNED, selfSigned)
-        refreshSelfSigned()
-    }
-
-    private fun refreshSelfSigned() {
-        _selfSigned = settings.getBoolean(API_SELF_SIGNED, false)
-    }
-
     fun getBaseUrl(): String {
         if (_baseUrl.isEmpty()) {
             refreshBaseUrl()
@@ -118,20 +96,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         return _password
     }
 
-    fun getBasicUserName(): String {
-        if (_basicUserName.isEmpty()) {
-            refreshBasicUsername()
-        }
-        return _basicUserName
-    }
-
-    fun getBasicPassword(): String {
-        if (_basicPassword.isEmpty()) {
-            refreshBasicPassword()
-        }
-        return _basicPassword
-    }
-
     fun getItemsNumber(): Int {
         if (_itemsNumber == null) {
             refreshItemsNumber()
@@ -140,13 +104,13 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     }
 
     private fun refreshItemsNumber() {
-        _itemsNumber =
+        _itemsNumber = try {
-            try {
             settings.getString(API_ITEMS_NUMBER, "20").toInt()
         } catch (e: Exception) {
             settings.remove(API_ITEMS_NUMBER)
             20
         }
+
     }
 
     fun getApiTimeout(): Long {
@@ -159,9 +123,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     private fun secToMs(n: Long) = n * 1000
 
     private fun refreshApiTimeout() {
-        _apiTimeout =
+        _apiTimeout = secToMs(try {
-            secToMs(
-                try {
             val settingsTimeout = settings.getString(API_TIMEOUT, "60")
             if (settingsTimeout.toLong() > 0) {
                 settingsTimeout.toLong()
@@ -172,8 +134,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         } catch (e: Exception) {
             settings.remove(API_TIMEOUT)
             60
-                },
+        })
-            )
     }
 
     private fun refreshBaseUrl() {
@@ -188,14 +149,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         _password = settings.getString(PASSWORD, "")
     }
 
-    private fun refreshBasicUsername() {
-        _basicUserName = settings.getString(BASIC_LOGIN, "")
-    }
-
-    private fun refreshBasicPassword() {
-        _basicPassword = settings.getString(BASIC_PASSWORD, "")
-    }
-
     private fun refreshArticleViewerEnabled() {
         _articleViewer = settings.getBoolean(PREFER_ARTICLE_VIEWER, true)
     }
@@ -206,7 +159,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _articleViewer == true
     }
-
     private fun refreshShouldBeCardViewEnabled() {
         _shouldBeCardView = settings.getBoolean(CARD_VIEW_ACTIVE, false)
     }
@@ -217,7 +169,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _shouldBeCardView == true
     }
-
     private fun refreshDisplayUnreadCountEnabled() {
         _displayUnreadCount = settings.getBoolean(DISPLAY_UNREAD_COUNT, true)
     }
@@ -228,7 +179,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _displayUnreadCount == true
     }
-
     private fun refreshDisplayAllCountEnabled() {
         _displayAllCount = settings.getBoolean(DISPLAY_OTHER_COUNT, false)
     }
@@ -239,7 +189,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _displayAllCount == true
     }
-
     private fun refreshFullHeightCardsEnabled() {
         _fullHeightCards = settings.getBoolean(FULL_HEIGHT_CARDS, false)
     }
@@ -250,7 +199,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _fullHeightCards == true
     }
-
     private fun refreshUpdateSourcesEnabled() {
         _updateSources = settings.getBoolean(UPDATE_SOURCES, true)
     }
@@ -261,7 +209,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _updateSources == true
     }
-
     private fun refreshPeriodicRefreshEnabled() {
         _periodicRefresh = settings.getBoolean(PERIODIC_REFRESH, false)
     }
@@ -331,6 +278,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         return _notifyNewItems == true
     }
 
+
     private fun refreshMarkOnScrollEnabled() {
         _markOnScroll = settings.getBoolean(MARK_ON_SCROLL, false)
     }
@@ -342,6 +290,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         return _markOnScroll == true
     }
 
+
     private fun refreshActiveAllignment() {
         _activeAlignment = settings.getInt(TEXT_ALIGN, JUSTIFY)
     }
@@ -405,12 +354,9 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     fun refreshApiSettings() {
         refreshPassword()
         refreshUsername()
-        refreshBasicUsername()
-        refreshBasicPassword()
         refreshBaseUrl()
         refreshApiVersion()
         refreshPublicAccess()
-        refreshSelfSigned()
     }
 
     fun refreshUserSettings() {
@@ -439,19 +385,9 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     fun refreshLoginInformation(
         url: String,
         login: String,
-        password: String,
+        password: String
     ) {
-        val regex = """\/\/(\S+):(\S+)@""".toRegex()
-        val matchResult = regex.find(url)
-        if (matchResult != null) {
-            val (basicLogin, basicPassword) = matchResult.destructured
-            settings.putString(BASIC_LOGIN, basicLogin)
-            settings.putString(BASIC_PASSWORD, basicPassword)
-            val urlWithoutBasicAuth = url.replace(regex, "//")
-            settings.putString(BASE_URL, urlWithoutBasicAuth)
-        } else {
         settings.putString(BASE_URL, url)
-        }
         settings.putString(LOGIN, login)
         settings.putString(PASSWORD, password)
         refreshApiSettings()
@@ -461,8 +397,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         settings.remove(BASE_URL)
         settings.remove(LOGIN)
         settings.remove(PASSWORD)
-        settings.remove(BASIC_LOGIN)
-        settings.remove(BASIC_PASSWORD)
         refreshApiSettings()
     }
 
@@ -480,9 +414,9 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     companion object {
         const val translationUrl = "https://crwd.in/readerforselfoss"
 
-        const val sourceUrl = "https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform"
+        const val sourceUrl = "https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform"
 
-        const val trackerUrl = "https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues"
+        const val trackerUrl = "https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues"
 
         const val syncChannelId = "sync-channel-id"
 
@@ -496,8 +430,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
 
         const val API_PUBLIC_ACCESS = "apiPublicAccess"
 
-        const val API_SELF_SIGNED = "apiSelfSigned"
-
         const val API_ITEMS_NUMBER = "prefer_api_items_number"
 
         const val API_TIMEOUT = "api_timeout"
@@ -508,10 +440,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
 
         const val PASSWORD = "password"
 
-        const val BASIC_LOGIN = "basic_login"
-
-        const val BASIC_PASSWORD = "basic_password"
-
         const val PREFER_ARTICLE_VIEWER = "prefer_article_viewer"
 
         const val CARD_VIEW_ACTIVE = "card_view_active"
@@ -542,10 +470,12 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
 
         const val PERIODIC_REFRESH_MINUTES = "periodic_refresh_minutes"
 
+
         const val INFINITE_LOADING = "infinite_loading"
 
         const val ITEMS_CACHING = "items_caching"
 
         const val CURRENT_THEME = "currentMode"
+
     }
 }

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/utils/EntityUtils.kt

@@ -9,7 +9,7 @@ fun TAG.toView(): SelfossModel.Tag =
     SelfossModel.Tag(
         this.name,
         this.color,
-        this.unread.toInt(),
+        this.unread.toInt()
     )
 
 fun SOURCE.toView(): SelfossModel.SourceDetail =
@@ -21,7 +21,7 @@ fun SOURCE.toView(): SelfossModel.SourceDetail =
         this.spout,
         this.error,
         this.icon,
-        if (this.url != null) SelfossModel.SourceParams(this.url) else null,
+        if (this.url != null) SelfossModel.SourceParams(this.url) else null
     )
 
 fun SelfossModel.SourceDetail.toEntity(): SOURCE =
@@ -32,14 +32,14 @@ fun SelfossModel.SourceDetail.toEntity(): SOURCE =
         this.spout.orEmpty(),
         this.error.orEmpty(),
         this.icon.orEmpty(),
-        this.params?.url,
+        this.params?.url
     )
 
 fun SelfossModel.Tag.toEntity(): TAG =
     TAG(
         this.tag,
         this.color,
-        this.unread.toLong(),
+        this.unread.toLong()
     )
 
 fun ITEM.toView(): SelfossModel.Item =
@@ -55,7 +55,7 @@ fun ITEM.toView(): SelfossModel.Item =
         this.link,
         this.sourcetitle,
         this.tags.split(","),
-        this.author,
+        this.author
     )
 
 fun SelfossModel.Item.toEntity(): ITEM =
@@ -71,15 +71,5 @@ fun SelfossModel.Item.toEntity(): ITEM =
         this.link,
         this.sourcetitle.getHtmlDecoded(),
         this.tags.joinToString(","),
-        this.author,
+        this.author
     )
-
-fun SelfossModel.Tag.getColorHexCode(): String =
-    if (this.color.length == 4) { // #000
-        val char1 = this.color.get(1)
-        val char2 = this.color.get(2)
-        val char3 = this.color.get(3)
-        "#$char1$char1$char2$char2$char3$char3"
-    } else {
-        this.color
-    }

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/utils/Enums.kt

@@ -3,8 +3,7 @@ package bou.amine.apps.readerforselfossv2.utils
 enum class ItemType(val position: Int, val type: String) {
     UNREAD(1, "unread"),
     ALL(2, "all"),
-    STARRED(3, "starred"),
+    STARRED(3, "starred");
-    ;
 
     companion object {
         fun fromInt(value: Int) = values().first { it.position == value }

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

@@ -12,8 +12,4 @@ expect fun SelfossModel.Item.getImages(): ArrayList<String>
 
 expect fun SelfossModel.Source.getIcon(baseUrl: String): String
 
-expect fun constructUrl(
+expect fun constructUrl(baseUrl: String, path: String, file: String?): String
-    baseUrl: String,
-    path: String,
-    file: String?,
-): String

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/utils/StringUtils.kt

@@ -1,6 +1,7 @@
 package bou.amine.apps.readerforselfossv2.utils
 
-fun String?.isEmptyOrNullOrNullString(): Boolean = this == null || this == "null" || this.isEmpty()
+fun String?.isEmptyOrNullOrNullString(): Boolean =
+    this == null || this == "null" || this.isEmpty()
 
 fun String.longHash(): Long {
     var h = 98764321261L

shared/src/iosArm64Main/kotlin/bou/amine/apps/readerforselfossv2/rest/setupInsecureHTTPEngine.kt

@@ -1,6 +0,0 @@
-package bou.amine.apps.readerforselfossv2.rest
-
-import io.ktor.client.engine.cio.CIOEngineConfig
-
-actual fun setupInsecureHTTPEngine(config: CIOEngineConfig) {
-}

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

@@ -22,10 +22,6 @@ actual fun SelfossModel.Source.getIcon(baseUrl: String): String {
     TODO("Not yet implemented")
 }
 
-actual fun constructUrl(
+actual fun constructUrl(baseUrl: String, path: String, file: String?): String {
-    baseUrl: String,
-    path: String,
-    file: String?,
-): String {
     TODO("Not yet implemented")
 }

shared/src/iosX64Main/kotlin/bou/amine/apps/readerforselfossv2/rest/setupInsecureHTTPEngine.kt

@@ -1,6 +0,0 @@
-package bou.amine.apps.readerforselfossv2.rest
-
-import io.ktor.client.engine.cio.CIOEngineConfig
-
-actual fun setupInsecureHTTPEngine(config: CIOEngineConfig) {
-}

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

@@ -1,5 +1,7 @@
 package bou.amine.apps.readerforselfossv2.utils
 
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+
 actual class DateUtils {
     actual companion object {
         actual fun parseDate(dateString: String): Long {
@@ -10,4 +12,5 @@ actual class DateUtils {
             TODO("Not yet implemented")
         }
     }
+
 }

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

@@ -22,10 +22,6 @@ actual fun SelfossModel.Source.getIcon(baseUrl: String): String {
     TODO("Not yet implemented")
 }
 
-actual fun constructUrl(
+actual fun constructUrl(baseUrl: String, path: String, file: String?): String {
-    baseUrl: String,
-    path: String,
-    file: String?,
-): String {
     TODO("Not yet implemented")
 }