26 changed files with 84 additions and 393 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,58 +1,3 @@
-**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
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
@ -599,14 +599,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                return true
            }
            R.id.action_disconnect -> {
-                needsConfirmation(R.string.confirm_disconnect_title, R.string.confirm_disconnect_description) {
-                    runBlocking {
-                        repository.logout()
-                    }
-                    val intent = Intent(this, LoginActivity::class.java)
-                    this.startActivity(intent)
-                    finish()
+                runBlocking {
+                    repository.logout()
                }
+                val intent = Intent(this, LoginActivity::class.java)
+                this.startActivity(intent)
+                finish()
                return true
            }
            R.id.action_settings -> {
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt
@ -71,11 +71,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {
            finish()
        }

-        try {
-            readItem(allItems[currentItem])
-        } catch (e: IndexOutOfBoundsException) {
-            finish()
-        }
+        readItem(allItems[currentItem])

        binding.pager.adapter = ScreenSlidePagerAdapter(this)
        binding.pager.setCurrentItem(currentItem, false)
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt
@ -27,11 +27,11 @@ import bou.amine.apps.readerforselfossv2.android.model.toModel
 import bou.amine.apps.readerforselfossv2.android.model.toParcelable
 import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
-import bou.amine.apps.readerforselfossv2.android.utils.isUrlValid
 import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
 import bou.amine.apps.readerforselfossv2.model.MercuryModel
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import bou.amine.apps.readerforselfossv2.model.StatusAndData
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.MercuryApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@ -260,8 +260,21 @@ class ArticleFragment : Fragment(), DIAware {
        CoroutineScope(Dispatchers.Main).launch {
            try {
                val response = mercuryApi.query(url)
-                if (response.success && response.data != null) {
-                    handleMercuryData(response.data!!)
+                if (response.success && response.data != null && !response.data?.content.isNullOrEmpty()) {
+                    binding.titleView.text = response.data!!.title.orEmpty()
+                    if (typeface != null) {
+                        binding.titleView.typeface = typeface
+                    }
+                    URL(response.data!!.url)
+                    url = response.data!!.url
+
+                    contentText = response.data!!.content.orEmpty()
+                    htmlToWebview()
+
+                    handleLeadImage(response)
+
+                    binding.nestedScrollView.scrollTo(0, 0)
+                    binding.progressBar.visibility = View.GONE
                } else {
                    openInBrowserAfterFailing()
                }
@ -274,35 +287,14 @@ class ArticleFragment : Fragment(), DIAware {
        }
    }

-    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!!
-
-            contentText = data.content.orEmpty()
-            htmlToWebview()
-
-            handleLeadImage(data?.lead_image_url)
-
-            binding.nestedScrollView.scrollTo(0, 0)
-            binding.progressBar.visibility = View.GONE
-        }
-    }
-
-    private fun handleLeadImage(lead_image_url: String?) {
-        if (!lead_image_url.isNullOrEmpty() && context != null) {
+    private fun handleLeadImage(response: StatusAndData<MercuryModel.ParsedContent>) {
+        if (!response.data?.lead_image_url.isNullOrEmpty() && context != null) {
            binding.imageView.visibility = View.VISIBLE
            Glide
                .with(requireContext())
                .asBitmap()
                .load(
-                    lead_image_url
+                    response.data!!.lead_image_url.orEmpty()
                )
                .apply(RequestOptions.fitCenterTransform())
                .into(binding.imageView)
@ -315,7 +307,7 @@ class ArticleFragment : Fragment(), DIAware {
        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) {
+                return if (context != null && binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
                    try {
                        requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
                    } catch (e: ActivityNotFoundException) {
@ -531,12 +523,7 @@ class ArticleFragment : Fragment(), DIAware {

    private fun openInBrowserAfterFailing() {
        binding.progressBar.visibility = View.GONE
-        if (context != null) {
-            requireContext().openInBrowserAsNewTask(this@ArticleFragment.item)
-        } else {
-            Exception("openInBrowserAfterFailing context is null").sendSilentlyWithAcraWithName("openInBrowserAfterFailing > $context")
-
-        }
+        requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
    }

    companion object {
@ -554,8 +541,8 @@ class ArticleFragment : Fragment(), DIAware {
    }

    fun performClick(): Boolean {
-        if (allImages != null && (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
-            binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE)
+        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)
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
@ -149,23 +149,21 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
            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")
+            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 {
--- a/androidApp/src/main/res/values-ca-rES/strings.xml
+++ b/androidApp/src/main/res/values-ca-rES/strings.xml
@ -128,6 +128,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/androidApp/src/main/res/values-de-rDE/strings.xml
+++ b/androidApp/src/main/res/values-de-rDE/strings.xml
@ -128,6 +128,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/androidApp/src/main/res/values-es-rES/strings.xml
+++ b/androidApp/src/main/res/values-es-rES/strings.xml
@ -128,6 +128,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/androidApp/src/main/res/values-fa-rIR/strings.xml
+++ b/androidApp/src/main/res/values-fa-rIR/strings.xml
@ -128,6 +128,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/androidApp/src/main/res/values-fr-rFR/strings.xml
+++ b/androidApp/src/main/res/values-fr-rFR/strings.xml
@ -128,6 +128,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/androidApp/src/main/res/values-gl-rES/strings.xml
+++ b/androidApp/src/main/res/values-gl-rES/strings.xml
@ -33,8 +33,8 @@
    <string name="addStringNoUrl">"Accede pra engadir fontes."</string>
    <string name="cant_get_sources">"Non se pode obter a lista de fontes."</string>
    <string name="cant_create_source">"Non se pode crear unha fonte."</string>
-    <string name="cant_get_spouts_no_network">"Non se pode obter a lista de spouts por mor dun erro de rede."</string>
-    <string name="cant_get_spouts">"Non se pode obter a lista de spoits. Pode que haxa algún problema coa api."</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="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,18 +116,16 @@
    <string name="reader_static_bar_on">A barra inferior mostrarase sempre</string>
    <string name="reader_static_bar_off">A barra inferior pode mostrarse a través do botón flotante</string>
    <string name="remove_source">Eliminar fonte</string>
-    <string name="pref_theme_title">Modo Claro/Escuro</string>
-    <string name="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="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="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>
--- a/androidApp/src/main/res/values-in-rID/strings.xml
+++ b/androidApp/src/main/res/values-in-rID/strings.xml
@ -90,7 +90,7 @@
    <string name="pref_switch_items_caching">Save items for offline use</string>
    <string name="pref_switch_update_sources">Check for new sources and tags</string>
    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
-    <string name="network_connectivity_lost">"Koneksi jaringan hilang"</string>
+    <string name="network_connectivity_lost">"Network connection lost"</string>
    <string name="network_connectivity_retrieved">"Network connection is now available"</string>
    <string name="pref_switch_periodic_refresh">Sync articles</string>
    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
@ -128,6 +128,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/androidApp/src/main/res/values-it-rIT/strings.xml
+++ b/androidApp/src/main/res/values-it-rIT/strings.xml
@ -128,6 +128,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/androidApp/src/main/res/values-ko-rKR/strings.xml
+++ b/androidApp/src/main/res/values-ko-rKR/strings.xml
@ -128,6 +128,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/androidApp/src/main/res/values-nl-rNL/strings.xml
+++ b/androidApp/src/main/res/values-nl-rNL/strings.xml
@ -128,6 +128,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/androidApp/src/main/res/values-pt-rBR/strings.xml
+++ b/androidApp/src/main/res/values-pt-rBR/strings.xml
@ -128,6 +128,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/androidApp/src/main/res/values-pt-rPT/strings.xml
+++ b/androidApp/src/main/res/values-pt-rPT/strings.xml
@ -128,6 +128,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/androidApp/src/main/res/values-si-rLK/strings.xml
+++ b/androidApp/src/main/res/values-si-rLK/strings.xml
@ -128,6 +128,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/androidApp/src/main/res/values-tr-rTR/strings.xml
+++ b/androidApp/src/main/res/values-tr-rTR/strings.xml
@ -128,6 +128,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/androidApp/src/main/res/values-zh-rCN/strings.xml
+++ b/androidApp/src/main/res/values-zh-rCN/strings.xml
@ -125,9 +125,7 @@
    <string name="crash_toast_text">发生崩溃。请将细节发送给开发人员。</string>
    <string name="pref_switch_disable_acra">"禁用自动错误报告 "</string>
    <string name="menu_home_filter">筛选器</string>
-    <string name="application_selfoss_only">此应用只适用于 Selfoss 实例，不适用于其他 RSS 。</string>
-    <string name="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="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-zh-rTW/strings.xml
+++ b/androidApp/src/main/res/values-zh-rTW/strings.xml
@ -128,6 +128,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@ -131,6 +131,4 @@
    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
    <string name="menu_home_sources">Sources</string>
    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/MercuryModel.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/MercuryModel.kt
@ -6,12 +6,9 @@ class MercuryModel {

    @Serializable
    class ParsedContent(
-        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
+        val title: String?,
+        val content: String?,
+        val lead_image_url: String?, // NOSONAR
+        val url: String
    )
 }
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt
@ -24,8 +24,8 @@ class SelfossModel {
    @Serializable
    class Stats(
        val total: Int,
-        val unread: Int? = null,
-        val starred: Int? = null
+        val unread: Int?,
+        val starred: Int?
    )

    @Serializable
@ -36,9 +36,9 @@ class SelfossModel {

    @Serializable
    data class ApiInformation(
-        val version: String? = null,
-        val apiversion: String? = null,
-        val configuration: ApiConfiguration? = null
+        val version: String?,
+        val apiversion: String?,
+        val configuration: ApiConfiguration?
    ) {
        fun getApiMajorVersion(): Int {
            var versionNumber = 0
@ -54,9 +54,9 @@ class SelfossModel {
    @Serializable
    data class ApiConfiguration(
        @Serializable(with = BooleanSerializer::class)
-        val publicMode: Boolean? = null,
+        val publicMode: Boolean?,
        @Serializable(with = BooleanSerializer::class)
-        val authEnabled: Boolean? = null
+        val authEnabled: Boolean?
    ) {
        fun isAuthEnabled() = authEnabled ?: true

@ -75,7 +75,7 @@ class SelfossModel {
    data class SourceStats(
        override val id: Int,
        override var title: String,
-        override var unread: Int? = null,
+        override var unread: Int?,
        override var error: String? = null,
        override var icon: String? = null
        ) : Source
@ -86,11 +86,11 @@ class SelfossModel {
        override var title: String,
        override var unread: Int? = null,
        @Serializable(with = TagsListSerializer::class)
-        var tags: List<String>? = null,
-        var spout: String? = null,
-        override var error: String? = null,
-        override var icon: String? = null,
-        var params: SourceParams? = null
+        var tags: List<String>?,
+        var spout: String?,
+        override var error: String?,
+        override var icon: String?,
+        var params: SourceParams?
    ) : Source

    @Serializable
@ -107,13 +107,13 @@ class SelfossModel {
        var unread: Boolean,
        @Serializable(with = BooleanSerializer::class)
        var starred: Boolean,
-        val thumbnail: String? = null,
-        val icon: String? = null,
+        val thumbnail: String?,
+        val icon: String?,
        val link: String,
        val sourcetitle: String,
        @Serializable(with = TagsListSerializer::class)
        val tags: List<String>,
-        val author: String? = null
+        val author: String?
    ) {
        fun getLinkDecoded(): String {
            var stringUrl: String
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt
@ -7,7 +7,6 @@ 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.auth.providers.*
 import io.ktor.client.plugins.cache.*
 import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.plugins.cookies.*
@ -16,9 +15,6 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
-import io.ktor.util.*
-import io.ktor.utils.io.charsets.*
-import io.ktor.utils.io.core.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@ -36,7 +32,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                    prettyPrint = true
                    isLenient = true
                    ignoreUnknownKeys = true
-                    explicitNulls = false
                })
            }
            install(Logging) {
@ -68,7 +63,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
            expectSuccess = false
        }

-
        return client
    }

@ -80,13 +74,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
        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() =
@ -109,23 +96,11 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
    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())
-        if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-            headers {
-                append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
-                )
-            }
-        }
    })

    private fun shouldHaveNewLogout() =
@ -139,23 +114,9 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
        }

    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()))
-                    )
-                }
-            }
-        })
+        responseOrSuccessIf404(client.tryToGet(url("/logout")))

-    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()))
-                )
-            }
-        }
-    })
+    private suspend fun doLogout() = maybeResponse(client.tryToDelete(url("/api/session/current")))

    suspend fun getItems(
        type: String,
@ -178,12 +139,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
            parameter("updatedsince", updatedSince)
            parameter("items", items ?: appSettingsService.getItemsNumber())
            parameter("offset", offset)
-            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                headers {
-                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
-                    )
-                }
-            }
        })

    suspend fun getItemsWithoutCatch(): StatusAndData<List<SelfossModel.Item>> =
@ -194,12 +149,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
            }
            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> =
@ -208,12 +157,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                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>> =
@ -222,12 +165,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                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> =
@ -236,12 +173,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                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>> =
@ -250,12 +181,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                parameter("username", appSettingsService.getUserName())
                parameter("password", appSettingsService.getPassword())
            }
-            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                headers {
-                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
-                    )
-                }
-            }
        })

    suspend fun sourcesStats(): StatusAndData<ArrayList<SelfossModel.SourceStats>> =
@ -264,12 +189,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                parameter("username", appSettingsService.getUserName())
                parameter("password", appSettingsService.getPassword())
            }
-            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                headers {
-                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
-                    )
-                }
-            }
        })

    suspend fun sourcesDetailed(): StatusAndData<ArrayList<SelfossModel.SourceDetail>> =
@ -278,23 +197,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                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()))
-                    )
-                }
-            }
-        })
+        bodyOrFailure(client.tryToGet(url("/api/about")))

    suspend fun markAsRead(id: String): SuccessResponse =
        maybeResponse(client.tryToPost(url("/mark/$id")) {
@ -302,12 +208,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                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 =
@ -316,12 +216,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                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 =
@ -330,12 +224,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                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 =
@ -344,12 +232,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                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 =
@ -361,14 +243,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                    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()))
-                        )
-                    }
-                }
            }
        ))

@ -404,14 +278,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                append("url", url)
                append("spout", spout)
                append(tagsParamName, tags)
-            },
-            block = {
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
-                        )
-                    }
-                }
            }
        )

@ -449,14 +315,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                append("url", url)
                append("spout", spout)
                append(tagsParamName, tags)
-            },
-            block = {
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
-                        )
-                    }
-                }
            }
        )

@ -466,18 +324,5 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                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()
-                            )
-                        )
-                    )
-                }
-            }
        })
 }
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/AppSettingsService.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/AppSettingsService.kt
@ -10,9 +10,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
    private var _publicAccess: 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
@ -98,20 +96,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
        return _password
    }

-    fun getBasicUserName(): String {
-        if (_basicUserName.isEmpty()) {
-            refreshBasicUsername()
-        }
-        return _basicUserName
-    }
-
-    fun getBasicPassword(): String {
-        if (_basicPassword.isEmpty()) {
-            refreshBasicPassword()
-        }
-        return _basicPassword
-    }
-
    fun getItemsNumber(): Int {
        if (_itemsNumber == null) {
            refreshItemsNumber()
@ -165,14 +149,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
        _password = settings.getString(PASSWORD, "")
    }

-    private fun refreshBasicUsername() {
-        _basicUserName = settings.getString(BASIC_LOGIN, "")
-    }
-
-    private fun refreshBasicPassword() {
-        _basicPassword = settings.getString(BASIC_PASSWORD, "")
-    }
-
    private fun refreshArticleViewerEnabled() {
        _articleViewer = settings.getBoolean(PREFER_ARTICLE_VIEWER, true)
    }
@ -378,8 +354,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
    fun refreshApiSettings() {
        refreshPassword()
        refreshUsername()
-        refreshBasicUsername()
-        refreshBasicPassword()
        refreshBaseUrl()
        refreshApiVersion()
        refreshPublicAccess()
@ -413,17 +387,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
        login: String,
        password: String
    ) {
-        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(BASE_URL, url)
        settings.putString(LOGIN, login)
        settings.putString(PASSWORD, password)
        refreshApiSettings()
@ -433,8 +397,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
        settings.remove(BASE_URL)
        settings.remove(LOGIN)
        settings.remove(PASSWORD)
-        settings.remove(BASIC_LOGIN)
-        settings.remove(BASIC_PASSWORD)
        refreshApiSettings()
    }

@ -478,10 +440,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {

        const val PASSWORD = "password"

-        const val BASIC_LOGIN = "basic_login"
-
-        const val BASIC_PASSWORD = "basic_password"
-
        const val PREFER_ARTICLE_VIEWER = "prefer_article_viewer"

        const val CARD_VIEW_ACTIVE = "card_view_active"
@ -512,6 +470,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {

        const val PERIODIC_REFRESH_MINUTES = "periodic_refresh_minutes"

+
        const val INFINITE_LOADING = "infinite_loading"

        const val ITEMS_CACHING = "items_caching"