chore: lint cleaning.

## Types of changes

- [ ] I have read the **CONTRIBUTING** document.
- [ ] My code follows the code style of this project.
- [ ] I have updated the documentation accordingly.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
- [ ] This is **NOT** translation related.

This closes issue #XXX

This is implements feature #YYY

This finishes chore #ZZZ

Co-authored-by: davidoskky <davidoskky@yahoo.it>
Co-authored-by: aminecmi <aminecmi@gmail.com>
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/150

.drone.yml

@@ -3,35 +3,38 @@ 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\npushCache=false\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\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
       - echo "---------------------------------------------------------"
-      - echo "Building..."
-      - ./gradlew build -x test
+      - echo "Configure java..."
+      - . ~/.bash_profile
+      - jenv global 17.0
+      - java --version
+      - date
       - echo "---------------------------------------------------------"
-      - echo "Testing..."
+      - echo "Building and testing..."
+      - ./gradlew build
       - echo "---------------------------------------------------------"
-      - ./gradlew koverMergedXmlReport
-    environment:
-      TZ: Europe/Paris
-      SONAR_HOST_URL:
-        from_secret: sonarScannerHostUrl
-      SONAR_LOGIN:
-        from_secret: sonarScannerLogin
-  - name: Analyse
-    image: kytay/sonar-node-plugin
-    settings:
-      sonar_host:
-        from_secret: sonarScannerHostUrl
-      sonar_token:
-        from_secret: sonarScannerLogin
-      use_node_version: 16.18.1
-      sonar_debug: true
-      sonar_project_settings: ./sonar-project.properties
 trigger:
   event:
     - push
@@ -43,19 +46,31 @@ type: docker
 name: Publish
 
 steps:
-  - name: createTag
+  - 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
-      - git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git
-      - git push pushing --tags
+      - 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
-      GITEA_USR:
-        from_secret: giteaUsr
-      GITEA_PASS:
-        from_secret: giteaPass
+
+  - 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
@@ -77,10 +92,7 @@ steps:
         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/
+        - 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:
@@ -102,10 +114,10 @@ steps:
       - git fetch --tags
       - echo "---------------------------------------------------------"
       - echo "Configure gradle..."
-      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\npushCache=false\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=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  -P pushCache=false
+      - ./gradlew :androidApp:assembleGithubConfigRelease
       - echo "---------------------------------------------------------"
       - echo "Get Key"
       - wget https://amine-louveau.fr/key
@@ -132,6 +144,27 @@ steps:
         from_secret: giteaAPI
       base_url: https://gitea.amine-louveau.fr
       files: signed.apk
+
+  - name: notify
+    image: drillster/drone-email
+    failure: ignore
+    settings:
+      host:
+        from_secret: smtpHOST
+      port:
+        from_secret: smtpPORT
+      username:
+        from_secret: smtpUSERNAME
+      password:
+        from_secret: smtpPASSWORD
+      from:
+        from_secret: smtpFROM
+      subject: Mapping file
+      recipients:
+        from_secret: smtpTO
+      recipients_only: true
+      skip_verify: true
+      attachment: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt
 trigger:
   event:
     - tag

CHANGELOG.md

@@ -1,3 +1,210 @@
+**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.
+- feat: Use /sources/stats in the home (#133)
+- Changelog for v123030681 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123030681**
+
+- fix: Unread and starred can be null.
+- Fixed version number issue.
+- Changelog for v123030621 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123030621**
+
+- fix: url required issue.
+- fix: Canvas reused issue.
+- Changelog for v123020572 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123020572**
+
+- fix: requirecontext issues ?
+- debug: activity not found exception.
+- Changelog for v123020571 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123020571**
+
+- chore: remove errors logging.
+- fix: quickfix for url param not provided for some sources.
+- Update 'CHANGELOG.md'
+- Changelog for v123020523 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123020523**
+
+- fix: Git changelog.
+
+--------------------------------------------------------------------
+
+**v123020491**
+
+- fix: Fixed acra bug reporting.
+
+--------------------------------------------------------------------
+
+**v123010301**
+
+- Chore: acra config.
+
+--------------------------------------------------------------------
+
+**v123010281**
+
+- improvement: Improve right to left support (#130) Co-authored-by: davidoskky <davidoskky@hidden.hidden> Co-committed-by: davidoskky <davidoskky@hidden.hidden>
+
+--------------------------------------------------------------------
+
+**v123010261**
+
+- feat: Handle public instances (#126) Co-authored-by: davidoskky <davidoskky@hidden.hidden> Co-committed-by: davidoskky <davidoskky@hidden.hidden>
+- ci: Pull request should trigger ci.
+- fix: Complete the disconnection before redirecting to the login screen
+- Complete the disconnection before redirecting to the login screen
+
+--------------------------------------------------------------------
+
+**v123010241**
+
+- Merge pull request 'feat: swipe down to close images' (#122) from davidoskky/ReaderForSelfoss-multiplatform:swipe_down into master
+- Remove unnecessary definition
+- Remove unused import
+- Adjust the image closing animation
+- Add a dark hue to the underlying article when swiping to close images
+- Rename activity style to avoid interferences
+- Adapt the style of the image activity to the rest of the application
+- Resolve issues when swiping down to close images
+- Close the image fragment only if the image has been dragged down
+- Animate swipe down to close images
+- Swipe down to close images
+
+--------------------------------------------------------------------
+
+**v123010041**
+
+- Merge pull request 'scroll-tag-filters' (#124) from scroll-tag-filters into master
+- fix: added POST_NOTIFICATIONS to fix notifications issues.
+- fix: scrollable filter sheet.
+- enhancement: Ellipsize chips text.
+- Cleaning.
+
+--------------------------------------------------------------------
+
+**v122123641**
+
+- feat: Disable the failing source in the filter sheet.
+- feat: Display the source error in the sources list.
+
+--------------------------------------------------------------------
+
+**v122123631**
+
+- build: Added back maven repos (see https://gitlab.com/fdroid/fdroiddata/-/commit/1fb9d60dc58511abc2bb4eb321977922a0682c8b#note_1223925153)
+- build: Added back maven repos (see https://gitlab.com/fdroid/fdroiddata/-/commit/1fb9d60dc58511abc2bb4eb321977922a0682c8b#note_1223925153)
+- debug: trying to resolve `Canvas: trying to use a recycled bitmap`.
+- fix: NPE may be caused by the binding or the title that was null.
+- chore: Skip drone pipeline on changelog push.
+
+--------------------------------------------------------------------
+
+**v122123621**
+
+- fix: Automatic CHANGELOG generation.
+- Merge pull request 'Sources Upsert' (#119) from sources-edit into master
+- Source update screen.
+- Sources menu.
+- chore: Automatic CHANGELOG generation.
+
+--------------------------------------------------------------------
+
 # V2/Multiplatform rewrite
 
 **v1**

androidApp/build.gradle.kts

@@ -8,15 +8,15 @@ plugins {
     kotlin("android")
     kotlin("kapt")
     id("com.mikepenz.aboutlibraries.plugin")
-    id("org.jetbrains.kotlinx.kover") version "0.6.1"
+    id("org.jetbrains.kotlinx.kover")
 }
 
 fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
-    var result: String = ByteArrayOutputStream().use { outputStream ->
+    val result: String = ByteArrayOutputStream().use { outputStream ->
         project.exec {
             commandLine = cmd.split(" ")
             standardOutput = outputStream
-            isIgnoreExitValue = ignore ?: false
+            isIgnoreExitValue = ignore
         }
         outputStream.toString()
     }
@@ -24,11 +24,10 @@ fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
 }
 
 fun gitVersion(): String {
-    var process = ""
     val maybeTagOfCurrentCommit = execWithOutput("git -C ../ describe --contains HEAD", true)
-    process = if (maybeTagOfCurrentCommit.isEmpty()) {
+    val process = if (maybeTagOfCurrentCommit.isEmpty()) {
         println("No tag on current commit. Will take the latest one.")
-        execWithOutput("git -C ../ for-each-ref refs/tags --sort=-authordate --format='%(refname:short)' --count=1")
+        execWithOutput("git -C ../ for-each-ref refs/tags --sort=-refname --format='%(refname:short)' --count=1")
     } else {
         println("Tag found on current commit")
         execWithOutput("git -C ../ describe --contains HEAD")
@@ -56,24 +55,24 @@ fun versionNameFromGit(): String {
 
 android {
     compileOptions {
+        isCoreLibraryDesugaringEnabled = true
         // Flag to enable support for the new language APIs
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     // For Kotlin projects
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
-    compileSdk = 33
-    buildToolsVersion = "31.0.0"
+    compileSdk = 34
     buildFeatures {
         viewBinding = true
     }
     defaultConfig {
         applicationId = "bou.amine.apps.readerforselfossv2.android"
-        minSdk = 21
-        targetSdk = 33
+        minSdk = 25
+        targetSdk = 34
         versionCode = versionCodeFromGit()
         versionName = versionNameFromGit()
 
@@ -86,7 +85,7 @@ android {
         // tests
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    packagingOptions {
+    packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
@@ -112,27 +111,28 @@ android {
 }
 
 dependencies {
-    implementation(project(":shared"))
-    implementation("com.google.android.material:material:1.5.0")
-    implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
 
-    implementation("androidx.preference:preference-ktx:1.1.1")
+    implementation(project(":shared"))
+    implementation("com.google.android.material:material:1.9.0")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1")
+
+    implementation("androidx.preference:preference-ktx:1.2.1")
 
     implementation(fileTree(mapOf("include" to listOf("*.jar"), "dir" to "libs")))
 
     // Android Support
-    implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("com.google.android.material:material:1.5.0")
-    implementation("androidx.recyclerview:recyclerview:1.3.0-alpha01")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("com.google.android.material:material:1.9.0")
+    implementation("androidx.recyclerview:recyclerview:1.3.1")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("androidx.vectordrawable:vectordrawable:1.2.0-alpha02")
+    implementation("androidx.vectordrawable:vectordrawable:1.2.0-beta01")
     implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.annotation:annotation:1.3.0")
-    implementation("androidx.work:work-runtime-ktx:2.7.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
-    implementation("org.jsoup:jsoup:1.14.3")
+    implementation("androidx.annotation:annotation:1.7.0")
+    implementation("androidx.work:work-runtime-ktx:2.8.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("org.jsoup:jsoup:1.15.4")
 
     //multidex
     implementation("androidx.multidex:multidex:2.0.1")
@@ -143,18 +143,17 @@ 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.14.2")
-    implementation("com.github.bumptech.glide:okhttp3-integration:4.14.2")
+    kapt("com.github.bumptech.glide:compiler:4.15.0")
+    implementation("com.github.bumptech.glide:okhttp3-integration:4.15.0")
 
     // Themes
     implementation("com.github.rubensousa:floatingtoolbar:1.5.1")
 
     // Pager
     implementation("me.relex:circleindicator:2.1.6")
-    implementation("androidx.viewpager2:viewpager2:1.1.0-beta01")
+    implementation("androidx.viewpager2:viewpager2:1.1.0-beta02")
 
     //Dependency Injection
     implementation("org.kodein.di:kodein-di:7.14.0")
@@ -170,12 +169,12 @@ dependencies {
     //PhotoView
     implementation("com.github.chrisbanes:PhotoView:2.3.0")
 
-    implementation("androidx.core:core-ktx:1.8.0")
+    implementation("androidx.core:core-ktx:1.12.0")
 
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
 
     // Network information
-     implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
+    implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
 
     // SQLDELIGHT
     implementation("com.squareup.sqldelight:android-driver:1.5.4")
@@ -183,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.6.0")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 
     implementation("ch.acra:acra-http:$acraVersion")

androidApp/proguard-rules.pro

@@ -55,6 +55,7 @@
 # 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.

androidApp/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
@@ -52,7 +53,7 @@
                 android:value=".HomeActivity" />
         </activity>
         <activity
-            android:name=".AddSourceActivity"
+            android:name=".UpsertSourceActivity"
             android:parentActivityName=".SourcesActivity"
             android:exported="true">
             <meta-data
@@ -69,7 +70,8 @@
             android:name=".ReaderActivity">
         </activity>
         <activity
-            android:name=".ImageActivity">
+            android:name=".ImageActivity"
+            android:theme="@style/Theme.AppCompat.ImageActivity">
         </activity>
 
         <meta-data android:name="android.webkit.WebView.MetricsOptOut"

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

@@ -6,4 +6,4 @@ import org.acra.ktx.sendSilentlyWithAcra
 fun Throwable.sendSilentlyWithAcraWithName(name: String) {
     ACRA.errorReporter.putCustomData("error_source", name)
     this.sendSilentlyWithAcra()
-}
+}

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

@@ -1,172 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.widget.*
-import androidx.appcompat.app.AppCompatActivity
-import androidx.constraintlayout.widget.ConstraintLayout
-import bou.amine.apps.readerforselfossv2.android.databinding.ActivityAddSourceBinding
-import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlInvalid
-import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
-import bou.amine.apps.readerforselfossv2.repository.Repository
-import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.kodein.di.DIAware
-import org.kodein.di.android.closestDI
-import org.kodein.di.instance
-
-
-class AddSourceActivity : AppCompatActivity(), DIAware {
-
-    private var mSpoutsValue: String? = null
-
-    private lateinit var binding: ActivityAddSourceBinding
-
-    override val di by closestDI()
-    private val repository : Repository by instance()
-    private val appSettingsService : AppSettingsService by instance()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityAddSourceBinding.inflate(layoutInflater)
-        val view = binding.root
-
-        setContentView(view)
-
-        setSupportActionBar(binding.toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        supportActionBar?.setDisplayShowHomeEnabled(true)
-
-        maybeGetDetailsFromIntentSharing(intent, binding.sourceUri, binding.nameInput)
-
-        binding.saveBtn.setOnClickListener {
-            handleSaveSource(
-                binding.tags,
-                binding.nameInput.text.toString(),
-                binding.sourceUri.text.toString()
-            )
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        val baseUrl = appSettingsService.getBaseUrl()
-        if (baseUrl.isEmpty() || baseUrl.isBaseUrlInvalid()) {
-            mustLoginToAddSource()
-        } else {
-            handleSpoutsSpinner(binding.spoutsSpinner, binding.progress, binding.formContainer)
-        }
-    }
-
-    private fun handleSpoutsSpinner(
-        spoutsSpinner: Spinner,
-        mProgress: ProgressBar,
-        formContainer: ConstraintLayout
-    ) {
-        val spoutsKV = HashMap<String, String>()
-        spoutsSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(adapterView: AdapterView<*>, view: View?, i: Int, l: Long) {
-                if (view != null) {
-                    val spoutName = (view as TextView).text.toString()
-                    mSpoutsValue = spoutsKV[spoutName]
-                }
-            }
-
-            override fun onNothingSelected(adapterView: AdapterView<*>) {
-                mSpoutsValue = null
-            }
-        }
-
-
-        fun handleSpoutFailure(networkIssue: Boolean = false) {
-            Toast.makeText(
-                this@AddSourceActivity,
-                if (networkIssue) R.string.cant_get_spouts_no_network else R.string.cant_get_spouts,
-                Toast.LENGTH_SHORT
-            ).show()
-            mProgress.visibility = View.GONE
-        }
-
-        CoroutineScope(Dispatchers.Main).launch {
-            try {
-                val items = repository.getSpouts()
-                if (items.isNotEmpty()) {
-                    val itemsStrings = items.map { it.value.name }
-                    for ((key, value) in items) {
-                        spoutsKV[value.name] = key
-                    }
-
-                    mProgress.visibility = View.GONE
-                    formContainer.visibility = View.VISIBLE
-
-                    val spinnerArrayAdapter =
-                        ArrayAdapter(
-                            this@AddSourceActivity,
-                            android.R.layout.simple_spinner_item,
-                            itemsStrings
-                        )
-                    spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-                    spoutsSpinner.adapter = spinnerArrayAdapter
-                } else {
-                    handleSpoutFailure()
-                }
-            } catch (e: NetworkUnavailableException) {
-                handleSpoutFailure(networkIssue = true)
-            }
-        }
-    }
-
-    private fun maybeGetDetailsFromIntentSharing(
-        intent: Intent,
-        sourceUri: EditText,
-        nameInput: EditText
-    ) {
-        if (Intent.ACTION_SEND == intent.action && "text/plain" == intent.type) {
-            sourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
-            nameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
-        }
-    }
-
-    private fun mustLoginToAddSource() {
-        Toast.makeText(this, getString(R.string.addStringNoUrl), Toast.LENGTH_SHORT).show()
-        val i = Intent(this, LoginActivity::class.java)
-        startActivity(i)
-        finish()
-    }
-
-    private fun handleSaveSource(tags: EditText, title: String, url: String) {
-
-        val sourceDetailsUnavailable =
-            title.isEmpty() || url.isEmpty() || mSpoutsValue == null || mSpoutsValue!!.isEmpty()
-
-        when {
-            sourceDetailsUnavailable -> {
-                Toast.makeText(this, R.string.form_not_complete, Toast.LENGTH_SHORT).show()
-            }
-            else -> {
-                CoroutineScope(Dispatchers.Main).launch {
-                    val successfullyAddedSource = repository.createSource(
-                        title,
-                        url,
-                        mSpoutsValue!!,
-                        tags.text.toString(),
-                        "",
-                    )
-                    if (successfullyAddedSource) {
-                        finish()
-                    } else {
-                        Toast.makeText(
-                            this@AddSourceActivity,
-                            R.string.cant_create_source,
-                            Toast.LENGTH_SHORT
-                        ).show()
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -36,15 +36,14 @@ import com.ashokvarma.bottomnavigation.TextBadgeItem
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 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,22 +61,22 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     private var fromTabShortcut: Boolean = false
 
-    private val settingsLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        appSettingsService.refreshUserSettings()
-    }
+    private val settingsLauncher =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            appSettingsService.refreshUserSettings()
+        }
 
     override val di by closestDI()
-    private val repository : Repository by instance()
-    private val appSettingsService : AppSettingsService by instance()
-
+    private val repository: Repository by instance()
+    private val appSettingsService: AppSettingsService by instance()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHomeBinding.inflate(layoutInflater)
         val view = binding.root
 
-        fromTabShortcut =  intent.getIntExtra("shortcutTab", -1) != -1
-        repository.offlineOverride =  intent.getBooleanExtra("startOffline", false)
+        fromTabShortcut = intent.getIntExtra("shortcutTab", -1) != -1
+        repository.offlineOverride = intent.getBooleanExtra("startOffline", false)
 
         if (fromTabShortcut) {
             elementsShown = ItemType.fromInt(intent.getIntExtra("shortcutTab", ItemType.UNREAD.position))
@@ -91,7 +90,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
         handleSwipeRefreshLayout()
 
-
         if (appSettingsService.isItemCachingEnabled()) {
             CoroutineScope(Dispatchers.Main).launch {
                 repository.tryToCacheItemsAndGetNewOnes()
@@ -103,7 +101,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
@@ -114,31 +112,41 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             }
         }
 
+        val swipeDirs =
+            if (appSettingsService.getPublicAccess()) {
+                0
+            } else {
+                ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
+            }
+
         val simpleItemTouchCallback =
             object : ItemTouchHelper.SimpleCallback(
                 0,
-                ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
+                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(viewHolder: RecyclerView.ViewHolder, swipeDir: Int) {
+                override fun onSwiped(
+                    viewHolder: RecyclerView.ViewHolder,
+                    swipeDir: Int,
+                ) {
                     val position = viewHolder.bindingAdapterPosition
                     val i = items.elementAtOrNull(position)
 
@@ -155,7 +163,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()
                     }
                 }
@@ -164,7 +172,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         ItemTouchHelper(simpleItemTouchCallback).attachToRecyclerView(binding.recyclerView)
     }
 
-    private fun updateBottomBarBadgeCount(badge: TextBadgeItem, count: Int) {
+    private fun updateBottomBarBadgeCount(
+        badge: TextBadgeItem,
+        count: Int,
+    ) {
         if (count > 0) {
             badge
                 .setText(count.toString())
@@ -175,16 +186,18 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     }
 
     private fun handleBottomBar() {
-
-        tabNewBadge = TextBadgeItem()
-            .setText("")
-            .setHideOnSelect(false).hide(false)
-        tabArchiveBadge = TextBadgeItem()
-            .setText("")
-            .setHideOnSelect(false).hide(false)
-        tabStarredBadge = TextBadgeItem()
-            .setText("")
-            .setHideOnSelect(false).hide(false)
+        tabNewBadge =
+            TextBadgeItem()
+                .setText("")
+                .setHideOnSelect(false).hide(false)
+        tabArchiveBadge =
+            TextBadgeItem()
+                .setText("")
+                .setHideOnSelect(false).hide(false)
+        tabStarredBadge =
+            TextBadgeItem()
+                .setText("")
+                .setHideOnSelect(false).hide(false)
 
         if (appSettingsService.isDisplayUnreadCountEnabled()) {
             lifecycleScope.launch {
@@ -211,19 +224,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)
 
@@ -264,7 +277,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         getElementsAccordingToTab()
     }
 
-
     private fun handleGDPRDialog(GDPRShown: Boolean) {
         val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
         messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
@@ -274,7 +286,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()
@@ -291,37 +303,41 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         when (currentManager) {
             is StaggeredGridLayoutManager ->
                 if (!appSettingsService.isCardViewEnabled()) {
-                    layoutManager = GridLayoutManager(
-                        this,
-                        calculateNoOfColumns()
-                    )
+                    layoutManager =
+                        GridLayoutManager(
+                            this,
+                            calculateNoOfColumns(),
+                        )
                     binding.recyclerView.layoutManager = layoutManager
                 }
             is GridLayoutManager ->
                 if (appSettingsService.isCardViewEnabled()) {
-                    layoutManager = StaggeredGridLayoutManager(
-                        calculateNoOfColumns(),
-                        StaggeredGridLayoutManager.VERTICAL
-                    )
+                    layoutManager =
+                        StaggeredGridLayoutManager(
+                            calculateNoOfColumns(),
+                            StaggeredGridLayoutManager.VERTICAL,
+                        )
                     layoutManager.gapStrategy =
-                            StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
+                        StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
                     binding.recyclerView.layoutManager = layoutManager
                 }
             else ->
                 if (currentManager == null) {
                     if (!appSettingsService.isCardViewEnabled()) {
-                        layoutManager = GridLayoutManager(
-                            this,
-                            calculateNoOfColumns()
-                        )
+                        layoutManager =
+                            GridLayoutManager(
+                                this,
+                                calculateNoOfColumns(),
+                            )
                         binding.recyclerView.layoutManager = layoutManager
                     } else {
-                        layoutManager = StaggeredGridLayoutManager(
-                            calculateNoOfColumns(),
-                            StaggeredGridLayoutManager.VERTICAL
-                        )
+                        layoutManager =
+                            StaggeredGridLayoutManager(
+                                calculateNoOfColumns(),
+                                StaggeredGridLayoutManager.VERTICAL,
+                            )
                         layoutManager.gapStrategy =
-                                StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
+                            StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
                         binding.recyclerView.layoutManager = layoutManager
                     }
                 }
@@ -329,70 +345,76 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     }
 
     private fun handleBottomBarActions() {
-        binding.bottomBar.setTabSelectedListener(object : BottomNavigationBar.OnTabSelectedListener {
-            override fun onTabUnselected(position: Int) = Unit
+        binding.bottomBar.setTabSelectedListener(
+            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) {
-                            getElementsAccordingToTab()
-                        } else {
-                            layoutManager.scrollToPositionWithOffset(0, 0)
-                        }
-                    is GridLayoutManager ->
-                        if (layoutManager.findFirstCompletelyVisibleItemPosition() == 0) {
-                            getElementsAccordingToTab()
-                        } else {
-                            layoutManager.scrollToPositionWithOffset(0, 0)
-                        }
-                    else -> Unit
+                override fun onTabReselected(position: Int) {
+                    when (val layoutManager = binding.recyclerView.adapter) {
+                        is StaggeredGridLayoutManager ->
+                            if (layoutManager.findFirstCompletelyVisibleItemPositions(null)[0] == 0) {
+                                getElementsAccordingToTab()
+                            } else {
+                                layoutManager.scrollToPositionWithOffset(0, 0)
+                            }
+                        is GridLayoutManager ->
+                            if (layoutManager.findFirstCompletelyVisibleItemPosition() == 0) {
+                                getElementsAccordingToTab()
+                            } else {
+                                layoutManager.scrollToPositionWithOffset(0, 0)
+                            }
+                        else -> Unit
+                    }
                 }
-            }
 
-            override fun onTabSelected(position: Int) {
-                offset = 0
-                lastFetchDone = false
+                override fun onTabSelected(position: Int) {
+                    offset = 0
+                    lastFetchDone = false
 
-                elementsShown = ItemType.fromInt(position + 1)
-                getElementsAccordingToTab()
-                binding.recyclerView.scrollToPosition(0)
+                    elementsShown = ItemType.fromInt(position + 1)
+                    getElementsAccordingToTab()
+                    binding.recyclerView.scrollToPosition(0)
 
-                fetchOnEmptyList()
-            }
-        })
+                    fetchOnEmptyList()
+                }
+            },
+        )
     }
 
     fun fetchOnEmptyList() {
         binding.recyclerView.doOnNextLayout {
-            // TODO: do if last element (or is empty ?)
             getElementsAccordingToTab(true)
         }
     }
 
     private fun handleInfiniteScroll() {
-        recyclerViewScrollListener = object : RecyclerView.OnScrollListener() {
-            override fun onScrolled(localRecycler: RecyclerView, dx: Int, dy: Int) {
-                if (dy > 0) {
-                    val lastVisibleItem = getLastVisibleItem()
+        recyclerViewScrollListener =
+            object : RecyclerView.OnScrollListener() {
+                override fun onScrolled(
+                    localRecycler: RecyclerView,
+                    dx: Int,
+                    dy: Int,
+                ) {
+                    if (dy > 0) {
+                        val lastVisibleItem = getLastVisibleItem()
 
-                    if (lastVisibleItem == (items.size - 1) && items.size < maxItemNumber()) {
-                        getElementsAccordingToTab(appendResults = true)
+                        if (lastVisibleItem == (items.size - 1) && items.size < maxItemNumber()) {
+                            getElementsAccordingToTab(appendResults = true)
+                        }
                     }
                 }
             }
-        }
 
         binding.recyclerView.clearOnScrollListeners()
         binding.recyclerView.addOnScrollListener(recyclerViewScrollListener)
     }
 
-    private fun getLastVisibleItem() : Int {
+    private fun getLastVisibleItem(): Int {
         return when (val manager = binding.recyclerView.layoutManager) {
-            is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions(
-                null
-            ).last()
+            is StaggeredGridLayoutManager ->
+                manager.findLastCompletelyVisibleItemPositions(
+                    null,
+                ).last()
             is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition()
             else -> 0
         }
@@ -405,28 +427,31 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             binding.emptyText.visibility = View.GONE
         }
 
-    fun getElementsAccordingToTab(
-        appendResults: Boolean = false
-    ) {
-        offset = if (appendResults && items.size > 0) {
-            items.size - 1
-        } else {
-            0
-        }
+    fun getElementsAccordingToTab(appendResults: Boolean = false) {
+        offset =
+            if (appendResults && items.size > 0) {
+                items.size - 1
+            } else {
+                0
+            }
         firstVisible = if (appendResults) firstVisible else 0
 
         getItems(appendResults, elementsShown)
     }
 
-    private fun getItems(appendResults: Boolean, itemType: ItemType) {
+    private fun getItems(
+        appendResults: Boolean,
+        itemType: ItemType,
+    ) {
         CoroutineScope(Dispatchers.Main).launch {
             binding.swipeRefreshLayout.isRefreshing = true
             repository.displayedItems = itemType
-            items = if (appendResults) {
-                repository.getOlderItems()
-            } else {
-                repository.getNewerItems()
-            }
+            items =
+                if (appendResults) {
+                    repository.getOlderItems()
+                } else {
+                    repository.getNewerItems()
+                }
             binding.swipeRefreshLayout.isRefreshing = false
             handleListResult()
         }
@@ -435,43 +460,44 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     private fun handleListResult(appendResults: Boolean = false) {
         if (appendResults) {
             val oldManager = binding.recyclerView.layoutManager
-            firstVisible = when (oldManager) {
-                is StaggeredGridLayoutManager ->
-                    oldManager.findFirstCompletelyVisibleItemPositions(null).last()
-                is GridLayoutManager ->
-                    oldManager.findFirstCompletelyVisibleItemPosition()
-                else -> 0
-            }
+            firstVisible =
+                when (oldManager) {
+                    is StaggeredGridLayoutManager ->
+                        oldManager.findFirstCompletelyVisibleItemPositions(null).last()
+                    is GridLayoutManager ->
+                        oldManager.findFirstCompletelyVisibleItemPosition()
+                    else -> 0
+                }
         }
 
         if (recyclerAdapter == null) {
             if (appSettingsService.isCardViewEnabled()) {
                 recyclerAdapter =
-                        ItemCardAdapter(
-                            this,
-                            items,
-                        ) {
-                            updateItems(it)
-                        }
+                    ItemCardAdapter(
+                        this,
+                        items,
+                    ) {
+                        updateItems(it)
+                    }
             } else {
                 recyclerAdapter =
-                        ItemListAdapter(
-                            this,
-                            items,
-                        ) {
-                            updateItems(it)
-                        }
+                    ItemListAdapter(
+                        this,
+                        items,
+                    ) {
+                        updateItems(it)
+                    }
 
                 binding.recyclerView.addItemDecoration(
                     DividerItemDecoration(
                         this@HomeActivity,
-                        DividerItemDecoration.VERTICAL
-                    )
+                        DividerItemDecoration.VERTICAL,
+                    ),
                 )
             }
             binding.recyclerView.adapter = recyclerAdapter
         } else {
-                (recyclerAdapter as ItemsAdapter<*>).updateAllItems(items)
+            (recyclerAdapter as ItemsAdapter<*>).updateAllItems(items)
         }
 
         reloadBadges()
@@ -511,6 +537,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         val inflater = menuInflater
         inflater.inflate(R.menu.home_menu, menu)
+        if (appSettingsService.getPublicAccess()) {
+            menu.removeItem(R.id.readAll)
+            menu.removeItem(R.id.action_sources)
+        }
 
         val searchItem = menu.findItem(R.id.action_search)
         val searchView = searchItem.getActionView() as SearchView
@@ -519,7 +549,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         return true
     }
 
-    private fun needsConfirmation(titleRes: Int, messageRes: Int, doFn: () -> Unit) {
+    private fun needsConfirmation(
+        titleRes: Int,
+        messageRes: Int,
+        doFn: () -> Unit,
+    ) {
         AlertDialog.Builder(this@HomeActivity)
             .setMessage(messageRes)
             .setTitle(titleRes)
@@ -539,21 +573,20 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             R.id.refresh -> {
                 needsConfirmation(R.string.menu_home_refresh, R.string.refresh_dialog_message) {
                     Toast.makeText(this, R.string.refresh_in_progress, Toast.LENGTH_SHORT).show()
-                    // TODO: Use Dispatchers.IO
                     CoroutineScope(Dispatchers.Main).launch {
                         val updatedRemote = repository.updateRemote()
                         if (updatedRemote) {
-                            // TODO: Send toast messages from the repository
                             Toast.makeText(
                                 this@HomeActivity,
-                                R.string.refresh_success_response, Toast.LENGTH_LONG
+                                R.string.refresh_success_response,
+                                Toast.LENGTH_LONG,
                             )
                                 .show()
                         } else {
                             Toast.makeText(
                                 this@HomeActivity,
                                 R.string.refresh_failer_message,
-                                Toast.LENGTH_SHORT
+                                Toast.LENGTH_SHORT,
                             ).show()
                         }
                     }
@@ -571,7 +604,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()
 
@@ -580,7 +613,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()
@@ -591,18 +624,24 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                 return true
             }
             R.id.action_disconnect -> {
-                CoroutineScope(Dispatchers.Main).launch {
-                    repository.logout()
+                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()
                 }
-                this@HomeActivity.finish()
-                val intent = Intent(this, LoginActivity::class.java)
-                this.startActivity(intent)
                 return true
             }
             R.id.action_settings -> {
                 settingsLauncher.launch(Intent(this, SettingsActivity::class.java))
                 return true
             }
+            R.id.action_sources -> {
+                startActivity(Intent(this, SourcesActivity::class.java))
+                return true
+            }
             else -> return super.onOptionsItemSelected(item)
         }
     }
@@ -621,11 +660,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     private fun handleRecurringTask() {
         if (appSettingsService.isPeriodicRefreshEnabled()) {
-            val myConstraints = Constraints.Builder()
-                .setRequiresBatteryNotLow(true)
-                .setRequiresCharging(appSettingsService.isRefreshWhenChargingOnlyEnabled())
-                .setRequiresStorageNotLow(true)
-                .build()
+            val myConstraints =
+                Constraints.Builder()
+                    .setRequiresBatteryNotLow(true)
+                    .setRequiresCharging(appSettingsService.isRefreshWhenChargingOnlyEnabled())
+                    .setRequiresStorageNotLow(true)
+                    .build()
 
             val backgroundWork =
                 PeriodicWorkRequestBuilder<LoadingWorker>(appSettingsService.getRefreshMinutes(), TimeUnit.MINUTES)
@@ -633,8 +673,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                     .addTag("selfoss-loading")
                     .build()
 
-            WorkManager.getInstance(baseContext).enqueueUniquePeriodicWork("selfoss-loading", ExistingPeriodicWorkPolicy.KEEP, backgroundWork)
+            WorkManager.getInstance(
+                baseContext,
+            ).enqueueUniquePeriodicWork("selfoss-loading", ExistingPeriodicWorkPolicy.KEEP, backgroundWork)
         }
     }
 }
-

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

@@ -3,6 +3,7 @@ package bou.amine.apps.readerforselfossv2.android
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
+import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
@@ -10,8 +11,8 @@ import bou.amine.apps.readerforselfossv2.android.databinding.ActivityImageBindin
 import bou.amine.apps.readerforselfossv2.android.fragments.ImageFragment
 
 class ImageActivity : AppCompatActivity() {
-    private lateinit var allImages : ArrayList<String>
-    private var position : Int = 0
+    private lateinit var allImages: ArrayList<String>
+    private var position: Int = 0
 
     private lateinit var binding: ActivityImageBinding
 
@@ -23,7 +24,6 @@ class ImageActivity : AppCompatActivity() {
         setContentView(view)
 
         setSupportActionBar(binding.toolBar)
-        supportActionBar?.setDisplayShowTitleEnabled(false)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
         allImages = intent.getStringArrayListExtra("allImages") as ArrayList<String>
@@ -31,12 +31,52 @@ class ImageActivity : AppCompatActivity() {
 
         binding.pager.adapter = ScreenSlidePagerAdapter(this)
         binding.pager.setCurrentItem(position, false)
+
+        val transitionListener =
+            object : MotionLayout.TransitionListener {
+                override fun onTransitionStarted(
+                    motionLayout: MotionLayout?,
+                    startId: Int,
+                    endId: Int,
+                ) {
+                    // Nothing
+                }
+
+                override fun onTransitionChange(
+                    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(
+                    motionLayout: MotionLayout?,
+                    triggerId: Int,
+                    positive: Boolean,
+                    progress: Float,
+                ) {
+                    // Nothing
+                }
+            }
+        binding.root.setTransitionListener(transitionListener)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             android.R.id.home -> {
-                onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
                 return true
             }
         }
@@ -45,9 +85,8 @@ 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

@@ -27,11 +27,8 @@ import org.acra.ACRA
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
-import java.security.MessageDigest
-
 
 class LoginActivity : AppCompatActivity(), DIAware {
-
     private var inValidCount: Int = 0
     private var isWithLogin = false
 
@@ -41,7 +38,6 @@ class LoginActivity : AppCompatActivity(), DIAware {
     private val repository: Repository by instance()
     private val appSettingsService: AppSettingsService by instance()
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -58,29 +54,7 @@ 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)
-                }
-            }
+            goToMain()
         }
 
         handleActions()
@@ -92,7 +66,6 @@ class LoginActivity : AppCompatActivity(), DIAware {
     }
 
     private fun handleActions() {
-
         binding.passwordView.setOnEditorActionListener(
             TextView.OnEditorActionListener { _, id, _ ->
                 if (id == R.id.loginView || id == EditorInfo.IME_NULL) {
@@ -100,7 +73,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
                     return@OnEditorActionListener true
                 }
                 false
-            }
+            },
         )
 
         binding.signInButton.setOnClickListener { attemptLogin() }
@@ -121,7 +94,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()
         }
@@ -129,7 +102,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
     private fun goToMain() {
         CoroutineScope(Dispatchers.Main).launch {
-            repository.updateApiVersion()
+            repository.updateApiInformation()
             ACRA.errorReporter.putCustomData("SELFOSS_API_VERSION", appSettingsService.getApiVersion().toString())
         }
         val intent = Intent(this, HomeActivity::class.java)
@@ -146,7 +119,6 @@ class LoginActivity : AppCompatActivity(), DIAware {
     }
 
     private fun attemptLogin() {
-
         // Reset errors.
         binding.urlView.error = null
         binding.loginView.error = null
@@ -157,13 +129,67 @@ class LoginActivity : AppCompatActivity(), DIAware {
         val login = binding.loginView.text.toString().trim()
         val password = binding.passwordView.text.toString().trim()
 
-        var cancel = false
-        var focusView: View? = null
+        failInvalidUrl(url)
+        failLoginDetails(password, login)
 
+        showProgress(true)
+
+        appSettingsService.updateSelfSigned(binding.selfSigned.isChecked)
+
+        repository.refreshLoginInformation(url, login, password)
+
+        CoroutineScope(Dispatchers.Main).launch {
+            repository.updateApiInformation()
+            val result = repository.login()
+            if (result) {
+                val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance()
+                if (!errorFetching && !displaySelfossOnly) {
+                    goToMain()
+                } else {
+                    if (displaySelfossOnly) {
+                        Toast.makeText(
+                            applicationContext,
+                            R.string.application_selfoss_only,
+                            Toast.LENGTH_LONG,
+                        ).show()
+                    }
+                    preferenceError()
+                }
+            } else {
+                preferenceError()
+            }
+            showProgress(false)
+        }
+    }
+
+    private fun failLoginDetails(
+        password: String,
+        login: String,
+    ) {
+        var lastFocusedView: View? = null
+        var cancel = false
+        if (isWithLogin) {
+            if (TextUtils.isEmpty(password)) {
+                binding.passwordView.error = getString(R.string.error_invalid_password)
+                lastFocusedView = binding.passwordView
+                cancel = true
+            }
+
+            if (TextUtils.isEmpty(login)) {
+                binding.loginView.error = getString(R.string.error_field_required)
+                lastFocusedView = binding.loginView
+                cancel = true
+            }
+        }
+        maybeCancelAndFocusView(cancel, lastFocusedView)
+    }
+
+    private fun failInvalidUrl(url: String) {
+        val focusView = binding.urlView
+        var cancel = false
         if (url.isBaseUrlInvalid()) {
-            binding.urlView.error = getString(R.string.login_url_problem)
-            focusView = binding.urlView
             cancel = true
+            binding.urlView.error = getString(R.string.login_url_problem)
             inValidCount++
             if (inValidCount == 3) {
                 val alertDialog = AlertDialog.Builder(this).create()
@@ -171,55 +197,21 @@ 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
             }
         }
+        maybeCancelAndFocusView(cancel, focusView)
+    }
 
-        if (isWithLogin) {
-            if (TextUtils.isEmpty(password)) {
-                binding.passwordView.error = getString(R.string.error_invalid_password)
-                focusView = binding.passwordView
-                cancel = true
-            }
-
-            if (TextUtils.isEmpty(login)) {
-                binding.loginView.error = getString(R.string.error_field_required)
-                focusView = binding.loginView
-                cancel = true
-            }
-        }
-
+    private fun maybeCancelAndFocusView(
+        cancel: Boolean,
+        focusView: View?,
+    ) {
         if (cancel) {
             focusView?.requestFocus()
-        } else {
-            showProgress(true)
-
-            repository.refreshLoginInformation(url, login, password)
-
-            CoroutineScope(Dispatchers.Main).launch {
-                val result = repository.login()
-                if (result) {
-                    val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance()
-                    if (!errorFetching && !displaySelfossOnly) {
-                        goToMain()
-                    } else {
-                        if (displaySelfossOnly) {
-                            Toast.makeText(
-                                applicationContext,
-                                R.string.application_selfoss_only,
-                                Toast.LENGTH_LONG
-                            ).show()
-                        }
-                        preferenceError()
-                    }
-                } else {
-                    preferenceError()
-                }
-                showProgress(false)
-            }
         }
     }
 
@@ -231,12 +223,13 @@ class LoginActivity : AppCompatActivity(), DIAware {
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
-                if (show) 0F else 1F
-            ).setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE
-                }
-            }
+                if (show) 0F else 1F,
+            ).setListener(
+                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
@@ -244,12 +237,13 @@ class LoginActivity : AppCompatActivity(), DIAware {
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
-                if (show) 1F else 0F
-            ).setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
-                }
-            }
+                if (show) 1F else 0F,
+            ).setListener(
+                object : AnimatorListenerAdapter() {
+                    override fun onAnimationEnd(animation: Animator) {
+                        binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
+                    }
+                },
             )
     }
 

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

@@ -8,7 +8,6 @@ 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

@@ -3,10 +3,7 @@ package bou.amine.apps.readerforselfossv2.android
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
-import android.graphics.drawable.Drawable
-import android.net.Uri
 import android.os.Build
-import android.widget.ImageView
 import android.widget.Toast
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -18,8 +15,6 @@ import bou.amine.apps.readerforselfossv2.dao.DriverFactory
 import bou.amine.apps.readerforselfossv2.dao.ReaderForSelfossDB
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestOptions
 import com.github.ln_12.library.ConnectivityStatus
 import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
@@ -37,12 +32,20 @@ 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 singleton { Repository(instance(), instance(), isConnectionAvailable, instance()) }
+        bind<Repository>() with
+            singleton {
+                Repository(
+                    instance(),
+                    instance(),
+                    isConnectionAvailable,
+                    instance(),
+                )
+            }
         bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
         bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
     }
@@ -64,25 +67,33 @@ class MyApp : MultiDexApplication(), DIAware {
 
             handleNotificationChannels()
 
-            ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(connectivityStatus, repository))
+            ProcessLifecycleOwner.get().lifecycle.addObserver(
+                AppLifeCycleObserver(
+                    connectivityStatus,
+                    repository,
+                ),
+            )
 
             CoroutineScope(Dispatchers.Main).launch {
                 viewModel.networkAvailableProvider.collect { networkAvailable ->
-                    val toastMessage = if (networkAvailable) {
-                        repository.handleDBActions()
-                        R.string.network_connectivity_retrieved
-                    } else {
-                        R.string.network_connectivity_lost
-                    }
+                    val toastMessage =
+                        if (networkAvailable) {
+                            repository.handleDBActions()
+                            R.string.network_connectivity_retrieved
+                        } else {
+                            R.string.network_connectivity_lost
+                        }
 
                     Toast.makeText(
                         applicationContext,
                         toastMessage,
-                        Toast.LENGTH_SHORT
+                        Toast.LENGTH_SHORT,
                     ).show()
                 }
             }
         }
+
+        repository.migrate(driverFactory)
     }
 
     override fun attachBaseContext(base: Context?) {
@@ -90,23 +101,40 @@ class MyApp : MultiDexApplication(), DIAware {
 
         initAcra {
             reportFormat = StringFormat.JSON
-            reportContent = listOf(
-                ReportField.REPORT_ID, ReportField.INSTALLATION_ID,
-                ReportField.APP_VERSION_CODE, ReportField.APP_VERSION_NAME,
-                ReportField.BUILD, ReportField.ANDROID_VERSION, ReportField.BRAND, ReportField.PHONE_MODEL,
-                ReportField.AVAILABLE_MEM_SIZE, ReportField.TOTAL_MEM_SIZE,
-                ReportField.STACK_TRACE, ReportField.APPLICATION_LOG, ReportField.LOGCAT,
-                ReportField.INITIAL_CONFIGURATION, ReportField.CRASH_CONFIGURATION, ReportField.IS_SILENT,
-                ReportField.USER_APP_START_DATE, ReportField.USER_COMMENT, ReportField.USER_CRASH_DATE, ReportField.USER_EMAIL, ReportField.CUSTOM_DATA)
+            reportContent =
+                listOf(
+                    ReportField.REPORT_ID,
+                    ReportField.INSTALLATION_ID,
+                    ReportField.APP_VERSION_CODE,
+                    ReportField.APP_VERSION_NAME,
+                    ReportField.BUILD,
+                    ReportField.ANDROID_VERSION,
+                    ReportField.BRAND,
+                    ReportField.PHONE_MODEL,
+                    ReportField.AVAILABLE_MEM_SIZE,
+                    ReportField.TOTAL_MEM_SIZE,
+                    ReportField.STACK_TRACE,
+                    ReportField.APPLICATION_LOG,
+                    ReportField.LOGCAT,
+                    ReportField.INITIAL_CONFIGURATION,
+                    ReportField.CRASH_CONFIGURATION,
+                    ReportField.IS_SILENT,
+                    ReportField.USER_APP_START_DATE,
+                    ReportField.USER_COMMENT,
+                    ReportField.USER_CRASH_DATE,
+                    ReportField.USER_EMAIL,
+                    ReportField.CUSTOM_DATA,
+                )
             toast {
-                //required
+                // required
                 text = getString(R.string.crash_toast_text)
                 length = Toast.LENGTH_SHORT
             }
             httpSender {
-                uri = "https://bugs.amine-louveau.fr/report" /*best guess, you may need to adjust this*/
-                basicAuthLogin = "LMTlLZuazADohTCm"
-                basicAuthPassword = "he6ghHp83F0PYPfh"
+                uri =
+                    "https://bugs.amine-louveau.fr/report" // best guess, you may need to adjust this
+                basicAuthLogin = "qMEscjj89Gwt6cPR"
+                basicAuthPassword = "Yo58QFlGzFaWlBzP"
                 httpMethod = HttpSender.Method.POST
             }
         }
@@ -122,7 +150,12 @@ class MyApp : MultiDexApplication(), DIAware {
 
             val newItemsChannelname = getString(R.string.new_items_channel_sync)
             val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT
-            val newItemsChannelmChannel = NotificationChannel(AppSettingsService.newItemsChannelId, newItemsChannelname, newItemsChannelimportance)
+            val newItemsChannelmChannel =
+                NotificationChannel(
+                    AppSettingsService.newItemsChannelId,
+                    newItemsChannelname,
+                    newItemsChannelimportance,
+                )
 
             notificationManager.createNotificationChannel(mChannel)
             notificationManager.createNotificationChannel(newItemsChannelmChannel)
@@ -133,17 +166,22 @@ class MyApp : MultiDexApplication(), DIAware {
         val oldHandler = Thread.getDefaultUncaughtExceptionHandler()
 
         Thread.setDefaultUncaughtExceptionHandler { thread, e ->
-            if (e is NoClassDefFoundError && e.stackTrace.asList().any {
+            if (e is NoClassDefFoundError &&
+                e.stackTrace.asList().any {
                     it.toString().contains("android.view.ViewDebug")
-                }) {
+                }
+            ) {
+                // Nothing
             } else {
                 oldHandler.uncaughtException(thread, e)
             }
         }
     }
 
-    class AppLifeCycleObserver(val connectivityStatus: ConnectivityStatus, val repository: Repository) : DefaultLifecycleObserver {
-
+    class AppLifeCycleObserver(
+        val connectivityStatus: ConnectivityStatus,
+        val repository: Repository,
+    ) : DefaultLifecycleObserver {
         override fun onResume(owner: LifecycleOwner) {
             super.onResume(owner)
             repository.connectionMonitored = true
@@ -156,4 +194,4 @@ class MyApp : MultiDexApplication(), DIAware {
             super.onPause(owner)
         }
     }
-}
+}

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

@@ -23,7 +23,6 @@ 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
@@ -71,7 +70,11 @@ class ReaderActivity : AppCompatActivity(), DIAware {
             finish()
         }
 
-        readItem(allItems[currentItem])
+        try {
+            readItem(allItems[currentItem])
+        } catch (e: IndexOutOfBoundsException) {
+            finish()
+        }
 
         binding.pager.adapter = ScreenSlidePagerAdapter(this)
         binding.pager.setCurrentItem(currentItem, false)
@@ -84,7 +87,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {
     }
 
     private fun readItem(item: SelfossModel.Item) {
-        if (appSettingsService.isMarkOnScrollEnabled()) {
+        if (appSettingsService.isMarkOnScrollEnabled() && !appSettingsService.getPublicAccess()) {
             CoroutineScope(Dispatchers.IO).launch {
                 repository.markAsRead(item)
             }
@@ -98,15 +101,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(keyCode: Int, event: KeyEvent?): Boolean {
+    override fun onKeyDown(
+        keyCode: Int,
+        event: KeyEvent?,
+    ): Boolean {
         return when (keyCode) {
             KeyEvent.KEYCODE_VOLUME_DOWN -> {
                 val currentFragment =
@@ -137,28 +140,32 @@ class ReaderActivity : AppCompatActivity(), DIAware {
         inflater.inflate(R.menu.reader_menu, menu)
         toolbarMenu = menu
 
-        if (allItems.isNotEmpty() && allItems[currentItem].starred) {
-            canRemoveFromFavorite()
-        } else {
-            canFavorite()
-        }
         alignmentMenu()
 
-        binding.pager.registerOnPageChangeCallback(
-            object : ViewPager2.OnPageChangeCallback() {
-
-                override fun onPageSelected(position: Int) {
-                    super.onPageSelected(position)
-
-                    if (allItems[position].starred) {
-                        canRemoveFromFavorite()
-                    } else {
-                        canFavorite()
-                    }
-                    readItem(allItems[position])
-                }
+        if (appSettingsService.getPublicAccess()) {
+            menu.removeItem(R.id.star)
+        } else {
+            if (allItems.isNotEmpty() && allItems[currentItem].starred) {
+                canRemoveFromFavorite()
+            } else {
+                canFavorite()
             }
-        )
+
+            binding.pager.registerOnPageChangeCallback(
+                object : ViewPager2.OnPageChangeCallback() {
+                    override fun onPageSelected(position: Int) {
+                        super.onPageSelected(position)
+
+                        if (allItems[position].starred) {
+                            canRemoveFromFavorite()
+                        } else {
+                            canFavorite()
+                        }
+                        readItem(allItems[position])
+                    }
+                },
+            )
+        }
 
         return true
     }
@@ -177,20 +184,18 @@ class ReaderActivity : AppCompatActivity(), DIAware {
 
         when (item.itemId) {
             android.R.id.home -> {
-                onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
                 return true
             }
             R.id.star -> {
                 if (allItems[binding.pager.currentItem].starred) {
                     CoroutineScope(Dispatchers.IO).launch {
                         repository.unstarr(allItems[binding.pager.currentItem])
-                        // TODO: Handle failure
                     }
                     afterUnsave()
                 } else {
                     CoroutineScope(Dispatchers.IO).launch {
                         repository.starr(allItems[binding.pager.currentItem])
-                        // TODO: Handle failure
                     }
                     afterSave()
                 }

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

@@ -18,11 +18,10 @@ 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()
-    private val repository : Repository by instance()
+    private val repository: Repository by instance()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         binding = ActivitySourcesBinding.inflate(layoutInflater)
@@ -49,31 +48,33 @@ class SourcesActivity : AppCompatActivity(), DIAware {
         super.onResume()
         val mLayoutManager = LinearLayoutManager(this)
 
-        var items: ArrayList<SelfossModel.Source>
+        var items: ArrayList<SelfossModel.SourceDetail>
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = mLayoutManager
 
         CoroutineScope(Dispatchers.Main).launch {
-            val response = repository.getSources()
+            val response = repository.getSourcesDetails()
             if (response.isNotEmpty()) {
                 items = response
-                val mAdapter = SourcesListAdapter(
-                    this@SourcesActivity, items
-                )
+                val mAdapter =
+                    SourcesListAdapter(
+                        this@SourcesActivity,
+                        items,
+                    )
                 binding.recyclerView.adapter = mAdapter
                 mAdapter.notifyDataSetChanged()
             } else {
                 Toast.makeText(
                     this@SourcesActivity,
                     R.string.cant_get_sources,
-                    Toast.LENGTH_SHORT
+                    Toast.LENGTH_SHORT,
                 ).show()
             }
         }
 
         binding.fab.setOnClickListener {
-            startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))
+            startActivity(Intent(this@SourcesActivity, UpsertSourceActivity::class.java))
         }
     }
 }

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

@@ -0,0 +1,210 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import bou.amine.apps.readerforselfossv2.android.databinding.ActivityUpsertSourceBinding
+import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlInvalid
+import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
+import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import bou.amine.apps.readerforselfossv2.repository.Repository
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+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
+
+    private lateinit var binding: ActivityUpsertSourceBinding
+
+    override val di by closestDI()
+    private val repository: Repository by instance()
+    private val appSettingsService: AppSettingsService by instance()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityUpsertSourceBinding.inflate(layoutInflater)
+        val view = binding.root
+
+        existingSource = repository.getSelectedSource()
+        if (existingSource != null) {
+            binding.formContainer.visibility = View.GONE
+            binding.progress.visibility = View.VISIBLE
+        }
+        val title = if (existingSource == null) R.string.add_source else R.string.update_source
+
+        supportFragmentManager.addOnBackStackChangedListener {
+            if (supportFragmentManager.backStackEntryCount == 0) {
+                setTitle(title)
+            }
+        }
+
+        setContentView(view)
+
+        setSupportActionBar(binding.toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+        supportActionBar?.title = resources.getString(title)
+
+        maybeGetDetailsFromIntentSharing(intent)
+
+        binding.saveBtn.setOnClickListener {
+            handleSaveSource()
+        }
+    }
+
+    private fun initFields(items: Map<String, SelfossModel.Spout>) {
+        binding.nameInput.setText(existingSource!!.title)
+        binding.tags.setText(existingSource!!.tags?.joinToString(", "))
+        binding.sourceUri.setText(existingSource!!.params?.url)
+        binding.spoutsSpinner.setSelection(items.keys.indexOf(existingSource!!.spout))
+        binding.progress.visibility = View.GONE
+        binding.formContainer.visibility = View.VISIBLE
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        val baseUrl = appSettingsService.getBaseUrl()
+        if (baseUrl.isEmpty() || baseUrl.isBaseUrlInvalid()) {
+            mustLoginToAddSource()
+        } else {
+            handleSpoutsSpinner()
+        }
+    }
+
+    private fun handleSpoutsSpinner() {
+        val spoutsKV = HashMap<String, String>()
+        binding.spoutsSpinner.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    adapterView: AdapterView<*>,
+                    view: View?,
+                    i: Int,
+                    l: Long,
+                ) {
+                    if (view != null) {
+                        val spoutName = (view as TextView).text.toString()
+                        mSpoutsValue = spoutsKV[spoutName]
+                    }
+                }
+
+                override fun onNothingSelected(adapterView: AdapterView<*>) {
+                    mSpoutsValue = null
+                }
+            }
+
+        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,
+            ).show()
+            binding.progress.visibility = View.GONE
+        }
+
+        CoroutineScope(Dispatchers.Main).launch {
+            try {
+                val items = repository.getSpouts()
+                if (items.isNotEmpty()) {
+                    val itemsStrings = items.map { it.value.name }
+                    for ((key, value) in items) {
+                        spoutsKV[value.name] = key
+                    }
+
+                    binding.progress.visibility = View.GONE
+                    binding.formContainer.visibility = View.VISIBLE
+
+                    val spinnerArrayAdapter =
+                        ArrayAdapter(
+                            this@UpsertSourceActivity,
+                            android.R.layout.simple_spinner_item,
+                            itemsStrings,
+                        )
+                    spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                    binding.spoutsSpinner.adapter = spinnerArrayAdapter
+
+                    if (existingSource != null) {
+                        initFields(items)
+                    }
+                } else {
+                    handleSpoutFailure()
+                }
+            } catch (e: NetworkUnavailableException) {
+                handleSpoutFailure(networkIssue = true)
+            }
+        }
+    }
+
+    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))
+        }
+    }
+
+    private fun mustLoginToAddSource() {
+        Toast.makeText(this, getString(R.string.addStringNoUrl), Toast.LENGTH_SHORT).show()
+        val i = Intent(this, LoginActivity::class.java)
+        startActivity(i)
+        finish()
+    }
+
+    private fun handleSaveSource() {
+        val url = binding.sourceUri.text.toString()
+
+        val sourceDetailsUnavailable =
+            title.isEmpty() || url.isEmpty() || mSpoutsValue == null || mSpoutsValue!!.isEmpty()
+
+        when {
+            sourceDetailsUnavailable -> {
+                Toast.makeText(this, R.string.form_not_complete, Toast.LENGTH_SHORT).show()
+            }
+            else -> {
+                CoroutineScope(Dispatchers.Main).launch {
+                    val successfullyAddedSource =
+                        if (existingSource != null) {
+                            repository.updateSource(
+                                existingSource!!.id,
+                                binding.nameInput.text.toString(),
+                                url,
+                                mSpoutsValue!!,
+                                binding.tags.text.toString(),
+                            )
+                        } else {
+                            repository.createSource(
+                                binding.nameInput.text.toString(),
+                                url,
+                                mSpoutsValue!!,
+                                binding.tags.text.toString(),
+                            )
+                        }
+                    if (successfullyAddedSource) {
+                        finish()
+                    } else {
+                        Toast.makeText(
+                            this@UpsertSourceActivity,
+                            R.string.cant_create_source,
+                            Toast.LENGTH_SHORT,
+                        ).show()
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        repository.unsetSelectedSource()
+    }
+}

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

@@ -9,10 +9,9 @@ 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.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.circularBitmapDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
 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,8 +21,6 @@ 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
@@ -35,10 +32,9 @@ 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 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()
 
@@ -46,16 +42,26 @@ class ItemCardAdapter(
     override val repository: Repository by instance()
     override val appSettingsService: AppSettingsService by instance()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): ViewHolder {
         val binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(binding)
     }
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+    override fun onBindViewHolder(
+        holder: ViewHolder,
+        position: Int,
+    ) {
         with(holder) {
             val itm = items[position]
 
             binding.favButton.isSelected = itm.starred
+            if (appSettingsService.getPublicAccess()) {
+                binding.favButton.visibility = View.GONE
+            }
+
             binding.title.text = itm.title.getHtmlDecoded()
 
             binding.title.setOnTouchListener(LinkOnTouchListener())
@@ -79,16 +85,9 @@ class ItemCardAdapter(
             }
 
             if (itm.getIcon(repository.baseUrl).isEmpty()) {
-                val color = generator.getColor(itm.title.getHtmlDecoded())
-
-                val drawable =
-                    TextDrawable
-                        .builder()
-                        .round()
-                        .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
-                binding.sourceImage.setImageDrawable(drawable)
+                binding.sourceImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
             } else {
-                c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage)
+                c.circularDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage)
             }
         }
     }
@@ -104,7 +103,6 @@ class ItemCardAdapter(
         }
 
         private fun handleClickListeners() {
-
             binding.favButton.setOnClickListener {
                 val item = items[bindingAdapterPosition]
                 if (item.starred) {
@@ -137,7 +135,7 @@ class ItemCardAdapter(
                     bindingAdapterPosition,
                     items[bindingAdapterPosition].getLinkDecoded(),
                     appSettingsService.isArticleViewerEnabled(),
-                    app
+                    app,
                 )
             }
         }

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

@@ -7,10 +7,8 @@ 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.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.circularBitmapDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
 import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
@@ -18,8 +16,6 @@ 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
@@ -27,21 +23,26 @@ 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 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 val repository: Repository by instance()
+    override val appSettingsService: AppSettingsService by instance()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): ViewHolder {
         val binding = ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(binding)
     }
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+    override fun onBindViewHolder(
+        holder: ViewHolder,
+        position: Int,
+    ) {
         with(holder) {
             val itm = items[position]
 
@@ -54,22 +55,13 @@ class ItemListAdapter(
             binding.sourceTitleAndDate.text = itm.sourceAuthorAndDate()
 
             if (itm.getThumbnail(repository.baseUrl).isEmpty()) {
-
                 if (itm.getIcon(repository.baseUrl).isEmpty()) {
-                    val color = generator.getColor(itm.title.getHtmlDecoded())
-
-                    val drawable =
-                            TextDrawable
-                                    .builder()
-                                    .round()
-                                    .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
-
-                    binding.itemImage.setImageDrawable(drawable)
+                    binding.itemImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
                 } else {
-                    c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
+                    c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
                 }
             } else {
-                c.bitmapCenterCrop(itm.getThumbnail(repository.baseUrl), binding.itemImage)
+                c.circularDrawable(itm.getThumbnail(repository.baseUrl), binding.itemImage)
             }
         }
     }
@@ -77,7 +69,6 @@ class ItemListAdapter(
     override fun getItemCount(): Int = items.size
 
     inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root) {
-
         init {
             handleLinkOpening()
         }
@@ -89,7 +80,7 @@ class ItemListAdapter(
                     bindingAdapterPosition,
                     items[bindingAdapterPosition].getLinkDecoded(),
                     appSettingsService.isArticleViewerEnabled(),
-                    app
+                    app,
                 )
             }
         }

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

@@ -28,16 +28,20 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         updateItems(this.items)
     }
 
-    private fun unmarkSnackbar(item: SelfossModel.Item, position: Int) {
-        val s = Snackbar
-            .make(
-                app.findViewById(R.id.coordLayout),
-                R.string.marked_as_read,
-                Snackbar.LENGTH_LONG
-            )
-            .setAction(R.string.undo_string) {
-                unreadItemAtIndex(item, position, false)
-            }
+    private fun unmarkSnackbar(
+        item: SelfossModel.Item,
+        position: Int,
+    ) {
+        val s =
+            Snackbar
+                .make(
+                    app.findViewById(R.id.coordLayout),
+                    R.string.marked_as_read,
+                    Snackbar.LENGTH_LONG,
+                )
+                .setAction(R.string.undo_string) {
+                    unreadItemAtIndex(item, position, false)
+                }
 
         val view = s.view
         val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
@@ -45,16 +49,20 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         s.show()
     }
 
-    private fun markSnackbar(item: SelfossModel.Item, position: Int) {
-        val s = Snackbar
-            .make(
-                app.findViewById(R.id.coordLayout),
-                R.string.marked_as_unread,
-                Snackbar.LENGTH_LONG
-            )
-            .setAction(R.string.undo_string) {
-                readItemAtIndex(item, position, false)
-            }
+    private fun markSnackbar(
+        item: SelfossModel.Item,
+        position: Int,
+    ) {
+        val s =
+            Snackbar
+                .make(
+                    app.findViewById(R.id.coordLayout),
+                    R.string.marked_as_unread,
+                    Snackbar.LENGTH_LONG,
+                )
+                .setAction(R.string.undo_string) {
+                    readItemAtIndex(item, position, false)
+                }
 
         val view = s.view
         val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
@@ -70,7 +78,11 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         }
     }
 
-    private fun readItemAtIndex(item: SelfossModel.Item, position: Int, showSnackbar: Boolean = true) {
+    private fun readItemAtIndex(
+        item: SelfossModel.Item,
+        position: Int,
+        showSnackbar: Boolean = true,
+    ) {
         CoroutineScope(Dispatchers.IO).launch {
             repository.markAsRead(item)
         }
@@ -86,10 +98,13 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         }
     }
 
-    private fun unreadItemAtIndex(item: SelfossModel.Item, position: Int, showSnackbar: Boolean = true) {
+    private fun unreadItemAtIndex(
+        item: SelfossModel.Item,
+        position: Int,
+        showSnackbar: Boolean = true,
+    ) {
         CoroutineScope(Dispatchers.IO).launch {
             repository.unmarkAsRead(item)
-
         }
         notifyItemChanged(position)
         if (showSnackbar) {
@@ -97,11 +112,13 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         }
     }
 
-    fun addItemAtIndex(item: SelfossModel.Item, position: Int) {
+    fun addItemAtIndex(
+        item: SelfossModel.Item,
+        position: Int,
+    ) {
         items.add(position, item)
         notifyItemInserted(position)
         updateItems(items)
-
     }
 
     fun addItemsAtEnd(newItems: List<SelfossModel.Item>) {
@@ -109,6 +126,5 @@ 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

@@ -2,22 +2,22 @@ package bou.amine.apps.readerforselfossv2.android.adapters
 
 import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity
 import bou.amine.apps.readerforselfossv2.android.databinding.SourceListItemBinding
-import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.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,34 +28,39 @@ import org.kodein.di.instance
 
 class SourcesListAdapter(
     private val app: Activity,
-    private val items: ArrayList<SelfossModel.Source>
+    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()
+    private val repository: Repository by instance()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): ViewHolder {
         binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(binding.root)
     }
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+    override fun onBindViewHolder(
+        holder: ViewHolder,
+        position: Int,
+    ) {
         val itm = items[position]
 
         if (itm.getIcon(repository.baseUrl).isEmpty()) {
-            val color = generator.getColor(itm.title.getHtmlDecoded())
-
-            val drawable =
-                TextDrawable
-                    .builder()
-                    .round()
-                    .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
-            binding.itemImage.setImageDrawable(drawable)
+            binding.itemImage.setBackgroundAndText(itm.title.getHtmlDecoded())
         } else {
-            c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
+            c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
+        }
+
+        if (!itm.error.isNullOrBlank()) {
+            binding.errorText.visibility = View.VISIBLE
+            binding.errorText.text = itm.error
+        } else {
+            binding.errorText.visibility = View.GONE
         }
 
         binding.sourceTitle.text = itm.title.getHtmlDecoded()
@@ -68,19 +73,17 @@ class SourcesListAdapter(
     override fun getItemCount(): Int = items.size
 
     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) = items[bindingAdapterPosition]
+                val (id, title) = items[bindingAdapterPosition]
                 CoroutineScope(Dispatchers.IO).launch {
-                    val successfullyDeletedSource = repository.deleteSource(id)
+                    val successfullyDeletedSource = repository.deleteSource(id, title)
                     if (successfullyDeletedSource) {
                         items.removeAt(bindingAdapterPosition)
                         notifyItemRemoved(bindingAdapterPosition)
@@ -89,11 +92,18 @@ class SourcesListAdapter(
                         Toast.makeText(
                             app,
                             R.string.can_delete_source,
-                            Toast.LENGTH_SHORT
+                            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,88 +26,91 @@ import org.kodein.di.instance
 import java.util.*
 import kotlin.concurrent.schedule
 
-class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params), DIAware {
-
+class LoadingWorker(val context: Context, params: WorkerParameters) :
+    Worker(context, params),
+    DIAware {
     override val di by lazy { (applicationContext as MyApp).di }
-    private val repository : Repository by instance()
-    private val appSettingsService : AppSettingsService by instance()
+    private val repository: Repository by instance()
+    private val appSettingsService: AppSettingsService by instance()
 
-override fun doWork(): Result {
-    if (appSettingsService.isPeriodicRefreshEnabled() && isNetworkAccessible(context)) {
+    override fun doWork(): Result {
+        if (appSettingsService.isPeriodicRefreshEnabled() && isNetworkAccessible(context)) {
+            CoroutineScope(Dispatchers.IO).launch {
+                val notificationManager =
+                    applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-        CoroutineScope(Dispatchers.IO).launch {
-            val notificationManager =
-                applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+                val notification =
+                    NotificationCompat.Builder(applicationContext, AppSettingsService.syncChannelId)
+                        .setContentTitle(context.getString(R.string.loading_notification_title))
+                        .setContentText(context.getString(R.string.loading_notification_text))
+                        .setOngoing(true)
+                        .setPriority(PRIORITY_LOW)
+                        .setChannelId(AppSettingsService.syncChannelId)
+                        .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
 
-            val notification =
-                NotificationCompat.Builder(applicationContext, AppSettingsService.syncChannelId)
-                    .setContentTitle(context.getString(R.string.loading_notification_title))
-                    .setContentText(context.getString(R.string.loading_notification_text))
-                    .setOngoing(true)
-                    .setPriority(PRIORITY_LOW)
-                    .setChannelId(AppSettingsService.syncChannelId)
-                    .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
+                notificationManager.notify(1, notification.build())
 
-            notificationManager.notify(1, notification.build())
+                repository.handleDBActions()
 
-            repository.handleDBActions()
-
-            val apiItems = repository.tryToCacheItemsAndGetNewOnes()
-            if (appSettingsService.isNotifyNewItemsEnabled()) {
-                launch {
-                    handleNewItemsNotification(apiItems, notificationManager)
+                val apiItems = repository.tryToCacheItemsAndGetNewOnes()
+                if (appSettingsService.isNotifyNewItemsEnabled()) {
+                    launch {
+                        handleNewItemsNotification(apiItems, notificationManager)
+                    }
                 }
+                apiItems.map { it.preloadImages(context) }
             }
-            apiItems.map { it.preloadImages(context) }
         }
+        return Result.success()
     }
-    return Result.success()
-}
 
     private fun handleNewItemsNotification(
         newItems: List<SelfossModel.Item>?,
-        notificationManager: NotificationManager
+        notificationManager: NotificationManager,
     ) {
-        // TODO: Check if this coroutine is actually required
         CoroutineScope(Dispatchers.IO).launch {
-                val apiItems = newItems.orEmpty()
+            val apiItems = newItems.orEmpty()
 
-
-                val newSize = apiItems.filter { it.unread }.size
-                if (newSize > 0) {
-
-                    val intent = Intent(context, MainActivity::class.java).apply {
+            val newSize = apiItems.filter { it.unread }.size
+            if (newSize > 0) {
+                val intent =
+                    Intent(context, MainActivity::class.java).apply {
                         flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                     }
-                    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                val pflags =
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                         PendingIntent.FLAG_IMMUTABLE
                     } else {
                         0
                     }
-                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, pflags)
+                val pendingIntent: PendingIntent =
+                    PendingIntent.getActivity(context, 0, intent, pflags)
 
-                    val newItemsNotification =
-                        NotificationCompat.Builder(applicationContext, AppSettingsService.newItemsChannelId)
-                            .setContentTitle(context.getString(R.string.new_items_notification_title))
-                            .setContentText(
-                                context.getString(
-                                    R.string.new_items_notification_text,
-                                    newSize
-                                )
-                            )
-                            .setPriority(PRIORITY_DEFAULT)
-                            .setChannelId(AppSettingsService.newItemsChannelId)
-                            .setContentIntent(pendingIntent)
-                            .setAutoCancel(true)
-                            .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
+                val newItemsNotification =
+                    NotificationCompat.Builder(
+                        applicationContext,
+                        AppSettingsService.newItemsChannelId,
+                    )
+                        .setContentTitle(context.getString(R.string.new_items_notification_title))
+                        .setContentText(
+                            context.getString(
+                                R.string.new_items_notification_text,
+                                newSize,
+                            ),
+                        )
+                        .setPriority(PRIORITY_DEFAULT)
+                        .setChannelId(AppSettingsService.newItemsChannelId)
+                        .setContentIntent(pendingIntent)
+                        .setAutoCancel(true)
+                        .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
 
-                    Timer("", false).schedule(4000) {
-                        notificationManager.notify(2, newItemsNotification.build())
-                    }
+                Timer("", false).schedule(4000) {
+                    notificationManager.notify(2, newItemsNotification.build())
                 }
+            }
             Timer("", false).schedule(4000) {
                 notificationManager.cancel(1)
             }
         }
     }
-}
+}

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

@@ -1,5 +1,6 @@
 package bou.amine.apps.readerforselfossv2.android.fragments
 
+import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.TypedArray
@@ -26,8 +27,10 @@ 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.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.MercuryApi
@@ -54,6 +57,7 @@ import java.net.URL
 import java.util.*
 import java.util.concurrent.ExecutionException
 
+private const val IMAGE_JPG = "image/jpg"
 
 class ArticleFragment : Fragment(), DIAware {
     private var fontSize: Int = 16
@@ -63,13 +67,12 @@ class ArticleFragment : Fragment(), DIAware {
     private lateinit var contentSource: String
     private lateinit var contentImage: String
     private lateinit var contentTitle: String
-    private lateinit var allImages : ArrayList<String>
+    private lateinit var allImages: ArrayList<String>
     private lateinit var fab: FloatingActionButton
     private lateinit var textAlignment: String
-    private var _binding: FragmentArticleBinding? = null
-    private val binding get() = _binding
+    private lateinit var binding: FragmentArticleBinding
 
-    override val di : DI by closestDI()
+    override val di: DI by closestDI()
     private val repository: Repository by instance()
     private val appSettingsService: AppSettingsService by instance()
 
@@ -78,8 +81,7 @@ class ArticleFragment : Fragment(), DIAware {
     private var font = ""
     private var staticBar = false
 
-    private val mercuryApi : MercuryApi by instance()
-
+    private val mercuryApi: MercuryApi by instance()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -92,10 +94,10 @@ class ArticleFragment : Fragment(), DIAware {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         try {
-            _binding = FragmentArticleBinding.inflate(inflater, container, false)
+            binding = FragmentArticleBinding.inflate(inflater, container, false)
 
             url = item.getLinkDecoded()
             contentText = item.content
@@ -110,89 +112,27 @@ class ArticleFragment : Fragment(), DIAware {
 
             refreshAlignment()
 
-            fab = binding!!.fab
+            fab = binding.fab
 
             fab.backgroundTintList = ColorStateList.valueOf(resources.getColor(R.color.colorAccent))
 
             fab.rippleColor = resources.getColor(R.color.colorAccentDark)
 
-            val floatingToolbar: FloatingToolbar = binding!!.floatingToolbar
-            floatingToolbar.attachFab(fab)
-
-            floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent))
-
-            floatingToolbar.setClickListener(
-                object : FloatingToolbar.ItemClickListener {
-                    override fun onItemClick(item: MenuItem) {
-                        when (item.itemId) {
-                            R.id.share_action -> requireActivity().shareLink(url, contentTitle)
-                            R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
-                            R.id.unread_action -> if (context != null) {
-                                if (this@ArticleFragment.item.unread) {
-                                    CoroutineScope(Dispatchers.IO).launch {
-                                        repository.markAsRead(this@ArticleFragment.item)
-                                    }
-                                    this@ArticleFragment.item.unread = false
-                                    Toast.makeText(
-                                        context,
-                                        R.string.marked_as_read,
-                                        Toast.LENGTH_LONG
-                                    ).show()
-                                } else {
-                                    CoroutineScope(Dispatchers.IO).launch {
-                                        repository.unmarkAsRead(this@ArticleFragment.item)
-                                    }
-                                    this@ArticleFragment.item.unread = true
-                                    Toast.makeText(
-                                        context,
-                                        R.string.marked_as_unread,
-                                        Toast.LENGTH_LONG
-                                    ).show()
-                                }
-                            }
-                            else -> Unit
-                        }
-                    }
-
-                    override fun onItemLongClick(item: MenuItem?) {
-                    }
-                }
-            )
+            val floatingToolbar: FloatingToolbar = handleFloatingToolbar()
 
             if (staticBar) {
                 fab.hide()
                 floatingToolbar.show()
             }
 
-            binding!!.source.text = contentSource
+            binding.source.text = contentSource
             if (typeface != null) {
-                binding!!.source.typeface = typeface
+                binding.source.typeface = typeface
             }
 
-            if (contentText.isEmptyOrNullOrNullString()) {
-                getContentFromMercury()
-            } else {
-                binding!!.titleView.text = contentTitle
-                if (typeface != null) {
-                    binding!!.titleView.typeface = typeface
-                }
+            handleContent()
 
-                htmlToWebview()
-
-                if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
-                    binding!!.imageView.visibility = View.VISIBLE
-                    Glide
-                        .with(requireContext())
-                        .asBitmap()
-                        .load(contentImage)
-                        .apply(RequestOptions.fitCenterTransform())
-                        .into(binding!!.imageView)
-                } else {
-                    binding!!.imageView.visibility = View.GONE
-                }
-            }
-
-            binding!!.nestedScrollView.setOnScrollChangeListener(
+            binding.nestedScrollView.setOnScrollChangeListener(
                 NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                     if (scrollY > oldScrollY) {
                         floatingToolbar.hide()
@@ -204,215 +144,317 @@ class ArticleFragment : Fragment(), DIAware {
                             if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
                         }
                     }
-                }
+                },
             )
-
         } catch (e: InflateException) {
             e.sendSilentlyWithAcraWithName("webview not available")
-            AlertDialog.Builder(requireContext())
-                .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
-                .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
-                .setPositiveButton(android.R.string.ok
-                ) { _, _ ->
-                    appSettingsService.disableArticleViewer()
-                    requireActivity().finish()
-                }
-                .create()
-                .show()
+            if (context != null) {
+                AlertDialog.Builder(requireContext())
+                    .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
+                    .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
+                    .setPositiveButton(
+                        android.R.string.ok,
+                    ) { _, _ ->
+                        appSettingsService.disableArticleViewer()
+                        requireActivity().finish()
+                    }
+                    .create()
+                    .show()
+            }
         }
 
-        return binding!!.root
+        return binding.root
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    private fun handleContent() {
+        if (contentText.isEmptyOrNullOrNullString()) {
+            if (repository.isNetworkAvailable()) {
+                getContentFromMercury()
+            }
+        } else {
+            binding.titleView.text = contentTitle
+            if (typeface != null) {
+                binding.titleView.typeface = typeface
+            }
+
+            htmlToWebview()
+
+            if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
+                binding.imageView.visibility = View.VISIBLE
+                Glide
+                    .with(requireContext())
+                    .asBitmap()
+                    .load(contentImage)
+                    .apply(RequestOptions.fitCenterTransform())
+                    .into(binding.imageView)
+            } else {
+                binding.imageView.visibility = View.GONE
+            }
+        }
+    }
+
+    private fun handleFloatingToolbar(): FloatingToolbar {
+        val floatingToolbar: FloatingToolbar = binding.floatingToolbar
+        if (appSettingsService.getPublicAccess()) {
+            floatingToolbar.setMenu(R.menu.reader_toolbar_no_read)
+        }
+        floatingToolbar.attachFab(fab)
+
+        floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent))
+
+        floatingToolbar.setClickListener(
+            object : FloatingToolbar.ItemClickListener {
+                override fun onItemClick(item: MenuItem) {
+                    when (item.itemId) {
+                        R.id.share_action -> requireActivity().shareLink(url, contentTitle)
+                        R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
+                        R.id.unread_action ->
+                            if (context != null) {
+                                if (this@ArticleFragment.item.unread) {
+                                    CoroutineScope(Dispatchers.IO).launch {
+                                        repository.markAsRead(this@ArticleFragment.item)
+                                    }
+                                    this@ArticleFragment.item.unread = false
+                                    Toast.makeText(
+                                        context,
+                                        R.string.marked_as_read,
+                                        Toast.LENGTH_LONG,
+                                    ).show()
+                                } else {
+                                    CoroutineScope(Dispatchers.IO).launch {
+                                        repository.unmarkAsRead(this@ArticleFragment.item)
+                                    }
+                                    this@ArticleFragment.item.unread = true
+                                    Toast.makeText(
+                                        context,
+                                        R.string.marked_as_unread,
+                                        Toast.LENGTH_LONG,
+                                    ).show()
+                                }
+                            }
+                        else -> Unit
+                    }
+                }
+
+                override fun onItemLongClick(item: MenuItem?) {
+                    // We do nothing
+                }
+            },
+        )
+        return floatingToolbar
     }
 
     private fun refreshAlignment() {
-        textAlignment = when (appSettingsService.getActiveAllignment()) {
-            1 -> "justify"
-            2 -> "left"
-            else -> "justify"
-        }
+        textAlignment =
+            when (appSettingsService.getActiveAllignment()) {
+                1 -> "justify"
+                2 -> "left"
+                else -> "justify"
+            }
     }
 
     private fun getContentFromMercury() {
-        if (repository.isNetworkAvailable()) {
-            binding!!.progressBar.visibility = View.VISIBLE
+        binding.progressBar.visibility = View.VISIBLE
 
-            CoroutineScope(Dispatchers.Main).launch {
-                try {
-                    val response = mercuryApi.query(url)
-                    if (response.success && response.data != null && !response.data?.content.isNullOrEmpty()) {
-                        binding!!.titleView.text = response.data!!.title.orEmpty()
-                        try {
-                            if (typeface != null) {
-                                binding!!.titleView.typeface = typeface
-                            }
-                        } catch (e: Exception) {
-                            e.sendSilentlyWithAcraWithName("getContentFromMercury > typeface")
-                        }
-
-                        try {
-                            // Note: Mercury may return relative urls... If it does the url val will not be changed.
-                            URL(response.data!!.url)
-                            url = response.data!!.url
-                        } catch (e: MalformedURLException) {
-                            // Mercury returned a relative url
-                            e.sendSilentlyWithAcraWithName("getContentFromMercury > malformedurlexception")
-                        }
-
-                        try {
-                            contentText = response.data!!.content.orEmpty()
-                            htmlToWebview()
-                        } catch (e: Exception) {
-                            e.sendSilentlyWithAcraWithName("getContentFromMercury > contenttext or html")
-                        }
-
-                        if (!response.data?.lead_image_url.isNullOrEmpty() && context != null) {
-                            try {
-                                binding!!.imageView.visibility = View.VISIBLE
-                                try {
-                                    Glide
-                                        .with(requireContext())
-                                        .asBitmap()
-                                        .load(
-                                            response.data!!.lead_image_url.orEmpty()
-                                        )
-                                        .apply(RequestOptions.fitCenterTransform())
-                                        .into(binding!!.imageView)
-                                } catch (e: Exception) {
-                                    e.sendSilentlyWithAcraWithName("getContentFromMercury > glide lead image")
-                                }
-                            } catch (e: Exception) {
-                                e.sendSilentlyWithAcraWithName("getContentFromMercury > outside glide lead image")
-                            }
-                        } else {
-                            binding!!.imageView.visibility = View.GONE
-                        }
-
-                        try {
-                            binding!!.nestedScrollView.scrollTo(0, 0)
-                            binding!!.progressBar.visibility = View.GONE
-                        } catch (e: Exception) {
-                            e.sendSilentlyWithAcraWithName("getContentFromMercury > scrollview")
-                        }
-                    } else {
-                        openInBrowserAfterFailing()
-                    }
-                } catch (e: SocketTimeoutException) {
-                    openInBrowserAfterFailing()
-                } catch (e: Exception) {
-                    e.sendSilentlyWithAcraWithName("getContentFromMercury > whole thing")
+        CoroutineScope(Dispatchers.Main).launch {
+            try {
+                val response = mercuryApi.query(url)
+                if (response.success && response.data != null) {
+                    handleMercuryData(response.data!!)
+                } else {
                     openInBrowserAfterFailing()
                 }
+            } catch (e: SocketTimeoutException) {
+                openInBrowserAfterFailing()
+            } catch (e: Exception) {
+                e.sendSilentlyWithAcraWithName("getContentFromMercury > $url")
+                openInBrowserAfterFailing()
             }
         }
     }
 
-    private fun htmlToWebview() {
-
-        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
-
-        val colorOnSurface = TypedValue()
-        requireContext().theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true)
-
-        val colorSurface = TypedValue()
-        requireContext().theme.resolveAttribute(R.attr.colorSurface, colorSurface, true)
-
-        binding!!.webcontent.settings.useWideViewPort = true
-        binding!!.webcontent.settings.loadWithOverviewMode = true
-        binding!!.webcontent.settings.javaScriptEnabled = false
-
-        binding!!.webcontent.webViewClient = object : WebViewClient() {
-            @Deprecated("Deprecated in Java")
-            override fun shouldOverrideUrlLoading(view: WebView?, url : String): Boolean {
-                if (binding!!.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-                    requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
-                }
-                return true
+    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 = data.url!!
 
-            @Deprecated("Deprecated in Java")
-            override fun shouldInterceptRequest(view: WebView, url: String): WebResourceResponse? {
-                val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
-                if (url.lowercase(Locale.US).contains(".jpg") || url.lowercase(Locale.US).contains(".jpeg")) {
-                    try {
-                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.JPEG))
-                    } catch ( e : ExecutionException) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg > $url")
-                    }
-                }
-                else if (url.lowercase(Locale.US).contains(".png")) {
-                    try {
-                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
-                    } catch ( e : ExecutionException) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png > $url")
-                    }
-                }
-                else if (url.lowercase(Locale.US).contains(".webp")) {
-                    try {
-                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
-                    } catch ( e : ExecutionException) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp > $url")
-                    }
-                }
+            contentText = data.content.orEmpty()
+            htmlToWebview()
 
-                return super.shouldInterceptRequest(view, url)
-            }
+            handleLeadImage(data?.lead_image_url)
+
+            binding.nestedScrollView.scrollTo(0, 0)
+            binding.progressBar.visibility = View.GONE
         }
+    }
 
-        val gestureDetector = GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
-            override fun onSingleTapUp(e: MotionEvent): Boolean {
-                return performClick()
+    private fun handleLeadImage(lead_image_url: String?) {
+        if (!lead_image_url.isNullOrEmpty() && context != null) {
+            binding.imageView.visibility = View.VISIBLE
+            Glide
+                .with(requireContext())
+                .asBitmap()
+                .load(
+                    lead_image_url,
+                )
+                .apply(RequestOptions.fitCenterTransform())
+                .into(binding.imageView)
+        } else {
+            binding.imageView.visibility = View.GONE
+        }
+    }
+
+    private fun handleImageLoading() {
+        binding.webcontent.webViewClient =
+            object : WebViewClient() {
+                @Deprecated("Deprecated in Java")
+                override fun shouldOverrideUrlLoading(
+                    view: WebView?,
+                    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) {
+                            e.sendSilentlyWithAcraWithName("activityNotFound > $url")
+                        }
+                        true
+                    } else {
+                        false
+                    }
+                }
+
+                @Deprecated("Deprecated in Java")
+                override fun shouldInterceptRequest(
+                    view: WebView,
+                    url: String,
+                ): WebResourceResponse? {
+                    val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
+                    if (url.lowercase(Locale.US).contains(".jpg") ||
+                        url.lowercase(Locale.US)
+                            .contains(".jpeg")
+                    ) {
+                        try {
+                            val image =
+                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                            return WebResourceResponse(
+                                IMAGE_JPG,
+                                "UTF-8",
+                                getBitmapInputStream(image, Bitmap.CompressFormat.JPEG),
+                            )
+                        } catch (e: ExecutionException) {
+                            // Do nothing
+                        }
+                    } else if (url.lowercase(Locale.US).contains(".png")) {
+                        try {
+                            val image =
+                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                            return WebResourceResponse(
+                                IMAGE_JPG,
+                                "UTF-8",
+                                getBitmapInputStream(image, Bitmap.CompressFormat.PNG),
+                            )
+                        } catch (e: ExecutionException) {
+                            // Do nothing
+                        }
+                    } else if (url.lowercase(Locale.US).contains(".webp")) {
+                        try {
+                            val image =
+                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                            return WebResourceResponse(
+                                IMAGE_JPG,
+                                "UTF-8",
+                                getBitmapInputStream(image, Bitmap.CompressFormat.WEBP),
+                            )
+                        } catch (e: ExecutionException) {
+                            // Do nothing
+                        }
+                    }
+
+                    return super.shouldInterceptRequest(view, url)
+                }
             }
-        })
+    }
 
-        binding!!.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
+    private fun htmlToWebview() {
+        if (context != null) {
+            val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
+            val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
 
-        binding!!.webcontent.settings.layoutAlgorithm =
+            binding.webcontent.settings.standardFontFamily = a.getString(0)
+            binding.webcontent.visibility = View.VISIBLE
+
+            val colorOnSurface = TypedValue()
+            requireContext().theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true)
+
+            val colorSurface = TypedValue()
+            requireContext().theme.resolveAttribute(R.attr.colorSurface, colorSurface, true)
+
+            binding.webcontent.settings.useWideViewPort = true
+            binding.webcontent.settings.loadWithOverviewMode = true
+            binding.webcontent.settings.javaScriptEnabled = false
+
+            handleImageLoading()
+
+            val gestureDetector =
+                GestureDetector(
+                    activity,
+                    object : GestureDetector.SimpleOnGestureListener() {
+                        override fun onSingleTapUp(e: MotionEvent): Boolean {
+                            return performClick()
+                        }
+                    },
+                )
+
+            binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event) }
+
+            binding.webcontent.settings.layoutAlgorithm =
                 WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
 
-        var baseUrl: String? = null
+            var baseUrl: String? = null
 
-        try {
-            val itemUrl = URL(url)
-            baseUrl = itemUrl.protocol + "://" + itemUrl.host
-        } catch (e: MalformedURLException) {
-            e.sendSilentlyWithAcraWithName("htmlToWebview > item url")
-        }
+            try {
+                val itemUrl = URL(url)
+                baseUrl = itemUrl.protocol + "://" + itemUrl.host
+            } catch (e: MalformedURLException) {
+                e.sendSilentlyWithAcraWithName("htmlToWebview > $url")
+            }
 
-        val fontName =  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 fontName =
+                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 = if (font.isNotEmpty()) {
-            """<link href="https://fonts.googleapis.com/css?family=${fontName.replace(" ", "+")}" rel="stylesheet">
+            val fontLinkAndStyle =
+                if (font.isNotEmpty()) {
+                    """<link href="https://fonts.googleapis.com/css?family=${
+                        fontName.replace(
+                            " ",
+                            "+",
+                        )
+                    }" rel="stylesheet">
                 |<style>
                 |   * {
                 |       font-family: '$fontName';
                 |   }
                 |</style>
-            """.trimMargin()
-        } else {
-            ""
-        }
+                    """.trimMargin()
+                } else {
+                    ""
+                }
 
-        binding!!.webcontent.loadDataWithBaseURL(
-            baseUrl,
-            """<html>
+            binding.webcontent.loadDataWithBaseURL(
+                baseUrl,
+                """<html>
                 |<head>
                 |   <meta name="viewport" content="width=device-width, initial-scale=1">
                 |   <style>
@@ -423,7 +465,12 @@ class ArticleFragment : Fragment(), DIAware {
                 |        max-width: 100%;
                 |      }
                 |      a {
-                |        color: ${String.format("#%06X", 0xFFFFFF and resources.getColor(R.color.colorAccent))} !important;
+                |        color: ${
+                    String.format(
+                        "#%06X",
+                        0xFFFFFF and resources.getColor(R.color.colorAccent),
+                    )
+                } !important;
                 |      }
                 |      *:not(a) {
                 |        color: ${String.format("#%06X", 0xFFFFFF and colorOnSurface.data)};
@@ -434,11 +481,26 @@ class ArticleFragment : Fragment(), DIAware {
                 |        word-break: break-word;
                 |        overflow:hidden;
                 |        line-height: 1.5em;
-                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)};
+                |        background-color: ${
+                    String.format(
+                        "#%06X",
+                        0xFFFFFF and colorSurface.data,
+                    )
+                };
                 |      }
                 |      body, html {
-                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)} !important;
-                |        border-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)}  !important;
+                |        background-color: ${
+                    String.format(
+                        "#%06X",
+                        0xFFFFFF and colorSurface.data,
+                    )
+                } !important;
+                |        border-color: ${
+                    String.format(
+                        "#%06X",
+                        0xFFFFFF and colorSurface.data,
+                    )
+                }  !important;
                 |        padding: 0 !important;
                 |        margin: 0 !important;
                 |      }
@@ -448,41 +510,50 @@ class ArticleFragment : Fragment(), DIAware {
                 |      pre, code {
                 |        white-space: pre-wrap;
                 |        width:100%;
-                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)};
+                |        background-color: ${
+                    String.format(
+                        "#%06X",
+                        0xFFFFFF and colorSurface.data,
+                    )
+                };
                 |      }
                 |   </style>
                 |   $fontLinkAndStyle
                 |</head>
                 |<body>
                 |   $contentText
-                |</body>""".trimMargin(),
-            "text/html",
-            "utf-8",
-            null
-        )
+                |</body>
+                """.trimMargin(),
+                "text/html",
+                "utf-8",
+                null,
+            )
+        }
     }
 
     fun scrollDown() {
-        val height = binding!!.nestedScrollView.measuredHeight
-        binding!!.nestedScrollView.smoothScrollBy(0, height/2)
+        val height = binding.nestedScrollView.measuredHeight
+        binding.nestedScrollView.smoothScrollBy(0, height / 2)
     }
 
     fun scrollUp() {
-        val height = binding!!.nestedScrollView.measuredHeight
-        binding!!.nestedScrollView.smoothScrollBy(0, -height/2)
+        val height = binding.nestedScrollView.measuredHeight
+        binding.nestedScrollView.smoothScrollBy(0, -height / 2)
     }
 
     private fun openInBrowserAfterFailing() {
-        binding!!.progressBar.visibility = View.GONE
-        requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
+        binding.progressBar.visibility = View.GONE
+        if (context != null) {
+            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())
@@ -492,10 +563,12 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     fun performClick(): Boolean {
-        if (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)
+        if (allImages != null && (
+                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)
             intent.putExtra("allImages", allImages)
@@ -505,6 +578,4 @@ class ArticleFragment : Fragment(), DIAware {
         }
         return false
     }
-
-
 }

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

@@ -4,7 +4,9 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
+import android.os.Build
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
@@ -12,15 +14,14 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import bou.amine.apps.readerforselfossv2.android.HomeActivity
 import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding
 import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import com.bumptech.glide.Glide
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
+import com.bumptech.glide.request.target.ViewTarget
+import com.bumptech.glide.request.transition.Transition
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.chip.Chip
 import kotlinx.coroutines.CoroutineScope
@@ -31,9 +32,8 @@ 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()
 
@@ -42,123 +42,24 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
-        val binding =
-            bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding.inflate(
+        binding =
+            FilterFragmentBinding.inflate(
                 inflater,
                 container,
-                false
+                false,
             )
 
         val context: Context? = context
 
-        val tagGroup = binding.tagsGroup
-        val sourceGroup = binding.sourcesGroup
-
         if (context == null) {
             dismiss()
             Exception("FilterSheetFragment context is null").sendSilentlyWithAcraWithName("FilterSheetFragment > onCreateView")
         } else {
             CoroutineScope(Dispatchers.Main).launch {
-                val tags = repository.getTags()
-
-                tags.forEach { tag ->
-                    val c = Chip(context)
-                    c.text = tag.tag
-
-                    val gd = GradientDrawable()
-                    val gdColor = try {
-                        Color.parseColor(tag.color)
-                    } catch (e: IllegalArgumentException) {
-                        e.sendSilentlyWithAcraWithName("color issue " + tag.color)
-                        resources.getColor(R.color.colorPrimary)
-                    }
-                    gd.setColor(gdColor)
-                    gd.shape = GradientDrawable.RECTANGLE
-                    gd.setSize(30, 30)
-                    gd.cornerRadius = 30F
-                    c.chipIcon = gd
-
-                    c.setOnCloseIconClickListener {
-                        (it as Chip).isCloseIconVisible = false
-                        selectedChip = null
-                        repository.setTagFilter(null)
-                    }
-
-                    c.setOnClickListener {
-                        if (selectedChip != null) {
-                            selectedChip!!.isCloseIconVisible = false
-                        }
-                        (it as Chip).isCloseIconVisible = true
-                        selectedChip = it
-                        repository.setTagFilter(tag)
-
-                        repository.setSourceFilter(null)
-                    }
-
-                    if (repository.tagFilter.value?.equals(tag) == true) {
-                        c.isCloseIconVisible = true
-                        selectedChip = c
-                    }
-
-                    tagGroup.addView(c)
-                }
-
-                repository.getSources().forEach { source ->
-                    val c = Chip(context)
-
-                    Glide.with(context)
-                        .load(source.getIcon(repository.baseUrl))
-                        .listener(object : RequestListener<Drawable?> {
-                            override fun onLoadFailed(
-                                e: GlideException?,
-                                model: Any?,
-                                target: Target<Drawable?>?,
-                                isFirstResource: Boolean
-                            ): Boolean {
-                                return false
-                            }
-
-                            override fun onResourceReady(
-                                resource: Drawable?,
-                                model: Any?,
-                                target: Target<Drawable?>?,
-                                dataSource: DataSource?,
-                                isFirstResource: Boolean
-                            ): Boolean {
-                                c.chipIcon = resource
-                                return false
-                            }
-                        }).preload()
-
-                    c.text = source.title.getHtmlDecoded()
-
-                    c.setOnCloseIconClickListener {
-                        (it as Chip).isCloseIconVisible = false
-                        selectedChip = null
-                        repository.setSourceFilter(null)
-                    }
-
-                    c.setOnClickListener {
-                        if (selectedChip != null) {
-                            selectedChip!!.isCloseIconVisible = false
-                        }
-                        (it as Chip).isCloseIconVisible = true
-                        selectedChip = it
-                        repository.setSourceFilter(source)
-
-                        repository.setTagFilter(null)
-                    }
-
-
-                    if (repository.sourceFilter.value?.equals(source) == true) {
-                        c.isCloseIconVisible = true
-                        selectedChip = c
-                    }
-
-                    sourceGroup.addView(c)
-                }
+                handleTagChips(context)
+                handleSourceChips(context)
 
                 binding.progressBar2.visibility = GONE
                 binding.filterView.visibility = VISIBLE
@@ -173,9 +74,121 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
         return binding.root
     }
 
+    private suspend fun handleSourceChips(context: Context) {
+        val sourceGroup = binding.sourcesGroup
+
+        repository.getSourcesDetailsOrStats().forEachIndexed { _, source ->
+            val c = Chip(context)
+            c.ellipsize = TextUtils.TruncateAt.END
+
+            Glide.with(context)
+                .load(source.getIcon(repository.baseUrl))
+                .into(
+                    object : ViewTarget<Chip?, Drawable?>(c) {
+                        override fun onResourceReady(
+                            resource: Drawable,
+                            transition: Transition<in Drawable?>?,
+                        ) {
+                            try {
+                                c.chipIcon = resource
+                            } catch (e: Exception) {
+                                e.sendSilentlyWithAcraWithName("sources > onResourceReady")
+                            }
+                        }
+                    },
+                )
+
+            c.text = source.title.getHtmlDecoded()
+
+            c.setOnCloseIconClickListener {
+                (it as Chip).isCloseIconVisible = false
+                selectedChip = null
+                repository.setSourceFilter(null)
+            }
+
+            c.setOnClickListener {
+                if (selectedChip != null) {
+                    selectedChip!!.isCloseIconVisible = false
+                }
+                (it as Chip).isCloseIconVisible = true
+                selectedChip = it
+                repository.setSourceFilter(source)
+
+                repository.setTagFilter(null)
+            }
+
+            if (repository.sourceFilter.value?.equals(source) == true) {
+                c.isCloseIconVisible = true
+                selectedChip = c
+            }
+
+            c.isEnabled = source.error.isNullOrBlank()
+
+            if (!source.error.isNullOrBlank() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                c.tooltipText = source.error
+            }
+
+            sourceGroup.addView(c)
+        }
+    }
+
+    private suspend fun handleTagChips(context: Context) {
+        val tagGroup = binding.tagsGroup
+
+        val tags = repository.getTags()
+
+        tags.forEachIndexed { _, tag ->
+            val c = Chip(context)
+            c.ellipsize = TextUtils.TruncateAt.END
+            c.text = tag.tag
+
+            if (tag.color.isNotEmpty()) {
+                try {
+                    val gd = GradientDrawable()
+                    val gdColor =
+                        try {
+                            Color.parseColor(tag.color)
+                        } catch (e: IllegalArgumentException) {
+                            e.sendSilentlyWithAcraWithName("color issue " + tag.color)
+                            resources.getColor(R.color.colorPrimary)
+                        }
+                    gd.setColor(gdColor)
+                    gd.shape = GradientDrawable.RECTANGLE
+                    gd.setSize(30, 30)
+                    gd.cornerRadius = 30F
+                    c.chipIcon = gd
+                } catch (e: Exception) {
+                    e.sendSilentlyWithAcraWithName("tags > GradientDrawable")
+                }
+            }
+
+            c.setOnCloseIconClickListener {
+                (it as Chip).isCloseIconVisible = false
+                selectedChip = null
+                repository.setTagFilter(null)
+            }
+
+            c.setOnClickListener {
+                if (selectedChip != null) {
+                    selectedChip!!.isCloseIconVisible = false
+                }
+                (it as Chip).isCloseIconVisible = true
+                selectedChip = it
+                repository.setTagFilter(tag)
+
+                repository.setSourceFilter(null)
+            }
+
+            if (repository.tagFilter.value?.equals(tag) == true) {
+                c.isCloseIconVisible = true
+                selectedChip = c
+            }
+
+            tagGroup.addView(c)
+        }
+    }
+
     companion object {
         const val TAG = "FilterModalBottomSheet"
     }
-
-
-}
+}

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

@@ -11,8 +11,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
 
 class ImageFragment : Fragment() {
-
-    private lateinit var imageUrl : String
+    private lateinit var imageUrl: String
     private val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
     private var _binding: FragmentImageBinding? = null
     private val binding get() = _binding
@@ -23,16 +22,20 @@ class ImageFragment : Fragment() {
         imageUrl = requireArguments().getString("imageUrl")!!
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
         _binding = FragmentImageBinding.inflate(inflater, container, false)
         val view = binding?.root
 
         binding!!.photoView.visibility = View.VISIBLE
         Glide.with(requireActivity())
-                .asBitmap()
-                .apply(glideOptions)
-                .load(imageUrl)
-                .into(binding!!.photoView)
+            .asBitmap()
+            .apply(glideOptions)
+            .load(imageUrl)
+            .into(binding!!.photoView)
 
         return view
     }
@@ -45,9 +48,7 @@ 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)
@@ -55,4 +56,4 @@ class ImageFragment : Fragment() {
             return fragment
         }
     }
-}
+}

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

@@ -8,23 +8,21 @@ import bou.amine.apps.readerforselfossv2.utils.getImages
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
-import org.acra.ktx.sendSilentlyWithAcra
 
-fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
+fun SelfossModel.Item.preloadImages(context: Context): Boolean {
     val imageUrls = this.getImages()
 
     val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL).timeout(10000)
 
-
     try {
         for (url in imageUrls) {
-            if ( URLUtil.isValidUrl(url)) {
+            if (URLUtil.isValidUrl(url)) {
                 Glide.with(context).asBitmap()
                     .apply(glideOptions)
                     .load(url).submit()
             }
         }
-    } catch (e : Error) {
+    } catch (e: Error) {
         e.sendSilentlyWithAcraWithName("preloadImages")
         return false
     }
@@ -42,4 +40,4 @@ fun String.toTextDrawableString(): String {
         }
     }
     return textDrawable.toString()
-}
+}

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

@@ -4,7 +4,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 
-fun SelfossModel.Item.toParcelable() : ParecelableItem =
+fun SelfossModel.Item.toParcelable(): ParecelableItem =
     ParecelableItem(
         this.id,
         this.datetime,
@@ -17,9 +17,10 @@ fun SelfossModel.Item.toParcelable() : ParecelableItem =
         this.link,
         this.sourcetitle,
         this.tags.joinToString(","),
-        this.author
+        this.author,
     )
-fun ParecelableItem.toModel() : SelfossModel.Item =
+
+fun ParecelableItem.toModel(): SelfossModel.Item =
     SelfossModel.Item(
         this.id,
         this.datetime,
@@ -32,8 +33,9 @@ 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,
@@ -46,15 +48,16 @@ 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> = object : Parcelable.Creator<ParecelableItem> {
-            override fun createFromParcel(source: Parcel): ParecelableItem = ParecelableItem(source)
-            override fun newArray(size: Int): Array<ParecelableItem?> = arrayOfNulls(size)
-        }
+        val CREATOR: Parcelable.Creator<ParecelableItem> =
+            object : Parcelable.Creator<ParecelableItem> {
+                override fun createFromParcel(source: Parcel): ParecelableItem = ParecelableItem(source)
+
+                override fun newArray(size: Int): Array<ParecelableItem?> = arrayOfNulls(size)
+            }
     }
 
     constructor(source: Parcel) : this(
@@ -69,12 +72,15 @@ 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(dest: Parcel, flags: Int) {
+    override fun writeToParcel(
+        dest: Parcel,
+        flags: Int,
+    ) {
         dest.writeInt(id)
         dest.writeString(datetime)
         dest.writeString(title)
@@ -88,4 +94,4 @@ data class ParecelableItem(
         dest.writeString(tags)
         dest.writeString(author)
     }
-}
+}

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

@@ -21,12 +21,13 @@ import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import com.mikepenz.aboutlibraries.LibsBuilder
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
-import org.kodein.di.instance
 
 private const val TITLE_TAG = "settingsActivityTitle"
 
-class SettingsActivity : AppCompatActivity(),
-        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, DIAware {
+class SettingsActivity :
+    AppCompatActivity(),
+    PreferenceFragmentCompat.OnPreferenceStartFragmentCallback,
+    DIAware {
     override val di by closestDI()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -36,9 +37,9 @@ class SettingsActivity : AppCompatActivity(),
         setContentView(binding.root)
         if (savedInstanceState == null) {
             supportFragmentManager
-                    .beginTransaction()
-                    .replace(R.id.settings, MainPreferenceFragment())
-                    .commit()
+                .beginTransaction()
+                .replace(R.id.settings, MainPreferenceFragment())
+                .commit()
         } else {
             title = savedInstanceState.getCharSequence(TITLE_TAG)
         }
@@ -72,57 +73,67 @@ class SettingsActivity : AppCompatActivity(),
     }
 
     override fun onPreferenceStartFragment(
-            caller: PreferenceFragmentCompat,
-            pref: Preference
+        caller: PreferenceFragmentCompat,
+        pref: Preference,
     ): Boolean {
         // Instantiate the new Fragment
         val args = pref.extras
-        val fragment = supportFragmentManager.fragmentFactory.instantiate(
+        val fragment =
+            supportFragmentManager.fragmentFactory.instantiate(
                 classLoader,
-                pref.fragment
-        ).apply {
-            arguments = args
-            setTargetFragment(caller, 0)
-        }
+                pref.fragment.toString(),
+            ).apply {
+                arguments = args
+                setTargetFragment(caller, 0)
+            }
         // Replace the existing Fragment with the new Fragment
         supportFragmentManager.beginTransaction()
-                .replace(R.id.settings, fragment)
-                .addToBackStack(null)
-                .commit()
+            .replace(R.id.settings, fragment)
+            .addToBackStack(null)
+            .commit()
         title = pref.title
         supportActionBar?.title = title
         return true
     }
 
     class MainPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        override fun onCreatePreferences(
+            savedInstanceState: Bundle?,
+            rootKey: String?,
+        ) {
             setPreferencesFromResource(R.xml.pref_main, rootKey)
 
-            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
-                true
-            }
-
-            preferenceManager.findPreference<Preference>("action_about")?.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
-                context?.let {
-                    LibsBuilder()
-                        .withAboutIconShown(true)
-                        .withAboutVersionShown(true)
-                        .start(it)
+            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener =
+                Preference.OnPreferenceChangeListener { _, newValue ->
+                    AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
+                    true
+                }
+
+            preferenceManager.findPreference<Preference>("action_about")?.onPreferenceClickListener =
+                Preference.OnPreferenceClickListener { _ ->
+                    context?.let {
+                        LibsBuilder()
+                            .withAboutIconShown(true)
+                            .withAboutVersionShown(true)
+                            .start(it)
+                    }
+                    true
                 }
-                true
-            }
         }
     }
 
     class GeneralPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        override fun onCreatePreferences(
+            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 = arrayOf(
+                editText.filters =
+                    arrayOf(
                         InputFilter { source, _, _, dest, _, _ ->
                             try {
                                 val input: Int = (dest.toString() + source.toString()).toInt()
@@ -132,31 +143,53 @@ class SettingsActivity : AppCompatActivity(),
                                 Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
                             }
                             ""
-                        }
-                )
+                        },
+                    )
             }
         }
     }
 
     class ArticleViewerPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        override fun onCreatePreferences(
+            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 { object : TextWatcher {
-                    override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-                    override fun afterTextChanged(editable: Editable) {
-                        try {
-                            editText.textSize = editable.toString().toInt().toFloat()
-                        } catch (e: NumberFormatException) {
-                            e.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > afterTextChanged")
+                editText.addTextChangedListener {
+                    object : TextWatcher {
+                        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,
+                        ) {
+                            // We do nothing
+                        }
+
+                        override fun afterTextChanged(editable: Editable) {
+                            try {
+                                editText.textSize = editable.toString().toInt().toFloat()
+                            } catch (e: NumberFormatException) {
+                                e.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > afterTextChanged")
+                            }
                         }
                     }
-                } }
-                editText.filters = arrayOf(
+                }
+                editText.filters =
+                    arrayOf(
                         InputFilter { source, _, _, dest, _, _ ->
                             try {
                                 val input = (dest.toString() + source.toString()).toInt()
@@ -165,26 +198,33 @@ class SettingsActivity : AppCompatActivity(),
                                 nfe.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > filters")
                             }
                             ""
-                        }
-                )
+                        },
+                    )
             }
         }
     }
 
     class OfflinePreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        override fun onCreatePreferences(
+            savedInstanceState: Bundle?,
+            rootKey: String?,
+        ) {
             setPreferencesFromResource(R.xml.pref_offline, rootKey)
         }
     }
 
     class ThemePreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        override fun onCreatePreferences(
+            savedInstanceState: Bundle?,
+            rootKey: String?,
+        ) {
             setPreferencesFromResource(R.xml.pref_theme, rootKey)
 
-            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
-                true
-            }
+            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener =
+                Preference.OnPreferenceChangeListener { _, newValue ->
+                    AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
+                    true
+                }
         }
     }
 
@@ -194,29 +234,38 @@ class SettingsActivity : AppCompatActivity(),
             startActivity(browserIntent)
         }
 
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        override fun onCreatePreferences(
+            savedInstanceState: Bundle?,
+            rootKey: String?,
+        ) {
             setPreferencesFromResource(R.xml.pref_links, rootKey)
 
-            preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                openUrl(Uri.parse(AppSettingsService.trackerUrl))
-                true
-            }
+            preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener =
+                Preference.OnPreferenceClickListener {
+                    openUrl(Uri.parse(AppSettingsService.trackerUrl))
+                    true
+                }
 
-            preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                openUrl(Uri.parse(AppSettingsService.sourceUrl))
-                false
-            }
+            preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener =
+                Preference.OnPreferenceClickListener {
+                    openUrl(Uri.parse(AppSettingsService.sourceUrl))
+                    false
+                }
 
-            preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                openUrl(Uri.parse(AppSettingsService.translationUrl))
-                false
-            }
+            preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener =
+                Preference.OnPreferenceClickListener {
+                    openUrl(Uri.parse(AppSettingsService.translationUrl))
+                    false
+                }
         }
     }
 
     class ExperimentalPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        override fun onCreatePreferences(
+            savedInstanceState: Bundle?,
+            rootKey: String?,
+        ) {
             setPreferencesFromResource(R.xml.pref_experimental, rootKey)
         }
     }
-}
+}

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

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

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

@@ -0,0 +1,65 @@
+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,14 +21,13 @@ 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) {
@@ -44,8 +43,7 @@ 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()
@@ -66,7 +64,10 @@ fun Context.openInBrowserAsNewTask(i: SelfossModel.Item) {
 }
 
 class LinkOnTouchListener : View.OnTouchListener {
-    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
+    override fun onTouch(
+        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,5 +8,4 @@ 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,40 +3,39 @@ package bou.amine.apps.readerforselfossv2.android.utils.glide
 import android.content.Context
 import android.graphics.Bitmap
 import android.widget.ImageView
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
+import bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
 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(url: String, iv: ImageView) =
-    Glide.with(this)
-        .asBitmap()
-        .load(url)
-        .apply(RequestOptions.centerCropTransform())
-        .into(iv)
+fun Context.bitmapCenterCrop(
+    url: String,
+    iv: ImageView,
+) = Glide.with(this)
+    .asBitmap()
+    .load(url)
+    .apply(RequestOptions.centerCropTransform())
+    .into(iv)
 
-fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
-    Glide.with(this)
-        .asBitmap()
-        .load(url)
-        .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 Context.circularDrawable(
+    url: String,
+    view: CircleImageView,
+) {
+    view.textView.text = ""
 
-fun getBitmapInputStream(bitmap:Bitmap,compressFormat: Bitmap.CompressFormat): InputStream {
+    Glide.with(this)
+        .load(url)
+        .into(view.imageView)
+}
+
+fun getBitmapInputStream(
+    bitmap: Bitmap,
+    compressFormat: Bitmap.CompressFormat,
+): InputStream {
     val byteArrayOutputStream = ByteArrayOutputStream()
     bitmap.compress(compressFormat, 80, byteArrayOutputStream)
     val bitmapData: ByteArray = byteArrayOutputStream.toByteArray()
     return ByteArrayInputStream(bitmapData)
-}
+}

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

@@ -26,4 +26,4 @@ fun isNetworkAccessible(context: Context): Boolean {
         val network = connectivityManager.activeNetworkInfo ?: return false
         return network.isConnectedOrConnecting
     }
-}
+}

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

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

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

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawerContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="bou.amine.apps.readerforselfossv2.android.HomeActivity"
     android:fitsSystemWindows="true"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    tools:context="bou.amine.apps.readerforselfossv2.android.HomeActivity">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordLayout"
@@ -28,12 +27,14 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <androidx.appcompat.widget.Toolbar app:popupTheme="?attr/toolbarPopupTheme" android:theme="@style/ToolBarStyle"
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/toolBar"
                         android:layout_width="match_parent"
                         android:layout_height="?attr/actionBarSize"
+                        android:theme="@style/ToolBarStyle"
+                        app:popupTheme="?attr/toolbarPopupTheme"
 
-                         />
+                        />
 
                 </com.google.android.material.appbar.AppBarLayout>
 
@@ -45,19 +46,19 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:orientation="vertical"
-                        android:background="?android:attr/windowBackground">
+                        android:background="?android:attr/windowBackground"
+                        android:orientation="vertical">
 
                         <TextView
                             android:id="@+id/emptyText"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:background="@android:color/transparent"
                             android:gravity="center_horizontal"
                             android:paddingTop="100dp"
                             android:text="@string/nothing_here"
                             android:textAlignment="center"
                             android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                            android:background="@android:color/transparent"
                             android:visibility="gone" />
 
                         <androidx.recyclerview.widget.RecyclerView
@@ -69,7 +70,7 @@
                             android:paddingBottom="60dp"
                             android:scrollbars="vertical"
                             app:layout_behavior="@string/appbar_scrolling_view_behavior"
-                            tools:listitem="@layout/list_item"/>
+                            tools:listitem="@layout/list_item" />
                     </LinearLayout>
 
                 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -77,6 +78,7 @@
             </LinearLayout>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
         <com.ashokvarma.bottomnavigation.BottomNavigationBar
             android:id="@+id/bottomBar"
             android:layout_width="match_parent"

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

@@ -1,33 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    app:layoutDescription="@xml/image_close_scene">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar android:theme="@style/ToolBarStyle"
             android:id="@+id/toolBar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
 
-             />
+            />
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/pager"
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/scrollView"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+    </androidx.core.widget.NestedScrollView>
+
+
+</androidx.constraintlayout.motion.widget.MotionLayout>

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

@@ -1,31 +1,30 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:gravity="center_horizontal"
     android:orientation="vertical"
     tools:context="bou.amine.apps.readerforselfossv2.android.LoginActivity">
+
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar app:popupTheme="?attr/toolbarPopupTheme" android:theme="@style/ToolBarStyle"
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-
-             />
+            android:theme="@style/ToolBarStyle"
+            app:popupTheme="?attr/toolbarPopupTheme" />
 
     </com.google.android.material.appbar.AppBarLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingBottom="@dimen/activity_vertical_margin"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin">
+        android:padding="@dimen/activity_horizontal_margin">
         <!-- Login progress -->
         <ProgressBar
             android:id="@+id/loginProgress"
@@ -33,67 +32,72 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
-            android:visibility="gone"/>
+            android:visibility="gone" />
 
-        <ScrollView
+        <LinearLayout
             android:id="@+id/loginForm"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-            <LinearLayout
+            <EditText
+                android:id="@+id/urlView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:hint="@string/prompt_url"
+                android:imeOptions="actionUnspecified"
+                android:importantForAutofill="no"
+                android:inputType="textUri"
+                android:maxLines="1"
+                android:minHeight="48dp" />
 
-                <EditText
-                    android:id="@+id/urlView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/prompt_url"
-                    android:imeOptions="actionUnspecified"
-                    android:importantForAutofill="no"
-                    android:inputType="textUri"
-                    android:maxLines="1" />
+            <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:text="@string/withLoginSwitch"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:id="@+id/withLogin"
-                    android:layout_weight="1"/>
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/withLogin"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/withLoginSwitch"
+                android:textAlignment="viewStart" />
 
-                <EditText
-                    android:id="@+id/loginView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:autofillHints="username"
-                    android:hint="@string/prompt_login"
-                    android:inputType="text"
-                    android:maxLines="1"
-                    android:visibility="gone" />
+            <EditText
+                android:id="@+id/loginView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="username"
+                android:hint="@string/prompt_login"
+                android:inputType="text"
+                android:maxLines="1"
+                android:minHeight="48dp"
+                android:visibility="gone" />
 
-                <EditText
-                    android:id="@+id/passwordView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:autofillHints="password"
-                    android:hint="@string/prompt_password"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:visibility="gone" />
+            <EditText
+                android:id="@+id/passwordView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="password"
+                android:hint="@string/prompt_password"
+                android:inputType="textPassword"
+                android:maxLines="1"
+                android:minHeight="48dp"
+                android:visibility="gone" />
 
-                <Button
-                    android:id="@+id/signInButton"
-                    style="?android:textAppearanceSmall"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginBottom="16dp"
-                    android:text="@string/action_sign_in"
-                    android:textStyle="bold" />
+            <Button
+                android:id="@+id/signInButton"
+                style="?android:textAppearanceSmall"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:text="@string/action_sign_in"
+                android:textStyle="bold" />
 
-            </LinearLayout>
-        </ScrollView>
+        </LinearLayout>
     </LinearLayout>
 
 </LinearLayout>

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

@@ -24,7 +24,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:listitem="@layout/source_list_item">
     </androidx.recyclerview.widget.RecyclerView>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="bou.amine.apps.readerforselfossv2.android.AddSourceActivity">
+    tools:context="bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -17,116 +17,83 @@
             <androidx.appcompat.widget.Toolbar app:popupTheme="?attr/toolbarPopupTheme" android:theme="@style/ToolBarStyle"
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-
-                 />
+                android:layout_height="?attr/actionBarSize" />
 
         </com.google.android.material.appbar.AppBarLayout>
 
 
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:paddingBottom="@dimen/activity_vertical_margin"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:layout_height="match_parent"
-            android:layout_width="match_parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
             android:id="@+id/formContainer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="16dp"
             android:visibility="gone"
             app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintVertical_bias="0.0">
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
-            <TextView
-                android:text="@string/add_source"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/textView2"
-                android:textAppearance="@style/TextAppearance.AppCompat.Large"
-                android:textAlignment="center"
-                android:layout_marginTop="16dp"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginEnd="16dp"
-                app:layout_constraintRight_toRightOf="parent"
-                android:layout_marginRight="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_marginLeft="16dp"
-                android:gravity="center_horizontal" />
 
             <EditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
                 android:id="@+id/nameInput"
-                android:layout_marginTop="32dp"
-                app:layout_constraintTop_toBottomOf="@+id/textView2"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                android:inputType="text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="48dp"
+                android:layout_marginTop="16dp"
+                android:autofillHints="false"
                 android:hint="@string/add_source_hint_name"
-                android:textColorHint="?android:textColorPrimary"
-                android:autofillHints="false" />
-
-            <EditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="textUri"
-                android:ems="10"
-                android:id="@+id/sourceUri"
-                android:hint="@string/add_source_hint_url"
-                android:textColorHint="?android:textColorPrimary"
-                android:layout_marginTop="16dp"
-                app:layout_constraintTop_toBottomOf="@+id/nameInput"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                android:autofillHints="false" />
-
-            <EditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:id="@+id/tags"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_marginTop="16dp"
-                app:layout_constraintTop_toBottomOf="@+id/sourceUri"
-                android:hint="@string/add_source_hint_tags"
-                android:textColorHint="?android:textColorPrimary"
                 android:inputType="text"
-                android:autofillHints="false" />
+                android:textColorHint="?android:textColorPrimary"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <EditText
+                android:id="@+id/sourceUri"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="48dp"
+                android:layout_marginTop="16dp"
+                android:autofillHints="false"
+                android:hint="@string/add_source_hint_url"
+                android:inputType="textUri"
+                android:textColorHint="?android:textColorPrimary"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/nameInput" />
+
+            <EditText
+                android:id="@+id/tags"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="48dp"
+                android:layout_marginTop="16dp"
+                android:autofillHints="false"
+                android:hint="@string/add_source_hint_tags"
+                android:inputType="text"
+                android:textColorHint="?android:textColorPrimary"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/sourceUri" />
 
             <Spinner
-                android:layout_width="match_parent"
                 android:id="@+id/spoutsSpinner"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="48dp"
                 android:layout_marginTop="16dp"
-                app:layout_constraintTop_toBottomOf="@+id/tags"
-                app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_height="40dp"/>
+                app:layout_constraintTop_toBottomOf="@+id/tags" />
 
             <Button
-                android:text="@string/add_source_save"
+                android:id="@+id/saveBtn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/saveBtn"
-                android:elevation="5dp"
-                android:textColor="?android:textColorPrimary"
-                android:layout_marginEnd="16dp"
-                app:layout_constraintRight_toRightOf="parent"
-                android:layout_marginRight="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_marginLeft="16dp"
                 android:layout_marginTop="16dp"
-                app:layout_constraintTop_toBottomOf="@+id/spoutsSpinner"
+                android:elevation="5dp"
+                android:text="@string/add_source_save"
+                android:textColor="?android:textColorPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
-                android:layout_marginBottom="16dp"
-                app:layout_constraintVertical_bias="0.0"/>
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/spoutsSpinner" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -135,8 +102,6 @@
             style="?android:attr/progressBarStyleLarge"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent"

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

@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/card"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="8dp"
-    android:layout_marginRight="8dp"
-    android:layout_marginTop="8dp"
-    app:layout_constraintHorizontal_bias="0.62"
-    app:layout_constraintLeft_toLeftOf="parent"
-    app:layout_constraintRight_toRightOf="parent"
+    android:layout_margin="8dp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     card_view:cardElevation="2dp"
     card_view:cardUseCompatPadding="true"
@@ -28,8 +24,8 @@
             android:layout_height="wrap_content"
             android:adjustViewBounds="true"
             android:cropToPadding="true"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/background_splash"
             card_view:layout_constraintBottom_toTopOf="@+id/constraintLayout" />
@@ -39,18 +35,17 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/itemImage">
 
-            <ImageView
+            <bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
                 android:id="@+id/sourceImage"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:layout_marginLeft="8dp"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
-                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/background_splash" />
 
@@ -58,70 +53,58 @@
                 android:id="@+id/title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_marginStart="8dp"
-                android:gravity="start"
+                android:layout_margin="8dp"
                 android:textAlignment="viewStart"
-                android:textStyle="bold"
                 android:textColor="?android:textColorPrimary"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintLeft_toRightOf="@+id/sourceImage"
-                app:layout_constraintRight_toRightOf="parent"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/sourceImage"
                 app:layout_constraintTop_toTopOf="@+id/sourceImage"
                 tools:text="Titre" />
 
             <TextView
                 android:id="@+id/sourceTitleAndDate"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:gravity="start"
                 android:textAlignment="viewStart"
-                android:textSize="14sp"
                 android:textColor="?android:textColorPrimary"
-                app:layout_constraintLeft_toLeftOf="@+id/title"
+                android:textSize="14sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/title"
                 app:layout_constraintTop_toBottomOf="@+id/title"
                 tools:text="Google Actualité Il y a 5h" />
 
-            <RelativeLayout
-                android:layout_width="0dp"
+            <LinearLayout
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate">
 
                 <ImageButton
-                    android:id="@+id/favButton"
+                    android:id="@+id/browserBtn"
                     android:layout_width="35dp"
                     android:layout_height="35dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
                     android:adjustViewBounds="true"
                     android:background="@android:color/transparent"
+                    android:contentDescription="@string/reader_action_open"
                     android:elevation="5dp"
                     android:padding="4dp"
                     android:scaleType="centerCrop"
-                    app:srcCompat="@drawable/ic_menu_heart_60dp"
-                    app:tint="@color/ic_menu_heart_color" />
+                    app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
+                    app:tint="?android:attr/textColorPrimary" />
 
                 <ImageButton
                     android:id="@+id/shareBtn"
                     android:layout_width="35dp"
                     android:layout_height="35dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_toLeftOf="@+id/favButton"
-                    android:layout_toStartOf="@+id/favButton"
+                    android:layout_marginStart="16dp"
                     android:adjustViewBounds="true"
                     android:background="@android:color/transparent"
+                    android:contentDescription="@string/share"
                     android:elevation="5dp"
                     android:padding="4dp"
                     android:scaleType="centerCrop"
@@ -129,23 +112,21 @@
                     app:tint="?android:attr/textColorPrimary" />
 
                 <ImageButton
-                    android:id="@+id/browserBtn"
+                    android:id="@+id/favButton"
                     android:layout_width="35dp"
                     android:layout_height="35dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_toLeftOf="@+id/shareBtn"
-                    android:layout_toStartOf="@+id/shareBtn"
+                    android:layout_marginStart="16dp"
                     android:adjustViewBounds="true"
                     android:background="@android:color/transparent"
+                    android:contentDescription="@string/add_to_favs_reader"
                     android:elevation="5dp"
                     android:padding="4dp"
                     android:scaleType="centerCrop"
-                    app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
-                    app:tint="?android:attr/textColorPrimary" />
+                    app:srcCompat="@drawable/ic_menu_heart_60dp"
+                    app:tint="@color/ic_menu_heart_color" />
 
-            </RelativeLayout>
+
+            </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,26 @@
+<?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/filter_fragment.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -17,73 +16,81 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="gone" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/filterView"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"
-        tools:visibility="visible">
+        android:fillViewport="true">
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/floatingActionButton2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-
-            android:layout_marginTop="8dp"
-            android:clickable="true"
-            app:backgroundTint="@color/colorAccent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:rippleColor="@color/colorAccentDark"
-            app:srcCompat="@drawable/ic_menu_search_white_24dp" />
-
-        <TextView
-            android:id="@+id/filterTagsTitle"
-            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/filter_item_tags"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-        <com.google.android.material.chip.ChipGroup
-            android:id="@+id/tagsGroup"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/filterView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="24dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/filterTagsTitle"
-            app:singleSelection="true">
+            android:visibility="gone"
+            tools:visibility="visible">
 
-        </com.google.android.material.chip.ChipGroup>
+            <TextView
+                android:id="@+id/filterTagsTitle"
+                style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/filter_item_tags"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/filterSourcesTitle"
-            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="24dp"
-            android:text="@string/filter_item_sources"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tagsGroup" />
+            <TextView
+                android:id="@+id/filterSourcesTitle"
+                style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginTop="24dp"
+                android:text="@string/filter_item_sources"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tagsGroup" />
 
 
-        <com.google.android.material.chip.ChipGroup
-            android:id="@+id/sourcesGroup"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="24dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/filterSourcesTitle">
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/tagsGroup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="24dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/filterTagsTitle"
+                app:singleSelection="true">
 
-        </com.google.android.material.chip.ChipGroup>
+            </com.google.android.material.chip.ChipGroup>
+
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/sourcesGroup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="24dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/filterSourcesTitle">
+
+            </com.google.android.material.chip.ChipGroup>
+
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/floatingActionButton2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="16dp"
+                android:clickable="true"
+                android:contentDescription="@string/menu_home_search"
+                android:focusable="true"
+                app:backgroundTint="@color/colorAccent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:rippleColor="@color/colorAccentDark"
+                app:srcCompat="@drawable/ic_menu_search_white_24dp" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,5 +1,4 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -22,10 +21,22 @@
                 android:layout_width="0dp"
                 android:layout_height="200dp"
                 android:scaleType="centerCrop"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                />
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/titleView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginRight="16dp"
+                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
             <TextView
                 android:id="@+id/source"
@@ -36,40 +47,23 @@
                 android:layout_marginRight="16dp"
                 android:textColor="?android:textColorSecondary"
                 android:textSize="12sp"
-                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/titleView" />
 
-            <TextView
-                android:id="@+id/titleView"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="8dp"
-                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                android:textStyle="bold"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
-
             <WebView
                 android:id="@+id/webcontent"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginRight="16dp"
+                android:background="?attr/webviewBackground"
+                android:paddingBottom="48dp"
                 android:textColorLink="?attr/colorAccent"
                 android:visibility="gone"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="24dp"
-                android:paddingBottom="48dp"
-                android:background="?attr/webviewBackground"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/source"
                 tools:visibility="visible" />
 
@@ -80,10 +74,10 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_gravity="start|bottom|end"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_gravity="end|bottom|right">
+        app:layout_constraintStart_toStartOf="parent">
 
         <com.github.rubensousa.floatingtoolbar.FloatingToolbar
             android:id="@+id/floatingToolbar"
@@ -96,12 +90,11 @@
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom|right"
-            android:layout_marginBottom="16dp"
+            android:layout_gravity="end|bottom"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:paddingBottom="@dimen/activity_vertical_margin"
+            android:layout_marginBottom="16dp"
             android:paddingTop="@dimen/activity_vertical_margin"
+            android:paddingBottom="@dimen/activity_vertical_margin"
             android:src="@drawable/ic_add_white_24dp"
             app:backgroundTint="?attr/colorAccent"
             app:fabSize="mini"
@@ -112,11 +105,11 @@
         android:id="@+id/progressBar"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"
-        android:animateLayoutChanges="true"
         android:alpha="0.8"
+        android:animateLayoutChanges="true"
         android:background="@color/black"
-        android:clickable="false">
+        android:clickable="false"
+        android:visibility="gone">
 
         <ProgressBar
             style="?android:attr/progressBarStyleLarge"

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

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.github.chrisbanes.photoview.PhotoView
-        android:id="@+id/photoView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:adjustViewBounds="true"
-        android:background="@drawable/checkerboard"
-        app:srcCompat="@android:drawable/screen_background_dark" />
+        <com.github.chrisbanes.photoview.PhotoView
+            android:id="@+id/photoView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:adjustViewBounds="true"
+            android:background="@drawable/checkerboard"
+            app:srcCompat="@android:drawable/screen_background_dark" />
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -3,17 +3,16 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="88dp">
+    android:layout_height="wrap_content">
 
-    <ImageView
+    <bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
         android:id="@+id/itemImage"
         android:layout_width="46dp"
         android:layout_height="46dp"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="21dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginLeft="8dp" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/title"
@@ -24,39 +23,30 @@
         android:layout_marginEnd="16dp"
         android:ellipsize="end"
         android:fontFamily="sans-serif"
-        android:gravity="start"
         android:maxLines="3"
         android:textAlignment="viewStart"
-        android:textAllCaps="false"
+        android:textColor="?android:textColorPrimary"
         android:textSize="16sp"
         android:textStyle="bold"
-        android:textColor="?android:textColorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/itemImage"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Titre"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="16dp" />
+        tools:text="Titre" />
 
     <TextView
         android:id="@+id/sourceTitleAndDate"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="66dp"
         android:layout_marginEnd="16dp"
         android:gravity="start"
         android:maxLines="1"
         android:textAlignment="viewStart"
-        android:textSize="14sp"
         android:textColor="?android:textColorPrimary"
+        android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/itemImage"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Google Actualité Il y a 5h"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="16dp" />
+        app:layout_constraintTop_toBottomOf="@+id/itemImage"
+        tools:text="Google Actualité Il y a 5h" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -3,48 +3,74 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
 
-    <ImageView
-        android:id="@+id/itemImage"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:importantForAccessibility="no"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/sourceTitle"
-        android:layout_width="0dp"
-        android:layout_height="17dp"
-        android:layout_marginStart="8dp"
-        android:ellipsize="end"
-        android:gravity="start"
-        android:maxLines="1"
-        android:textAlignment="textStart"
-        android:textSize="13sp"
-        android:textColor="?android:textColorPrimary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
-        app:layout_constraintStart_toEndOf="@+id/itemImage"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="source title" />
-
     <Button
         android:id="@+id/deleteBtn"
         style="@style/Widget.AppCompat.Button.Borderless"
-        android:layout_width="34dp"
-        android:layout_height="34dp"
+        android:layout_width="48dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:background="@drawable/ic_remove_circle_outline_black_24dp"
         android:backgroundTint="?android:textColorSecondary"
-        android:elevation="4dp"
         android:contentDescription="@string/remove_source"
+        android:elevation="4dp"
+        app:iconSize="34dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
+        android:id="@+id/itemImage"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <TextView
+        android:id="@+id/sourceTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAlignment="viewStart"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/errorText"
+        app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
+        app:layout_constraintStart_toEndOf="@+id/itemImage"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Source title" />
+
+    <TextView
+        android:id="@+id/errorText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10sp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textColor="@color/red"
+        android:textStyle="italic"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/itemImage"
+        tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+        tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -20,6 +20,11 @@
           android:orderInCategory="2"
           app:showAsAction="ifRoom"/>
 
+    <item android:id="@+id/action_sources"
+        android:title="@string/menu_home_sources"
+        android:orderInCategory="97"
+        app:showAsAction="never"/>
+
     <item android:id="@+id/action_settings"
         android:title="@string/title_activity_settings"
         android:orderInCategory="98"

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

@@ -0,0 +1,16 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/open_action"
+        android:icon="@drawable/ic_open_in_browser_white_24dp"
+        android:title="@string/reader_action_open"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/share_action"
+        android:icon="@drawable/ic_share_white_24dp"
+        android:title="@string/reader_action_share"
+        app:showAsAction="ifRoom" />
+
+</menu>

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

@@ -126,4 +126,9 @@
     <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>
+    <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

@@ -126,4 +126,9 @@
     <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>
+    <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

@@ -126,4 +126,9 @@
     <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>
+    <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

@@ -126,4 +126,9 @@
     <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>
+    <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

@@ -126,4 +126,9 @@
     <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>
+    <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">"Can't get spouts list because of a network issue."</string>
-    <string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</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">"Non se pode obter a lista de spoits. Pode que haxa algún problema coa api."</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,14 +116,19 @@
     <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">Light/Dark mode</string>
-    <string name="mode_dark">Dark mode</string>
-    <string name="mode_system">Follow the system setting</string>
-    <string name="mode_light">Light mode</string>
-    <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="pref_theme_title">Modo Claro/Escuro</string>
+    <string name="mode_dark">Modo escuro</string>
+    <string name="mode_system">Seguir axustes do sistema</string>
+    <string name="mode_light">Modo claro</string>
+    <string name="gdpr_dialog_title">A aplicación non comparte ningún dato persoal seu.</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="crash_toast_text">Ocurriu un erro. Enviando os detalles o desenvolvedor.</string>
+    <string name="pref_switch_disable_acra">"Deshabilitar o reporte automático de erros. "</string>
+    <string name="menu_home_filter">Filtros</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="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">"Network connection lost"</string>
+    <string name="network_connectivity_lost">"Koneksi jaringan hilang"</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>
@@ -126,4 +126,9 @@
     <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>
+    <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

@@ -126,4 +126,9 @@
     <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>
+    <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

@@ -126,4 +126,9 @@
     <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>
+    <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

@@ -1,9 +0,0 @@
-<?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>
-</resources>

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

@@ -126,4 +126,9 @@
     <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>
+    <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

@@ -126,4 +126,9 @@
     <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>
+    <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

@@ -126,4 +126,9 @@
     <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>
+    <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

@@ -126,4 +126,9 @@
     <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>
+    <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

@@ -126,4 +126,9 @@
     <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>
+    <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,5 +125,10 @@
     <string name="crash_toast_text">发生崩溃。请将细节发送给开发人员。</string>
     <string name="pref_switch_disable_acra">"禁用自动错误报告 "</string>
     <string name="menu_home_filter">筛选器</string>
-    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="application_selfoss_only">此应用只适用于 Selfoss 实例，不适用于其他 RSS 。</string>
+    <string name="menu_home_sources">源</string>
+    <string name="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

@@ -126,4 +126,9 @@
     <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>
+    <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/colors.xml

@@ -12,4 +12,5 @@
     <color name="refresh_progress_2">@color/colorAccent</color>
     <color name="refresh_progress_3">@color/pink</color>
     <color name="dark">#FF282828</color>
+    <color name="transparent_dark_background">#33000000</color>
 </resources>

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

@@ -6,6 +6,7 @@
     <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>
@@ -129,4 +130,8 @@
     <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>
+    <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

@@ -26,4 +26,16 @@
         <item name="android:textColorSecondary">@color/white</item>
         <item name="actionMenuTextColor">@color/white</item>
     </style>
+
+    <style name="Theme.AppCompat.ImageActivity" parent="NoBar">
+        <item name="android:windowBackground">@color/transparent_dark_background</item>
+        <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/main/res/xml/image_close_scene.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:motion="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/motionLayout">
+
+    <Transition
+        motion:constraintSetStart="@+id/start"
+        motion:constraintSetEnd="@+id/end"
+        motion:duration="500"
+        motion:motionInterpolator="linear">
+
+        <OnSwipe
+            motion:touchAnchorId="@+id/scrollView"
+            motion:touchAnchorSide="top"
+            motion:onTouchUp="autoCompleteToStart" />
+    </Transition>
+
+    <ConstraintSet android:id="@+id/start">
+
+        <Constraint
+            android:id="@id/scrollView"
+            motion:layout_constraintBottom_toBottomOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent">
+        </Constraint>
+    </ConstraintSet>
+
+    <ConstraintSet android:id="@+id/end">
+
+        <Constraint
+            android:id="@+id/scrollView"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginBottom="0dp"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintBottom_toBottomOf="parent"
+            motion:layout_constraintEnd_toEndOf="parent">
+        </Constraint>
+    </ConstraintSet>
+</MotionScene>

androidApp/src/test/kotlin/DatesTest.kt

@@ -8,39 +8,48 @@ import kotlinx.datetime.toInstant
 import org.junit.Test
 
 class DatesTest {
-
-    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"
+    private val newVersionDateVariant = "2022-12-24T17:00:08+00"
+    private val newVersionDate = "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"
 
     @Test
-    fun v3_date_should_be_parsed() {
-        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)
+    fun new_version_date_should_be_parsed() {
+        val date = DateUtils.parseDate(newVersionDate)
         val expected =
             LocalDateTime(2013, 4, 7, 13, 43, 0, 0).toInstant(TimeZone.currentSystemDefault())
                 .toEpochMilliseconds()
 
-        assertEquals(date, expected)
+        assertEquals(expected, date)
     }
 
     @Test
-    fun bug1_date_should_be_parsed() {
-        val date = DateUtils.parseDate(bug1Date)
+    fun old_version_date_should_be_parsed() {
+        val date = DateUtils.parseDate(oldVersionDate)
         val expected =
-            LocalDateTime(2022, 12, 24, 18, 0, 8, 0).toInstant(TimeZone.currentSystemDefault())
+            LocalDateTime(2013, 5, 7, 13, 46, 0, 0).toInstant(TimeZone.currentSystemDefault())
                 .toEpochMilliseconds()
 
-        assertEquals(date, expected)
+        assertEquals(expected, date)
     }
 
+    @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

@@ -18,6 +18,20 @@ import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
 
+private const val BASE_URL = "https://test.com/selfoss/"
+
+private const val USERNAME = "username"
+
+private const val SPOUT = "spouts\\rss\\fulltextrss"
+
+private const val IMAGE_URL = "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
+
+private const val IMAGE_URL_2 = "d8c92cdb1ef119ea85c4b9205c879ca7.png"
+
+private const val FEED_URL = "https://test.com/feed"
+
+private const val TAGS = "Test, New"
+
 class RepositoryTest {
     private val db = mockk<ReaderForSelfossDB>(relaxed = true)
     private val appSettingsService = mockk<AppSettingsService>()
@@ -28,16 +42,16 @@ class RepositoryTest {
     private val NUMBER_STARRED = 20
     private lateinit var repository: Repository
 
-
     private fun initializeRepository(
-        isConnectionAvailable: MutableStateFlow<Boolean> = MutableStateFlow(
-            true
-        )
+        isConnectionAvailable: MutableStateFlow<Boolean> =
+            MutableStateFlow(
+                true,
+            ),
     ) {
         repository = Repository(api, appSettingsService, isConnectionAvailable, db)
 
         runBlocking {
-            repository.updateApiVersion()
+            repository.updateApiInformation()
         }
     }
 
@@ -45,19 +59,23 @@ class RepositoryTest {
     fun setup() {
         clearAllMocks()
         every { appSettingsService.getApiVersion() } returns 4
-        every { appSettingsService.getBaseUrl() } returns "https://test.com/selfoss/"
+        every { appSettingsService.getBaseUrl() } returns BASE_URL
+        every { appSettingsService.getUserName() } returns USERNAME
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
 
-        coEvery { api.version() } returns StatusAndData(
-            success = true,
-            data = SelfossModel.ApiVersion("2.19-ba1e8e3", "4.0.0")
-        )
-        coEvery { api.stats() } returns StatusAndData(
-            success = true,
-            data = SelfossModel.Stats(NUMBER_ARTICLES, NUMBER_UNREAD, NUMBER_STARRED)
-        )
+        coEvery { api.apiInformation() } returns
+            StatusAndData(
+                success = true,
+                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true)),
+            )
+        coEvery { api.stats() } returns
+            StatusAndData(
+                success = true,
+                data = SelfossModel.Stats(NUMBER_ARTICLES, NUMBER_UNREAD, NUMBER_STARRED),
+            )
 
+        every { db.itemsQueries.deleteItemsWhereSource(any()) } returns Unit
         every { db.itemsQueries.items().executeAsList() } returns generateTestDBItems()
         every { db.tagsQueries.deleteAllTags() } returns Unit
         every { db.tagsQueries.transaction(any(), any()) } returns Unit
@@ -68,7 +86,7 @@ class RepositoryTest {
     fun instantiate_repository() {
         initializeRepository()
 
-        coVerify(exactly = 1) { api.version() }
+        coVerify(exactly = 1) { api.apiInformation() }
     }
 
     @Test
@@ -77,7 +95,7 @@ class RepositoryTest {
 
         initializeRepository(MutableStateFlow(false))
 
-        coVerify(exactly = 0) { api.version() }
+        coVerify(exactly = 0) { api.apiInformation() }
         coVerify(exactly = 0) { api.stats() }
     }
 
@@ -85,7 +103,7 @@ class RepositoryTest {
     fun get_api_4_date_with_api_1_version_stored() {
         every { appSettingsService.getApiVersion() } returns 1
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = true, data = generateTestApiItem())
+            StatusAndData(success = true, data = generateTestApiItem())
         every { appSettingsService.updateApiVersion(any()) } returns Unit
 
         initializeRepository()
@@ -97,17 +115,81 @@ class RepositoryTest {
         verify(exactly = 1) { appSettingsService.updateApiVersion(4) }
     }
 
+    @Test
+    fun get_public_access() {
+        every { appSettingsService.updatePublicAccess(any()) } returns Unit
+        coEvery { api.apiInformation() } returns
+            StatusAndData(
+                success = true,
+                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true)),
+            )
+        every { appSettingsService.getUserName() } returns ""
+
+        initializeRepository()
+
+        coVerify(exactly = 1) { api.apiInformation() }
+        coVerify(exactly = 1) { appSettingsService.updatePublicAccess(true) }
+    }
+
+    @Test
+    fun get_public_access_username_not_empty() {
+        every { appSettingsService.updatePublicAccess(any()) } returns Unit
+        coEvery { api.apiInformation() } returns
+            StatusAndData(
+                success = true,
+                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true)),
+            )
+        every { appSettingsService.getUserName() } returns "username"
+
+        initializeRepository()
+
+        coVerify(exactly = 1) { api.apiInformation() }
+        coVerify(exactly = 0) { appSettingsService.updatePublicAccess(true) }
+    }
+
+    @Test
+    fun get_public_access_no_auth() {
+        every { appSettingsService.updatePublicAccess(any()) } returns Unit
+        coEvery { api.apiInformation() } returns
+            StatusAndData(
+                success = true,
+                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, false)),
+            )
+        every { appSettingsService.getUserName() } returns ""
+
+        initializeRepository()
+
+        coVerify(exactly = 1) { api.apiInformation() }
+        coVerify(exactly = 0) { appSettingsService.updatePublicAccess(true) }
+    }
+
+    @Test
+    fun get_public_access_disabled() {
+        every { appSettingsService.updatePublicAccess(any()) } returns Unit
+        coEvery { api.apiInformation() } returns
+            StatusAndData(
+                success = true,
+                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true)),
+            )
+        every { appSettingsService.getUserName() } returns ""
+
+        initializeRepository()
+
+        coVerify(exactly = 1) { api.apiInformation() }
+        coVerify(exactly = 0) { appSettingsService.updatePublicAccess(true) }
+    }
+
     @Test
     fun get_api_1_date_with_api_4_version_stored() {
         every { appSettingsService.getApiVersion() } returns 4
-        coEvery { api.version() } returns StatusAndData(success = false, null)
+        coEvery { api.apiInformation() } returns StatusAndData(success = false, null)
         val itemParameters = FakeItemParameters()
         itemParameters.datetime = "2021-04-23 11:45:32"
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(
-                    success = true,
-                    data = generateTestApiItem(itemParameters)
-                )
+            StatusAndData(
+                success = true,
+                data = generateTestApiItem(itemParameters),
+            )
 
         initializeRepository()
         runBlocking {
@@ -120,7 +202,7 @@ class RepositoryTest {
     @Test
     fun get_newer_items() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = true, data = generateTestApiItem())
+            StatusAndData(success = true, data = generateTestApiItem())
 
         initializeRepository()
         runBlocking {
@@ -135,7 +217,7 @@ class RepositoryTest {
     @Test
     fun get_all_newer_items() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = true, data = generateTestApiItem())
+            StatusAndData(success = true, data = generateTestApiItem())
 
         initializeRepository()
         repository.displayedItems = ItemType.ALL
@@ -151,7 +233,7 @@ class RepositoryTest {
     @Test
     fun get_newer_starred_items() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = true, data = generateTestApiItem())
+            StatusAndData(success = true, data = generateTestApiItem())
 
         initializeRepository()
         repository.displayedItems = ItemType.STARRED
@@ -188,10 +270,10 @@ class RepositoryTest {
         itemParameter3.tags = "Other, Tag"
         itemParameter3.id = "3"
         coEvery { db.itemsQueries.items().executeAsList() } returns generateTestDBItems(
-            itemParameter1
+            itemParameter1,
         ) +
-                generateTestDBItems(itemParameter2) +
-                generateTestDBItems(itemParameter3)
+            generateTestDBItems(itemParameter2) +
+            generateTestDBItems(itemParameter3)
 
         every { appSettingsService.isItemCachingEnabled() } returns true
 
@@ -216,22 +298,26 @@ class RepositoryTest {
         itemParameter3.sourcetitle = "Other"
         itemParameter3.id = "3"
         coEvery { db.itemsQueries.items().executeAsList() } returns generateTestDBItems(
-            itemParameter1
+            itemParameter1,
         ) +
-                generateTestDBItems(itemParameter2) +
-                generateTestDBItems(itemParameter3)
+            generateTestDBItems(itemParameter2) +
+            generateTestDBItems(itemParameter3)
 
         every { appSettingsService.isItemCachingEnabled() } returns true
 
         initializeRepository(MutableStateFlow(false))
-        repository.setSourceFilter(SelfossModel.Source(
-            1,
-            "Test",
-            listOf("tags"),
-            "spouts\\rss\\fulltextrss",
-            "",
-            "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-        ))
+        repository.setSourceFilter(
+            SelfossModel.SourceDetail(
+                1,
+                "Test",
+                null,
+                listOf("tags"),
+                SPOUT,
+                "",
+                IMAGE_URL,
+                SelfossModel.SourceParams("url"),
+            ),
+        )
         runBlocking {
             repository.getNewerItems()
         }
@@ -244,7 +330,7 @@ class RepositoryTest {
     @Test
     fun get_older_items() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = true, data = generateTestApiItem())
+            StatusAndData(success = true, data = generateTestApiItem())
 
         initializeRepository()
         repository.items = ArrayList(generateTestApiItem())
@@ -260,7 +346,7 @@ class RepositoryTest {
     @Test
     fun get_all_older_items() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = true, data = generateTestApiItem())
+            StatusAndData(success = true, data = generateTestApiItem())
 
         initializeRepository()
         repository.items = ArrayList(generateTestApiItem())
@@ -277,7 +363,7 @@ class RepositoryTest {
     @Test
     fun get_older_starred_items() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = true, data = generateTestApiItem())
+            StatusAndData(success = true, data = generateTestApiItem())
 
         initializeRepository()
         repository.displayedItems = ItemType.STARRED
@@ -514,14 +600,16 @@ class RepositoryTest {
     }
 
     private fun prepareTags(): Pair<List<SelfossModel.Tag>, List<TAG>> {
-        val tags = listOf(
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
+        val tags =
+            listOf(
+                SelfossModel.Tag("test", "red", 6),
+                SelfossModel.Tag("second", "yellow", 0),
+            )
+        val tagsDB =
+            listOf(
+                TAG("test_DB", "red", 6),
+                TAG("second_DB", "yellow", 0),
+            )
 
         coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
         coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
@@ -532,55 +620,63 @@ class RepositoryTest {
     fun get_sources() {
         val (sources, sourcesDB) = prepareSources()
         initializeRepository()
-        var testSources: List<SelfossModel.Source>?
+        var testSources: List<SelfossModel.Source>
         runBlocking {
-            testSources = repository.getSources()
+            testSources = repository.getSourcesDetails()
         }
 
-        assertSame(sources, testSources)
+        assertEquals(sources, testSources)
         assertNotEquals(sourcesDB.map { it.toView() }, testSources)
-        coVerify(exactly = 1) { api.sources() }
+        coVerify(exactly = 1) { api.sourcesDetailed() }
     }
 
-    private fun prepareSources(): Pair<ArrayList<SelfossModel.Source>, List<SOURCE>> {
-        val sources = arrayListOf(
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
+    private fun prepareSources(): Pair<ArrayList<SelfossModel.SourceDetail>, List<SOURCE>> {
+        val sources =
+            arrayListOf(
+                SelfossModel.SourceDetail(
+                    1,
+                    "First source",
+                    null,
+                    listOf("Test", "second"),
+                    SPOUT,
+                    "",
+                    IMAGE_URL_2,
+                    SelfossModel.SourceParams("url"),
+                ),
+                SelfossModel.SourceDetail(
+                    2,
+                    "Second source",
+                    null,
+                    listOf("second"),
+                    SPOUT,
+                    "",
+                    IMAGE_URL,
+                    SelfossModel.SourceParams("url"),
+                ),
             )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First DB source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
+        val sourcesDB =
+            listOf(
+                SOURCE(
+                    "1",
+                    "First DB source",
+                    "Test,second",
+                    SPOUT,
+                    "",
+                    IMAGE_URL_2,
+                    "url",
+                ),
+                SOURCE(
+                    "2",
+                    "Second source",
+                    "second",
+                    SPOUT,
+                    "",
+                    IMAGE_URL,
+                    "url",
+                ),
             )
-        )
 
-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
+        coEvery { api.sourcesDetailed() } returns StatusAndData(success = true, data = sources)
         every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
         return Pair(sources, sourcesDB)
     }
@@ -594,13 +690,13 @@ class RepositoryTest {
         initializeRepository()
         var testSources: List<SelfossModel.Source>?
         runBlocking {
-            testSources = repository.getSources()
+            testSources = repository.getSourcesDetails()
             // Sources will be fetched from the database on the second call, thus testSources != sources
-            testSources = repository.getSources()
+            testSources = repository.getSourcesDetails()
         }
 
-        coVerify(exactly = 1) { api.sources() }
-        assertNotSame(sources, testSources)
+        coVerify(exactly = 1) { api.sourcesDetailed() }
+        assertNotEquals(sources, testSources)
         assertEquals(sourcesDB.map { it.toView() }, testSources)
         verify(atLeast = 1) { db.sourcesQueries.sources().executeAsList() }
     }
@@ -612,13 +708,13 @@ class RepositoryTest {
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
         every { appSettingsService.isItemCachingEnabled() } returns false
         initializeRepository()
-        var testSources: List<SelfossModel.Source>?
+        var testSources: List<SelfossModel.Source>
         runBlocking {
-            testSources = repository.getSources()
+            testSources = repository.getSourcesDetails()
         }
 
-        assertSame(sources, testSources)
-        coVerify(exactly = 1) { api.sources() }
+        assertEquals(sources, testSources)
+        coVerify(exactly = 1) { api.sourcesDetailed() }
         verify(exactly = 0) { db.sourcesQueries }
     }
 
@@ -629,13 +725,13 @@ class RepositoryTest {
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         every { appSettingsService.isItemCachingEnabled() } returns false
         initializeRepository()
-        var testSources: List<SelfossModel.Source>?
+        var testSources: List<SelfossModel.Source>
         runBlocking {
-            testSources = repository.getSources()
+            testSources = repository.getSourcesDetails()
         }
 
-        assertSame(sources, testSources)
-        coVerify(exactly = 1) { api.sources() }
+        assertEquals(sources, testSources)
+        coVerify(exactly = 1) { api.sourcesDetailed() }
         verify(atLeast = 1) { db.sourcesQueries }
     }
 
@@ -643,13 +739,13 @@ class RepositoryTest {
     fun get_sources_without_connection() {
         val (_, sourcesDB) = prepareSources()
         initializeRepository(MutableStateFlow(false))
-        var testSources: List<SelfossModel.Source>?
+        var testSources: List<SelfossModel.Source>
         runBlocking {
-            testSources = repository.getSources()
+            testSources = repository.getSourcesDetails()
         }
 
         assertEquals(sourcesDB.map { it.toView() }, testSources)
-        coVerify(exactly = 0) { api.sources() }
+        coVerify(exactly = 0) { api.sourcesDetailed() }
         verify(atLeast = 1) { db.sourcesQueries.sources().executeAsList() }
     }
 
@@ -660,13 +756,13 @@ class RepositoryTest {
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
         initializeRepository(MutableStateFlow(false))
-        var testSources: List<SelfossModel.Source>?
+        var testSources: List<SelfossModel.Source>
         runBlocking {
-            testSources = repository.getSources()
+            testSources = repository.getSourcesDetails()
         }
 
         assertEquals(emptyList<SelfossModel.Source>(), testSources)
-        coVerify(exactly = 0) { api.sources() }
+        coVerify(exactly = 0) { api.sourcesDetailed() }
         verify(exactly = 0) { db.sourcesQueries.sources().executeAsList() }
     }
 
@@ -677,13 +773,13 @@ class RepositoryTest {
         every { appSettingsService.isItemCachingEnabled() } returns true
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         initializeRepository(MutableStateFlow(false))
-        var testSources: List<SelfossModel.Source>?
+        var testSources: List<SelfossModel.Source>
         runBlocking {
-            testSources = repository.getSources()
+            testSources = repository.getSourcesDetails()
         }
 
         assertEquals(sourcesDB.map { it.toView() }, testSources)
-        coVerify(exactly = 0) { api.sources() }
+        coVerify(exactly = 0) { api.sourcesDetailed() }
         verify(atLeast = 1) { db.sourcesQueries.sources().executeAsList() }
     }
 
@@ -694,31 +790,31 @@ class RepositoryTest {
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         initializeRepository(MutableStateFlow(false))
-        var testSources: List<SelfossModel.Source>?
+        var testSources: List<SelfossModel.Source>
         runBlocking {
-            testSources = repository.getSources()
+            testSources = repository.getSourcesDetails()
         }
 
         assertEquals(sourcesDB.map { it.toView() }, testSources)
-        coVerify(exactly = 0) { api.sources() }
+        coVerify(exactly = 0) { api.sourcesDetailed() }
         verify(atLeast = 1) { db.sourcesQueries.sources().executeAsList() }
     }
 
     @Test
     fun create_source() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
-                SuccessResponse(true)
+        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
+            SuccessResponse(true)
 
         initializeRepository()
         var response: Boolean
         runBlocking {
-            response = repository.createSource(
-                "test",
-                "https://test.com/feed",
-                "spouts\\rss\\fulltextrss",
-                "Test, New",
-                ""
-            )
+            response =
+                repository.createSource(
+                    "test",
+                    FEED_URL,
+                    SPOUT,
+                    TAGS,
+                )
         }
 
         coVerify(exactly = 1) {
@@ -727,7 +823,6 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
-                any(),
             )
         }
         assertSame(true, response)
@@ -735,19 +830,19 @@ class RepositoryTest {
 
     @Test
     fun create_source_but_response_fails() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
-                SuccessResponse(false)
+        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
+            SuccessResponse(false)
 
         initializeRepository()
         var response: Boolean
         runBlocking {
-            response = repository.createSource(
-                "test",
-                "https://test.com/feed",
-                "spouts\\rss\\fulltextrss",
-                "Test, New",
-                ""
-            )
+            response =
+                repository.createSource(
+                    "test",
+                    FEED_URL,
+                    SPOUT,
+                    TAGS,
+                )
         }
 
         coVerify(exactly = 1) {
@@ -756,7 +851,6 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
-                any(),
             )
         }
         assertSame(false, response)
@@ -764,19 +858,19 @@ class RepositoryTest {
 
     @Test
     fun create_source_without_connection() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
-                SuccessResponse(true)
+        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
+            SuccessResponse(true)
 
         initializeRepository(MutableStateFlow(false))
         var response: Boolean
         runBlocking {
-            response = repository.createSource(
-                "test",
-                "https://test.com/feed",
-                "spouts\\rss\\fulltextrss",
-                "Test, New",
-                ""
-            )
+            response =
+                repository.createSource(
+                    "test",
+                    FEED_URL,
+                    SPOUT,
+                    TAGS,
+                )
         }
 
         coVerify(exactly = 0) {
@@ -785,7 +879,6 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
-                any()
             )
         }
         assertSame(false, response)
@@ -798,10 +891,11 @@ class RepositoryTest {
         initializeRepository()
         var response: Boolean
         runBlocking {
-            response = repository.deleteSource(5)
+            response = repository.deleteSource(5, "src")
         }
 
         coVerify(exactly = 1) { api.deleteSource(5) }
+        coVerify(exactly = 1) { db.itemsQueries.deleteItemsWhereSource("src") }
         assertSame(true, response)
     }
 
@@ -812,10 +906,11 @@ class RepositoryTest {
         initializeRepository()
         var response: Boolean
         runBlocking {
-            response = repository.deleteSource(5)
+            response = repository.deleteSource(5, "src")
         }
 
         coVerify(exactly = 1) { api.deleteSource(5) }
+        coVerify(exactly = 0) { db.itemsQueries.deleteItemsWhereSource("src") }
         assertSame(false, response)
     }
 
@@ -826,19 +921,21 @@ class RepositoryTest {
         initializeRepository(MutableStateFlow(false))
         var response: Boolean
         runBlocking {
-            response = repository.deleteSource(5)
+            response = repository.deleteSource(5, "src")
         }
 
         coVerify(exactly = 0) { api.deleteSource(5) }
+        coVerify(exactly = 1) { db.itemsQueries.deleteItemsWhereSource("src") }
         assertSame(false, response)
     }
 
     @Test
     fun update_remote() {
-        coEvery { api.update() } returns StatusAndData(
-            success = true,
-            data = "finished"
-        )
+        coEvery { api.update() } returns
+            StatusAndData(
+                success = true,
+                data = "finished",
+            )
 
         initializeRepository()
         var response: Boolean
@@ -852,10 +949,11 @@ class RepositoryTest {
 
     @Test
     fun update_remote_but_response_fails() {
-        coEvery { api.update() } returns StatusAndData(
-            success = false,
-            data = "unallowed access"
-        )
+        coEvery { api.update() } returns
+            StatusAndData(
+                success = false,
+                data = "unallowed access",
+            )
 
         initializeRepository()
         var response: Boolean
@@ -869,10 +967,11 @@ class RepositoryTest {
 
     @Test
     fun update_remote_with_unallowed_access() {
-        coEvery { api.update() } returns StatusAndData(
-            success = true,
-            data = "unallowed access"
-        )
+        coEvery { api.update() } returns
+            StatusAndData(
+                success = true,
+                data = "unallowed access",
+            )
 
         initializeRepository()
         var response: Boolean
@@ -886,10 +985,11 @@ class RepositoryTest {
 
     @Test
     fun update_remote_without_connection() {
-        coEvery { api.update() } returns StatusAndData(
-            success = true,
-            data = "undocumented..."
-        )
+        coEvery { api.update() } returns
+            StatusAndData(
+                success = true,
+                data = "undocumented...",
+            )
 
         initializeRepository(MutableStateFlow(false))
         var response: Boolean
@@ -949,14 +1049,14 @@ class RepositoryTest {
         coEvery { appSettingsService.refreshLoginInformation(any(), any(), any()) } returns Unit
 
         initializeRepository()
-        repository.refreshLoginInformation("https://test.com/selfoss/", "login", "password")
+        repository.refreshLoginInformation(BASE_URL, "login", "password")
 
         coVerify(exactly = 1) { api.refreshLoginInformation() }
         coVerify(exactly = 1) {
             appSettingsService.refreshLoginInformation(
-                "https://test.com/selfoss/",
+                BASE_URL,
                 "login",
-                "password"
+                "password",
             )
         }
     }
@@ -976,13 +1076,14 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
-                any()
+                any(),
+            )
+        } returnsMany
+            listOf(
+                StatusAndData(success = true, data = generateTestApiItem(itemParameter1)),
+                StatusAndData(success = true, data = generateTestApiItem(itemParameter2)),
+                StatusAndData(success = true, data = generateTestApiItem(itemParameter1)),
             )
-        } returnsMany listOf(
-            StatusAndData(success = true, data = generateTestApiItem(itemParameter1)),
-            StatusAndData(success = true, data = generateTestApiItem(itemParameter2)),
-            StatusAndData(success = true, data = generateTestApiItem(itemParameter1)),
-        )
 
         initializeRepository()
         prepareSearch()
@@ -996,7 +1097,7 @@ class RepositoryTest {
     @Test
     fun cache_items_but_response_fails() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = false, data = generateTestApiItem())
+            StatusAndData(success = false, data = generateTestApiItem())
 
         initializeRepository()
         prepareSearch()
@@ -1010,7 +1111,7 @@ class RepositoryTest {
     @Test
     fun cache_items_without_connection() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = false, data = generateTestApiItem())
+            StatusAndData(success = false, data = generateTestApiItem())
 
         initializeRepository(MutableStateFlow(false))
         prepareSearch()
@@ -1024,15 +1125,17 @@ class RepositoryTest {
     private fun prepareSearch() {
         repository.setTagFilter(SelfossModel.Tag("Tag", "read", 0))
         repository.setSourceFilter(
-            SelfossModel.Source(
+            SelfossModel.SourceDetail(
                 1,
                 "First source",
+                5,
                 listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
+                SPOUT,
                 "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            )
+                IMAGE_URL_2,
+                SelfossModel.SourceParams("url"),
+            ),
         )
         repository.searchFilter = "search"
     }
-}
+}

androidApp/src/test/kotlin/TestUtils.kt

@@ -3,7 +3,6 @@ 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(
@@ -18,8 +17,8 @@ fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<I
             link = item.link,
             sourcetitle = item.sourcetitle,
             tags = item.tags,
-            author = item.author
-        )
+            author = item.author,
+        ),
     )
 }
 
@@ -37,8 +36,8 @@ fun generateTestApiItem(item: FakeItemParameters = FakeItemParameters()): List<S
             link = item.link,
             sourcetitle = item.sourcetitle,
             tags = item.tags.split(','),
-            author = item.author
-        )
+            author = item.author,
+        ),
     )
 }
 
@@ -57,4 +56,4 @@ class FakeItemParameters {
     var sourcetitle = "La Chimica e la Società"
     var tags = "Chimica, Testing"
     var author = "Someone important"
-}
+}

build.gradle.kts

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

gradle.properties

@@ -13,24 +13,16 @@
 #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 @@
-#Wed Feb 09 17:05:19 CET 2022
+#Thu Jul 13 11:41:19 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1,32 +1,17 @@
-val pushCache: String by settings
-
 pluginManagement {
     repositories {
-        maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
-        // IMPORTANT : Add back when new plugin added
-        // google()
-        // gradlePluginPortal()
-        // mavenCentral()
+        // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
+        google()
+        gradlePluginPortal()
+        mavenCentral()
     }
 }
 
 dependencyResolutionManagement {
     repositories {
-        maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
-        // IMPORTANT : Add back when new library added
-        // google()
-        // mavenCentral()
-    }
-}
-
-
-buildCache {
-    remote<HttpBuildCache> {
-        url = uri("http://18.0.0.7:3071/cache/")
-        isAllowInsecureProtocol = true
-        isAllowUntrustedServer = true
-        isUseExpectContinue = true
-        isPush = (pushCache == "true")
+        // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
+        google()
+        mavenCentral()
     }
 }
 

shared/build.gradle.kts

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

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

@@ -7,4 +7,4 @@ actual class DriverFactory(private val context: Context) {
     actual fun createDriver(): SqlDriver {
         return AndroidSqliteDriver(ReaderForSelfossDB.Schema, context, "ReaderForSelfossV2-android.db")
     }
-}
+}

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

@@ -0,0 +1,23 @@
+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

@@ -3,31 +3,40 @@ package bou.amine.apps.readerforselfossv2.utils
 import android.text.format.DateUtils
 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()
+
+        // We may need to consider moving the formatting to platform specific code, even if the tests are doubled
+        // For now, we handle this in a hacky way, because kotlin only accepts iso formats
         actual fun parseDate(dateString: String): Long {
-            return try {
-                Instant.parse(dateString).toEpochMilliseconds()
-            } catch (e: Exception) {
-                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]
+            var isoDateString: String =
+                if (dateString.matches(oldVersionFormat)) {
+                    dateString.replace(" ", "T")
+                } else if (dateString.matches(newVersionFormat)) {
+                    dateString.split("+")[0]
+                } else {
+                    throw Exception("Unrecognized format for $dateString")
                 }
-                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 " " + DateUtils.getRelativeTimeSpanString(
-                date,
-                Clock.System.now().toEpochMilliseconds(),
-                DateUtils.MINUTE_IN_MILLIS,
-                DateUtils.FORMAT_ABBREV_RELATIVE
-            )
+            return " " +
+                DateUtils.getRelativeTimeSpanString(
+                    date,
+                    Clock.System.now().toEpochMilliseconds(),
+                    DateUtils.MINUTE_IN_MILLIS,
+                    DateUtils.FORMAT_ABBREV_RELATIVE,
+                )
         }
     }
-}
+}

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

@@ -21,13 +21,13 @@ actual fun SelfossModel.Item.getThumbnail(baseUrl: String): String {
 actual fun SelfossModel.Item.getImages(): ArrayList<String> {
     val allImages = ArrayList<String>()
 
-    for ( image in Jsoup.parse(content).getElementsByTag("img")) {
+    for (image in Jsoup.parse(content).getElementsByTag("img")) {
         val url = image.attr("src")
         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,7 +38,11 @@ actual fun SelfossModel.Source.getIcon(baseUrl: String): String {
     return constructUrl(baseUrl, "favicons", icon)
 }
 
-actual fun constructUrl(baseUrl: String, path: String, file: String?): String {
+actual fun constructUrl(
+    baseUrl: String,
+    path: String,
+    file: String?,
+): String {
     return if (file == null || file == "null" || file.isEmpty()) {
         ""
     } else {
@@ -47,4 +51,4 @@ actual fun constructUrl(baseUrl: String, path: String, file: String?): String {
 
         baseUriBuilder.toString()
     }
-}
+}

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

@@ -2,14 +2,12 @@ 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
 import org.kodein.di.singleton
 
 val networkModule by DI.Module {
-    bind<AppSettingsService>() with singleton { AppSettingsService() }
     bind<SelfossApi>() with singleton { SelfossApi(instance()) }
     bind<MercuryApi>() with singleton { MercuryApi() }
-}
+}

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/dao/DeviceDatabase.kt

@@ -4,4 +4,4 @@ import com.squareup.sqldelight.db.SqlDriver
 
 expect class DriverFactory {
     fun createDriver(): SqlDriver
-}
+}

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

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

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

@@ -1,3 +1,3 @@
 package bou.amine.apps.readerforselfossv2.model
 
-class NetworkUnavailableException : Exception()
+class NetworkUnavailableException : Exception()

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

@@ -18,4 +18,4 @@ class StatusAndData<T>(val success: Boolean, val data: T? = null) {
             return StatusAndData(false)
         }
     }
-}
+}

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

@@ -9,54 +9,94 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+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,
-        val starred: Int
+        val unread: Int? = null,
+        val starred: Int? = null,
     )
 
     @Serializable
     data class Spout(
         val name: String,
-        val description: String
+        val description: String,
     )
 
     @Serializable
-    data class ApiVersion(
-        val version: String?,
-        val apiversion: String?
+    data class ApiInformation(
+        val version: String? = null,
+        val apiversion: String? = null,
+        val configuration: ApiConfiguration? = null,
     ) {
-        fun getApiMajorVersion() : Int {
+        fun getApiMajorVersion(): Int {
             var versionNumber = 0
             if (apiversion != null) {
                 versionNumber = apiversion.substringBefore(".").toInt()
             }
             return versionNumber
         }
+
+        fun getApiConfiguration() = configuration ?: ApiConfiguration(null, null)
     }
 
     @Serializable
-    data class Source(
-        val id: Int,
-        val title: String,
+    data class ApiConfiguration(
+        @Serializable(with = BooleanSerializer::class)
+        val publicMode: Boolean? = null,
+        @Serializable(with = BooleanSerializer::class)
+        val authEnabled: Boolean? = null,
+    ) {
+        fun isAuthEnabled() = authEnabled ?: true
+
+        fun isPublicModeEnabled() = publicMode ?: false
+    }
+
+    interface Source {
+        val id: Int
+        var title: String
+        var unread: Int?
+        var error: String?
+        var icon: String?
+    }
+
+    @Serializable
+    data class SourceStats(
+        override val id: Int,
+        override var title: String,
+        override var unread: Int? = null,
+        override var error: String? = null,
+        override var icon: String? = null,
+    ) : Source
+
+    @Serializable
+    data class SourceDetail(
+        override val id: Int,
+        override var title: String,
+        override var unread: Int? = null,
         @Serializable(with = TagsListSerializer::class)
-        val tags: List<String>,
-        val spout: String,
-        val error: String,
-        val icon: String?
+        var tags: List<String>? = null,
+        var spout: String? = null,
+        override var error: String? = null,
+        override var icon: String? = null,
+        var params: SourceParams? = null,
+    ) : Source
+
+    @Serializable
+    data class SourceParams(
+        val url: String? = null,
     )
+
     @Serializable
     data class Item(
         val id: Int,
@@ -67,24 +107,19 @@ class SelfossModel {
         var unread: Boolean,
         @Serializable(with = BooleanSerializer::class)
         var starred: Boolean,
-        val thumbnail: String?,
-        val icon: String?,
+        val thumbnail: String? = null,
+        val icon: String? = null,
         val link: String,
         val sourcetitle: String,
         @Serializable(with = TagsListSerializer::class)
         val tags: List<String>,
-        val author: String
+        val author: String? = null,
     ) {
-        // TODO: maybe find a better way to handle these kind of urls
         fun getLinkDecoded(): String {
             var stringUrl: String
             stringUrl =
-                if (link.startsWith("http://news.google.com/news/") || link.startsWith("https://news.google.com/news/")) {
-                    if (link.contains("&amp;url=")) {
-                        link.substringAfter("&amp;url=")
-                    } else {
-                        this.link.replace("&amp;", "&")
-                    }
+                if (link.contains("//news.google.com/news/") && link.contains("&amp;url=")) {
+                    link.substringAfter("&amp;url=")
                 } else {
                     this.link.replace("&amp;", "&")
                 }
@@ -104,7 +139,7 @@ class SelfossModel {
 
         fun sourceAuthorAndDate(): String {
             var txt = this.sourcetitle.getHtmlDecoded()
-            if (this.author.isNotEmpty()) {
+            if (!this.author.isNullOrBlank()) {
                 txt += " (by ${this.author}) "
             }
             txt += DateUtils.parseRelativeDate(this.datetime)
@@ -117,22 +152,23 @@ class SelfossModel {
         }
     }
 
-
     // TODO: this seems to be super slow.
     object TagsListSerializer : KSerializer<List<String>> {
         override fun deserialize(decoder: Decoder): List<String> {
-            return when(val json = ((decoder as JsonDecoder).decodeJsonElement())) {
-                is JsonArray -> json.toList().map { it.toString() }
+            return when (val json = ((decoder as JsonDecoder).decodeJsonElement())) {
+                is JsonArray -> json.toList().map { it.toString().replace("^\"|\"$".toRegex(), "") }
                 else -> json.toString().split(",")
             }
-
         }
 
         override val descriptor: SerialDescriptor
             get() = PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING)
 
-        override fun serialize(encoder: Encoder, value: List<String>) {
-            TODO("Not yet implemented")
+        override fun serialize(
+            encoder: Encoder,
+            value: List<String>,
+        ) {
+            encoder.encodeCollection(PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING), value.size) { this.toString() }
         }
     }
 
@@ -149,7 +185,10 @@ class SelfossModel {
         override val descriptor: SerialDescriptor
             get() = PrimitiveSerialDescriptor("b", PrimitiveKind.BOOLEAN)
 
-        override fun serialize(encoder: Encoder, value: Boolean) {
+        override fun serialize(
+            encoder: Encoder,
+            value: Boolean,
+        ) {
             TODO("Not yet implemented")
         }
     }

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

@@ -19,9 +19,8 @@ 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
 
@@ -44,49 +43,47 @@ class Repository(
     private val _badgeStarred = MutableStateFlow(0)
     val badgeStarred = _badgeStarred.asStateFlow()
 
-    private var fetchedSources = false
     private var fetchedTags = false
+    private var fetchedSources = false
 
     private var _readerItems = ArrayList<SelfossModel.Item>()
+    private var _selectedSource: SelfossModel.SourceDetail? = null
 
     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
-        // TODO: Use the updatedSince parameter
         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error()
-        var fromDB = false
         if (isNetworkAvailable()) {
-            fetchedItems = api.getItems(
-                displayedItems.type,
-                offset = 0,
-                tagFilter.value?.tag,
-                sourceFilter.value?.id?.toLong(),
-                searchFilter,
-                null
-            )
-        } else {
-            if (appSettingsService.isItemCachingEnabled()) {
-                fromDB = true
-                var dbItems = getDBItems().filter {
-                    displayedItems == ItemType.ALL ||
-                            (it.unread && displayedItems == ItemType.UNREAD) ||
-                            (it.starred && displayedItems == ItemType.STARRED)
-                }
-                if (tagFilter.value != null) {
-                    dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter.value!!.tag) }
-                }
-                if (sourceFilter.value != null) {
-                    dbItems = dbItems.filter { it.sourcetitle == sourceFilter.value!!.title }
-                }
-                fetchedItems = StatusAndData.succes(
-                    dbItems.map { it.toView() }
+            fetchedItems =
+                api.getItems(
+                    displayedItems.type,
+                    offset = 0,
+                    tagFilter.value?.tag,
+                    sourceFilter.value?.id?.toLong(),
+                    searchFilter,
+                    null,
                 )
+        } else if (appSettingsService.isItemCachingEnabled()) {
+            var dbItems =
+                getDBItems().filter {
+                    displayedItems == ItemType.ALL ||
+                        (it.unread && displayedItems == ItemType.UNREAD) ||
+                        (it.starred && displayedItems == ItemType.STARRED)
+                }
+            if (tagFilter.value != null) {
+                dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter.value!!.tag) }
             }
+            if (sourceFilter.value != null) {
+                dbItems = dbItems.filter { it.sourcetitle == sourceFilter.value!!.title }
+            }
+            val itemsList = ArrayList(dbItems.map { it.toView() })
+            itemsList.sortByDescending { DateUtils.parseDate(it.datetime) }
+            fetchedItems =
+                StatusAndData.succes(
+                    itemsList,
+                )
         }
 
         if (fetchedItems.success && fetchedItems.data != null) {
             items = ArrayList(fetchedItems.data!!)
-            if (fromDB) {
-                items.sortByDescending { DateUtils.parseDate(it.datetime) }
-            }
         }
         return items
     }
@@ -95,14 +92,15 @@ class Repository(
         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error()
         if (isNetworkAvailable()) {
             val offset = items.size
-            fetchedItems = api.getItems(
-                displayedItems.type,
-                offset,
-                tagFilter.value?.tag,
-                sourceFilter.value?.id?.toLong(),
-                searchFilter,
-                null
-            )
+            fetchedItems =
+                api.getItems(
+                    displayedItems.type,
+                    offset,
+                    tagFilter.value?.tag,
+                    sourceFilter.value?.id?.toLong(),
+                    searchFilter,
+                    null,
+                )
         } // When using the db cache, we load everything the first time, so there should be nothing more to load.
 
         if (fetchedItems.success && fetchedItems.data != null) {
@@ -113,15 +111,16 @@ class Repository(
 
     private suspend fun getMaxItemsForBackground(itemType: ItemType): List<SelfossModel.Item> {
         return if (isNetworkAvailable()) {
-            val items = api.getItems(
-                itemType.type,
-                0,
-                null,
-                null,
-                null,
-                null,
-                200
-            )
+            val items =
+                api.getItems(
+                    itemType.type,
+                    0,
+                    null,
+                    null,
+                    null,
+                    null,
+                    200,
+                )
             return if (items.success && items.data != null) {
                 items.data
             } else {
@@ -137,9 +136,9 @@ class Repository(
         if (isNetworkAvailable()) {
             val response = api.stats()
             if (response.success && response.data != null) {
-                _badgeUnread.value = response.data.unread
+                _badgeUnread.value = response.data.unread ?: 0
                 _badgeAll.value = response.data.total
-                _badgeStarred.value = response.data.starred
+                _badgeStarred.value = response.data.starred ?: 0
                 success = true
             }
         } else if (appSettingsService.isItemCachingEnabled()) {
@@ -172,40 +171,61 @@ class Repository(
         }
     }
 
-    // TODO: Add tests
     suspend fun getSpouts(): Map<String, SelfossModel.Spout> {
         return if (isNetworkAvailable()) {
             val spouts = api.spouts()
             if (spouts.success && spouts.data != null) {
                 spouts.data
             } else {
-                emptyMap() // TODO: do something here
+                emptyMap()
             }
         } else {
             throw NetworkUnavailableException()
         }
     }
 
-    suspend fun getSources(): ArrayList<SelfossModel.Source> {
+    suspend fun getSourcesDetailsOrStats(): ArrayList<SelfossModel.Source> {
+        var sources = ArrayList<SelfossModel.Source>()
         val isDatabaseEnabled =
             appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
-        return if (isNetworkAvailable() && !fetchedSources) {
-            val apiSources = api.sources()
-            if (apiSources.success && apiSources.data != null && isDatabaseEnabled) {
-                resetDBSourcesWithData(apiSources.data)
-                if (!appSettingsService.isUpdateSourcesEnabled()) {
+        val shouldFetch = if (!appSettingsService.isUpdateSourcesEnabled()) !fetchedSources else true
+        if (shouldFetch && isNetworkAvailable()) {
+            if (appSettingsService.getPublicAccess()) {
+                val apiSources = api.sourcesStats()
+                if (apiSources.success && apiSources.data != null) {
                     fetchedSources = true
+                    sources = apiSources.data as ArrayList<SelfossModel.Source>
                 }
+            } else {
+                sources = getSourcesDetails() as ArrayList<SelfossModel.Source>
             }
-            apiSources.data ?: ArrayList()
         } else if (isDatabaseEnabled) {
-            ArrayList(getDBSources().map { it.toView() })
-        } else {
-            ArrayList()
+            sources = getDBSources().map { it.toView() } as ArrayList<SelfossModel.Source>
         }
+
+        return sources
+    }
+
+    suspend fun getSourcesDetails(): ArrayList<SelfossModel.SourceDetail> {
+        var sources = ArrayList<SelfossModel.SourceDetail>()
+        val isDatabaseEnabled =
+            appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
+        val shouldFetch = if (!appSettingsService.isUpdateSourcesEnabled()) !fetchedSources else true
+        if (shouldFetch && isNetworkAvailable()) {
+            val apiSources = api.sourcesDetailed()
+            if (apiSources.success && apiSources.data != null) {
+                fetchedSources = true
+                sources = apiSources.data
+                if (isDatabaseEnabled) {
+                    resetDBSourcesWithData(sources)
+                }
+            }
+        } else if (isDatabaseEnabled) {
+            sources = getDBSources().map { it.toView() } as ArrayList<SelfossModel.SourceDetail>
+        }
+        return sources
     }
 
-    // TODO: Add tests
     suspend fun markAsRead(item: SelfossModel.Item): Boolean {
         val success = markAsReadById(item.id)
 
@@ -224,7 +244,6 @@ class Repository(
         }
     }
 
-    // TODO: Add tests
     suspend fun unmarkAsRead(item: SelfossModel.Item): Boolean {
         val success = unmarkAsReadById(item.id)
 
@@ -243,7 +262,6 @@ class Repository(
         }
     }
 
-    // TODO: Add tests
     suspend fun starr(item: SelfossModel.Item): Boolean {
         val success = starrById(item.id)
 
@@ -262,7 +280,6 @@ class Repository(
         }
     }
 
-    // TODO: Add tests
     suspend fun unstarr(item: SelfossModel.Item): Boolean {
         val success = unstarrById(item.id)
 
@@ -281,7 +298,6 @@ class Repository(
         }
     }
 
-    // TODO: Add tests
     suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
         var success = false
 
@@ -343,7 +359,6 @@ class Repository(
         url: String,
         spout: String,
         tags: String,
-        filter: String
     ): Boolean {
         var response = false
         if (isNetworkAvailable()) {
@@ -352,20 +367,44 @@ class Repository(
                 url,
                 spout,
                 tags,
-                filter
             ).isSuccess == true
         }
 
         return response
     }
 
-    suspend fun deleteSource(id: Int): Boolean {
+    suspend fun updateSource(
+        id: Int,
+        title: String,
+        url: String,
+        spout: String,
+        tags: String,
+    ): Boolean {
+        var response = false
+        if (isNetworkAvailable()) {
+            response = api.updateSourceForVersion(id, title, url, spout, tags).isSuccess == true
+        }
+
+        return response
+    }
+
+    suspend fun deleteSource(
+        id: Int,
+        title: String,
+    ): Boolean {
         var success = false
         if (isNetworkAvailable()) {
             val response = api.deleteSource(id)
             success = response.isSuccess
         }
 
+        // We filter on success or if the network isn't available
+        if (success || !isNetworkAvailable()) {
+            items = ArrayList(items.filter { it.sourcetitle != title })
+            setReaderItems(items)
+            db.itemsQueries.deleteItemsWhereSource(title)
+        }
+
         return success
     }
 
@@ -424,30 +463,43 @@ class Repository(
         }
     }
 
-    fun refreshLoginInformation(url: String, login: String, password: String) {
+    fun refreshLoginInformation(
+        url: String,
+        login: String,
+        password: String,
+    ) {
         appSettingsService.refreshLoginInformation(url, login, password)
         baseUrl = url
         api.refreshLoginInformation()
     }
 
-    suspend fun updateApiVersion() {
+    suspend fun updateApiInformation() {
         val apiMajorVersion = appSettingsService.getApiVersion()
 
         if (isNetworkAvailable()) {
-            val fetchedVersion = api.version()
-            if (fetchedVersion.success && fetchedVersion.data != null && fetchedVersion.data.getApiMajorVersion() != apiMajorVersion) {
-                appSettingsService.updateApiVersion(fetchedVersion.data.getApiMajorVersion())
+            val fetchedInformation = api.apiInformation()
+            if (fetchedInformation.success && fetchedInformation.data != null) {
+                if (fetchedInformation.data.getApiMajorVersion() != apiMajorVersion) {
+                    appSettingsService.updateApiVersion(fetchedInformation.data.getApiMajorVersion())
+                }
+                // 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() &&
+                    fetchedInformation.data.getApiConfiguration().isAuthEnabled() &&
+                    fetchedInformation.data.getApiConfiguration().isPublicModeEnabled()
+                ) {
+                    appSettingsService.updatePublicAccess(true)
+                }
             }
         }
     }
 
     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()
 
@@ -463,7 +515,7 @@ class Repository(
         }
     }
 
-    private fun resetDBSourcesWithData(sources: List<SelfossModel.Source>) {
+    private fun resetDBSourcesWithData(sources: List<SelfossModel.SourceDetail>) {
         db.sourcesQueries.deleteAllSources()
 
         db.sourcesQueries.transaction {
@@ -488,9 +540,8 @@ class Repository(
         read: Boolean = false,
         unread: Boolean = false,
         starred: Boolean = false,
-        unstarred: Boolean = false
-    ) =
-        db.actionsQueries.insertAction(articleid, read, unread, starred, unstarred)
+        unstarred: Boolean = false,
+    ) = db.actionsQueries.insertAction(articleid, read, unread, starred, unstarred)
 
     private fun updateDBItem(item: SelfossModel.Item) =
         db.itemsQueries.updateItem(
@@ -504,7 +555,8 @@ class Repository(
             item.link,
             item.sourcetitle,
             item.tags.joinToString(","),
-            item.id.toString()
+            item.author,
+            item.id.toString(),
         )
 
     suspend fun tryToCacheItemsAndGetNewOnes(): List<SelfossModel.Item> {
@@ -520,34 +572,39 @@ class Repository(
         return emptyList()
     }
 
-    // TODO: Add tests
     suspend fun handleDBActions() {
-
         val actions: List<ACTION> = getDBActions()
 
         actions.forEach { action ->
             when {
-                action.read -> doAndReportOnFail(
-                    markAsReadById(action.articleid.toInt()),
-                    action
-                )
-                action.unread -> doAndReportOnFail(
-                    unmarkAsReadById(action.articleid.toInt()),
-                    action
-                )
-                action.starred -> doAndReportOnFail(
-                    starrById(action.articleid.toInt()),
-                    action
-                )
-                action.unstarred -> doAndReportOnFail(
-                    unstarrById(action.articleid.toInt()),
-                    action
-                )
+                action.read ->
+                    doAndReportOnFail(
+                        markAsReadById(action.articleid.toInt()),
+                        action,
+                    )
+                action.unread ->
+                    doAndReportOnFail(
+                        unmarkAsReadById(action.articleid.toInt()),
+                        action,
+                    )
+                action.starred ->
+                    doAndReportOnFail(
+                        starrById(action.articleid.toInt()),
+                        action,
+                    )
+                action.unstarred ->
+                    doAndReportOnFail(
+                        unstarrById(action.articleid.toInt()),
+                        action,
+                    )
             }
         }
     }
 
-    private fun doAndReportOnFail(result: Boolean, action: ACTION) {
+    private fun doAndReportOnFail(
+        result: Boolean,
+        action: ACTION,
+    ) {
         if (result) {
             deleteDBAction(action)
         }
@@ -568,4 +625,20 @@ class Repository(
     fun getReaderItems(): ArrayList<SelfossModel.Item> {
         return _readerItems
     }
-}
+
+    fun migrate(driverFactory: DriverFactory) {
+        ReaderForSelfossDB.Schema.migrate(driverFactory.createDriver(), 0, 1)
+    }
+
+    fun setSelectedSource(source: SelfossModel.SourceDetail) {
+        _selectedSource = source
+    }
+
+    fun unsetSelectedSource() {
+        _selectedSource = null
+    }
+
+    fun getSelectedSource(): SelfossModel.SourceDetail? {
+        return _selectedSource
+    }
+}

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

@@ -11,25 +11,27 @@ 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 {
-                    prettyPrint = true
-                    isLenient = true
-                    ignoreUnknownKeys = true
-                })
+                json(
+                    Json {
+                        prettyPrint = true
+                        isLenient = true
+                        ignoreUnknownKeys = true
+                    },
+                )
             }
             install(Logging) {
-                logger = object : Logger {
-                    override fun log(message: String) {
-                        Napier.d(message, tag = "LogMercuryCalls")
+                logger =
+                    object : Logger {
+                        override fun log(message: String) {
+                            Napier.d(message, tag = "LogMercuryCalls")
+                        }
                     }
-                }
                 level = LogLevel.INFO
             }
             expectSuccess = false
@@ -37,7 +39,9 @@ class MercuryApi() {
     }
 
     suspend fun query(url: String): StatusAndData<MercuryModel.ParsedContent> =
-        bodyOrFailure(client.get("https://amine-louveau.fr/parser.php") {
-            parameter("link", url)
-        })
-}
+        bodyOrFailure(
+            client.get("https://amine-louveau.fr/parser.php") {
+                parameter("link", url)
+            },
+        )
+}

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

@@ -10,7 +10,6 @@ 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)
@@ -23,6 +22,9 @@ suspend fun maybeResponse(r: HttpResponse?): SuccessResponse {
     return if (r != null && r.status.isSuccess()) {
         r.body()
     } else {
+        if (r != null) {
+            Napier.i("Error ${r.status}", tag = "maybeResponse")
+        }
         SuccessResponse(false)
     }
 }
@@ -37,7 +39,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 {
@@ -50,30 +52,46 @@ inline fun tryToRequest(
 
 suspend inline fun HttpClient.tryToGet(
     urlString: String,
-    crossinline block: HttpRequestBuilder.() -> Unit = {}
-): HttpResponse? = tryToRequest("Get") { return this.get { url(urlString); block() } }
-
+    crossinline block: HttpRequestBuilder.() -> Unit = {},
+): HttpResponse? =
+    tryToRequest("Get") {
+        return this.get {
+            url(urlString)
+            block()
+        }
+    }
 
 suspend inline fun HttpClient.tryToPost(
     urlString: String,
-    block: HttpRequestBuilder.() -> Unit = {}
-): HttpResponse? = tryToRequest("Post") { return this.post { url(urlString); block() } }
+    block: HttpRequestBuilder.() -> Unit = {},
+): HttpResponse? =
+    tryToRequest("Post") {
+        return this.post {
+            url(urlString)
+            block()
+        }
+    }
 
 suspend inline fun HttpClient.tryToDelete(
     urlString: String,
-    block: HttpRequestBuilder.() -> Unit = {}
-): HttpResponse? = tryToRequest("Delete") { return this.delete { url(urlString); block() } }
-
+    block: HttpRequestBuilder.() -> Unit = {},
+): HttpResponse? =
+    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) {
             url(url)
             block()
         }
-    }
+    }

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

@@ -5,41 +5,64 @@ 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.*
-import io.ktor.client.plugins.*
-import io.ktor.client.plugins.cache.*
-import io.ktor.client.plugins.contentnegotiation.*
-import io.ktor.client.plugins.cookies.*
-import io.ktor.client.plugins.logging.*
-import io.ktor.client.request.*
-import io.ktor.client.statement.*
-import io.ktor.http.*
-import io.ktor.serialization.kotlinx.json.*
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.cio.CIO
+import io.ktor.client.engine.cio.CIOEngineConfig
+import io.ktor.client.plugins.HttpRequestRetry
+import io.ktor.client.plugins.HttpTimeout
+import io.ktor.client.plugins.auth.providers.BasicAuthCredentials
+import io.ktor.client.plugins.cache.HttpCache
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.cookies.HttpCookies
+import io.ktor.client.plugins.logging.LogLevel
+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
 
-class SelfossApi(private val appSettingsService: AppSettingsService) {
+expect fun setupInsecureHTTPEngine(config: CIOEngineConfig)
 
+class SelfossApi(private val appSettingsService: AppSettingsService) {
     var client = createHttpClient()
 
-    private fun createHttpClient(): HttpClient {
-        val client = HttpClient {
+    fun createHttpClient() =
+        HttpClient(CIO) {
+            if (appSettingsService.getSelfSigned()) {
+                engine {
+                    setupInsecureHTTPEngine(this)
+                }
+            }
             install(ContentNegotiation) {
                 install(HttpCache)
-                json(Json {
-                    prettyPrint = true
-                    isLenient = true
-                    ignoreUnknownKeys = true
-                })
+                json(
+                    Json {
+                        prettyPrint = true
+                        isLenient = true
+                        ignoreUnknownKeys = true
+                        explicitNulls = false
+                    },
+                )
             }
             install(Logging) {
-                logger = object : Logger {
-                    override fun log(message: String) {
-                        Napier.d(message, tag = "LogApiCalls")
+                logger =
+                    object : Logger {
+                        override fun log(message: String) {
+                            Napier.d(message, tag = "LogApiCalls")
+                        }
                     }
-                }
                 level = LogLevel.INFO
             }
             install(HttpTimeout) {
@@ -55,7 +78,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     Napier.i("Will modify", tag = "HttpSend")
                     CoroutineScope(Dispatchers.Main).launch {
                         Napier.i("Will login", tag = "HttpSend")
-                        this@SelfossApi.login()
+                        login()
                         Napier.i("Did login", tag = "HttpSend")
                     }
                 }
@@ -63,23 +86,33 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             expectSuccess = false
         }
 
-        return client
-    }
-
-    fun url(path: String) =
-        "${appSettingsService.getBaseUrl()}$path"
+    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.getPassword().isNotEmpty()
+
+    private fun hasLoginInfo() =
+        appSettingsService.getUserName().isNotEmpty() &&
+            appSettingsService.getPassword()
+                .isNotEmpty()
 
     suspend fun login(): SuccessResponse =
-        if (appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword().isNotEmpty()) {
+        if (appSettingsService.getUserName().isNotEmpty() &&
+            appSettingsService.getPassword()
+                .isNotEmpty()
+        ) {
             if (shouldHavePostLogin()) {
                 postLogin()
             } else {
@@ -89,17 +122,50 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             SuccessResponse(true)
         }
 
-    private suspend fun getLogin() = maybeResponse(client.tryToGet(url("/login")) {
-        parameter("username", appSettingsService.getUserName())
-        parameter("password", appSettingsService.getPassword())
-    })
+    private suspend fun getLogin() =
+        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() = maybeResponse(client.tryToPost(url("/login")) {
-        parameter("username", appSettingsService.getUserName())
-        parameter("password", appSettingsService.getPassword())
-    })
+    private suspend fun postLogin() =
+        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
+
     suspend fun logout(): SuccessResponse =
         if (shouldHaveNewLogout()) {
             doLogout()
@@ -107,9 +173,43 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             maybeLogoutIfAvailable()
         }
 
-    private suspend fun maybeLogoutIfAvailable() = responseOrSuccessIf404(client.tryToGet(url("/logout")))
+    private suspend fun maybeLogoutIfAvailable() =
+        responseOrSuccessIf404(
+            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() = maybeResponse(client.tryToDelete(url("/api/session/current")))
+    private suspend fun doLogout() =
+        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,
@@ -118,132 +218,353 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         source: Long?,
         search: String?,
         updatedSince: String?,
-        items: Int? = null
+        items: Int? = null,
     ): StatusAndData<List<SelfossModel.Item>> =
-        bodyOrFailure(client.tryToGet(url("/items")) {
-            if (!shouldHavePostLogin()) {
-                parameter("username", appSettingsService.getUserName())
-                parameter("password", appSettingsService.getPassword())
-            }
-            parameter("type", type)
-            parameter("tag", tag)
-            parameter("source", source)
-            parameter("search", search)
-            parameter("updatedsince", updatedSince)
-            parameter("items", items ?: appSettingsService.getItemsNumber())
-            parameter("offset", offset)
-        })
+        bodyOrFailure(
+            client.tryToGet(url("/items")) {
+                if (!shouldHavePostLogin()) {
+                    parameter("username", appSettingsService.getUserName())
+                    parameter("password", appSettingsService.getPassword())
+                }
+                parameter("type", type)
+                parameter("tag", tag)
+                parameter("source", source)
+                parameter("search", search)
+                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(client.get(url("/items")) {
-            if (!shouldHavePostLogin()) {
-                parameter("username", appSettingsService.getUserName())
-                parameter("password", appSettingsService.getPassword())
-            }
-            parameter("type", "all")
-            parameter("items", 1)
-        })
+        bodyOrFailure(
+            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(client.tryToGet(url("/stats")) {
-            if (!shouldHavePostLogin()) {
-                parameter("username", appSettingsService.getUserName())
-                parameter("password", appSettingsService.getPassword())
-            }
-        })
+        bodyOrFailure(
+            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(client.tryToGet(url("/tags")) {
-            if (!shouldHavePostLogin()) {
-                parameter("username", appSettingsService.getUserName())
-                parameter("password", appSettingsService.getPassword())
-            }
-        })
+        bodyOrFailure(
+            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(client.tryToGet(url("/update")) {
-            if (!shouldHavePostLogin()) {
-                parameter("username", appSettingsService.getUserName())
-                parameter("password", appSettingsService.getPassword())
-            }
-        })
+        bodyOrFailure(
+            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(client.tryToGet(url("/sources/spouts")) {
-            if (!shouldHavePostLogin()) {
-                parameter("username", appSettingsService.getUserName())
-                parameter("password", appSettingsService.getPassword())
-            }
-        })
+        bodyOrFailure(
+            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 sources(): StatusAndData<ArrayList<SelfossModel.Source>> =
-        bodyOrFailure(client.tryToGet(url("/sources/list")) {
-            if (!shouldHavePostLogin()) {
-                parameter("username", appSettingsService.getUserName())
-                parameter("password", appSettingsService.getPassword())
-            }
-        })
+    suspend fun sourcesStats(): StatusAndData<ArrayList<SelfossModel.SourceStats>> =
+        bodyOrFailure(
+            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 version(): StatusAndData<SelfossModel.ApiVersion> =
-        bodyOrFailure(client.tryToGet(url("/api/about")))
+    suspend fun sourcesDetailed(): StatusAndData<ArrayList<SelfossModel.SourceDetail>> =
+        bodyOrFailure(
+            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(
+            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(client.tryToPost(url("/mark/$id")) {
-            if (!shouldHavePostLogin()) {
-                parameter("username", appSettingsService.getUserName())
-                parameter("password", appSettingsService.getPassword())
-            }
-        })
+        maybeResponse(
+            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(client.tryToPost(url("/unmark/$id")) {
-            if (!shouldHavePostLogin()) {
-                parameter("username", appSettingsService.getUserName())
-                parameter("password", appSettingsService.getPassword())
-            }
-        })
+        maybeResponse(
+            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(client.tryToPost(url("/starr/$id")) {
-            if (!shouldHavePostLogin()) {
-                parameter("username", appSettingsService.getUserName())
-                parameter("password", appSettingsService.getPassword())
-            }
-        })
+        maybeResponse(
+            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(client.tryToPost(url("/unstarr/$id")) {
-            if (!shouldHavePostLogin()) {
-                parameter("username", appSettingsService.getUserName())
-                parameter("password", appSettingsService.getPassword())
-            }
-        })
+        maybeResponse(
+            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(client.tryToSubmitForm(
-            url = url("/mark"),
-            formParameters = Parameters.build {
-                if (!shouldHavePostLogin()) {
-                    append("username", appSettingsService.getUserName())
-                    append("password", appSettingsService.getPassword())
-                }
-                ids.map { append("ids[]", it) }
-            }
-        ))
+        maybeResponse(
+            client.tryToSubmitForm(
+                url = url("/mark"),
+                formParameters =
+                    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,
         url: String,
         spout: String,
         tags: String,
-        filter: String
     ): SuccessResponse =
         maybeResponse(
             if (appSettingsService.getApiVersion() > 1) {
-                createSource("tags[]", title, url, spout, tags, filter)
+                createSource("tags[]", title, url, spout, tags)
             } else {
-                createSource("tags", title, url, spout, tags, filter)
-            }
+                createSource("tags", title, url, spout, tags)
+            },
         )
 
     private suspend fun createSource(
@@ -252,28 +573,110 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         url: String,
         spout: String,
         tags: String,
-        filter: String
     ): HttpResponse? =
         client.tryToSubmitForm(
             url = url("/source"),
-            formParameters = Parameters.build {
-                if (!shouldHavePostLogin()) {
-                    append("username", appSettingsService.getUserName())
-                    append("password", appSettingsService.getPassword())
+            formParameters =
+                Parameters.build {
+                    if (!shouldHavePostLogin()) {
+                        append("username", appSettingsService.getUserName())
+                        append("password", appSettingsService.getPassword())
+                    }
+                    append("title", title)
+                    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(),
+                                ),
+                            ),
+                        )
+                    }
                 }
-                append("title", title)
-                append("url", url)
-                append("spout", spout)
-                append(tagsParamName, tags)
-                append("filter", filter)
-            }
+            },
+        )
+
+    suspend fun updateSourceForVersion(
+        id: Int,
+        title: String,
+        url: String,
+        spout: 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(
+        id: Int,
+        tagsParamName: String,
+        title: String,
+        url: String,
+        spout: String,
+        tags: String,
+    ): HttpResponse? =
+        client.tryToSubmitForm(
+            url = url("/source/$id"),
+            formParameters =
+                Parameters.build {
+                    if (!shouldHavePostLogin()) {
+                        append("username", appSettingsService.getUserName())
+                        append("password", appSettingsService.getPassword())
+                    }
+                    append("title", title)
+                    append("url", url)
+                    append("spout", spout)
+                    append(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(client.tryToDelete(url("/source/$id")) {
-            if (!shouldHavePostLogin()) {
-                parameter("username", appSettingsService.getUserName())
-                parameter("password", appSettingsService.getPassword())
-            }
-        })
-}
+        maybeResponse(
+            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

@@ -0,0 +1,105 @@
+package bou.amine.apps.readerforselfossv2.service
+
+import com.russhwolf.settings.Settings
+
+// This will be used in ACRA process. For now, it does nothing.
+// This is to fix ACRA not sending reports anymore.
+// See https://www.acra.ch/docs/Troubleshooting-Guide#applicationoncreate
+class ACRASettings : Settings {
+    override val keys: Set<String> = emptySet()
+    override val size: Int = 0
+
+    override fun clear() {
+        // Nothing
+    }
+
+    override fun getBoolean(
+        key: String,
+        defaultValue: Boolean,
+    ): Boolean = false
+
+    override fun getBooleanOrNull(key: String): Boolean? = null
+
+    override fun getDouble(
+        key: String,
+        defaultValue: Double,
+    ): Double = 0.0
+
+    override fun getDoubleOrNull(key: String): Double? = null
+
+    override fun getFloat(
+        key: String,
+        defaultValue: Float,
+    ): Float = 0.0F
+
+    override fun getFloatOrNull(key: String): Float? = null
+
+    override fun getInt(
+        key: String,
+        defaultValue: Int,
+    ): Int = 0
+
+    override fun getIntOrNull(key: String): Int? = null
+
+    override fun getLong(
+        key: String,
+        defaultValue: Long,
+    ): Long = 0
+
+    override fun getLongOrNull(key: String): Long? = null
+
+    override fun getString(
+        key: String,
+        defaultValue: String,
+    ): String = "0"
+
+    override fun getStringOrNull(key: String): String? = null
+
+    override fun hasKey(key: String): Boolean = false
+
+    override fun putBoolean(
+        key: String,
+        value: Boolean,
+    ) {
+        // Nothing
+    }
+
+    override fun putDouble(
+        key: String,
+        value: Double,
+    ) {
+        // Nothing
+    }
+
+    override fun putFloat(
+        key: String,
+        value: Float,
+    ) {
+        // Nothing
+    }
+
+    override fun putInt(
+        key: String,
+        value: Int,
+    ) {
+        // Nothing
+    }
+
+    override fun putLong(
+        key: String,
+        value: Long,
+    ) {
+        // Nothing
+    }
+
+    override fun putString(
+        key: String,
+        value: String,
+    ) {
+        // Nothing
+    }
+
+    override fun remove(key: String) {
+        // Nothing
+    }
+}

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

@@ -1,17 +1,24 @@
 package bou.amine.apps.readerforselfossv2.service
 
 import com.russhwolf.settings.Settings
-import io.github.aakira.napier.Napier
-import io.ktor.client.plugins.*
 
-class AppSettingsService {
-    val settings: Settings = Settings()
+class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
+    val settings: 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
@@ -36,7 +43,6 @@ class AppSettingsService {
     private var _font: String = ""
     private var _theme: Int? = null
 
-
     init {
         refreshApiSettings()
         refreshUserSettings()
@@ -50,10 +56,47 @@ class AppSettingsService {
         return _apiVersion
     }
 
+    fun updateApiVersion(apiMajorVersion: Int) {
+        settings.putInt(API_VERSION_MAJOR, apiMajorVersion)
+        refreshApiVersion()
+    }
+
     private fun refreshApiVersion() {
         _apiVersion = settings.getInt(API_VERSION_MAJOR, -1)
     }
 
+    fun getPublicAccess(): Boolean {
+        if (_publicAccess == null) {
+            refreshPublicAccess()
+        }
+        return _publicAccess!!
+    }
+
+    fun updatePublicAccess(publicAccess: Boolean) {
+        settings.putBoolean(API_PUBLIC_ACCESS, publicAccess)
+        refreshPublicAccess()
+    }
+
+    private fun refreshPublicAccess() {
+        _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()
@@ -75,6 +118,20 @@ class AppSettingsService {
         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()
@@ -83,13 +140,13 @@ class AppSettingsService {
     }
 
     private fun refreshItemsNumber() {
-        _itemsNumber = try {
-            settings.getString(API_ITEMS_NUMBER, "20").toInt()
-        } catch (e: Exception) {
-            settings.remove(API_ITEMS_NUMBER)
-            20
-        }
-
+        _itemsNumber =
+            try {
+                settings.getString(API_ITEMS_NUMBER, "20").toInt()
+            } catch (e: Exception) {
+                settings.remove(API_ITEMS_NUMBER)
+                20
+            }
     }
 
     fun getApiTimeout(): Long {
@@ -102,18 +159,21 @@ class AppSettingsService {
     private fun secToMs(n: Long) = n * 1000
 
     private fun refreshApiTimeout() {
-        _apiTimeout = secToMs(try {
-            val settingsTimeout = settings.getString(API_TIMEOUT, "60")
-            if (settingsTimeout.toLong() > 0) {
-                settingsTimeout.toLong()
-            } else {
-                settings.remove(API_TIMEOUT)
-                60
-            }
-        } catch (e: Exception) {
-            settings.remove(API_TIMEOUT)
-            60
-        })
+        _apiTimeout =
+            secToMs(
+                try {
+                    val settingsTimeout = settings.getString(API_TIMEOUT, "60")
+                    if (settingsTimeout.toLong() > 0) {
+                        settingsTimeout.toLong()
+                    } else {
+                        settings.remove(API_TIMEOUT)
+                        60
+                    }
+                } catch (e: Exception) {
+                    settings.remove(API_TIMEOUT)
+                    60
+                },
+            )
     }
 
     private fun refreshBaseUrl() {
@@ -128,6 +188,14 @@ class AppSettingsService {
         _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)
     }
@@ -138,6 +206,7 @@ class AppSettingsService {
         }
         return _articleViewer == true
     }
+
     private fun refreshShouldBeCardViewEnabled() {
         _shouldBeCardView = settings.getBoolean(CARD_VIEW_ACTIVE, false)
     }
@@ -148,6 +217,7 @@ class AppSettingsService {
         }
         return _shouldBeCardView == true
     }
+
     private fun refreshDisplayUnreadCountEnabled() {
         _displayUnreadCount = settings.getBoolean(DISPLAY_UNREAD_COUNT, true)
     }
@@ -158,6 +228,7 @@ class AppSettingsService {
         }
         return _displayUnreadCount == true
     }
+
     private fun refreshDisplayAllCountEnabled() {
         _displayAllCount = settings.getBoolean(DISPLAY_OTHER_COUNT, false)
     }
@@ -168,6 +239,7 @@ class AppSettingsService {
         }
         return _displayAllCount == true
     }
+
     private fun refreshFullHeightCardsEnabled() {
         _fullHeightCards = settings.getBoolean(FULL_HEIGHT_CARDS, false)
     }
@@ -178,6 +250,7 @@ class AppSettingsService {
         }
         return _fullHeightCards == true
     }
+
     private fun refreshUpdateSourcesEnabled() {
         _updateSources = settings.getBoolean(UPDATE_SOURCES, true)
     }
@@ -188,6 +261,7 @@ class AppSettingsService {
         }
         return _updateSources == true
     }
+
     private fun refreshPeriodicRefreshEnabled() {
         _periodicRefresh = settings.getBoolean(PERIODIC_REFRESH, false)
     }
@@ -257,7 +331,6 @@ class AppSettingsService {
         return _notifyNewItems == true
     }
 
-
     private fun refreshMarkOnScrollEnabled() {
         _markOnScroll = settings.getBoolean(MARK_ON_SCROLL, false)
     }
@@ -269,7 +342,6 @@ class AppSettingsService {
         return _markOnScroll == true
     }
 
-
     private fun refreshActiveAllignment() {
         _activeAlignment = settings.getInt(TEXT_ALIGN, JUSTIFY)
     }
@@ -333,8 +405,12 @@ class AppSettingsService {
     fun refreshApiSettings() {
         refreshPassword()
         refreshUsername()
+        refreshBasicUsername()
+        refreshBasicPassword()
         refreshBaseUrl()
         refreshApiVersion()
+        refreshPublicAccess()
+        refreshSelfSigned()
     }
 
     fun refreshUserSettings() {
@@ -363,9 +439,19 @@ class AppSettingsService {
     fun refreshLoginInformation(
         url: String,
         login: String,
-        password: String
+        password: String,
     ) {
-        settings.putString(BASE_URL, url)
+        val regex = """\/\/(\D+):(\D+)@""".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()
@@ -375,14 +461,11 @@ class AppSettingsService {
         settings.remove(BASE_URL)
         settings.remove(LOGIN)
         settings.remove(PASSWORD)
+        settings.remove(BASIC_LOGIN)
+        settings.remove(BASIC_PASSWORD)
         refreshApiSettings()
     }
 
-    fun updateApiVersion(apiMajorVersion: Int) {
-        settings.putInt(API_VERSION_MAJOR, apiMajorVersion)
-        refreshApiVersion()
-    }
-
     fun clearAll() {
         settings.clear()
         refreshApiSettings()
@@ -411,6 +494,10 @@ class AppSettingsService {
 
         const val API_VERSION_MAJOR = "apiVersionMajor"
 
+        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"
@@ -421,6 +508,10 @@ class AppSettingsService {
 
         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"
@@ -451,12 +542,10 @@ class AppSettingsService {
 
         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,34 +9,37 @@ fun TAG.toView(): SelfossModel.Tag =
     SelfossModel.Tag(
         this.name,
         this.color,
-        this.unread.toInt()
+        this.unread.toInt(),
     )
 
-fun SOURCE.toView(): SelfossModel.Source =
-    SelfossModel.Source(
+fun SOURCE.toView(): SelfossModel.SourceDetail =
+    SelfossModel.SourceDetail(
         this.id.toInt(),
         this.title,
-        this.tags.split(","),
+        null,
+        this.tags?.split(","),
         this.spout,
         this.error,
-        this.icon
+        this.icon,
+        if (this.url != null) SelfossModel.SourceParams(this.url) else null,
     )
 
-fun SelfossModel.Source.toEntity(): SOURCE =
+fun SelfossModel.SourceDetail.toEntity(): SOURCE =
     SOURCE(
         this.id.toString(),
         this.title.getHtmlDecoded(),
-        this.tags.joinToString(","),
-        this.spout,
-        this.error,
-        this.icon.orEmpty()
+        this.tags?.joinToString(",").orEmpty(),
+        this.spout.orEmpty(),
+        this.error.orEmpty(),
+        this.icon.orEmpty(),
+        this.params?.url,
     )
 
 fun SelfossModel.Tag.toEntity(): TAG =
     TAG(
         this.tag,
         this.color,
-        this.unread.toLong()
+        this.unread.toLong(),
     )
 
 fun ITEM.toView(): SelfossModel.Item =
@@ -52,7 +55,7 @@ fun ITEM.toView(): SelfossModel.Item =
         this.link,
         this.sourcetitle,
         this.tags.split(","),
-        this.author
+        this.author,
     )
 
 fun SelfossModel.Item.toEntity(): ITEM =
@@ -68,5 +71,5 @@ fun SelfossModel.Item.toEntity(): ITEM =
         this.link,
         this.sourcetitle.getHtmlDecoded(),
         this.tags.joinToString(","),
-        this.author
-    )
+        this.author,
+    )

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

@@ -3,9 +3,10 @@ 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,4 +12,8 @@ expect fun SelfossModel.Item.getImages(): ArrayList<String>
 
 expect fun SelfossModel.Source.getIcon(baseUrl: String): String
 
-expect fun constructUrl(baseUrl: String, path: String, file: String?): String
+expect fun constructUrl(
+    baseUrl: String,
+    path: String,
+    file: String?,
+): String

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

@@ -1,7 +1,6 @@
 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
@@ -19,4 +18,4 @@ fun String.toStringUriWithHttp(): String =
         "http://" + this
     } else {
         this
-    }
+    }

shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/1.sqm

@@ -1 +1,6 @@
-ALTER TABLE ITEM ADD COLUMN `author` TEXT NOT NULL;
+CREATE TABLE ITEM_BACKUP AS SELECT `id`, `datetime`, `title`, `content`,
+ `unread`, `starred`, `thumbnail`, `icon`, `link`, `sourcetitle`,
+ `tags` FROM ITEM;
+ALTER TABLE ITEM_BACKUP ADD COLUMN `author` TEXT;
+DROP TABLE ITEM;
+ALTER TABLE ITEM_BACKUP RENAME TO ITEM;

shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/2.sqm

@@ -0,0 +1 @@
+ALTER TABLE SOURCE ADD COLUMN `url` TEXT;

shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/Items.sq

@@ -10,7 +10,7 @@ CREATE TABLE ITEM (
     `link` TEXT NOT NULL,
     `sourcetitle` TEXT NOT NULL,
     `tags` TEXT NOT NULL,
-    `author` TEXT NOT NULL,
+    `author` TEXT,
     PRIMARY KEY(`id`)
 );
 
@@ -27,5 +27,8 @@ INSERT OR REPLACE INTO ITEM VALUES ?;
 deleteItem:
 DELETE FROM ITEM WHERE `id` = ?;
 
+deleteItemsWhereSource:
+DELETE FROM ITEM WHERE `sourcetitle` = ?;
+
 updateItem:
-UPDATE ITEM SET `datetime` = ?, `title` = ?, `content` = ?, `unread` = ?, `starred` = ?, `thumbnail` = ?, `icon` = ?, `link` = ?, `sourcetitle` = ?, `tags` = ? WHERE `id` = ?;
+UPDATE ITEM SET `datetime` = ?, `title` = ?, `content` = ?, `unread` = ?, `starred` = ?, `thumbnail` = ?, `icon` = ?, `link` = ?, `sourcetitle` = ?, `tags` = ?, `author` = ? WHERE `id` = ?;

shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/Sources.sq

@@ -5,6 +5,7 @@ CREATE TABLE SOURCE (
     `spout` TEXT NOT NULL,
     `error` TEXT NOT NULL,
     `icon` TEXT NOT NULL,
+    `url` TEXT,
     PRIMARY KEY(`id`)
 );