Tentative self signed ssl support

CHANGELOG.md

@@ -1,51 +1,3 @@
-**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

androidApp/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
     kotlin("android")
     kotlin("kapt")
     id("com.mikepenz.aboutlibraries.plugin")
-    id("org.jetbrains.kotlinx.kover")
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
 
 fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
@@ -16,7 +16,7 @@ fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
         project.exec {
             commandLine = cmd.split(" ")
             standardOutput = outputStream
-            isIgnoreExitValue = ignore
+            isIgnoreExitValue = ignore ?: false
         }
         outputStream.toString()
     }
@@ -24,8 +24,9 @@ fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
 }
 
 fun gitVersion(): String {
+    var process = ""
     val maybeTagOfCurrentCommit = execWithOutput("git -C ../ describe --contains HEAD", true)
-    var process = if (maybeTagOfCurrentCommit.isEmpty()) {
+    process = if (maybeTagOfCurrentCommit.isEmpty()) {
         println("No tag on current commit. Will take the latest one.")
         execWithOutput("git -C ../ for-each-ref refs/tags --sort=-refname --format='%(refname:short)' --count=1")
     } else {
@@ -57,13 +58,13 @@ android {
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
         // Flag to enable support for the new language APIs
-        sourceCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     // For Kotlin projects
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "11"
     }
     compileSdk = 33
     buildToolsVersion = "33.0.0"
@@ -170,7 +171,7 @@ dependencies {
     //PhotoView
     implementation("com.github.chrisbanes:PhotoView:2.3.0")
 
-    implementation("androidx.core:core-ktx:1.10.1")
+    implementation("androidx.core:core-ktx:1.8.0")
 
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
 

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

@@ -139,8 +139,6 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
         showProgress(true)
 
-        appSettingsService.updateSelfSigned(binding.selfSigned.isChecked)
-
         repository.refreshLoginInformation(url, login, password)
 
         CoroutineScope(Dispatchers.Main).launch {

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()
-        }
 
         binding.pager.adapter = ScreenSlidePagerAdapter(this)
         binding.pager.setCurrentItem(currentItem, false)

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) {
+                if (response.success && response.data != null && !response.data?.content.isNullOrEmpty()) {
-                    handleMercuryData(response.data!!)
+                    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) {
+    private fun handleLeadImage(response: StatusAndData<MercuryModel.ParsedContent>) {
-        if (data.error == true || data.failed == true) {
+        if (!response.data?.lead_image_url.isNullOrEmpty() && context != null) {
-            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) {
             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) {
+        requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
-            requireContext().openInBrowserAsNewTask(this@ArticleFragment.item)
-        } else {
-            Exception("openInBrowserAfterFailing context is null").sendSilentlyWithAcraWithName("openInBrowserAfterFailing > $context")
-
-        }
     }
 
     companion object {
@@ -554,8 +541,8 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     fun performClick(): Boolean {
-        if (allImages != null && (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
+        if (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
-            binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE)
+            binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
         ) {
 
             val position: Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)

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

@@ -149,7 +149,6 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
             c.ellipsize = TextUtils.TruncateAt.END
             c.text = tag.tag
 
-            if (tag.color.isNotEmpty()) {
             try {
                 val gd = GradientDrawable()
                 val gdColor = try {
@@ -166,7 +165,6 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
             } catch (e: Exception) {
                 e.sendSilentlyWithAcraWithName("tags > GradientDrawable")
             }
-            }
 
             c.setOnCloseIconClickListener {
                 (it as Chip).isCloseIconVisible = false

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

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

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

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

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

@@ -90,7 +90,7 @@
     <string name="pref_switch_items_caching">Save items for offline use</string>
     <string name="pref_switch_update_sources">Check for new sources and tags</string>
     <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
-    <string name="network_connectivity_lost">"Koneksi jaringan hilang"</string>
+    <string name="network_connectivity_lost">"Network connection lost"</string>
     <string name="network_connectivity_retrieved">"Network connection is now available"</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>

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

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

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

@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Reader for Selfoss"</string>
     <string name="title_activity_login">"Log in"</string>
     <string name="prompt_password">"Password"</string>
@@ -6,7 +6,6 @@
     <string name="error_invalid_password">"Password not long enough"</string>
     <string name="error_field_required">"Field required"</string>
     <string name="prompt_url">"Url"</string>
-    <string name="disableSSL">"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>

build.gradle.kts

@@ -7,12 +7,12 @@ buildscript {
 
 plugins {
     //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("8.0.0").apply(false)
+    id("com.android.application").version("7.4.0").apply(false)
-    id("com.android.library").version("8.0.0").apply(false)
+    id("com.android.library").version("7.4.0").apply(false)
-    kotlin("android").version("1.9.0").apply(false)
+    kotlin("android").version("1.7.20").apply(false)
-    kotlin("multiplatform").version("1.9.0").apply(false)
+    kotlin("multiplatform").version("1.7.20").apply(false)
     id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)
-    id("org.jetbrains.kotlinx.kover").version("0.6.1").apply(true)
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
 
 allprojects {

gradle.properties

@@ -13,15 +13,22 @@
 #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

gradle/wrapper/gradle-wrapper.properties

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

shared/build.gradle.kts

@@ -1,5 +1,3 @@
-val ktorVersion = "2.3.2"
-
 object SqlDelight {
     const val runtime = "com.squareup.sqldelight:runtime:1.5.4"
     const val android = "com.squareup.sqldelight:android-driver:1.5.4"
@@ -11,12 +9,12 @@ plugins {
     kotlin("multiplatform")
     id("com.android.library")
     id("com.squareup.sqldelight")
-    kotlin("plugin.serialization") version "1.9.0"
+    kotlin("plugin.serialization") version "1.4.10"
-    id("org.jetbrains.kotlinx.kover")
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
 
 kotlin {
-    androidTarget()
+    android()
 
     listOf(
         iosX64(),
@@ -31,13 +29,12 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("io.ktor:ktor-client-core:$ktorVersion")
+                implementation("io.ktor:ktor-client-core:2.2.4")
-                implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
+                implementation("io.ktor:ktor-client-content-negotiation:2.2.4")
-                implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
+                implementation("io.ktor:ktor-serialization-kotlinx-json:2.2.4")
-                implementation("io.ktor:ktor-client-logging:$ktorVersion")
+                implementation("io.ktor:ktor-client-logging:2.2.4")
-                implementation("io.ktor:ktor-client-auth:$ktorVersion")
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
-
+                implementation("io.ktor:ktor-client-auth:2.2.4")
                 implementation("org.jsoup:jsoup:1.15.4")
 
                 //Dependency Injection
@@ -69,7 +66,7 @@ kotlin {
                 implementation(SqlDelight.android)
             }
         }
-        val androidUnitTest by getting {
+        val androidTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
                 implementation("junit:junit:4.13.2")
@@ -102,14 +99,15 @@ kotlin {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 32
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 21
+        targetSdk = 32
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
     namespace = "bou.amine.apps.readerforselfossv2"
 }

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

@@ -2,18 +2,15 @@ package bou.amine.apps.readerforselfossv2.rest
 
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import io.github.aakira.napier.Napier
-import io.ktor.client.HttpClient
+import io.ktor.client.*
-import io.ktor.client.engine.okhttp.OkHttp
+import io.ktor.client.engine.okhttp.*
-import io.ktor.client.plugins.HttpRequestRetry
+import io.ktor.client.plugins.*
-import io.ktor.client.plugins.HttpTimeout
+import io.ktor.client.plugins.cache.*
-import io.ktor.client.plugins.cache.HttpCache
+import io.ktor.client.plugins.contentnegotiation.*
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.cookies.*
-import io.ktor.client.plugins.cookies.HttpCookies
+import io.ktor.client.plugins.logging.*
-import io.ktor.client.plugins.logging.LogLevel
+import io.ktor.http.*
-import io.ktor.client.plugins.logging.Logger
+import io.ktor.serialization.kotlinx.json.*
-import io.ktor.client.plugins.logging.Logging
-import io.ktor.http.HttpStatusCode
-import io.ktor.serialization.kotlinx.json.json
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -32,12 +29,8 @@ class NaiveTrustManager : X509TrustManager {
     override fun getAcceptedIssuers(): Array<out X509Certificate> = arrayOf()
 }
 
-actual fun createHttpClient(
+actual fun createHttpClient(appSettingsService: AppSettingsService, api: SelfossApi) =
-    appSettingsService: AppSettingsService,
-    api: SelfossApi
-) =
     HttpClient(OkHttp) {
-        if (appSettingsService.getSelfSigned()) {
         engine {
             val trustManager = NaiveTrustManager()
             val sslContext = SSLContext.getInstance("TLS").apply {
@@ -51,7 +44,6 @@ actual fun createHttpClient(
                 .hostnameVerifier(AllowAllHostnameVerifier())
                 .build()
         }
-        }
         install(ContentNegotiation) {
             install(HttpCache)
             json(Json {

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 title: String?,
-        val content: String? = null,
+        val content: String?,
-        val lead_image_url: String? = null, // NOSONAR
+        val lead_image_url: String?, // NOSONAR
-        val url: String? = null,
+        val url: String
-        val error: Boolean? = null,
-        val message: String? = null,
-        val failed: Boolean? = null
     )
 }

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

@@ -24,8 +24,8 @@ class SelfossModel {
     @Serializable
     class Stats(
         val total: Int,
-        val unread: Int? = null,
+        val unread: Int?,
-        val starred: Int? = null
+        val starred: Int?
     )
 
     @Serializable
@@ -36,9 +36,9 @@ class SelfossModel {
 
     @Serializable
     data class ApiInformation(
-        val version: String? = null,
+        val version: String?,
-        val apiversion: String? = null,
+        val apiversion: String?,
-        val configuration: ApiConfiguration? = null
+        val configuration: ApiConfiguration?
     ) {
         fun getApiMajorVersion(): Int {
             var versionNumber = 0
@@ -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 tags: List<String>?,
-        var spout: String? = null,
+        var spout: String?,
-        override var error: String? = null,
+        override var error: String?,
-        override var icon: String? = null,
+        override var icon: String?,
-        var params: SourceParams? = null
+        var params: SourceParams?
     ) : Source
 
     @Serializable
@@ -107,13 +107,13 @@ class SelfossModel {
         var unread: Boolean,
         @Serializable(with = BooleanSerializer::class)
         var starred: Boolean,
-        val thumbnail: String? = null,
+        val thumbnail: String?,
-        val icon: String? = null,
+        val icon: String?,
         val link: String,
         val sourcetitle: String,
         @Serializable(with = TagsListSerializer::class)
         val tags: List<String>,
-        val author: String? = null
+        val author: String?
     ) {
         fun getLinkDecoded(): String {
             var stringUrl: String

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

@@ -4,22 +4,12 @@ import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.model.StatusAndData
 import bou.amine.apps.readerforselfossv2.model.SuccessResponse
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import io.ktor.client.HttpClient
+import io.ktor.client.*
-import io.ktor.client.plugins.auth.providers.BasicAuthCredentials
+import io.ktor.client.request.*
-import io.ktor.client.request.get
+import io.ktor.client.statement.*
-import io.ktor.client.request.headers
+import io.ktor.http.*
-import io.ktor.client.request.parameter
-import io.ktor.client.statement.HttpResponse
-import io.ktor.http.HttpHeaders
-import io.ktor.http.Parameters
-import io.ktor.util.encodeBase64
-import io.ktor.utils.io.charsets.Charsets
-import io.ktor.utils.io.core.toByteArray
 
-expect fun createHttpClient(
+expect fun createHttpClient(appSettingsService: AppSettingsService, api: SelfossApi): HttpClient
-    appSettingsService: AppSettingsService,
-    api: SelfossApi
-): HttpClient
 
 class SelfossApi(private val appSettingsService: AppSettingsService) {
 
@@ -33,13 +23,6 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         client = createHttpClient(appSettingsService, this)
     }
 
-    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
     fun shouldHavePostLogin() = appSettingsService.getApiVersion() != -1
     fun hasLoginInfo() =
@@ -62,23 +45,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() =
@@ -92,23 +63,9 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         }
 
     private suspend fun maybeLogoutIfAvailable() =
-        responseOrSuccessIf404(client.tryToGet(url("/logout")) {
+        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,
@@ -131,12 +88,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>> =
@@ -147,12 +98,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> =
@@ -161,12 +106,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>> =
@@ -175,12 +114,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> =
@@ -189,12 +122,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>> =
@@ -203,12 +130,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>> =
@@ -217,12 +138,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>> =
@@ -231,23 +146,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")) {
+        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")) {
@@ -255,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 unmarkAsRead(id: String): SuccessResponse =
@@ -269,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 starr(id: String): SuccessResponse =
@@ -283,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 unstarr(id: String): SuccessResponse =
@@ -297,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 markAllAsRead(ids: List<String>): SuccessResponse =
@@ -314,14 +192,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()))
-                        )
-                    }
-                }
             }
         ))
 
@@ -357,14 +227,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()))
-                        )
-                    }
-                }
             }
         )
 
@@ -402,14 +264,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()))
-                        )
-                    }
-                }
             }
         )
 
@@ -419,18 +273,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()
-                            )
-                        )
-                    )
-                }
-            }
         })
 }

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

@@ -8,12 +8,9 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     // 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
@@ -78,22 +75,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         _publicAccess = settings.getBoolean(API_PUBLIC_ACCESS, false)
     }
 
-    fun getSelfSigned(): Boolean {
-        if (_selfSigned == null) {
-            refreshSelfSigned()
-        }
-        return _selfSigned!!
-    }
-
-    fun updateSelfSigned(selfSigned: Boolean) {
-        settings.putBoolean(API_SELF_SIGNED, selfSigned)
-        refreshSelfSigned()
-    }
-
-    private fun refreshSelfSigned() {
-        _selfSigned = settings.getBoolean(API_SELF_SIGNED, false)
-    }
-
     fun getBaseUrl(): String {
         if (_baseUrl.isEmpty()) {
             refreshBaseUrl()
@@ -115,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()
@@ -182,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)
     }
@@ -395,12 +354,9 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     fun refreshApiSettings() {
         refreshPassword()
         refreshUsername()
-        refreshBasicUsername()
-        refreshBasicPassword()
         refreshBaseUrl()
         refreshApiVersion()
         refreshPublicAccess()
-        refreshSelfSigned()
     }
 
     fun refreshUserSettings() {
@@ -431,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(LOGIN, login)
         settings.putString(PASSWORD, password)
         refreshApiSettings()
@@ -451,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()
     }
 
@@ -486,8 +430,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
 
         const val API_PUBLIC_ACCESS = "apiPublicAccess"
 
-        const val API_SELF_SIGNED = "apiSelfSigned"
-
         const val API_ITEMS_NUMBER = "prefer_api_items_number"
 
         const val API_TIMEOUT = "api_timeout"
@@ -498,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"
@@ -532,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"