fix: build.

.gitea/workflows/common_build.yml

@@ -3,7 +3,7 @@ on:
   workflow_call:
 
 jobs:
-  BuildAndTestAndCoverage:
+  BuildAndTest:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
@@ -16,19 +16,35 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
-          cache: gradle
-      - uses: gradle/actions/setup-gradle@v3
-      - uses: android-actions/setup-android@v3
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
       - name: Configure gradle...
         run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true" >> ~/.gradle/gradle.properties
       - name: Build and test
-        run: ./gradlew build -x testReleaseUnitTest -x testDebugUnitTest -x testGithubConfigReleaseUnitTest -x testGithubConfigDebugUnitTest # These tests will be done
+        run: ./gradlew build -x testReleaseUnitTest -x testDebugUnitTest -x testGithubConfigReleaseUnitTest -x testGithubConfigDebugUnitTest # These tests will be done in the next step
+  coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Fetch tags
+        run: git fetch --tags -p
       - uses: KengoTODA/actions-setup-docker-compose@v1
         with:
           version: "2.23.3"
       - name: run selfoss
         run: |
           docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+      - uses: gradle/actions/setup-gradle@v3
+      - uses: android-actions/setup-android@v3
+      - name: Configure gradle...
+        run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true" >> ~/.gradle/gradle.properties
       - name: coverage
         run: |
           ./gradlew :koverHtmlReport

.gitea/workflows/on_merge_on_release.yml

@@ -85,7 +85,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
-          cache: gradle
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
       - name: Configure gradle...

.gitea/workflows/on_pr.yml

@@ -12,9 +12,8 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
+          distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
-          cache: gradle
       - name: Install klint
         run: curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
       - name: Install detekt
@@ -24,5 +23,4 @@ jobs:
       - name: Detecting...
         run: ./detekt-cli-1.23.1/bin/detekt-cli --all-rules --excludes '**/shared/build/**/*.kt' || true
   build:
-    needs: Lint
     uses: ./.gitea/workflows/common_build.yml

CHANGELOG.md

@@ -1,22 +1,3 @@
-**v124123651
-
-- Merge pull request 'Bugfixes' (#171) from bugfixes into master
-- config: crowdin
-- chore: can links be empty ?
-- fix: Context issues in article fragment.
-- fix: Context issues in fragment sheet.
-- fix: build.
-- chore: compile issue fix.
-- chore: filter some bugs.
-- bugfix: catch users using something other than selfoss.
-- bugfix: No browser, no link.
-- translations
-- chore: remove log.
-- translation
-- Changelog for v124123641
-
---------------------------------------------------------------------
-
 **v124123641
 
 - Chore: no tests on build.

androidApp/build.gradle.kts

@@ -1,7 +1,7 @@
 import java.io.ByteArrayOutputStream
 
 val ignoreGitVersion: String by project
-val acraVersion = "5.12.0"
+val acraVersion = "5.9.7"
 
 plugins {
     id("com.android.application")
@@ -9,7 +9,6 @@ plugins {
     kotlin("kapt")
     id("com.mikepenz.aboutlibraries.plugin")
     id("org.jetbrains.kotlinx.kover")
-    id("app.cash.sqldelight") version "2.0.2"
 }
 
 fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
@@ -66,14 +65,14 @@ android {
     kotlinOptions {
         jvmTarget = "17"
     }
-    compileSdk = 35
+    compileSdk = 34
     buildFeatures {
         viewBinding = true
     }
     defaultConfig {
         applicationId = "bou.amine.apps.readerforselfossv2.android"
         minSdk = 25
-        targetSdk = 34 // 35 when edge-to-edge is handled
+        targetSdk = 34
         versionCode = versionCodeFromGit()
         versionName = versionNameFromGit()
 
@@ -120,26 +119,28 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
 
     implementation(project(":shared"))
-    implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
+    implementation("com.google.android.material:material:1.9.0")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1")
 
     implementation("androidx.preference:preference-ktx:1.2.1")
 
     implementation(fileTree(mapOf("include" to listOf("*.jar"), "dir" to "libs")))
 
     // Android Support
-    implementation("com.google.android.material:material:1.12.0")
-    implementation("androidx.recyclerview:recyclerview:1.4.0-rc01")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("com.google.android.material:material:1.9.0")
+    implementation("androidx.recyclerview:recyclerview:1.3.1")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("androidx.vectordrawable:vectordrawable:1.2.0")
+    implementation("androidx.vectordrawable:vectordrawable:1.2.0-beta01")
     implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.annotation:annotation:1.9.1")
-    implementation("androidx.work:work-runtime-ktx:2.10.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.2.0")
-    implementation("org.jsoup:jsoup:1.18.3")
+    implementation("androidx.annotation:annotation:1.7.0")
+    implementation("androidx.work:work-runtime-ktx:2.8.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("org.jsoup:jsoup:1.15.4")
 
     //multidex
     implementation("androidx.multidex:multidex:2.0.1")
@@ -152,31 +153,31 @@ dependencies {
     implementation("com.ashokvarma.android:bottom-navigation-bar:2.2.0")
 
     // glide
-    kapt("com.github.bumptech.glide:compiler:4.16.0")
-    implementation("com.github.bumptech.glide:okhttp3-integration:4.16.0")
+    kapt("com.github.bumptech.glide:compiler:4.15.0")
+    implementation("com.github.bumptech.glide:okhttp3-integration:4.15.0")
 
     // Themes
     implementation("com.github.rubensousa:floatingtoolbar:1.5.1")
 
     // Pager
     implementation("me.relex:circleindicator:2.1.6")
-    implementation("androidx.viewpager2:viewpager2:1.1.0")
+    implementation("androidx.viewpager2:viewpager2:1.1.0-beta02")
 
     //Dependency Injection
-    implementation("org.kodein.di:kodein-di:7.23.1")
-    implementation("org.kodein.di:kodein-di-framework-android-x:7.23.1")
-    implementation("org.kodein.di:kodein-di-framework-android-x-viewmodel:7.23.1")
+    implementation("org.kodein.di:kodein-di:7.14.0")
+    implementation("org.kodein.di:kodein-di-framework-android-x:7.14.0")
+    implementation("org.kodein.di:kodein-di-framework-android-x-viewmodel:7.14.0")
 
     //Settings
-    implementation("com.russhwolf:multiplatform-settings-no-arg:1.3.0")
+    implementation("com.russhwolf:multiplatform-settings-no-arg:0.9")
 
     //Logging
-    implementation("io.github.aakira:napier:2.7.1")
+    implementation("io.github.aakira:napier:2.6.1")
 
     //PhotoView
     implementation("com.github.chrisbanes:PhotoView:2.3.0")
 
-    implementation("androidx.core:core-ktx:1.15.0")
+    implementation("androidx.core:core-ktx:1.12.0")
 
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
 
@@ -184,13 +185,13 @@ dependencies {
     implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
 
     // SQLDELIGHT
-    implementation("app.cash.sqldelight:android-driver:2.0.2")
+    implementation("com.squareup.sqldelight:android-driver:1.5.4")
 
     //test
     testImplementation("junit:junit:4.13.2")
-    testImplementation("io.mockk:mockk:1.13.14")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
+    testImplementation("io.mockk:mockk:1.12.0")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
     androidTestImplementation("androidx.test:runner:1.6.2")
     androidTestImplementation("androidx.test:rules:1.6.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")

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

@@ -2,7 +2,6 @@ package bou.amine.apps.readerforselfossv2.android
 
 import android.content.Context
 import androidx.annotation.ArrayRes
-import androidx.test.espresso.Espresso.onData
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.replaceText
@@ -15,7 +14,6 @@ import androidx.test.espresso.matcher.ViewMatchers.isNotChecked
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import org.hamcrest.CoreMatchers.allOf
-import org.hamcrest.Matchers.hasToString
 
 fun performLogin(someUrl: String? = null) {
     onView(withId(R.id.urlView)).perform(click()).perform(
@@ -24,6 +22,7 @@ fun performLogin(someUrl: String? = null) {
         )
     )
     onView(withId(R.id.signInButton)).perform(click())
+    Thread.sleep(10000)
 }
 
 fun loginAndInitHome() {
@@ -88,22 +87,4 @@ fun testPreferencesFromArray(
         openSettingItem()
         onView(withText(res)).check(matches(allOf(isDisplayed(), isChecked())))
     }
-}
-
-fun testAddSourceWithUrl(url: String, sourceName: String) {
-    onView(withId(R.id.fab))
-        .perform(click())
-    onView(withId(R.id.nameInput))
-        .perform(click()).perform(typeTextIntoFocusedView(sourceName))
-    onView(withId(R.id.sourceUri))
-        .perform(click())
-        .perform(typeTextIntoFocusedView(url))
-    onView(withId(R.id.tags))
-        .perform(click()).perform(typeTextIntoFocusedView("tag1,tag2,tag3"))
-    onView(withId(R.id.spoutsSpinner))
-        .perform(click())
-    onData(hasToString("RSS Feed")).perform(click())
-    onView(withId(R.id.saveBtn))
-        .perform(click())
-    onView(withText(sourceName)).check(matches(isDisplayed()))
 }

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

@@ -1,6 +1,9 @@
 package bou.amine.apps.readerforselfossv2.android
 
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -44,7 +47,9 @@ class HomeActivityTest {
                 isClickable()
             )
         )
-        openMenu()
+        openActionBarOverflowOrOptionsMenu(
+            ApplicationProvider.getApplicationContext<Context>()
+        )
         onView(withText(R.string.readAll)).check(matches(isDisplayed()))
         onView(withText(R.string.menu_home_sources)).check(matches(isDisplayed()))
         onView(withText(R.string.title_activity_settings)).check(matches(isDisplayed()))
@@ -73,31 +78,43 @@ class HomeActivityTest {
         ).check(matches(isDisplayed()))
         onView(isRoot()).perform(ViewActions.pressBack())
 
-        openMenu()
+        openActionBarOverflowOrOptionsMenu(
+            ApplicationProvider.getApplicationContext<Context>()
+        )
         onView(withText(R.string.readAll)).perform(click())
         onView(withText(R.string.markall_dialog_message)).check(matches(isDisplayed()))
         onView(isRoot()).perform(ViewActions.pressBack())
-        openMenu()
+        openActionBarOverflowOrOptionsMenu(
+            ApplicationProvider.getApplicationContext<Context>()
+        )
 
         onView(withText(R.string.menu_home_sources)).perform(click())
         onView(withId(R.id.fab)).check(matches(isDisplayed()))
         onView(isRoot()).perform(ViewActions.pressBack())
-        openMenu()
+        openActionBarOverflowOrOptionsMenu(
+            ApplicationProvider.getApplicationContext<Context>()
+        )
 
         onView(withText(R.string.title_activity_settings)).perform(click())
         onView(withText(R.string.pref_header_general)).check(matches(isDisplayed()))
         onView(isRoot()).perform(ViewActions.pressBack())
-        openMenu()
+        openActionBarOverflowOrOptionsMenu(
+            ApplicationProvider.getApplicationContext<Context>()
+        )
 
         onView(withText(R.string.menu_home_refresh)).perform(click())
         onView(withText(R.string.refresh_dialog_message)).check(matches(isDisplayed()))
         onView(isRoot()).perform(ViewActions.pressBack())
-        openMenu()
+        openActionBarOverflowOrOptionsMenu(
+            ApplicationProvider.getApplicationContext<Context>()
+        )
 
         /*onView(withText(R.string.issue_tracker_link)).perform(click())
         onView(withText(R.string.markall_dialog_message)).check(matches(isDisplayed()))
         onView(isRoot()).perform(ViewActions.pressBack())
-        openMenu()*/
+        openActionBarOverflowOrOptionsMenu(
+            ApplicationProvider.getApplicationContext<Context>()
+        )*/
 
         onView(withText(R.string.action_disconnect)).perform(click())
         onView(withText(R.string.confirm_disconnect_title)).check(matches(isDisplayed()))

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

@@ -6,7 +6,6 @@ import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.replaceText
-import androidx.test.espresso.action.ViewActions.swipeUp
 import androidx.test.espresso.action.ViewActions.typeTextIntoFocusedView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isChecked
@@ -103,7 +102,6 @@ class SettingsActivityGeneralTest {
                 )
             )
         )
-        onView(withId(R.id.settings)).perform(swipeUp())
         onView(withSettingsCheckboxWidget(R.string.display_all_counts_title)).check(
             matches(
                 allOf(

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

@@ -1,7 +1,9 @@
 package bou.amine.apps.readerforselfossv2.android
 
 import android.content.Context
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
@@ -31,7 +33,9 @@ class SettingsActivityTest {
             context = activity.window.context
         }
         loginAndInitHome()
-        openMenu()
+        openActionBarOverflowOrOptionsMenu(
+            ApplicationProvider.getApplicationContext<Context>()
+        )
         onView(withText(R.string.title_activity_settings)).perform(click())
     }
 

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

@@ -1,20 +1,19 @@
 package bou.amine.apps.readerforselfossv2.android
 
-import androidx.test.espresso.AmbiguousViewMatcherException
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.action.ViewActions.swipeDown
-import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
+import androidx.test.espresso.action.ViewActions.scrollCompletelyTo
+import androidx.test.espresso.action.ViewActions.typeTextIntoFocusedView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -24,6 +23,7 @@ import java.util.UUID
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class SourcesActivityTest {
+
     @get:Rule
     val activityRule = ActivityScenarioRule(LoginActivity::class.java)
 
@@ -34,50 +34,32 @@ class SourcesActivityTest {
         sourceName = UUID.randomUUID().toString().substring(0, 15)
 
         loginAndInitHome()
-        goToSources()
+        openActionBarOverflowOrOptionsMenu(
+            ApplicationProvider.getApplicationContext<Context>()
+        )
+        onView(withText(R.string.menu_home_sources))
+            .perform(click())
     }
 
     @Test
     fun addSource() {
-        testAddSourceWithUrl(
-            "https://lorem-rss.herokuapp.com/feed?unit=year&interval=1&length=10",
-            sourceName
-        )
-    }
-
-
-    @Test
-    fun addSourceCheckContent() {
-        testAddSourceWithUrl("https://news.google.com/rss?hl=en-US&gl=US&ceid=US:en", sourceName)
-        onView(isRoot()).perform(ViewActions.pressBack())
-        openMenu()
-        onView(withText(R.string.menu_home_refresh)).perform(click())
-        onView(withText(R.string.refresh_dialog_message)).check(matches(isDisplayed()))
-        onView(
-            withId(android.R.id.button1)
-        ).perform(click())
-        Thread.sleep(10000)
-        onView(withId(R.id.swipeRefreshLayout)).perform(swipeDown())
-        Thread.sleep(2000)
-        try {
-            onView(withId(R.id.sourceTitleAndDate)).check(matches(isDisplayed()))
-        } catch (e: AmbiguousViewMatcherException) {
-            assert(true)
-        }
-        goToSources()
-    }
-
-    @After
-    fun deleteTheCreatedSource() {
-        onView(withText(sourceName)).check(matches(isDisplayed()))
-        onView(withId(R.id.deleteBtn)).perform(click())
-        onView(withText(sourceName)).check(doesNotExist())
-    }
-
-
-    private fun goToSources() {
-        openMenu()
-        onView(withText(R.string.menu_home_sources))
+        onView(withId(R.id.fab))
             .perform(click())
+        onView(withId(R.id.nameInput))
+            .perform(click()).perform(typeTextIntoFocusedView(sourceName))
+        onView(withId(R.id.sourceUri))
+            .perform(click())
+            .perform(typeTextIntoFocusedView("https://lorem-rss.herokuapp.com/feed?unit=year&interval=1&length=10"))
+        onView(withId(R.id.tags))
+            .perform(click()).perform(typeTextIntoFocusedView("tag1,tag2,tag3"))
+        onView(withId(R.id.spoutsSpinner))
+            .perform(click())
+        onView(withText("RSS Feed"))
+            .perform(scrollCompletelyTo())
+            .perform(click())
+        onView(withId(R.id.saveBtn))
+            .perform(click())
+        onView(withText(sourceName)).check(matches(isDisplayed()))
     }
+
 }

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

@@ -1,6 +1,5 @@
 package bou.amine.apps.readerforselfossv2.android
 
-import android.content.Context
 import android.view.View
 import android.widget.EditText
 import android.widget.ImageView
@@ -8,8 +7,6 @@ import android.widget.RelativeLayout
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.core.graphics.drawable.toBitmap
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.Root
 import androidx.test.espresso.matcher.RootMatchers.isPlatformPopup
 import androidx.test.espresso.matcher.ViewMatchers.hasSibling
@@ -101,10 +98,4 @@ fun withSettingsCheckboxFrame(@StringRes id: Int): Matcher<View>? {
             )
         )
     )
-}
-
-fun openMenu() {
-    openActionBarOverflowOrOptionsMenu(
-        ApplicationProvider.getApplicationContext<Context>()
-    )
 }

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

@@ -52,7 +52,6 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.acra.ktx.sendSilentlyWithAcra
 import org.kodein.di.DI
 import org.kodein.di.DIAware
 import org.kodein.di.android.x.closestDI
@@ -104,12 +103,7 @@ class ArticleFragment : Fragment(), DIAware {
         try {
             binding = FragmentArticleBinding.inflate(inflater, container, false)
 
-            try {
-                url = item.getLinkDecoded()
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcra()
-            }
-
+            url = item.getLinkDecoded()
             contentText = item.content
             contentTitle = item.title.getHtmlDecoded()
             contentImage = item.getThumbnail(repository.baseUrl)
@@ -163,7 +157,7 @@ class ArticleFragment : Fragment(), DIAware {
             )
         } catch (e: InflateException) {
             e.sendSilentlyWithAcraWithName("webview not available")
-            try {
+            if (context != null) {
                 AlertDialog.Builder(requireContext())
                     .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
                     .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
@@ -175,8 +169,6 @@ class ArticleFragment : Fragment(), DIAware {
                     }
                     .create()
                     .show()
-            } catch (e: IllegalStateException) {
-                e.sendSilentlyWithAcraWithName("Context required is null")
             }
         }
 
@@ -226,14 +218,14 @@ class ArticleFragment : Fragment(), DIAware {
                         R.id.share_action -> requireActivity().shareLink(url, contentTitle)
                         R.id.open_action -> requireActivity().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
                         R.id.unread_action ->
-                            try {
+                            if (context != null) {
                                 if (this@ArticleFragment.item.unread) {
                                     CoroutineScope(Dispatchers.IO).launch {
                                         repository.markAsRead(this@ArticleFragment.item)
                                     }
                                     this@ArticleFragment.item.unread = false
                                     Toast.makeText(
-                                        requireContext(),
+                                        context,
                                         R.string.marked_as_read,
                                         Toast.LENGTH_LONG,
                                     ).show()
@@ -248,8 +240,6 @@ class ArticleFragment : Fragment(), DIAware {
                                         Toast.LENGTH_LONG,
                                     ).show()
                                 }
-                            } catch (e: IllegalStateException) {
-                                e.sendSilentlyWithAcraWithName("Context required is null")
                             }
 
                         else -> Unit
@@ -399,7 +389,7 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     private fun htmlToWebview() {
-        try {
+        if (context != null) {
             val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
             val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
 
@@ -544,8 +534,6 @@ class ArticleFragment : Fragment(), DIAware {
                 "utf-8",
                 null,
             )
-        } catch (e: IllegalStateException) {
-            e.sendSilentlyWithAcraWithName("Context required is null")
         }
     }
 
@@ -561,10 +549,10 @@ class ArticleFragment : Fragment(), DIAware {
 
     private fun openInBrowserAfterFailing() {
         binding.progressBar.visibility = View.GONE
-        try {
+        if (context != null) {
             requireContext().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
-        } catch (e: IllegalStateException) {
-            e.sendSilentlyWithAcraWithName("Context required is null")
+        } else {
+            Exception("openInBrowserAfterFailing context is null").sendSilentlyWithAcraWithName("openInBrowserAfterFailing > $context")
         }
     }
 

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

@@ -52,17 +52,19 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
                 false,
             )
 
-        try {
+        val context: Context? = context
+
+        if (context == null) {
+            dismiss()
+            Exception("FilterSheetFragment context is null").sendSilentlyWithAcraWithName("FilterSheetFragment > onCreateView")
+        } else {
             CoroutineScope(Dispatchers.Main).launch {
-                handleTagChips(requireContext())
-                handleSourceChips(requireContext())
+                handleTagChips(context)
+                handleSourceChips(context)
 
                 binding.progressBar2.visibility = GONE
                 binding.filterView.visibility = VISIBLE
             }
-        } catch (e: IllegalStateException) {
-            dismiss()
-            e.sendSilentlyWithAcraWithName("FilterSheetFragment > onCreateView")
         }
 
         binding.floatingActionButton2.setOnClickListener {

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

@@ -16,7 +16,7 @@ class AcraReportingAdministrator : ReportingAdministrator {
         config: CoreConfiguration,
         reportBuilder: ReportBuilder
     ): Boolean {
-        return reportBuilder.exception !is DeadSystemException && (reportBuilder.exception != null && reportBuilder.exception!!::class.simpleName != "CannotDeliverBroadcastException")
+        return reportBuilder.exception !is DeadSystemException
     }
 
     override fun shouldSendReport(

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

@@ -23,7 +23,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:gravity="center"
         android:orientation="vertical"
         android:padding="@dimen/activity_horizontal_margin">
         <!-- Login progress -->
@@ -38,7 +37,7 @@
         <LinearLayout
             android:id="@+id/loginForm"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <EditText
@@ -101,4 +100,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>

build.gradle.kts

@@ -1,3 +1,10 @@
+buildscript {
+    dependencies {
+        // SqlDelight
+        classpath("com.squareup.sqldelight:gradle-plugin:1.5.5")
+    }
+}
+
 plugins {
     //trick: for the same plugin versions in all sub-modules
     id("com.android.application").version("8.7.3").apply(false)

crowdin.yml

@@ -3,4 +3,11 @@ files:
     translation: /androidApp/src/main/res/values-%android_code%/%original_file_name%
     translate_attributes: '0'
     content_segmentation: '0'
+    translation_replace": {
+      "/master/app": "/androidApp",
+      "/master/androidApp": "/androidApp"
+    }
+    "ignore": [
+      "/gl/**"
+    ]
 preserve_hierarchy: true

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

@@ -1,16 +0,0 @@
-**v124123651**
-
-- Merge pull request 'Bugfixes' (#171) from bugfixes into master
-- config: crowdin
-- chore: can links be empty ?
-- fix: Context issues in article fragment.
-- fix: Context issues in fragment sheet.
-- fix: build.
-- chore: compile issue fix.
-- chore: filter some bugs.
-- bugfix: catch users using something other than selfoss.
-- bugfix: No browser, no link.
-- translations
-- chore: remove log.
-- translation
-- Changelog for v124123641

shared/build.gradle.kts

@@ -1,18 +1,18 @@
-val ktorVersion = "3.0.3"
+val ktorVersion = "2.3.2"
 
 object SqlDelight {
-    const val runtime = "app.cash.sqldelight:runtime:2.0.2"
-    const val android = "app.cash.sqldelight:android-driver:2.0.2"
-    const val native = "app.cash.sqldelight:native-driver:2.0.2"
+    const val runtime = "com.squareup.sqldelight:runtime:1.5.4"
+    const val android = "com.squareup.sqldelight:android-driver:1.5.4"
+    const val native = "com.squareup.sqldelight:native-driver:1.5.4"
 
 }
 
 plugins {
     kotlin("multiplatform")
     id("com.android.library")
+    id("com.squareup.sqldelight")
     kotlin("plugin.serialization") version "1.9.0"
     id("org.jetbrains.kotlinx.kover")
-    id("app.cash.sqldelight") version "2.0.2"
 }
 
 kotlin {
@@ -37,7 +37,7 @@ kotlin {
                 implementation("io.ktor:ktor-client-logging:$ktorVersion")
                 implementation("io.ktor:ktor-client-auth:$ktorVersion")
                 implementation("io.ktor:ktor-client-cio:$ktorVersion")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
 
                 implementation("org.jsoup:jsoup:1.15.4")
 
@@ -66,6 +66,7 @@ kotlin {
         val androidMain by getting {
             dependencies {
                 implementation("com.squareup.okhttp3:okhttp:4.11.0")
+                implementation("io.ktor:ktor-client-okhttp:2.2.4")
                 implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 
                 // Sql
@@ -85,6 +86,7 @@ kotlin {
 
             dependencies {
                 implementation(SqlDelight.native)
+                implementation("io.ktor:ktor-client-ios:2.1.1")
             }
         }
         val iosX64Test by getting
@@ -108,10 +110,11 @@ android {
     namespace = "bou.amine.apps.readerforselfossv2"
 }
 
+
+
 sqldelight {
-    databases {
-        create("ReaderForSelfossDB") {
-            packageName.set("bou.amine.apps.readerforselfossv2.dao")
-        }
+    database("ReaderForSelfossDB") {
+        packageName = "bou.amine.apps.readerforselfossv2.dao"
+        sourceFolders = listOf("sqldelight")
     }
 }

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

@@ -1,15 +1,10 @@
 package bou.amine.apps.readerforselfossv2.dao
-
 import android.content.Context
-import app.cash.sqldelight.db.SqlDriver
-import app.cash.sqldelight.driver.android.AndroidSqliteDriver
+import com.squareup.sqldelight.android.AndroidSqliteDriver
+import com.squareup.sqldelight.db.SqlDriver
 
 actual class DriverFactory(private val context: Context) {
     actual fun createDriver(): SqlDriver {
-        return AndroidSqliteDriver(
-            ReaderForSelfossDB.Schema,
-            context,
-            "ReaderForSelfossV2-android.db"
-        )
+        return AndroidSqliteDriver(ReaderForSelfossDB.Schema, context, "ReaderForSelfossV2-android.db")
     }
-}
+}

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

@@ -1,7 +1,7 @@
 package bou.amine.apps.readerforselfossv2.dao
 
-import app.cash.sqldelight.db.SqlDriver
+import com.squareup.sqldelight.db.SqlDriver
 
 expect class DriverFactory {
     fun createDriver(): SqlDriver
-}
+}

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

@@ -2,7 +2,6 @@ package bou.amine.apps.readerforselfossv2.model
 
 import bou.amine.apps.readerforselfossv2.utils.DateUtils
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
-import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.descriptors.PrimitiveKind
@@ -11,12 +10,7 @@ import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.encoding.encodeCollection
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonDecoder
-import kotlinx.serialization.json.boolean
-import kotlinx.serialization.json.booleanOrNull
-import kotlinx.serialization.json.int
-import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.*
 
 class SelfossModel {
     @Serializable
@@ -140,10 +134,6 @@ class SelfossModel {
                 stringUrl = "http:$stringUrl"
             }
 
-            if (stringUrl.isEmptyOrNullOrNullString()) {
-                throw Exception("Link ${link} was translated to ${stringUrl}, but was empty. Handle this.")
-            }
-
             return stringUrl
         }
 
@@ -186,10 +176,7 @@ class SelfossModel {
             encoder: Encoder,
             value: List<String>,
         ) {
-            encoder.encodeCollection(
-                PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING),
-                value.size
-            ) { this.toString() }
+            encoder.encodeCollection(PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING), value.size) { this.toString() }
         }
     }
 
@@ -204,10 +191,7 @@ class SelfossModel {
         }
 
         override val descriptor: SerialDescriptor
-            get() = PrimitiveSerialDescriptor(
-                "BooleanOrIntForSomeSelfossVersions",
-                PrimitiveKind.BOOLEAN
-            )
+            get() = PrimitiveSerialDescriptor("BooleanOrIntForSomeSelfossVersions", PrimitiveKind.BOOLEAN)
 
         override fun serialize(
             encoder: Encoder,
@@ -216,4 +200,4 @@ class SelfossModel {
             TODO("Not yet implemented")
         }
     }
-}
+}

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

@@ -1,26 +1,22 @@
 package bou.amine.apps.readerforselfossv2.rest
 
-import bou.amine.apps.readerforselfossv2.model.MercuryModel
-import bou.amine.apps.readerforselfossv2.model.StatusAndData
+import bou.amine.apps.readerforselfossv2.model.*
 import io.github.aakira.napier.Napier
-import io.ktor.client.HttpClient
-import io.ktor.client.plugins.cache.HttpCache
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.client.plugins.logging.LogLevel
-import io.ktor.client.plugins.logging.Logger
-import io.ktor.client.plugins.logging.Logging
-import io.ktor.client.request.get
-import io.ktor.client.request.parameter
-import io.ktor.serialization.kotlinx.json.json
+import io.ktor.client.*
+import io.ktor.client.plugins.cache.*
+import io.ktor.client.plugins.contentnegotiation.*
+import io.ktor.client.plugins.logging.*
+import io.ktor.client.request.*
+import io.ktor.serialization.kotlinx.json.*
 import kotlinx.serialization.json.Json
 
-class MercuryApi {
+class MercuryApi() {
     var client = createHttpClient()
 
     private fun createHttpClient(): HttpClient {
         return HttpClient {
-            install(HttpCache)
             install(ContentNegotiation) {
+                install(HttpCache)
                 json(
                     Json {
                         prettyPrint = true
@@ -48,4 +44,4 @@ class MercuryApi {
                 parameter("link", url)
             },
         )
-}
+}

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

@@ -45,8 +45,8 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     setupInsecureHTTPEngine(this)
                 }
             }
-            install(HttpCache)
             install(ContentNegotiation) {
+                install(HttpCache)
                 json(
                     Json {
                         prettyPrint = true
@@ -105,8 +105,8 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
 
     private fun hasLoginInfo() =
         appSettingsService.getUserName().isNotEmpty() &&
-                appSettingsService.getPassword()
-                    .isNotEmpty()
+            appSettingsService.getPassword()
+                .isNotEmpty()
 
     suspend fun login(): SuccessResponse =
         if (appSettingsService.getUserName().isNotEmpty() &&
@@ -127,9 +127,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             client.tryToGet(url("/login")) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -150,9 +148,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             client.tryToPost(url("/login")) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -168,8 +164,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             },
         )
 
-    private fun shouldHaveNewLogout() =
-        appSettingsService.getApiVersion() >= 5 // We are missing 4.1.0
+    private fun shouldHaveNewLogout() = appSettingsService.getApiVersion() >= 5 // We are missing 4.1.0
 
     suspend fun logout(): SuccessResponse =
         if (shouldHaveNewLogout()) {
@@ -181,9 +176,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
     private suspend fun maybeLogoutIfAvailable() =
         responseOrSuccessIf404(
             client.tryToGet(url("/logout")) {
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -202,9 +195,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
     private suspend fun doLogout() =
         maybeResponse(
             client.tryToDelete(url("/api/session/current")) {
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -242,9 +233,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 parameter("updatedsince", updatedSince)
                 parameter("items", items ?: appSettingsService.getItemsNumber())
                 parameter("offset", offset)
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -269,9 +258,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 }
                 parameter("type", "all")
                 parameter("items", 1)
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -294,9 +281,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -319,9 +304,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -344,9 +327,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -369,9 +350,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -394,9 +373,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -419,9 +396,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -440,9 +415,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
     suspend fun apiInformation(): StatusAndData<SelfossModel.ApiInformation> =
         bodyOrFailure(
             client.tryToGet(url("/api/about")) {
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -465,9 +438,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -490,9 +461,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -515,9 +484,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -540,9 +507,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -563,17 +528,15 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             client.tryToSubmitForm(
                 url = url("/mark"),
                 formParameters =
-                Parameters.build {
-                    if (!shouldHavePostLogin()) {
-                        append("username", appSettingsService.getUserName())
-                        append("password", appSettingsService.getPassword())
-                    }
-                    ids.map { append("ids[]", it) }
-                },
+                    Parameters.build {
+                        if (!shouldHavePostLogin()) {
+                            append("username", appSettingsService.getUserName())
+                            append("password", appSettingsService.getPassword())
+                        }
+                        ids.map { append("ids[]", it) }
+                    },
                 block = {
-                    if (appSettingsService.getBasicUserName()
-                            .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                    ) {
+                    if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                         headers {
                             append(
                                 HttpHeaders.Authorization,
@@ -614,20 +577,18 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         client.tryToSubmitForm(
             url = url("/source"),
             formParameters =
-            Parameters.build {
-                if (!shouldHavePostLogin()) {
-                    append("username", appSettingsService.getUserName())
-                    append("password", appSettingsService.getPassword())
-                }
-                append("title", title)
-                append("url", url)
-                append("spout", spout)
-                append(tagsParamName, tags)
-            },
+                Parameters.build {
+                    if (!shouldHavePostLogin()) {
+                        append("username", appSettingsService.getUserName())
+                        append("password", appSettingsService.getPassword())
+                    }
+                    append("title", title)
+                    append("url", url)
+                    append("spout", spout)
+                    append(tagsParamName, tags)
+                },
             block = {
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -669,20 +630,18 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         client.tryToSubmitForm(
             url = url("/source/$id"),
             formParameters =
-            Parameters.build {
-                if (!shouldHavePostLogin()) {
-                    append("username", appSettingsService.getUserName())
-                    append("password", appSettingsService.getPassword())
-                }
-                append("title", title)
-                append("url", url)
-                append("spout", spout)
-                append(tagsParamName, tags)
-            },
+                Parameters.build {
+                    if (!shouldHavePostLogin()) {
+                        append("username", appSettingsService.getUserName())
+                        append("password", appSettingsService.getPassword())
+                    }
+                    append("title", title)
+                    append("url", url)
+                    append("spout", spout)
+                    append(tagsParamName, tags)
+                },
             block = {
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -705,9 +664,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     parameter("username", appSettingsService.getUserName())
                     parameter("password", appSettingsService.getPassword())
                 }
-                if (appSettingsService.getBasicUserName()
-                        .isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
                     headers {
                         append(
                             HttpHeaders.Authorization,
@@ -722,4 +679,4 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 }
             },
         )
-}
+}

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

@@ -1,5 +1,3 @@
-import kotlin.Boolean;
-
 CREATE TABLE `ACTION` (
     `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
     `articleid` TEXT NOT NULL,

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

@@ -1,5 +1,3 @@
-import kotlin.Boolean;
-
 CREATE TABLE ITEM (
     `id` TEXT NOT NULL,
     `datetime` TEXT NOT NULL,

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

@@ -1,10 +1,10 @@
 package bou.amine.apps.readerforselfossv2.dao
 
-import app.cash.sqldelight.db.SqlDriver
-import app.cash.sqldelight.driver.native.NativeSqliteDriver
+import com.squareup.sqldelight.db.SqlDriver
+import com.squareup.sqldelight.drivers.native.NativeSqliteDriver
 
 actual class DriverFactory {
     actual fun createDriver(): SqlDriver {
         return NativeSqliteDriver(ReaderForSelfossDB.Schema, "ReaderForSelfossV2-IOS.db")
     }
-}
+}

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

@@ -1,10 +1,10 @@
 package bou.amine.apps.readerforselfossv2.dao
 
-import app.cash.sqldelight.db.SqlDriver
-import app.cash.sqldelight.driver.native.NativeSqliteDriver
+import com.squareup.sqldelight.db.SqlDriver
+import com.squareup.sqldelight.drivers.native.NativeSqliteDriver
 
 actual class DriverFactory {
     actual fun createDriver(): SqlDriver {
         return NativeSqliteDriver(ReaderForSelfossDB.Schema, "ReaderForSelfossV2-IOS.db")
     }
-}
+}