Changelog for v122123641 [CI SKIP]

feat: Disable the failing source in the filter sheet.
feat: Display the source error in the sources list.
2023-01-04 19:27:56 +00:00 · 2023-01-03 21:35:21 +01:00 · 2023-01-03 21:28:40 +01:00 · 2022-12-30 19:24:48 +00:00 · 2022-12-30 20:10:08 +01:00 · 2022-12-29 21:34:13 +01:00
66 changed files with 933 additions and 1133 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,31 +3,38 @@ type: docker
 name: test

 steps:
-  - name: AnylyseBuildTest
+  - name: BuildAndTest
    image: mingc/android-build-box:latest
    commands:
      - echo "---------------------------------------------------------"
      - echo "Configure gradle..."
      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
      - echo "---------------------------------------------------------"
-      - echo "Analysing..."
-      - ./gradlew sonarqube -Dsonar.projectKey=RFS2 -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN
-      - echo "---------------------------------------------------------"
      - echo "Building..."
-      - ./gradlew build
+      - ./gradlew build -x test
      - echo "---------------------------------------------------------"
      - echo "Testing..."
      - echo "---------------------------------------------------------"
-      - ./gradlew test
+      - ./gradlew koverMergedXmlReport
    environment:
+      TZ: Europe/Paris
      SONAR_HOST_URL:
        from_secret: sonarScannerHostUrl
      SONAR_LOGIN:
        from_secret: sonarScannerLogin
+  - name: Analyse
+    image: kytay/sonar-node-plugin
+    settings:
+      sonar_host:
+        from_secret: sonarScannerHostUrl
+      sonar_token:
+        from_secret: sonarScannerLogin
+      use_node_version: 16.18.1
+      sonar_debug: true
+      sonar_project_settings: ./sonar-project.properties
 trigger:
  event:
    - push
-    - pull_request

 ---
 kind: pipeline
@@ -35,14 +42,22 @@ type: docker
 name: Publish

 steps:
-  - name: createTag
+  - name: createTagAndChangelog
    image: ubuntu:latest
    commands:
      - apt-get update && apt-get install -y git
+      - git fetch --tags -p
+      - VER=$(git describe --tags --abbrev=0)
+      - CHANGELOG=$(git log $VER..HEAD --pretty="- %s")
+      - echo "**$VER**\n\n$CHANGELOG\n\n--------------------------------------------------------------------\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
+      - git add CHANGELOG.md
+      - git commit -m "Changelog for $VER [CI SKIP]"
      - ./build.sh --publish --from-ci
      - git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git
+      - git push pushing master
      - git push pushing --tags
    environment:
+      TZ: Europe/Paris
      GITEA_USR:
        from_secret: giteaUsr
      GITEA_PASS:
@@ -68,10 +83,7 @@ steps:
        from_secret: privateKey
      command_timeout: 2m
      script:
-        - cd /home/ubuntu
-        - sudo rm -rf /var/www/amine/version.txt
-        - sudo chown www-data:www-data ./version.txt
-        - sudo mv version.txt /var/www/amine/
+        - cd /home/ubuntu && sudo rm -rf /var/www/amine/version.txt && sudo chown www-data:www-data ./version.txt && sudo mv version.txt /var/www/amine/

 trigger:
  event:
@@ -88,9 +100,12 @@ steps:
  - name: build
    image: mingc/android-build-box:latest
    commands:
+      - echo "---------------------------------------------------------"
+      - echo "Fetch tags..."
+      - git fetch --tags
      - echo "---------------------------------------------------------"
      - echo "Configure gradle..."
-      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
+      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
      - echo "---------------------------------------------------------"
      - echo "Generate APK"
      - ./gradlew :androidApp:assembleGithubConfigRelease  -P pushCache=false
@@ -107,6 +122,7 @@ steps:
      - echo "Verify"
      - $ANDROID_HOME/build-tools/31.0.0/apksigner verify signed.apk
    environment:
+      TZ: Europe/Paris
      YOUR_KEYSTORE_PASSWORD:
        from_secret: keyPass
      YOUR_KEY_ALIAS:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+**v122123641**
+
+- feat: Disable the failing source in the filter sheet.
+- feat: Display the source error in the sources list.
+
+--------------------------------------------------------------------
+
+**v122123631**
+
+- build: Added back maven repos (see https://gitlab.com/fdroid/fdroiddata/-/commit/1fb9d60dc58511abc2bb4eb321977922a0682c8b#note_1223925153)
+- build: Added back maven repos (see https://gitlab.com/fdroid/fdroiddata/-/commit/1fb9d60dc58511abc2bb4eb321977922a0682c8b#note_1223925153)
+- debug: trying to resolve `Canvas: trying to use a recycled bitmap`.
+- fix: NPE may be caused by the binding or the title that was null.
+- chore: Skip drone pipeline on changelog push.
+
+--------------------------------------------------------------------
+
+**v122123621**
+
+- fix: Automatic CHANGELOG generation.
+- Merge pull request 'Sources Upsert' (#119) from sources-edit into master
+- Source update screen.
+- Sources menu.
+- chore: Automatic CHANGELOG generation.
+
+--------------------------------------------------------------------
+
 # V2/Multiplatform rewrite

 **v1**
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -8,6 +8,7 @@ plugins {
    kotlin("android")
    kotlin("kapt")
    id("com.mikepenz.aboutlibraries.plugin")
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }

 fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
@@ -145,8 +146,8 @@ dependencies {
    implementation("com.amulyakhare:com.amulyakhare.textdrawable:1.0.1")

    // glide
-    kapt("com.github.bumptech.glide:compiler:4.11.0")
-    implementation("com.github.bumptech.glide:okhttp3-integration:4.1.1")
+    kapt("com.github.bumptech.glide:compiler:4.14.2")
+    implementation("com.github.bumptech.glide:okhttp3-integration:4.14.2")

    // Themes
    implementation("com.github.rubensousa:floatingtoolbar:1.5.1")
@@ -187,9 +188,6 @@ dependencies {

    implementation("ch.acra:acra-http:$acraVersion")
    implementation("ch.acra:acra-toast:$acraVersion")
-
-    // Matomo
-    implementation("com.github.matomo-org:matomo-sdk-android:4.1.4")
 }

 tasks.withType<Test> {
--- a/androidApp/src/main/AndroidManifest.xml
+++ b/androidApp/src/main/AndroidManifest.xml
@@ -52,7 +52,7 @@
                android:value=".HomeActivity" />
        </activity>
        <activity
-            android:name=".AddSourceActivity"
+            android:name=".UpsertSourceActivity"
            android:parentActivityName=".SourcesActivity"
            android:exported="true">
            <meta-data
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ACRAUtils.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ACRAUtils.kt
@@ -4,6 +4,6 @@ import org.acra.ACRA
 import org.acra.ktx.sendSilentlyWithAcra

 fun Throwable.sendSilentlyWithAcraWithName(name: String) {
-        ACRA.errorReporter.putCustomData("error_source", name)
+    ACRA.errorReporter.putCustomData("error_source", name)
    this.sendSilentlyWithAcra()
 }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
@@ -1,7 +1,6 @@
 package bou.amine.apps.readerforselfossv2.android

 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
@@ -31,7 +30,6 @@ import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.ItemType
-import bou.amine.apps.readerforselfossv2.utils.longHash
 import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
@@ -41,8 +39,6 @@ import kotlinx.coroutines.launch
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
-import org.matomo.sdk.Tracker
-import org.matomo.sdk.extra.TrackHelper
 import java.security.MessageDigest
 import java.util.concurrent.TimeUnit

@@ -66,8 +62,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar

    private var fromTabShortcut: Boolean = false

-    private lateinit var tagsBadge: Map<Long, Int>
-
    private val settingsLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
        appSettingsService.refreshUserSettings()
    }
@@ -75,7 +69,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
    override val di by closestDI()
    private val repository : Repository by instance()
    private val appSettingsService : AppSettingsService by instance()
-    private val tracker : Tracker by instance()


    override fun onCreate(savedInstanceState: Bundle?) {
@@ -83,8 +76,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        binding = ActivityHomeBinding.inflate(layoutInflater)
        val view = binding.root

-        TrackHelper.track().screen("/home").with(tracker)
-
        fromTabShortcut =  intent.getIntExtra("shortcutTab", -1) != -1
        repository.offlineOverride =  intent.getBooleanExtra("startOffline", false)

@@ -156,15 +147,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar

                        adapter.handleItemAtIndex(position)

-                        val tagHashes = i.tags.map { it.longHash() }
-                        tagsBadge = tagsBadge.map {
-                            if (tagHashes.contains(it.key)) {
-                                (it.key to (it.value - 1))
-                            } else {
-                                (it.key to it.value)
-                            }
-                        }.toMap()
-
                        // Just load everythin
                        if (items.size <= 0) {
                            getElementsAccordingToTab()
@@ -612,15 +594,19 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                CoroutineScope(Dispatchers.Main).launch {
                    repository.logout()
                }
+                this@HomeActivity.finish()
                val intent = Intent(this, LoginActivity::class.java)
                this.startActivity(intent)
-                this@HomeActivity.finish()
                return true
            }
            R.id.action_settings -> {
                settingsLauncher.launch(Intent(this, SettingsActivity::class.java))
                return true
            }
+            R.id.action_sources -> {
+                startActivity(Intent(this, SourcesActivity::class.java))
+                return true
+            }
            else -> return super.onOptionsItemSelected(item)
        }
    }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt
@@ -11,6 +11,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
@@ -22,13 +23,10 @@ import com.mikepenz.aboutlibraries.LibsBuilder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.acra.ACRA
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
-import org.matomo.sdk.Tracker
-import org.matomo.sdk.extra.DimensionQueue
-import org.matomo.sdk.extra.DownloadTracker
-import org.matomo.sdk.extra.TrackHelper
 import java.security.MessageDigest


@@ -40,18 +38,13 @@ class LoginActivity : AppCompatActivity(), DIAware {
    private lateinit var binding: ActivityLoginBinding

    override val di by closestDI()
-    private val repository : Repository by instance()
-    private val appSettingsService : AppSettingsService by instance()
-    private val tracker : Tracker by instance()
+    private val repository: Repository by instance()
+    private val appSettingsService: AppSettingsService by instance()


    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

-        TrackHelper.track().download().identifier(DownloadTracker.Extra.ApkChecksum(applicationContext))
-            .with(tracker)
-        TrackHelper.track().screen("/login").with(tracker)
-
        handleTheme()

        binding = ActivityLoginBinding.inflate(layoutInflater)
@@ -64,7 +57,30 @@ class LoginActivity : AppCompatActivity(), DIAware {
        handleBaseUrlFail()

        if (appSettingsService.getBaseUrl().isNotEmpty()) {
-            goToMain()
+            showProgress(true)
+            // This should be reverted when "old" users connected with a non-selfoss rss
+            // are handled. Revert to "simple" way.
+            CoroutineScope(Dispatchers.Main).launch {
+                try {
+                    val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance()
+                    if (!errorFetching && !displaySelfossOnly) {
+                        goToMain()
+                    } else {
+                        showProgress(false)
+                        if (displaySelfossOnly) {
+                            Toast.makeText(
+                                applicationContext,
+                                R.string.application_selfoss_only,
+                                Toast.LENGTH_LONG
+                            ).show()
+                        }
+                        repository.logout()
+                    }
+                } catch (e: Throwable) {
+                    repository.logout()
+                    showProgress(false)
+                }
+            }
        }

        handleActions()
@@ -114,15 +130,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
    private fun goToMain() {
        CoroutineScope(Dispatchers.Main).launch {
            repository.updateApiVersion()
-
-            val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
-            messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
-            tracker.userId = String(messageDigest.digest())
-
-            val mDimensionQueue = DimensionQueue(tracker)
-            mDimensionQueue.add(1, appSettingsService.getApiVersion().toString())
-
-            tracker.isOptOut = !appSettingsService.isAnalyticsEnabled()
+            ACRA.errorReporter.putCustomData("SELFOSS_API_VERSION", appSettingsService.getApiVersion().toString())
        }
        val intent = Intent(this, HomeActivity::class.java)
        startActivity(intent)
@@ -191,17 +199,27 @@ class LoginActivity : AppCompatActivity(), DIAware {

            repository.refreshLoginInformation(url, login, password)

-            CoroutineScope(Dispatchers.IO).launch {
+            CoroutineScope(Dispatchers.Main).launch {
                val result = repository.login()
                if (result) {
-                    goToMain()
-                } else {
-                    CoroutineScope(Dispatchers.Main).launch {
+                    val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance()
+                    if (!errorFetching && !displaySelfossOnly) {
+                        goToMain()
+                    } else {
+                        if (displaySelfossOnly) {
+                            Toast.makeText(
+                                applicationContext,
+                                R.string.application_selfoss_only,
+                                Toast.LENGTH_LONG
+                            ).show()
+                        }
                        preferenceError()
                    }
+                } else {
+                    preferenceError()
                }
+                showProgress(false)
            }
-            showProgress(false)
        }
    }

@@ -215,11 +233,11 @@ class LoginActivity : AppCompatActivity(), DIAware {
            .alpha(
                if (show) 0F else 1F
            ).setListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator) {
-                binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE
+                override fun onAnimationEnd(animation: Animator) {
+                    binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE
+                }
            }
-        }
-        )
+            )

        binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
        binding.loginProgress
@@ -228,11 +246,11 @@ class LoginActivity : AppCompatActivity(), DIAware {
            .alpha(
                if (show) 1F else 0F
            ).setListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator) {
-                binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
+                override fun onAnimationEnd(animation: Animator) {
+                    binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
+                }
            }
-        }
-        )
+            )
    }

    override fun onCreateOptionsMenu(menu: Menu): Boolean {
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt
@@ -3,10 +3,7 @@ package bou.amine.apps.readerforselfossv2.android
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
-import android.graphics.drawable.Drawable
-import android.net.Uri
 import android.os.Build
-import android.widget.ImageView
 import android.widget.Toast
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -18,8 +15,6 @@ import bou.amine.apps.readerforselfossv2.dao.DriverFactory
 import bou.amine.apps.readerforselfossv2.dao.ReaderForSelfossDB
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestOptions
 import com.github.ln_12.library.ConnectivityStatus
 import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
@@ -35,9 +30,6 @@ import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
 import org.kodein.di.*
-import org.matomo.sdk.Matomo
-import org.matomo.sdk.Tracker
-import org.matomo.sdk.TrackerBuilder

 class MyApp : MultiDexApplication(), DIAware {

@@ -48,8 +40,6 @@ class MyApp : MultiDexApplication(), DIAware {
        bind<Repository>() with singleton { Repository(instance(), instance(), isConnectionAvailable, instance()) }
        bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
        bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
-        bind<Tracker>() with singleton { TrackerBuilder.createDefault("https://matomo.amine-louveau.fr/matomo.php", if (BuildConfig.DEBUG) 4 else 5).build(
-            Matomo.getInstance(applicationContext)) }
    }

    private val repository: Repository by instance()
@@ -88,6 +78,8 @@ class MyApp : MultiDexApplication(), DIAware {
                }
            }
        }
+
+        repository.migrate(driverFactory)
    }

    override fun attachBaseContext(base: Context?) {
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt
@@ -30,6 +30,8 @@ class ReaderActivity : AppCompatActivity(), DIAware {

    private lateinit var binding: ActivityReaderBinding

+    private var allItems: ArrayList<SelfossModel.Item> = ArrayList()
+
    override val di by closestDI()
    private val repository: Repository by instance()
    private val appSettingsService: AppSettingsService by instance()
@@ -61,12 +63,14 @@ class ReaderActivity : AppCompatActivity(), DIAware {
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        supportActionBar?.setDisplayShowHomeEnabled(true)

-        if (allItems.isEmpty()) {
+        currentItem = intent.getIntExtra("currentItem", 0)
+
+        allItems = repository.getReaderItems()
+
+        if (allItems.isEmpty() || currentItem > allItems.size) {
            finish()
        }

-        currentItem = intent.getIntExtra("currentItem", 0)
-
        readItem(allItems[currentItem])

        binding.pager.adapter = ScreenSlidePagerAdapter(this)
@@ -214,8 +218,4 @@ class ReaderActivity : AppCompatActivity(), DIAware {
        startActivity(intent)
        overridePendingTransition(0, 0)
    }
-
-    companion object {
-        var allItems: ArrayList<SelfossModel.Item> = ArrayList()
-    }
 }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/SourcesActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/SourcesActivity.kt
@@ -73,7 +73,7 @@ class SourcesActivity : AppCompatActivity(), DIAware {
        }

        binding.fab.setOnClickListener {
-            startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))
+            startActivity(Intent(this@SourcesActivity, UpsertSourceActivity::class.java))
        }
    }
 }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/UpsertSourceActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/UpsertSourceActivity.kt
@@ -3,12 +3,15 @@ package bou.amine.apps.readerforselfossv2.android
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
-import android.widget.*
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import androidx.constraintlayout.widget.ConstraintLayout
-import bou.amine.apps.readerforselfossv2.android.databinding.ActivityAddSourceBinding
+import bou.amine.apps.readerforselfossv2.android.databinding.ActivityUpsertSourceBinding
 import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlInvalid
 import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
+import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import kotlinx.coroutines.CoroutineScope
@@ -19,38 +22,59 @@ import org.kodein.di.android.closestDI
 import org.kodein.di.instance


-class AddSourceActivity : AppCompatActivity(), DIAware {
+class UpsertSourceActivity : AppCompatActivity(), DIAware {

+    private var existingSource: SelfossModel.Source? = null
    private var mSpoutsValue: String? = null

-    private lateinit var binding: ActivityAddSourceBinding
+    private lateinit var binding: ActivityUpsertSourceBinding

    override val di by closestDI()
-    private val repository : Repository by instance()
-    private val appSettingsService : AppSettingsService by instance()
+    private val repository: Repository by instance()
+    private val appSettingsService: AppSettingsService by instance()

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        binding = ActivityAddSourceBinding.inflate(layoutInflater)
+        binding = ActivityUpsertSourceBinding.inflate(layoutInflater)
        val view = binding.root

+        existingSource = repository.getSelectedSource()
+        if (existingSource != null) {
+            binding.formContainer.visibility = View.GONE
+            binding.progress.visibility = View.VISIBLE
+        }
+        val title = if (existingSource == null) R.string.add_source else R.string.update_source
+
+        supportFragmentManager.addOnBackStackChangedListener {
+            if (supportFragmentManager.backStackEntryCount == 0) {
+                setTitle(title)
+            }
+        }
+
        setContentView(view)

        setSupportActionBar(binding.toolbar)
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        supportActionBar?.setDisplayShowHomeEnabled(true)
+        supportActionBar?.title = resources.getString(title)

-        maybeGetDetailsFromIntentSharing(intent, binding.sourceUri, binding.nameInput)
+
+        maybeGetDetailsFromIntentSharing(intent)

        binding.saveBtn.setOnClickListener {
-            handleSaveSource(
-                binding.tags,
-                binding.nameInput.text.toString(),
-                binding.sourceUri.text.toString()
-            )
+            handleSaveSource()
        }
    }

+    private fun initFields(items: Map<String, SelfossModel.Spout>) {
+        binding.nameInput.setText(existingSource!!.title)
+        binding.tags.setText(existingSource!!.tags.joinToString(", "))
+        binding.sourceUri.setText(existingSource!!.params?.url)
+        binding.spoutsSpinner.setSelection(items.keys.indexOf(existingSource!!.spout))
+        binding.progress.visibility = View.GONE
+        binding.formContainer.visibility = View.VISIBLE
+    }
+
    override fun onResume() {
        super.onResume()

@@ -58,17 +82,13 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
        if (baseUrl.isEmpty() || baseUrl.isBaseUrlInvalid()) {
            mustLoginToAddSource()
        } else {
-            handleSpoutsSpinner(binding.spoutsSpinner, binding.progress, binding.formContainer)
+            handleSpoutsSpinner()
        }
    }

-    private fun handleSpoutsSpinner(
-        spoutsSpinner: Spinner,
-        mProgress: ProgressBar,
-        formContainer: ConstraintLayout
-    ) {
+    private fun handleSpoutsSpinner() {
        val spoutsKV = HashMap<String, String>()
-        spoutsSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+        binding.spoutsSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
            override fun onItemSelected(adapterView: AdapterView<*>, view: View?, i: Int, l: Long) {
                if (view != null) {
                    val spoutName = (view as TextView).text.toString()
@@ -84,11 +104,11 @@ class AddSourceActivity : AppCompatActivity(), DIAware {

        fun handleSpoutFailure(networkIssue: Boolean = false) {
            Toast.makeText(
-                this@AddSourceActivity,
+                this@UpsertSourceActivity,
                if (networkIssue) R.string.cant_get_spouts_no_network else R.string.cant_get_spouts,
                Toast.LENGTH_SHORT
            ).show()
-            mProgress.visibility = View.GONE
+            binding.progress.visibility = View.GONE
        }

        CoroutineScope(Dispatchers.Main).launch {
@@ -100,17 +120,21 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
                        spoutsKV[value.name] = key
                    }

-                    mProgress.visibility = View.GONE
-                    formContainer.visibility = View.VISIBLE
+                    binding.progress.visibility = View.GONE
+                    binding.formContainer.visibility = View.VISIBLE

                    val spinnerArrayAdapter =
                        ArrayAdapter(
-                            this@AddSourceActivity,
+                            this@UpsertSourceActivity,
                            android.R.layout.simple_spinner_item,
                            itemsStrings
                        )
                    spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-                    spoutsSpinner.adapter = spinnerArrayAdapter
+                    binding.spoutsSpinner.adapter = spinnerArrayAdapter
+
+                    if (existingSource != null) {
+                        initFields(items)
+                    }
                } else {
                    handleSpoutFailure()
                }
@@ -121,13 +145,11 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
    }

    private fun maybeGetDetailsFromIntentSharing(
-        intent: Intent,
-        sourceUri: EditText,
-        nameInput: EditText
+        intent: Intent
    ) {
        if (Intent.ACTION_SEND == intent.action && "text/plain" == intent.type) {
-            sourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
-            nameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
+            binding.sourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
+            binding.nameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
        }
    }

@@ -138,7 +160,8 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
        finish()
    }

-    private fun handleSaveSource(tags: EditText, title: String, url: String) {
+    private fun handleSaveSource() {
+        val url = binding.sourceUri.text.toString()

        val sourceDetailsUnavailable =
            title.isEmpty() || url.isEmpty() || mSpoutsValue == null || mSpoutsValue!!.isEmpty()
@@ -149,18 +172,27 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
            }
            else -> {
                CoroutineScope(Dispatchers.Main).launch {
-                    val successfullyAddedSource = repository.createSource(
-                        title,
-                        url,
-                        mSpoutsValue!!,
-                        tags.text.toString(),
-                        "",
-                    )
+                    val successfullyAddedSource = if (existingSource != null) {
+                        repository.updateSource(
+                            existingSource!!.id,
+                            binding.nameInput.text.toString(),
+                            url,
+                            mSpoutsValue!!,
+                            binding.tags.text.toString()
+                        )
+                    } else {
+                        repository.createSource(
+                            binding.nameInput.text.toString(),
+                            url,
+                            mSpoutsValue!!,
+                            binding.tags.text.toString(),
+                        )
+                    }
                    if (successfullyAddedSource) {
                        finish()
                    } else {
                        Toast.makeText(
-                            this@AddSourceActivity,
+                            this@UpsertSourceActivity,
                            R.string.cant_create_source,
                            Toast.LENGTH_SHORT
                        ).show()
@@ -169,4 +201,9 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
            }
        }
    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        repository.unsetSelectedSource()
+    }
 }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt
@@ -62,7 +62,7 @@ class ItemCardAdapter(

            binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))

-            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
+            binding.sourceTitleAndDate.text = itm.sourceAuthorAndDate()

            if (!appSettingsService.isFullHeightCardsEnabled()) {
                binding.itemImage.maxHeight = imageMaxHeight
@@ -132,8 +132,8 @@ class ItemCardAdapter(

        private fun handleLinkOpening() {
            binding.root.setOnClickListener {
+                repository.setReaderItems(items)
                c.openItemUrl(
-                    items,
                    bindingAdapterPosition,
                    items[bindingAdapterPosition].getLinkDecoded(),
                    appSettingsService.isArticleViewerEnabled(),
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemListAdapter.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemListAdapter.kt
@@ -51,7 +51,7 @@ class ItemListAdapter(

            binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))

-            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
+            binding.sourceTitleAndDate.text = itm.sourceAuthorAndDate()

            if (itm.getThumbnail(repository.baseUrl).isEmpty()) {

@@ -84,8 +84,8 @@ class ItemListAdapter(

        private fun handleLinkOpening() {
            binding.root.setOnClickListener {
+                repository.setReaderItems(items)
                c.openItemUrl(
-                    items,
                    bindingAdapterPosition,
                    items[bindingAdapterPosition].getLinkDecoded(),
                    appSettingsService.isArticleViewerEnabled(),
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemsAdapter.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemsAdapter.kt
@@ -36,9 +36,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                Snackbar.LENGTH_LONG
            )
            .setAction(R.string.undo_string) {
-                CoroutineScope(Dispatchers.IO).launch {
-                    unreadItemAtIndex(item, position, false)
-                }
+                unreadItemAtIndex(item, position, false)
            }

        val view = s.view
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt
@@ -2,12 +2,15 @@ package bou.amine.apps.readerforselfossv2.android.adapters

 import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
+import bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.SourceListItemBinding
 import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
@@ -58,6 +61,13 @@ class SourcesListAdapter(
            c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
        }

+        if (itm.error.isNotBlank()) {
+            binding.errorText.visibility = View.VISIBLE
+            binding.errorText.text = itm.error
+        } else {
+            binding.errorText.visibility = View.GONE
+        }
+
        binding.sourceTitle.text = itm.title.getHtmlDecoded()
    }

@@ -78,9 +88,9 @@ class SourcesListAdapter(
            val deleteBtn: Button = mView.findViewById(R.id.deleteBtn)

            deleteBtn.setOnClickListener {
-                val (id) = items[bindingAdapterPosition]
+                val (id, title) = items[bindingAdapterPosition]
                CoroutineScope(Dispatchers.IO).launch {
-                    val successfullyDeletedSource = repository.deleteSource(id)
+                    val successfullyDeletedSource = repository.deleteSource(id, title)
                    if (successfullyDeletedSource) {
                        items.removeAt(bindingAdapterPosition)
                        notifyItemRemoved(bindingAdapterPosition)
@@ -94,6 +104,14 @@ class SourcesListAdapter(
                    }
                }
            }
+
+            mView.setOnClickListener {
+                val source = items[bindingAdapterPosition]
+
+                repository.setSelectedSource(source)
+                app.startActivity(Intent(app, UpsertSourceActivity::class.java))
+
+            }
        }
    }
 }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt
@@ -16,7 +16,6 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.res.ResourcesCompat
 import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.Fragment
 import bou.amine.apps.readerforselfossv2.android.ImageActivity
@@ -45,8 +44,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.acra.ktx.sendWithAcra
 import org.kodein.di.DI
 import org.kodein.di.DIAware
 import org.kodein.di.android.x.closestDI
@@ -69,8 +66,7 @@ class ArticleFragment : Fragment(), DIAware {
    private lateinit var allImages : ArrayList<String>
    private lateinit var fab: FloatingActionButton
    private lateinit var textAlignment: String
-    private var _binding: FragmentArticleBinding? = null
-    private val binding get() = _binding!!
+    private lateinit var binding: FragmentArticleBinding

    override val di : DI by closestDI()
    private val repository: Repository by instance()
@@ -98,13 +94,13 @@ class ArticleFragment : Fragment(), DIAware {
        savedInstanceState: Bundle?
    ): View {
        try {
-            _binding = FragmentArticleBinding.inflate(inflater, container, false)
+            binding = FragmentArticleBinding.inflate(inflater, container, false)

            url = item.getLinkDecoded()
            contentText = item.content
            contentTitle = item.title.getHtmlDecoded()
            contentImage = item.getThumbnail(repository.baseUrl)
-            contentSource = item.sourceAndDateText()
+            contentSource = item.sourceAuthorAndDate()
            allImages = item.getImages()

            fontSize = appSettingsService.getFontSize()
@@ -227,11 +223,6 @@ class ArticleFragment : Fragment(), DIAware {
        return binding.root
    }

-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
    private fun refreshAlignment() {
        textAlignment = when (appSettingsService.getActiveAllignment()) {
            1 -> "justify"
@@ -343,14 +334,14 @@ class ArticleFragment : Fragment(), DIAware {
            }

            @Deprecated("Deprecated in Java")
-            override fun shouldInterceptRequest(view: WebView?, url: String): WebResourceResponse? {
+            override fun shouldInterceptRequest(view: WebView, url: String): WebResourceResponse? {
                val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
                if (url.lowercase(Locale.US).contains(".jpg") || url.lowercase(Locale.US).contains(".jpeg")) {
                    try {
                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.JPEG))
                    } catch ( e : ExecutionException) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg")
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg > $url")
                    }
                }
                else if (url.lowercase(Locale.US).contains(".png")) {
@@ -358,7 +349,7 @@ class ArticleFragment : Fragment(), DIAware {
                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
                    } catch ( e : ExecutionException) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png")
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png > $url")
                    }
                }
                else if (url.lowercase(Locale.US).contains(".webp")) {
@@ -366,7 +357,7 @@ class ArticleFragment : Fragment(), DIAware {
                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
                    } catch ( e : ExecutionException) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp")
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp > $url")
                    }
                }

--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
@@ -1,9 +1,10 @@
 package bou.amine.apps.readerforselfossv2.android.fragments

-import android.annotation.SuppressLint
+import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -13,9 +14,7 @@ import android.view.ViewGroup
 import bou.amine.apps.readerforselfossv2.android.HomeActivity
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
-import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
-import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import com.bumptech.glide.Glide
@@ -38,16 +37,14 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {

    override val di: DI by closestDI()
    private val repository: Repository by instance()
-    private val appSettingsService: AppSettingsService by instance()

    private var selectedChip: Chip? = null

-    @SuppressLint("ResourceAsColor")
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
-    ): View? {
+    ): View {
        val binding =
            bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding.inflate(
                inflater,
@@ -55,87 +52,132 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
                false
            )

+        val context: Context? = context
+
        val tagGroup = binding.tagsGroup
-        val hiddenTagGroup = binding.hiddenTagsGroup
        val sourceGroup = binding.sourcesGroup

-        CoroutineScope(Dispatchers.Main).launch {
-            val tags = repository.getTags()
-            val hiddenTags = appSettingsService.getHiddenTags()
+        if (context == null) {
+            dismiss()
+            Exception("FilterSheetFragment context is null").sendSilentlyWithAcraWithName("FilterSheetFragment > onCreateView")
+        } else {
+            CoroutineScope(Dispatchers.Main).launch {
+                val tags = repository.getTags()

-            tags.filterNot { hiddenTags.contains(it.tag) }.forEach { tag ->
-                val c = chipForTag(tag)
-                tagGroup.addView(c)
-            }
+                tags.forEach { tag ->
+                    val c = Chip(context)
+                    c.text = tag.tag

-            if (hiddenTags.isNotEmpty()) {
-                binding.filterHiddenTagsTitle.visibility = VISIBLE
-                binding.hiddenTagsGroup.visibility = VISIBLE
-
-                tags.filter { hiddenTags.contains(it.tag) }.forEach { tag ->
-                    val c = chipForTag(tag)
-
-                    hiddenTagGroup.addView(c)
-                }
-            }
-
-            repository.getSources().forEach { source ->
-                val c = Chip(requireContext())
-
-                Glide.with(requireContext())
-                    .load(source.getIcon(repository.baseUrl))
-                    .listener(object : RequestListener<Drawable?> {
-                        override fun onLoadFailed(
-                            e: GlideException?,
-                            model: Any?,
-                            target: Target<Drawable?>?,
-                            isFirstResource: Boolean
-                        ): Boolean {
-                            return false
+                    try {
+                        val gd = GradientDrawable()
+                        val gdColor = try {
+                            Color.parseColor(tag.color)
+                        } catch (e: IllegalArgumentException) {
+                            e.sendSilentlyWithAcraWithName("color issue " + tag.color)
+                            resources.getColor(R.color.colorPrimary)
                        }
-
-                        override fun onResourceReady(
-                            resource: Drawable?,
-                            model: Any?,
-                            target: Target<Drawable?>?,
-                            dataSource: DataSource?,
-                            isFirstResource: Boolean
-                        ): Boolean {
-                            c.chipIcon = resource
-                            return false
-                        }
-                    }).preload()
-
-                c.text = source.title.getHtmlDecoded()
-
-                c.setOnCloseIconClickListener {
-                    (it as Chip).isCloseIconVisible = false
-                    selectedChip = null
-                    repository.setSourceFilter(null)
-                }
-
-                c.setOnClickListener {
-                    if (selectedChip != null) {
-                        selectedChip!!.isCloseIconVisible = false
+                        gd.setColor(gdColor)
+                        gd.shape = GradientDrawable.RECTANGLE
+                        gd.setSize(30, 30)
+                        gd.cornerRadius = 30F
+                        c.chipIcon = gd
+                    } catch (e: Exception) {
+                        e.sendSilentlyWithAcraWithName("tags > GradientDrawable")
                    }
-                    (it as Chip).isCloseIconVisible = true
-                    selectedChip = it
-                    repository.setSourceFilter(source)

-                    repository.setTagFilter(null)
+                    c.setOnCloseIconClickListener {
+                        (it as Chip).isCloseIconVisible = false
+                        selectedChip = null
+                        repository.setTagFilter(null)
+                    }
+
+                    c.setOnClickListener {
+                        if (selectedChip != null) {
+                            selectedChip!!.isCloseIconVisible = false
+                        }
+                        (it as Chip).isCloseIconVisible = true
+                        selectedChip = it
+                        repository.setTagFilter(tag)
+
+                        repository.setSourceFilter(null)
+                    }
+
+                    if (repository.tagFilter.value?.equals(tag) == true) {
+                        c.isCloseIconVisible = true
+                        selectedChip = c
+                    }
+
+                    tagGroup.addView(c)
                }

+                repository.getSources().forEach { source ->
+                    val c = Chip(context)

-                if (repository.sourceFilter.value?.equals(source) == true) {
-                    c.isCloseIconVisible = true
-                    selectedChip = c
+                    Glide.with(context)
+                        .load(source.getIcon(repository.baseUrl))
+                        .listener(object : RequestListener<Drawable?> {
+                            override fun onLoadFailed(
+                                e: GlideException?,
+                                model: Any?,
+                                target: Target<Drawable?>?,
+                                isFirstResource: Boolean
+                            ): Boolean {
+                                return false
+                            }
+
+                            override fun onResourceReady(
+                                resource: Drawable?,
+                                model: Any?,
+                                target: Target<Drawable?>?,
+                                dataSource: DataSource?,
+                                isFirstResource: Boolean
+                            ): Boolean {
+                                try {
+                                    c.chipIcon = resource
+                                } catch (e: Exception) {
+                                    e.sendSilentlyWithAcraWithName("sources > onResourceReady")
+                                }
+                                return false
+                            }
+                        }).preload()
+
+                    c.text = source.title.getHtmlDecoded()
+
+                    c.setOnCloseIconClickListener {
+                        (it as Chip).isCloseIconVisible = false
+                        selectedChip = null
+                        repository.setSourceFilter(null)
+                    }
+
+                    c.setOnClickListener {
+                        if (selectedChip != null) {
+                            selectedChip!!.isCloseIconVisible = false
+                        }
+                        (it as Chip).isCloseIconVisible = true
+                        selectedChip = it
+                        repository.setSourceFilter(source)
+
+                        repository.setTagFilter(null)
+                    }
+
+
+                    if (repository.sourceFilter.value?.equals(source) == true) {
+                        c.isCloseIconVisible = true
+                        selectedChip = c
+                    }
+
+                    c.isEnabled = source.error.isBlank()
+
+                    if (source.error.isNotBlank() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        c.tooltipText = source.error
+                    }
+
+                    sourceGroup.addView(c)
                }

-                sourceGroup.addView(c)
+                binding.progressBar2.visibility = GONE
+                binding.filterView.visibility = VISIBLE
            }
-
-            binding.progressBar2.visibility = GONE
-            binding.filterView.visibility = VISIBLE
        }

        binding.floatingActionButton2.setOnClickListener {
@@ -146,49 +188,8 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
        return binding.root
    }

-    private fun chipForTag(tag: SelfossModel.Tag): Chip {
-        val c = Chip(requireContext())
-        c.text = tag.tag
-
-        val gd = GradientDrawable()
-        val gdColor = try {
-            Color.parseColor(tag.color)
-        } catch (e: IllegalArgumentException) {
-            e.sendSilentlyWithAcraWithName("color issue " + tag.color)
-            resources.getColor(R.color.colorPrimary)
-        }
-        gd.setColor(gdColor)
-        gd.shape = GradientDrawable.RECTANGLE
-        gd.setSize(30, 30)
-        gd.cornerRadius = 30F
-        c.chipIcon = gd
-
-        c.setOnCloseIconClickListener {
-            (it as Chip).isCloseIconVisible = false
-            selectedChip = null
-            repository.setTagFilter(null)
-        }
-
-        c.setOnClickListener {
-            if (selectedChip != null) {
-                selectedChip!!.isCloseIconVisible = false
-            }
-            (it as Chip).isCloseIconVisible = true
-            selectedChip = it
-            repository.setTagFilter(tag)
-
-            repository.setSourceFilter(null)
-        }
-
-        if (repository.tagFilter.value?.equals(tag) == true) {
-            c.isCloseIconVisible = true
-            selectedChip = c
-        }
-        return c
-    }
-
    companion object {
-        const val TAG = "ModalBottomSheet"
+        const val TAG = "FilterModalBottomSheet"
    }


--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ImageFragment.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ImageFragment.kt
@@ -28,7 +28,7 @@ class ImageFragment : Fragment() {
        val view = binding?.root

        binding!!.photoView.visibility = View.VISIBLE
-        Glide.with(activity)
+        Glide.with(requireActivity())
                .asBitmap()
                .apply(glideOptions)
                .load(imageUrl)
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/ParecelableItem.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/ParecelableItem.kt
@@ -16,7 +16,8 @@ fun SelfossModel.Item.toParcelable() : ParecelableItem =
        this.icon,
        this.link,
        this.sourcetitle,
-        this.tags.joinToString(",")
+        this.tags.joinToString(","),
+        this.author
    )
 fun ParecelableItem.toModel() : SelfossModel.Item =
    SelfossModel.Item(
@@ -30,7 +31,8 @@ fun ParecelableItem.toModel() : SelfossModel.Item =
        this.icon,
        this.link,
        this.sourcetitle,
-        this.tags.split(",")
+        this.tags.split(","),
+        this.author
    )
 data class ParecelableItem(
    val id: Int,
@@ -43,7 +45,8 @@ data class ParecelableItem(
    val icon: String?,
    val link: String,
    val sourcetitle: String,
-    val tags: String
+    val tags: String,
+    val author: String?
 ) : Parcelable {

    companion object {
@@ -65,7 +68,8 @@ data class ParecelableItem(
        icon = source.readString(),
        link = source.readString().orEmpty(),
        sourcetitle = source.readString().orEmpty(),
-        tags = source.readString().orEmpty()
+        tags = source.readString().orEmpty(),
+        author = source.readString().orEmpty()
    )

    override fun describeContents() = 0
@@ -82,5 +86,6 @@ data class ParecelableItem(
        dest.writeString(link)
        dest.writeString(sourcetitle)
        dest.writeString(tags)
+        dest.writeString(author)
    }
 }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt
@@ -19,13 +19,9 @@ import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySettingsBin
 import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import com.mikepenz.aboutlibraries.LibsBuilder
-import org.acra.ktx.sendSilentlyWithAcra
-import org.acra.ktx.sendWithAcra
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
-import org.matomo.sdk.Tracker
-import org.matomo.sdk.extra.TrackHelper

 private const val TITLE_TAG = "settingsActivityTitle"

@@ -33,14 +29,10 @@ class SettingsActivity : AppCompatActivity(),
        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, DIAware {
    override val di by closestDI()

-    private val tracker : Tracker by instance()
-
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        val binding = ActivitySettingsBinding.inflate(layoutInflater)

-        TrackHelper.track().screen("/settings").with(tracker)
-
        setContentView(binding.root)
        if (savedInstanceState == null) {
            supportFragmentManager
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/LinksUtils.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/LinksUtils.kt
@@ -18,7 +18,6 @@ import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull

 fun Context.openItemUrl(
-    allItems: ArrayList<SelfossModel.Item>,
    currentItem: Int,
    linkDecoded: String,
    articleViewer: Boolean,
@@ -33,7 +32,6 @@ fun Context.openItemUrl(
        ).show()
    } else {
        if (articleViewer) {
-            ReaderActivity.allItems = allItems
            val intent = Intent(this, ReaderActivity::class.java)
            intent.putExtra("currentItem", currentItem)
            app.startActivity(intent)
--- a/androidApp/src/main/res/drawable/ic_baseline_insights_24.xml
+++ b/androidApp/src/main/res/drawable/ic_baseline_insights_24.xml
@@ -1,7 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M21,8c-1.45,0 -2.26,1.44 -1.93,2.51l-3.55,3.56c-0.3,-0.09 -0.74,-0.09 -1.04,0l-2.55,-2.55C12.27,10.45 11.46,9 10,9c-1.45,0 -2.27,1.44 -1.93,2.52l-4.56,4.55C2.44,15.74 1,16.55 1,18c0,1.1 0.9,2 2,2c1.45,0 2.26,-1.44 1.93,-2.51l4.55,-4.56c0.3,0.09 0.74,0.09 1.04,0l2.55,2.55C12.73,16.55 13.54,18 15,18c1.45,0 2.27,-1.44 1.93,-2.52l3.56,-3.55C21.56,12.26 23,11.45 23,10C23,8.9 22.1,8 21,8z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M15,9l0.94,-2.07l2.06,-0.93l-2.06,-0.93l-0.94,-2.07l-0.92,2.07l-2.08,0.93l2.08,0.93z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M3.5,11l0.5,-2l2,-0.5l-2,-0.5l-0.5,-2l-0.5,2l-2,0.5l2,0.5z"/>
-</vector>
--- a/androidApp/src/main/res/layout/activity_upsert_source.xml
+++ b/androidApp/src/main/res/layout/activity_upsert_source.xml
@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    tools:context="bou.amine.apps.readerforselfossv2.android.AddSourceActivity">
+    tools:context="bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity">
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
@@ -41,36 +41,20 @@
            app:layout_constraintHorizontal_bias="1.0"
            app:layout_constraintVertical_bias="0.0">

-            <TextView
-                android:text="@string/add_source"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/textView2"
-                android:textAppearance="@style/TextAppearance.AppCompat.Large"
-                android:textAlignment="center"
-                android:layout_marginTop="16dp"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginEnd="16dp"
-                app:layout_constraintRight_toRightOf="parent"
-                android:layout_marginRight="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_marginLeft="16dp"
-                android:gravity="center_horizontal" />

            <EditText
+                android:id="@+id/nameInput"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:autofillHints="false"
                android:ems="10"
-                android:id="@+id/nameInput"
-                android:layout_marginTop="32dp"
-                app:layout_constraintTop_toBottomOf="@+id/textView2"
+                android:hint="@string/add_source_hint_name"
+                android:inputType="text"
+                android:textColorHint="?android:textColorPrimary"
                app:layout_constraintLeft_toLeftOf="parent"
                app:layout_constraintRight_toRightOf="parent"
-                android:inputType="text"
-                android:hint="@string/add_source_hint_name"
-                android:textColorHint="?android:textColorPrimary"
-                android:autofillHints="false" />
+                app:layout_constraintTop_toTopOf="parent" />

            <EditText
                android:layout_width="match_parent"
--- a/androidApp/src/main/res/layout/filter_fragment.xml
+++ b/androidApp/src/main/res/layout/filter_fragment.xml
@@ -62,33 +62,6 @@

        </com.google.android.material.chip.ChipGroup>

-        <TextView
-            android:id="@+id/filterHiddenTagsTitle"
-            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="24dp"
-            android:text="@string/filter_item_hidden_tags"
-            android:visibility="gone"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tagsGroup" />
-
-
-        <com.google.android.material.chip.ChipGroup
-            android:id="@+id/hiddenTagsGroup"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="24dp"
-            android:visibility="gone"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/filterHiddenTagsTitle"
-            app:singleSelection="true">
-
-        </com.google.android.material.chip.ChipGroup>
-
-
        <TextView
            android:id="@+id/filterSourcesTitle"
            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
@@ -98,7 +71,7 @@
            android:layout_marginTop="24dp"
            android:text="@string/filter_item_sources"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/hiddenTagsGroup" />
+            app:layout_constraintTop_toBottomOf="@+id/tagsGroup" />


        <com.google.android.material.chip.ChipGroup
--- a/androidApp/src/main/res/layout/source_list_item.xml
+++ b/androidApp/src/main/res/layout/source_list_item.xml
@@ -3,18 +3,40 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="48dp"
+    android:layout_height="wrap_content"
    android:orientation="vertical">


+    <Button
+        android:id="@+id/deleteBtn"
+        style="@style/Widget.AppCompat.Button.Borderless"
+        android:layout_width="48dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/ic_remove_circle_outline_black_24dp"
+        android:backgroundTint="?android:textColorSecondary"
+        android:contentDescription="@string/remove_source"
+        android:elevation="4dp"
+        app:iconSize="34dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
+
    <ImageView
        android:id="@+id/itemImage"
        android:layout_width="36dp"
        android:layout_height="36dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
        android:importantForAccessibility="no"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />

    <TextView
        android:id="@+id/sourceTitle"
@@ -25,26 +47,30 @@
        android:gravity="start"
        android:maxLines="1"
        android:textAlignment="textStart"
-        android:textSize="13sp"
        android:textColor="?android:textColorPrimary"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toTopOf="@+id/errorText"
        app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
        app:layout_constraintStart_toEndOf="@+id/itemImage"
        app:layout_constraintTop_toTopOf="parent"
        tools:text="source title" />

-    <Button
-        android:id="@+id/deleteBtn"
-        style="@style/Widget.AppCompat.Button.Borderless"
-        android:layout_width="34dp"
-        android:layout_height="34dp"
-        android:layout_marginEnd="8dp"
-        android:background="@drawable/ic_remove_circle_outline_black_24dp"
-        android:backgroundTint="?android:textColorSecondary"
-        android:elevation="4dp"
-        android:contentDescription="@string/remove_source"
+    <TextView
+        android:id="@+id/errorText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textColor="@color/red"
+        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/itemImage"
+        tools:text="Test"
+        tools:visibility="visible" />

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/androidApp/src/main/res/menu/home_menu.xml
+++ b/androidApp/src/main/res/menu/home_menu.xml
@@ -20,6 +20,11 @@
          android:orderInCategory="2"
          app:showAsAction="ifRoom"/>

+    <item android:id="@+id/action_sources"
+        android:title="@string/menu_home_sources"
+        android:orderInCategory="97"
+        app:showAsAction="never"/>
+
    <item android:id="@+id/action_settings"
        android:title="@string/title_activity_settings"
        android:orderInCategory="98"
--- a/androidApp/src/main/res/values-ca-rES/strings.xml
+++ b/androidApp/src/main/res/values-ca-rES/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Temes</string>
    <string name="pref_selfoss_category">API de Selfoss</string>
    <string name="pref_api_items_number_title">Nombre d\'elements carregats</string>
-    <string name="pref_hidden_tags">Etiquetes ocultes</string>
    <string name="pref_general_infinite_loading_title">Carrega articles en desplaçar</string>
    <string name="translation">Traducció</string>
    <string name="cant_open_invalid_url">L\'element URL no és vàlid. Estic intentant solucionar aquest problema perquè l\'aplicació no falli.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">Aquesta acció marcarà els elements com a llegits.</string>
    <string name="pref_switch_actions_pager_scroll">Marca com a llegit en lliscar el dit</string>
    <string name="pref_switch_actions_pager_scroll_off">No es marcaran els articles com a llegits en lliscar el dit d\'un article a l\'altre.</string>
-    <string name="filter_item_hidden_tags">Etiquetes ocultes</string>
    <string name="unmark">Marca com no llegit</string>
    <string name="pref_header_offline">Sense connexió i memòria clau</string>
    <string name="pref_switch_items_caching_off">Els articles no es guardaran a la memòria del dispositiu i l\'aplicació no es podrà utilitzar sense connexió.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Els articles se sincronitzaran periòdicament</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Interval de sincronització ( >= 15 minuts)]]></string>
    <string name="pref_switch_refresh_when_charging">Sincronitza només quan el telèfon s\'està carregant</string>
-    <string name="loading_notification_title">S\'està carregant...</string>
+    <string name="loading_notification_title">S\'està carregant…</string>
    <string name="loading_notification_text">Selfoss està sincronitzant els articles</string>
    <string name="notification_channel_sync">Notificació de sincronització</string>
    <string name="new_items_channel_sync">Notificació d\'elements nous</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-de-rDE/strings.xml
+++ b/androidApp/src/main/res/values-de-rDE/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Designs</string>
    <string name="pref_selfoss_category">selfoss API</string>
    <string name="pref_api_items_number_title">Loaded items number</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
    <string name="translation">Übersetzung</string>
    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">Dies wird alle Elemente als gelesen markieren.</string>
    <string name="pref_switch_actions_pager_scroll">Beim Wischen als gelesen markieren</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Eintrag als ungelesen markieren</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Die Artikel werden regelmäßig synchronisiert</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
    <string name="pref_switch_refresh_when_charging">Nur aktualisieren, wenn das Telefon aufgeladen wird</string>
-    <string name="loading_notification_title">Lädt...</string>
+    <string name="loading_notification_title">Lädt…</string>
    <string name="loading_notification_text">Selfoss synchronisiert Ihre Artikel</string>
    <string name="notification_channel_sync">Sync notification</string>
    <string name="new_items_channel_sync">New items notification</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-es-rES/strings.xml
+++ b/androidApp/src/main/res/values-es-rES/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Temas</string>
    <string name="pref_selfoss_category">Api de Selfoss</string>
    <string name="pref_api_items_number_title">Número de artículos cargados</string>
-    <string name="pref_hidden_tags">Etiquetas ocultas</string>
    <string name="pref_general_infinite_loading_title">Cargar más artículos en desplazamiento</string>
    <string name="translation">Traducción</string>
    <string name="cant_open_invalid_url">La url del elemento no es válida. Estoy buscando resolver este problema para que la aplicación no colapse.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">Esto marcará todos los artículos como leídos.</string>
    <string name="pref_switch_actions_pager_scroll">Marcar artículos como leídos al deslizar con el dedo hacia los lados</string>
    <string name="pref_switch_actions_pager_scroll_off">No marcar artículos como leídos al deslizar con el dedo hacia los lados.</string>
-    <string name="filter_item_hidden_tags">Etiquetas ocultas</string>
    <string name="unmark">Marcar artículo como no leído</string>
    <string name="pref_header_offline">Sin conexión y caché</string>
    <string name="pref_switch_items_caching_off">Los artículos no se guardarán en la memoria del dispositivo y la aplicación no se podrá utilizar sin conexión.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Los artículos se sincronizarán periódicamente</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Intervalo de sincronización (>= 15 minutos)]]></string>
    <string name="pref_switch_refresh_when_charging">Sólo refrescar cuando el teléfono está cargando</string>
-    <string name="loading_notification_title">Cargando...</string>
+    <string name="loading_notification_title">Cargando…</string>
    <string name="loading_notification_text">Selfoss está sincronizando tus artículos</string>
    <string name="notification_channel_sync">Notificación de sincronización</string>
    <string name="new_items_channel_sync">Notificación de elementos nuevos</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-fa-rIR/strings.xml
+++ b/androidApp/src/main/res/values-fa-rIR/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Themes</string>
    <string name="pref_selfoss_category">Selfoss Api</string>
    <string name="pref_api_items_number_title">Loaded items number</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
    <string name="translation">Translation</string>
    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
    <string name="loading_notification_text">Selfoss is syncing your articles</string>
    <string name="notification_channel_sync">Sync notification</string>
    <string name="new_items_channel_sync">New items notification</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-fr-rFR/strings.xml
+++ b/androidApp/src/main/res/values-fr-rFR/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Thèmes</string>
    <string name="pref_selfoss_category">Api Selfoss</string>
    <string name="pref_api_items_number_title">Nombre d\'articles chargés</string>
-    <string name="pref_hidden_tags">Tags Cachés</string>
    <string name="pref_general_infinite_loading_title">Charger plus d\'articles au scroll</string>
    <string name="translation">Traduction</string>
    <string name="cant_open_invalid_url">L’url de l’élément n’est pas valide. En attendant la résolution du problème, le lien ne s\'ouvrira pas.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">Marquer tous les éléments comme lus ?</string>
    <string name="pref_switch_actions_pager_scroll">Marquer comme lu à la navigation.</string>
    <string name="pref_switch_actions_pager_scroll_off">Ne pas marquer les articles comme lus à la navigation.</string>
-    <string name="filter_item_hidden_tags">Tags Cachés</string>
    <string name="unmark">Marquer l\'article comme non lu</string>
    <string name="pref_header_offline">Hors ligne et cache</string>
    <string name="pref_switch_items_caching_off">Les articles ne seront pas enregistrés et l\'application ne sera pas utilisable hors ligne.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Articles seront périodiquement synchronisées</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Interval de synchronisation ( >= 15 minutes)]]></string>
    <string name="pref_switch_refresh_when_charging">Synchroniser uniquement lorsque le téléphone est en charge</string>
-    <string name="loading_notification_title">Chargement ...</string>
+    <string name="loading_notification_title">Chargement …</string>
    <string name="loading_notification_text">Selfoss synchronise vos articles</string>
    <string name="notification_channel_sync">Notification de synchronisation</string>
    <string name="new_items_channel_sync">Notification de nouveaux articles</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Thème sombre</string>
    <string name="mode_system">Utiliser les paramètres système</string>
    <string name="mode_light">Thème clair</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-gl-rES/strings.xml
+++ b/androidApp/src/main/res/values-gl-rES/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Temas</string>
    <string name="pref_selfoss_category">API de Selfoss</string>
    <string name="pref_api_items_number_title">Número de elementos cargados</string>
-    <string name="pref_hidden_tags">Etiquetas ocultas</string>
    <string name="pref_general_infinite_loading_title">Cargar máis artigos ao desprazarse</string>
    <string name="translation">Traducción</string>
    <string name="cant_open_invalid_url">A URL do elemento non é válida. Estou tratando de solucionar isto pra que a aplicación non falle.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">Isto marcara todos os elementos como lidos.</string>
    <string name="pref_switch_actions_pager_scroll">Marcar artigos como lidos ao deslizar co dedo cara os lados</string>
    <string name="pref_switch_actions_pager_scroll_off">Non marcar artigos como lidos ao deslizar co dedo cara os lados.</string>
-    <string name="filter_item_hidden_tags">Etiquetas ocultas</string>
    <string name="unmark">Marcar artículo como non lido</string>
    <string name="pref_header_offline">Sen conexión e caché</string>
    <string name="pref_switch_items_caching_off">Os artigos non se gardaran na memoria do dispositivo e non se poderá utilizar a aplicación sen conexión.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Os artigos sincronizaranse periódicamente</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Intervalo de sincronización (>= 15 minutos)]]></string>
    <string name="pref_switch_refresh_when_charging">Só refrescar cando o teléfono se está a cargar</string>
-    <string name="loading_notification_title">Cargando...</string>
+    <string name="loading_notification_title">Cargando…</string>
    <string name="loading_notification_text">Selfoss está sincronizando os teus ar tigos</string>
    <string name="notification_channel_sync">Notificación de sincronización</string>
    <string name="new_items_channel_sync">Notificación de actualizacións</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-in-rID/strings.xml
+++ b/androidApp/src/main/res/values-in-rID/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Tema</string>
    <string name="pref_selfoss_category">Selfoss Api</string>
    <string name="pref_api_items_number_title">Item nomor dimuat</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Muat lebih banyak artikel saat membalik halaman</string>
    <string name="translation">Terjemahan</string>
    <string name="cant_open_invalid_url">Alamat tautan proyek tidak valid. Saya mencoba memecahkan masalah ini untuk menghindari aplikasi berhenti.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
    <string name="loading_notification_text">Selfoss is syncing your articles</string>
    <string name="notification_channel_sync">Sync notification</string>
    <string name="new_items_channel_sync">New items notification</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-it-rIT/strings.xml
+++ b/androidApp/src/main/res/values-it-rIT/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Temi</string>
    <string name="pref_selfoss_category">Api di Selfoss</string>
    <string name="pref_api_items_number_title">Numero di elementi caricati</string>
-    <string name="pref_hidden_tags">Tag nascosti</string>
    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
    <string name="translation">Traduzioni</string>
    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Segna come non letto</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
    <string name="loading_notification_text">Selfoss is syncing your articles</string>
    <string name="notification_channel_sync">Sync notification</string>
    <string name="new_items_channel_sync">New items notification</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-ko-rKR/strings.xml
+++ b/androidApp/src/main/res/values-ko-rKR/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Themes</string>
    <string name="pref_selfoss_category">Selfoss Api</string>
    <string name="pref_api_items_number_title">Loaded items number</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
    <string name="translation">Translation</string>
    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
    <string name="loading_notification_text">Selfoss is syncing your articles</string>
    <string name="notification_channel_sync">Sync notification</string>
    <string name="new_items_channel_sync">New items notification</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-night/strings.xml
+++ b/androidApp/src/main/res/values-night/strings.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-nl-rNL/strings.xml
+++ b/androidApp/src/main/res/values-nl-rNL/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Thema \'s</string>
    <string name="pref_selfoss_category">Selfoss Api</string>
    <string name="pref_api_items_number_title">Geladen items nummer</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Laad meer artikelen door te bladeren</string>
    <string name="translation">Vertaling</string>
    <string name="cant_open_invalid_url">De URL is ongeldig. Ik probeer dit probleem op te lossen, zodat de toepassing niet wordt afgesloten.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
    <string name="loading_notification_text">Selfoss is syncing your articles</string>
    <string name="notification_channel_sync">Sync notification</string>
    <string name="new_items_channel_sync">New items notification</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-pt-rBR/strings.xml
+++ b/androidApp/src/main/res/values-pt-rBR/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Temas</string>
    <string name="pref_selfoss_category">Selfoss Api</string>
    <string name="pref_api_items_number_title">Quantidade de itens carregados</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Carregar mais artigos ao realizar o scroll</string>
    <string name="translation">Traduções</string>
    <string name="cant_open_invalid_url">A url está inválida. Estou tentando resolver esse problema para que o aplicativo não encerre.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">Isso marcará todos os itens como lidos.</string>
    <string name="pref_switch_actions_pager_scroll">Marcar Como Lida ao Abrir</string>
    <string name="pref_switch_actions_pager_scroll_off">Não marca artigos como lido quando abrir.</string>
-    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
    <string name="loading_notification_text">Selfoss is syncing your articles</string>
    <string name="notification_channel_sync">Sync notification</string>
    <string name="new_items_channel_sync">New items notification</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-pt-rPT/strings.xml
+++ b/androidApp/src/main/res/values-pt-rPT/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Temas</string>
    <string name="pref_selfoss_category">Api de Selfoss</string>
    <string name="pref_api_items_number_title">Número de itens carregados</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Carregar mais artigos no pergaminho</string>
    <string name="translation">Tradução</string>
    <string name="cant_open_invalid_url">A url do item é inválido. Eu estou olhando para resolver esta questão, para que o app não vai falhar.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
    <string name="loading_notification_text">Selfoss is syncing your articles</string>
    <string name="notification_channel_sync">Sync notification</string>
    <string name="new_items_channel_sync">New items notification</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-si-rLK/strings.xml
+++ b/androidApp/src/main/res/values-si-rLK/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Themes</string>
    <string name="pref_selfoss_category">Selfoss Api</string>
    <string name="pref_api_items_number_title">Loaded items number</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
    <string name="translation">Translation</string>
    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
    <string name="loading_notification_text">Selfoss is syncing your articles</string>
    <string name="notification_channel_sync">Sync notification</string>
    <string name="new_items_channel_sync">New items notification</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-tr-rTR/strings.xml
+++ b/androidApp/src/main/res/values-tr-rTR/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Temalar</string>
    <string name="pref_selfoss_category">Selfoss Uygulaması</string>
    <string name="pref_api_items_number_title">Yüklenen öğe numarası</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Kaydırma üzerine daha fazla makale yükleyin</string>
    <string name="translation">Çeviri</string>
    <string name="cant_open_invalid_url">Öğe url geçersiz. Uygulama çökmeyeceği için bu sorunu çözmeye çalışıyorum.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
    <string name="loading_notification_text">Selfoss is syncing your articles</string>
    <string name="notification_channel_sync">Sync notification</string>
    <string name="new_items_channel_sync">New items notification</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-zh-rCN/strings.xml
+++ b/androidApp/src/main/res/values-zh-rCN/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">主题</string>
    <string name="pref_selfoss_category">塞尔福斯 Api</string>
    <string name="pref_api_items_number_title">已加载项目编号</string>
-    <string name="pref_hidden_tags">隐藏标签</string>
    <string name="pref_general_infinite_loading_title">翻页时载入更多文章</string>
    <string name="translation">翻译</string>
    <string name="cant_open_invalid_url">项目链接地址无效。我正在设法解决这个问题，以避免应用程序崩溃。</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">这将标记所有项目为已读。</string>
    <string name="pref_switch_actions_pager_scroll">滑动时标为已读</string>
    <string name="pref_switch_actions_pager_scroll_off">滑动时不标记文章为已读</string>
-    <string name="filter_item_hidden_tags">隐藏标签</string>
    <string name="unmark">标记条目为未读</string>
    <string name="pref_header_offline">离线和缓存</string>
    <string name="pref_switch_items_caching_off">文章不会被保存到设备内存，应用程序在离线时将无法阅读它们</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">将定期同步文章</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[同步间隔 (>= 15分钟)]]></string>
    <string name="pref_switch_refresh_when_charging">仅在手机充电时刷新</string>
-    <string name="loading_notification_title">加载中...</string>
+    <string name="loading_notification_title">加载中…</string>
    <string name="loading_notification_text">Selfoss 正在同步您的文章</string>
    <string name="notification_channel_sync">同步通知</string>
    <string name="new_items_channel_sync">新条目通知</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">深色模式</string>
    <string name="mode_system">遵循系统设置</string>
    <string name="mode_light">浅色模式</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
-    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
-    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
-    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
-    <string name="menu_home_filter">Filters</string>
+    <string name="gdpr_dialog_title">该应用不分享任何关于您的个人数据。</string>
+    <string name="gdpr_dialog_message"><![CDATA[崩溃报告发送现已启用。 可以从设置页面禁用它。 请记住，崩溃报告对于应用程序开发是必需的。]]></string>
+    <string name="crash_toast_text">发生崩溃。请将细节发送给开发人员。</string>
+    <string name="pref_switch_disable_acra">"禁用自动错误报告 "</string>
+    <string name="menu_home_filter">筛选器</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values-zh-rTW/strings.xml
+++ b/androidApp/src/main/res/values-zh-rTW/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">主题</string>
    <string name="pref_selfoss_category">塞尔福斯 Api</string>
    <string name="pref_api_items_number_title">已加载项目编号</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">翻页时载入更多文章</string>
    <string name="translation">翻译</string>
    <string name="cant_open_invalid_url">项目链接地址无效。我正在设法解决这个问题，以避免应用程序崩溃。</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -99,7 +97,7 @@
    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
    <string name="loading_notification_text">Selfoss is syncing your articles</string>
    <string name="notification_channel_sync">Sync notification</string>
    <string name="new_items_channel_sync">New items notification</string>
@@ -122,10 +120,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -69,7 +69,6 @@
    <string name="pref_header_theme">Themes</string>
    <string name="pref_selfoss_category">Selfoss Api</string>
    <string name="pref_api_items_number_title">Loaded items number</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
    <string name="translation">Translation</string>
    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
@@ -84,7 +83,6 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -107,7 +105,7 @@
    <string name="new_items_notification_text">%1$d new items loaded.</string>
    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
    <string name="shortcut_offline">Offline</string>
-    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_api_timeout">Api Timeout (seconds)</string>
    <string name="pref_header_experimental">Experimental</string>
    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
    <string name="webview_dialog_issue_title">Webview issue</string>
@@ -125,10 +123,12 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
    <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
 </resources>
--- a/androidApp/src/main/res/xml/pref_general.xml
+++ b/androidApp/src/main/res/xml/pref_general.xml
@@ -14,15 +14,6 @@
        android:title="@string/pref_api_items_number_title"
        app:iconSpaceReserved="false"/>

-    <EditTextPreference
-        android:defaultValue=""
-        android:hint="@string/add_source_hint_tags"
-        android:key="hidden_tags"
-        android:selectAllOnFocus="true"
-        android:singleLine="true"
-        android:title="@string/pref_hidden_tags"
-        app:iconSpaceReserved="false"/>
-
    <SwitchPreference
        android:defaultValue="false"
        android:key="infinite_loading"
--- a/androidApp/src/main/res/xml/pref_main.xml
+++ b/androidApp/src/main/res/xml/pref_main.xml
@@ -38,13 +38,6 @@
        android:icon="@drawable/ic_widgets_black_24dp" />


-    <SwitchPreference
-        android:defaultValue="false"
-        android:key="enable_analytics"
-        android:title="@string/pref_switch_enable_analytics"
-        android:icon="@drawable/ic_baseline_insights_24"/>
-
-
    <SwitchPreference
        android:defaultValue="false"
        android:key="acra.disable"
--- a/androidApp/src/test/kotlin/DatesTest.kt
+++ b/androidApp/src/test/kotlin/DatesTest.kt
@@ -11,11 +11,14 @@ class DatesTest {

    private val v3Date = "2013-04-07T13:43:00+01:00"
    private val v4Date = "2013-04-07 13:43:00"
+    private val bug1Date = "2022-12-24T17:00:08+00"

    @Test
    fun v3_date_should_be_parsed() {
        val date = DateUtils.parseDate(v3Date)
-        val expected = LocalDateTime(2013, 4, 7, 13, 43, 0, 0).toInstant(TimeZone.of("UTC+1")) .toEpochMilliseconds()
+        val expected =
+            LocalDateTime(2013, 4, 7, 14, 43, 0, 0).toInstant(TimeZone.currentSystemDefault())
+                .toEpochMilliseconds()

        assertEquals(date, expected)
    }
@@ -30,4 +33,14 @@ class DatesTest {
        assertEquals(date, expected)
    }

+    @Test
+    fun bug1_date_should_be_parsed() {
+        val date = DateUtils.parseDate(bug1Date)
+        val expected =
+            LocalDateTime(2022, 12, 24, 18, 0, 8, 0).toInstant(TimeZone.currentSystemDefault())
+                .toEpochMilliseconds()
+
+        assertEquals(date, expected)
+    }
+
 }
--- a/androidApp/src/test/kotlin/RepositoryTest.kt
+++ b/androidApp/src/test/kotlin/RepositoryTest.kt
@@ -58,6 +58,7 @@ class RepositoryTest {
            data = SelfossModel.Stats(NUMBER_ARTICLES, NUMBER_UNREAD, NUMBER_STARRED)
        )

+        every { db.itemsQueries.deleteItemsWhereSource(any()) } returns Unit
        every { db.itemsQueries.items().executeAsList() } returns generateTestDBItems()
        every { db.tagsQueries.deleteAllTags() } returns Unit
        every { db.tagsQueries.transaction(any(), any()) } returns Unit
@@ -230,7 +231,8 @@ class RepositoryTest {
            listOf("tags"),
            "spouts\\rss\\fulltextrss",
            "",
-            "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
+            "b3aa8a664d08eb15d6ff1db2fa83e0d9.png",
+            SelfossModel.SourceParams("url")
        ))
        runBlocking {
            repository.getNewerItems()
@@ -369,14 +371,7 @@ class RepositoryTest {

    @Test
    fun get_tags() {
-        val tags = listOf(
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
+        val (tags, tagsDB) = prepareTags()

        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
@@ -396,17 +391,7 @@ class RepositoryTest {

    @Test
    fun get_tags_with_sources_update_disabled() {
-        val tags = listOf(
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
-
-        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
-        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
+        val (tags, tagsDB) = prepareTags()
        every { appSettingsService.isUpdateSourcesEnabled() } returns false
        every { appSettingsService.isItemCachingEnabled() } returns true

@@ -426,17 +411,7 @@ class RepositoryTest {

    @Test
    fun get_tags_with_items_caching_disabled() {
-        val tags = listOf(
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
-
-        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
-        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
+        val (tags, _) = prepareTags()
        every { appSettingsService.isUpdateSourcesEnabled() } returns true
        every { appSettingsService.isItemCachingEnabled() } returns false

@@ -453,17 +428,7 @@ class RepositoryTest {

    @Test
    fun get_tags_with_sources_update_and_items_caching_disabled() {
-        val tags = listOf(
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
-
-        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
-        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
+        val (tags, tagsDB) = prepareTags()
        every { appSettingsService.isUpdateSourcesEnabled() } returns false
        every { appSettingsService.isItemCachingEnabled() } returns false

@@ -482,17 +447,7 @@ class RepositoryTest {

    @Test
    fun get_tags_without_connection() {
-        val tags = listOf(
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
-
-        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
-        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
+        val (tags, tagsDB) = prepareTags()
        every { appSettingsService.isUpdateSourcesEnabled() } returns true
        every { appSettingsService.isItemCachingEnabled() } returns true

@@ -510,17 +465,7 @@ class RepositoryTest {

    @Test
    fun get_tags_without_connection_and_items_caching_disabled() {
-        val tags = listOf(
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
-
-        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
-        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
+        prepareTags()
        every { appSettingsService.isItemCachingEnabled() } returns false
        every { appSettingsService.isUpdateSourcesEnabled() } returns true

@@ -537,17 +482,7 @@ class RepositoryTest {

    @Test
    fun get_tags_without_connection_and_sources_update_disabled() {
-        val tags = listOf(
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
-
-        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
-        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
+        val (tags, tagsDB) = prepareTags()
        every { appSettingsService.isUpdateSourcesEnabled() } returns false
        every { appSettingsService.isItemCachingEnabled() } returns true

@@ -565,17 +500,7 @@ class RepositoryTest {

    @Test
    fun get_tags_without_connection_and_sources_update_and_items_caching_disabled() {
-        val tags = listOf(
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
-
-        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
-        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
+        val (_, tagsDB) = prepareTags()
        every { appSettingsService.isUpdateSourcesEnabled() } returns false
        every { appSettingsService.isItemCachingEnabled() } returns false

@@ -590,47 +515,24 @@ class RepositoryTest {
        verify(atLeast = 1) { db.tagsQueries.tags().executeAsList() }
    }

-    @Test
-    fun get_sources() {
-        val sources = arrayListOf(
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
+    private fun prepareTags(): Pair<List<SelfossModel.Tag>, List<TAG>> {
+        val tags = listOf(
+            SelfossModel.Tag("test", "red", 6),
+            SelfossModel.Tag("second", "yellow", 0)
        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First DB source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
+        val tagsDB = listOf(
+            TAG("test_DB", "red", 6),
+            TAG("second_DB", "yellow", 0)
        )

-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
-        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
+        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
+        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
+        return Pair(tags, tagsDB)
+    }
+
+    @Test
+    fun get_sources() {
+        val (sources, sourcesDB) = prepareSources()
        initializeRepository()
        var testSources: List<SelfossModel.Source>?
        runBlocking {
@@ -642,8 +544,7 @@ class RepositoryTest {
        coVerify(exactly = 1) { api.sources() }
    }

-    @Test
-    fun get_sources_with_sources_update_disabled() {
+    private fun prepareSources(): Pair<ArrayList<SelfossModel.Source>, List<SOURCE>> {
        val sources = arrayListOf(
            SelfossModel.Source(
                1,
@@ -651,25 +552,28 @@ class RepositoryTest {
                listOf("Test", "second"),
                "spouts\\rss\\fulltextrss",
                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png",
+                SelfossModel.SourceParams("url")
            ),
            SelfossModel.Source(
                2,
-                "Second DB source",
+                "Second source",
                listOf("second"),
                "spouts\\rss\\fulltextrss",
                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
+                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png",
+                SelfossModel.SourceParams("url")
            )
        )
        val sourcesDB = listOf(
            SOURCE(
                "1",
-                "First source",
+                "First DB source",
                "Test,second",
                "spouts\\rss\\fulltextrss",
                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png",
+                "url"
            ),
            SOURCE(
                "2",
@@ -677,14 +581,22 @@ class RepositoryTest {
                "second",
                "spouts\\rss\\fulltextrss",
                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
+                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png",
+                "url"
            )
        )

-        every { appSettingsService.isUpdateSourcesEnabled() } returns false
-        every { appSettingsService.isItemCachingEnabled() } returns true
        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
+        return Pair(sources, sourcesDB)
+    }
+
+    @Test
+    fun get_sources_with_sources_update_disabled() {
+        val (sources, sourcesDB) = prepareSources()
+
+        every { appSettingsService.isUpdateSourcesEnabled() } returns false
+        every { appSettingsService.isItemCachingEnabled() } returns true
        initializeRepository()
        var testSources: List<SelfossModel.Source>?
        runBlocking {
@@ -701,47 +613,10 @@ class RepositoryTest {

    @Test
    fun get_sources_with_items_caching_disabled() {
-        val sources = arrayListOf(
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
+        val (sources, _) = prepareSources()

        every { appSettingsService.isUpdateSourcesEnabled() } returns true
        every { appSettingsService.isItemCachingEnabled() } returns false
-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
-        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
        initializeRepository()
        var testSources: List<SelfossModel.Source>?
        runBlocking {
@@ -755,47 +630,10 @@ class RepositoryTest {

    @Test
    fun get_sources_with_sources_update_and_items_caching_disabled() {
-        val sources = arrayListOf(
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
+        val (sources, _) = prepareSources()

        every { appSettingsService.isUpdateSourcesEnabled() } returns false
        every { appSettingsService.isItemCachingEnabled() } returns false
-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
-        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
        initializeRepository()
        var testSources: List<SelfossModel.Source>?
        runBlocking {
@@ -809,45 +647,7 @@ class RepositoryTest {

    @Test
    fun get_sources_without_connection() {
-        val sources = arrayListOf(
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First DB source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-
-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
-        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
+        val (_, sourcesDB) = prepareSources()
        initializeRepository(MutableStateFlow(false))
        var testSources: List<SelfossModel.Source>?
        runBlocking {
@@ -861,47 +661,10 @@ class RepositoryTest {

    @Test
    fun get_sources_without_connection_and_items_caching_disabled() {
-        val sources = arrayListOf(
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First DB source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
+        prepareSources()

        every { appSettingsService.isItemCachingEnabled() } returns false
        every { appSettingsService.isUpdateSourcesEnabled() } returns true
-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
-        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
        initializeRepository(MutableStateFlow(false))
        var testSources: List<SelfossModel.Source>?
        runBlocking {
@@ -915,47 +678,10 @@ class RepositoryTest {

    @Test
    fun get_sources_without_connection_and_sources_update_disabled() {
-        val sources = arrayListOf(
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First DB source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
+        val (_, sourcesDB) = prepareSources()

        every { appSettingsService.isItemCachingEnabled() } returns true
        every { appSettingsService.isUpdateSourcesEnabled() } returns false
-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
-        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
        initializeRepository(MutableStateFlow(false))
        var testSources: List<SelfossModel.Source>?
        runBlocking {
@@ -969,47 +695,10 @@ class RepositoryTest {

    @Test
    fun get_sources_without_connection_and_items_caching_and_sources_update_disabled() {
-        val sources = arrayListOf(
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First DB source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
+        val (_, sourcesDB) = prepareSources()

        every { appSettingsService.isItemCachingEnabled() } returns false
        every { appSettingsService.isUpdateSourcesEnabled() } returns false
-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
-        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
        initializeRepository(MutableStateFlow(false))
        var testSources: List<SelfossModel.Source>?
        runBlocking {
@@ -1023,7 +712,7 @@ class RepositoryTest {

    @Test
    fun create_source() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
                SuccessResponse(true)

        initializeRepository()
@@ -1034,7 +723,6 @@ class RepositoryTest {
                "https://test.com/feed",
                "spouts\\rss\\fulltextrss",
                "Test, New",
-                ""
            )
        }

@@ -1044,7 +732,6 @@ class RepositoryTest {
                any(),
                any(),
                any(),
-                any(),
            )
        }
        assertSame(true, response)
@@ -1052,7 +739,7 @@ class RepositoryTest {

    @Test
    fun create_source_but_response_fails() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
                SuccessResponse(false)

        initializeRepository()
@@ -1062,8 +749,7 @@ class RepositoryTest {
                "test",
                "https://test.com/feed",
                "spouts\\rss\\fulltextrss",
-                "Test, New",
-                ""
+                "Test, New"
            )
        }

@@ -1072,8 +758,7 @@ class RepositoryTest {
                any(),
                any(),
                any(),
-                any(),
-                any(),
+                any()
            )
        }
        assertSame(false, response)
@@ -1081,7 +766,7 @@ class RepositoryTest {

    @Test
    fun create_source_without_connection() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
                SuccessResponse(true)

        initializeRepository(MutableStateFlow(false))
@@ -1091,8 +776,7 @@ class RepositoryTest {
                "test",
                "https://test.com/feed",
                "spouts\\rss\\fulltextrss",
-                "Test, New",
-                ""
+                "Test, New"
            )
        }

@@ -1102,7 +786,6 @@ class RepositoryTest {
                any(),
                any(),
                any(),
-                any()
            )
        }
        assertSame(false, response)
@@ -1115,10 +798,11 @@ class RepositoryTest {
        initializeRepository()
        var response: Boolean
        runBlocking {
-            response = repository.deleteSource(5)
+            response = repository.deleteSource(5, "src")
        }

        coVerify(exactly = 1) { api.deleteSource(5) }
+        coVerify(exactly = 1) { db.itemsQueries.deleteItemsWhereSource("src") }
        assertSame(true, response)
    }

@@ -1129,10 +813,11 @@ class RepositoryTest {
        initializeRepository()
        var response: Boolean
        runBlocking {
-            response = repository.deleteSource(5)
+            response = repository.deleteSource(5, "src")
        }

        coVerify(exactly = 1) { api.deleteSource(5) }
+        coVerify(exactly = 0) { db.itemsQueries.deleteItemsWhereSource("src") }
        assertSame(false, response)
    }

@@ -1143,10 +828,11 @@ class RepositoryTest {
        initializeRepository(MutableStateFlow(false))
        var response: Boolean
        runBlocking {
-            response = repository.deleteSource(5)
+            response = repository.deleteSource(5, "src")
        }

        coVerify(exactly = 0) { api.deleteSource(5) }
+        coVerify(exactly = 1) { db.itemsQueries.deleteItemsWhereSource("src") }
        assertSame(false, response)
    }

@@ -1302,16 +988,7 @@ class RepositoryTest {
        )

        initializeRepository()
-        repository.setTagFilter(SelfossModel.Tag("Tag", "read", 0))
-        repository.setSourceFilter(SelfossModel.Source(
-            1,
-            "First source",
-            listOf("Test", "second"),
-            "spouts\\rss\\fulltextrss",
-            "",
-            "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-        ))
-        repository.searchFilter = "search"
+        prepareSearch()
        runBlocking {
            repository.tryToCacheItemsAndGetNewOnes()
        }
@@ -1325,16 +1002,7 @@ class RepositoryTest {
                StatusAndData(success = false, data = generateTestApiItem())

        initializeRepository()
-        repository.setTagFilter(SelfossModel.Tag("Tag", "read", 0))
-        repository.setSourceFilter(SelfossModel.Source(
-            1,
-            "First source",
-            listOf("Test", "second"),
-            "spouts\\rss\\fulltextrss",
-            "",
-            "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-        ))
-        repository.searchFilter = "search"
+        prepareSearch()
        runBlocking {
            repository.tryToCacheItemsAndGetNewOnes()
        }
@@ -1348,20 +1016,27 @@ class RepositoryTest {
                StatusAndData(success = false, data = generateTestApiItem())

        initializeRepository(MutableStateFlow(false))
-        repository.setTagFilter(SelfossModel.Tag("Tag", "read", 0))
-        repository.setSourceFilter(SelfossModel.Source(
-            1,
-            "First source",
-            listOf("Test", "second"),
-            "spouts\\rss\\fulltextrss",
-            "",
-            "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-        ))
-        repository.searchFilter = "search"
+        prepareSearch()
        runBlocking {
            repository.tryToCacheItemsAndGetNewOnes()
        }

        coVerify(exactly = 0) { api.getItems(any(), 0, null, null, null, null, 200) }
    }
+
+    private fun prepareSearch() {
+        repository.setTagFilter(SelfossModel.Tag("Tag", "read", 0))
+        repository.setSourceFilter(
+            SelfossModel.Source(
+                1,
+                "First source",
+                listOf("Test", "second"),
+                "spouts\\rss\\fulltextrss",
+                "",
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png",
+                SelfossModel.SourceParams("url")
+            )
+        )
+        repository.searchFilter = "search"
+    }
 }
--- a/androidApp/src/test/kotlin/TestUtils.kt
+++ b/androidApp/src/test/kotlin/TestUtils.kt
@@ -17,7 +17,8 @@ fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<I
            icon = item.icon,
            link = item.link,
            sourcetitle = item.sourcetitle,
-            tags = item.tags
+            tags = item.tags,
+            author = item.author
        )
    )
 }
@@ -35,7 +36,8 @@ fun generateTestApiItem(item: FakeItemParameters = FakeItemParameters()): List<S
            icon = item.icon,
            link = item.link,
            sourcetitle = item.sourcetitle,
-            tags = item.tags.split(',')
+            tags = item.tags.split(','),
+            author = item.author
        )
    )
 }
@@ -54,4 +56,5 @@ class FakeItemParameters {
        "https://ilblogdellasci.wordpress.com/2022/09/09/etica-della-ricerca-sotto-i-riflettori/"
    var sourcetitle = "La Chimica e la Società"
    var tags = "Chimica, Testing"
+    var author = "Someone important"
 }
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,14 +11,13 @@ plugins {
    id("com.android.library").version("7.3.1").apply(false)
    kotlin("android").version("1.7.20").apply(false)
    kotlin("multiplatform").version("1.7.20").apply(false)
-    id("org.sonarqube").version("3.4.0.2513").apply(false)
    id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }

-apply(plugin = "org.sonarqube")
-
 allprojects {
    repositories {
+        // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
        google()
        mavenCentral()
        jcenter()
@@ -30,3 +29,7 @@ allprojects {
 tasks.register("clean", Delete::class) {
    delete(rootProject.buildDir)
 }
+
+koverMerged {
+    enable()
+}
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,6 +2,7 @@ val pushCache: String by settings

 pluginManagement {
    repositories {
+        // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
        google()
        gradlePluginPortal()
        mavenCentral()
@@ -10,6 +11,7 @@ pluginManagement {

 dependencyResolutionManagement {
    repositories {
+        // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
        google()
        mavenCentral()
    }
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
    id("com.android.library")
    id("com.squareup.sqldelight")
    kotlin("plugin.serialization") version "1.4.10"
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }

 kotlin {
--- a/shared/src/androidMain/kotlin/bou/amine/apps/readerforselfossv2/utils/DateUtils.kt
+++ b/shared/src/androidMain/kotlin/bou/amine/apps/readerforselfossv2/utils/DateUtils.kt
@@ -10,7 +10,11 @@ actual class DateUtils {
            return try {
                Instant.parse(dateString).toEpochMilliseconds()
            } catch (e: Exception) {
-                LocalDateTime.parse(dateString.replace(" ", "T")).toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds()
+                var str = dateString.replace(" ", "T")
+                if (str.matches("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\+\\d{2}".toRegex())) {
+                    str = str.split("+")[0]
+                }
+                LocalDateTime.parse(str).toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds()
            }
        }

--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/MercuryModel.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/MercuryModel.kt
@@ -1,157 +1,14 @@
 package bou.amine.apps.readerforselfossv2.model

-import bou.amine.apps.readerforselfossv2.utils.DateUtils
-import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
-import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.*

 class MercuryModel {

    @Serializable
    class ParsedContent(
-        val title: String,
+        val title: String?,
        val content: String?,
        val lead_image_url: String?,
        val url: String
    )
-
-    @Serializable
-    data class Tag(
-        val tag: String,
-        val color: String,
-        val unread: Int
-    )
-
-    @Serializable
-    class Stats(
-        val total: Int,
-        val unread: Int,
-        val starred: Int
-    )
-
-    @Serializable
-    data class Spout(
-        val name: String,
-        val description: String
-    )
-
-    @Serializable
-    data class ApiVersion(
-        val version: String?,
-        val apiversion: String?
-    ) {
-        fun getApiMajorVersion() : Int {
-            var versionNumber = 0
-            if (apiversion != null) {
-                versionNumber = apiversion.substringBefore(".").toInt()
-            }
-            return versionNumber
-        }
-    }
-
-    @Serializable
-    data class Source(
-        val id: Int,
-        val title: String,
-        @Serializable(with = TagsListSerializer::class)
-        val tags: List<String>,
-        val spout: String,
-        val error: String,
-        val icon: String?
-    )
-
-    @Serializable
-    data class Item(
-        val id: Int,
-        val datetime: String,
-        val title: String,
-        val content: String,
-        @Serializable(with = BooleanSerializer::class)
-        var unread: Boolean,
-        @Serializable(with = BooleanSerializer::class)
-        var starred: Boolean,
-        val thumbnail: String?,
-        val icon: String?,
-        val link: String,
-        val sourcetitle: String,
-        @Serializable(with = TagsListSerializer::class)
-        val tags: List<String>
-    ) {
-        // TODO: maybe find a better way to handle these kind of urls
-        fun getLinkDecoded(): String {
-            var stringUrl: String
-            stringUrl =
-                if (link.startsWith("http://news.google.com/news/") || link.startsWith("https://news.google.com/news/")) {
-                    if (link.contains("&amp;url=")) {
-                        link.substringAfter("&amp;url=")
-                    } else {
-                        this.link.replace("&amp;", "&")
-                    }
-                } else {
-                    this.link.replace("&amp;", "&")
-                }
-
-            // handle :443 => https
-            if (stringUrl.contains(":443")) {
-                stringUrl = stringUrl.replace(":443", "").replace("http://", "https://")
-            }
-
-            // handle url not starting with http
-            if (stringUrl.startsWith("//")) {
-                stringUrl = "http:$stringUrl"
-            }
-
-            return stringUrl
-        }
-
-        fun sourceAndDateText(): String =
-            this.sourcetitle.getHtmlDecoded() + DateUtils.parseRelativeDate(this.datetime)
-
-        fun toggleStar(): Item {
-            this.starred = !this.starred
-            return this
-        }
-    }
-
-    // TODO: this seems to be super slow.
-    object TagsListSerializer : KSerializer<List<String>> {
-        override fun deserialize(decoder: Decoder): List<String> {
-            return when(val json = ((decoder as JsonDecoder).decodeJsonElement())) {
-                is JsonArray -> json.toList().map { it.toString() }
-                else -> json.toString().split(",")
-            }
-
-        }
-
-        override val descriptor: SerialDescriptor
-            get() = PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING)
-
-        override fun serialize(encoder: Encoder, value: List<String>) {
-            TODO("Not yet implemented")
-        }
-    }
-
-    object BooleanSerializer : KSerializer<Boolean> {
-        override fun deserialize(decoder: Decoder): Boolean {
-            val json = ((decoder as JsonDecoder).decodeJsonElement()).jsonPrimitive
-            return if (json.booleanOrNull != null) {
-                json.boolean
-            } else {
-                json.int == 1
-            }
-        }
-
-        override val descriptor: SerialDescriptor
-            get() = PrimitiveSerialDescriptor("b", PrimitiveKind.BOOLEAN)
-
-        override fun serialize(encoder: Encoder, value: Boolean) {
-            TODO("Not yet implemented")
-        }
-    }
 }
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/ResultModel.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/ResultModel.kt
@@ -1,8 +1,5 @@
 package bou.amine.apps.readerforselfossv2.model

-import io.ktor.client.call.*
-import io.ktor.client.statement.*
-import io.ktor.http.*
 import kotlinx.serialization.Serializable

@Serializable
@@ -21,28 +18,4 @@ class StatusAndData<T>(val success: Boolean, val data: T? = null) {
            return StatusAndData(false)
        }
    }
-}
-
-suspend fun responseOrSuccessIf404(r: HttpResponse): SuccessResponse {
-    return if (r.status === HttpStatusCode.NotFound) {
-        SuccessResponse(true)
-    } else {
-        maybeResponse(r)
-    }
-}
-
-suspend fun maybeResponse(r: HttpResponse): SuccessResponse {
-    return if (r.status.isSuccess()) {
-        r.body()
-    } else {
-        SuccessResponse(false)
-    }
-}
-
-suspend inline fun <reified T> bodyOrFailure(r: HttpResponse): StatusAndData<T> {
-    return if (r.status.isSuccess()) {
-        StatusAndData.succes(r.body())
-    } else {
-        StatusAndData.error()
-    }
 }
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt
@@ -9,6 +9,7 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.encoding.encodeCollection
 import kotlinx.serialization.json.*

 class SelfossModel {
@@ -55,9 +56,13 @@ class SelfossModel {
        val tags: List<String>,
        val spout: String,
        val error: String,
-        val icon: String?
+        val icon: String?,
+        val params: SourceParams?
+    )
+    @Serializable
+    data class SourceParams(
+        val url: String
    )
-
    @Serializable
    data class Item(
        val id: Int,
@@ -73,7 +78,8 @@ class SelfossModel {
        val link: String,
        val sourcetitle: String,
        @Serializable(with = TagsListSerializer::class)
-        val tags: List<String>
+        val tags: List<String>,
+        val author: String?
    ) {
        // TODO: maybe find a better way to handle these kind of urls
        fun getLinkDecoded(): String {
@@ -102,8 +108,14 @@ class SelfossModel {
            return stringUrl
        }

-        fun sourceAndDateText(): String =
-            this.sourcetitle.getHtmlDecoded() + DateUtils.parseRelativeDate(this.datetime)
+        fun sourceAuthorAndDate(): String {
+            var txt = this.sourcetitle.getHtmlDecoded()
+            if (!this.author.isNullOrBlank()) {
+                txt += " (by ${this.author}) "
+            }
+            txt += DateUtils.parseRelativeDate(this.datetime)
+            return txt
+        }

        fun toggleStar(): Item {
            this.starred = !this.starred
@@ -111,11 +123,12 @@ class SelfossModel {
        }
    }

+
    // TODO: this seems to be super slow.
    object TagsListSerializer : KSerializer<List<String>> {
        override fun deserialize(decoder: Decoder): List<String> {
            return when(val json = ((decoder as JsonDecoder).decodeJsonElement())) {
-                is JsonArray -> json.toList().map { it.toString() }
+                is JsonArray -> json.toList().map { it.toString().replace("^\"|\"$".toRegex(), "") }
                else -> json.toString().split(",")
            }

@@ -125,7 +138,7 @@ class SelfossModel {
            get() = PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING)

        override fun serialize(encoder: Encoder, value: List<String>) {
-            TODO("Not yet implemented")
+            encoder.encodeCollection(PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING), value.size) { this.toString() }
        }
    }

--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
@@ -8,13 +8,19 @@ import bou.amine.apps.readerforselfossv2.rest.SelfossApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.*
 import io.github.aakira.napier.Napier
+import io.ktor.client.call.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch

-class Repository(private val api: SelfossApi, private val appSettingsService: AppSettingsService, val isConnectionAvailable: MutableStateFlow<Boolean>, private val db: ReaderForSelfossDB) {
+class Repository(
+    private val api: SelfossApi,
+    private val appSettingsService: AppSettingsService,
+    val isConnectionAvailable: MutableStateFlow<Boolean>,
+    private val db: ReaderForSelfossDB
+) {

    var items = ArrayList<SelfossModel.Item>()
    var connectionMonitored = false
@@ -41,6 +47,9 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
    private var fetchedSources = false
    private var fetchedTags = false

+    private var _readerItems = ArrayList<SelfossModel.Item>()
+    private var _selectedSource: SelfossModel.Source? = null
+
    suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
        // TODO: Use the updatedSince parameter
        var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error()
@@ -146,7 +155,8 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
    }

    suspend fun getTags(): List<SelfossModel.Tag> {
-        val isDatabaseEnabled = appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
+        val isDatabaseEnabled =
+            appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
        return if (isNetworkAvailable() && !fetchedTags) {
            val apiTags = api.tags()
            if (apiTags.success && apiTags.data != null && isDatabaseEnabled) {
@@ -178,7 +188,8 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
    }

    suspend fun getSources(): ArrayList<SelfossModel.Source> {
-        val isDatabaseEnabled = appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
+        val isDatabaseEnabled =
+            appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
        return if (isNetworkAvailable() && !fetchedSources) {
            val apiSources = api.sources()
            if (apiSources.success && apiSources.data != null && isDatabaseEnabled) {
@@ -333,7 +344,6 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
        url: String,
        spout: String,
        tags: String,
-        filter: String
    ): Boolean {
        var response = false
        if (isNetworkAvailable()) {
@@ -342,20 +352,41 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
                url,
                spout,
                tags,
-                filter
            ).isSuccess == true
        }

        return response
    }

-    suspend fun deleteSource(id: Int): Boolean {
+    suspend fun updateSource(
+        id: Int,
+        title: String,
+        url: String,
+        spout: String,
+        tags: String
+    ): Boolean {
+        var response = false
+        if (isNetworkAvailable()) {
+            response = api.updateSourceForVersion(id, title, url, spout, tags).isSuccess == true
+        }
+
+        return response
+    }
+
+    suspend fun deleteSource(id: Int, title: String): Boolean {
        var success = false
        if (isNetworkAvailable()) {
            val response = api.deleteSource(id)
            success = response.isSuccess
        }

+        // We filter on success or if the network isn't available
+        if (success || !isNetworkAvailable()) {
+            items = ArrayList(items.filter { it.sourcetitle != title })
+            setReaderItems(items)
+            db.itemsQueries.deleteItemsWhereSource(title)
+        }
+
        return success
    }

@@ -380,18 +411,35 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
        return result
    }

+    suspend fun shouldBeSelfossInstance(): Pair<Boolean, Boolean> {
+        var fetchFailed = true
+        var showSelfossOnlyModal = false
+        if (isNetworkAvailable()) {
+            try {
+                // Trying to fetch one item, and check someone is trying to use the app with
+                // a random rss feed, that would throw a NoTransformationFoundException
+                fetchFailed = !api.getItemsWithoutCatch().success
+            } catch (e: NoTransformationFoundException) {
+                showSelfossOnlyModal = true
+            } catch (e: Throwable) {
+                Napier.e(e.stackTraceToString(), tag = "RepositoryImpl.shouldBeSelfossInstance")
+            }
+        }
+
+        return Pair(fetchFailed, showSelfossOnlyModal)
+    }
+
    suspend fun logout() {
        if (isNetworkAvailable()) {
            try {
                val response = api.logout()
-                if (response.isSuccess) {
+                if (!response.isSuccess) {
                    Napier.e("Couldn't logout.", tag = "RepositoryImpl.logout")
                }
            } catch (cause: Throwable) {
                Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.logout")
-            } finally {
-                appSettingsService.clearAll()
            }
+            appSettingsService.clearAll()
        } else {
            appSettingsService.clearAll()
        }
@@ -456,11 +504,30 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap

    private fun getDBItems(): List<ITEM> = db.itemsQueries.items().executeAsList()

-    private fun insertDBAction(articleid: String, read: Boolean = false, unread: Boolean = false, starred: Boolean = false, unstarred: Boolean = false) =
+    private fun insertDBAction(
+        articleid: String,
+        read: Boolean = false,
+        unread: Boolean = false,
+        starred: Boolean = false,
+        unstarred: Boolean = false
+    ) =
        db.actionsQueries.insertAction(articleid, read, unread, starred, unstarred)

    private fun updateDBItem(item: SelfossModel.Item) =
-        db.itemsQueries.updateItem(item.datetime, item.title.getHtmlDecoded(), item.content, item.unread, item.starred, item.thumbnail, item.icon, item.link, item.sourcetitle, item.tags.joinToString(","), item.id.toString())
+        db.itemsQueries.updateItem(
+            item.datetime,
+            item.title.getHtmlDecoded(),
+            item.content,
+            item.unread,
+            item.starred,
+            item.thumbnail,
+            item.icon,
+            item.link,
+            item.sourcetitle,
+            item.tags.joinToString(","),
+            item.author,
+            item.id.toString()
+        )

    suspend fun tryToCacheItemsAndGetNewOnes(): List<SelfossModel.Item> {
        try {
@@ -515,4 +582,28 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
    fun setSourceFilter(source: SelfossModel.Source?) {
        _sourceFilter.value = source
    }
+
+    fun setReaderItems(readerItems: ArrayList<SelfossModel.Item>) {
+        _readerItems = readerItems
+    }
+
+    fun getReaderItems(): ArrayList<SelfossModel.Item> {
+        return _readerItems
+    }
+
+    fun migrate(driverFactory: DriverFactory) {
+        ReaderForSelfossDB.Schema.migrate(driverFactory.createDriver(), 0, 1)
+    }
+
+    fun setSelectedSource(source: SelfossModel.Source) {
+        _selectedSource = source
+    }
+
+    fun unsetSelectedSource() {
+        _selectedSource = null
+    }
+
+    fun getSelectedSource(): SelfossModel.Source? {
+        return _selectedSource
+    }
 }
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/RestUtils.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/RestUtils.kt
@@ -0,0 +1,82 @@
+package bou.amine.apps.readerforselfossv2.rest
+
+import bou.amine.apps.readerforselfossv2.model.StatusAndData
+import bou.amine.apps.readerforselfossv2.model.SuccessResponse
+import io.github.aakira.napier.Napier
+import io.ktor.client.*
+import io.ktor.client.call.*
+import io.ktor.client.request.*
+import io.ktor.client.request.forms.*
+import io.ktor.client.statement.*
+import io.ktor.http.*
+
+
+suspend fun responseOrSuccessIf404(r: HttpResponse?): SuccessResponse {
+    return if (r != null && r.status === HttpStatusCode.NotFound) {
+        SuccessResponse(true)
+    } else {
+        maybeResponse(r)
+    }
+}
+
+suspend fun maybeResponse(r: HttpResponse?): SuccessResponse {
+    return if (r != null && r.status.isSuccess()) {
+        r.body()
+    } else {
+        if (r != null) {
+            Napier.i("Error ${r.status}", tag = "maybeResponse")
+        }
+        SuccessResponse(false)
+    }
+}
+
+suspend inline fun <reified T> bodyOrFailure(r: HttpResponse?): StatusAndData<T> {
+    return if (r != null && r.status.isSuccess()) {
+        StatusAndData.succes(r.body())
+    } else {
+        StatusAndData.error()
+    }
+}
+
+inline fun tryToRequest(
+    requestType: String,
+    fn: () -> HttpResponse
+): HttpResponse? {
+    var response: HttpResponse? = null
+    try {
+        response = fn()
+    } catch (ex: Exception) {
+        Napier.e("Couldn't execute $requestType request", ex, "tryTo$requestType")
+    }
+    return response
+}
+
+suspend inline fun HttpClient.tryToGet(
+    urlString: String,
+    crossinline block: HttpRequestBuilder.() -> Unit = {}
+): HttpResponse? = tryToRequest("Get") { return this.get { url(urlString); block() } }
+
+
+suspend inline fun HttpClient.tryToPost(
+    urlString: String,
+    block: HttpRequestBuilder.() -> Unit = {}
+): HttpResponse? = tryToRequest("Post") { return this.post { url(urlString); block() } }
+
+suspend inline fun HttpClient.tryToDelete(
+    urlString: String,
+    block: HttpRequestBuilder.() -> Unit = {}
+): HttpResponse? = tryToRequest("Delete") { return this.delete { url(urlString); block() } }
+
+
+suspend fun HttpClient.tryToSubmitForm(
+    url: String,
+    formParameters: Parameters = Parameters.Empty,
+    encodeInQuery: Boolean = false,
+    block: HttpRequestBuilder.() -> Unit = {}
+): HttpResponse? =
+    tryToRequest("SubmitForm") {
+        return this.submitForm(formParameters, encodeInQuery) {
+            url(url)
+            block()
+        }
+    }
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt
@@ -1,6 +1,8 @@
 package bou.amine.apps.readerforselfossv2.rest

-import bou.amine.apps.readerforselfossv2.model.*
+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.github.aakira.napier.Napier
 import io.ktor.client.*
@@ -10,7 +12,6 @@ import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.plugins.cookies.*
 import io.ktor.client.plugins.logging.*
 import io.ktor.client.request.*
-import io.ktor.client.request.forms.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
@@ -50,7 +51,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                retryIf { _, response ->
                    response.status == HttpStatusCode.Forbidden && shouldHavePostLogin() && hasLoginInfo()
                }
-                modifyRequest { _ ->
+                modifyRequest {
                    Napier.i("Will modify", tag = "HttpSend")
                    CoroutineScope(Dispatchers.Main).launch {
                        Napier.i("Will login", tag = "HttpSend")
@@ -75,10 +76,14 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {

    // Api version was introduces after the POST login, so when there is a version, it should be available
    private fun shouldHavePostLogin() = appSettingsService.getApiVersion() != -1
-    private fun hasLoginInfo() = appSettingsService.getUserName() != null && appSettingsService.getPassword() != null
+    private fun hasLoginInfo() =
+        appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword()
+            .isNotEmpty()

    suspend fun login(): SuccessResponse =
-        if (appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword().isNotEmpty()) {
+        if (appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword()
+                .isNotEmpty()
+        ) {
            if (shouldHavePostLogin()) {
                postLogin()
            } else {
@@ -88,17 +93,19 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
            SuccessResponse(true)
        }

-    private suspend fun getLogin() = maybeResponse(client.get(url("/login")) {
+    private suspend fun getLogin() = maybeResponse(client.tryToGet(url("/login")) {
        parameter("username", appSettingsService.getUserName())
        parameter("password", appSettingsService.getPassword())
    })

-    private suspend fun postLogin() = maybeResponse(client.post(url("/login")) {
+    private suspend fun postLogin() = maybeResponse(client.tryToPost(url("/login")) {
        parameter("username", appSettingsService.getUserName())
        parameter("password", appSettingsService.getPassword())
    })

-    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()) {
            doLogout()
@@ -106,9 +113,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
            maybeLogoutIfAvailable()
        }

-    private suspend fun maybeLogoutIfAvailable() = responseOrSuccessIf404(client.get(url("/logout")))
+    private suspend fun maybeLogoutIfAvailable() =
+        responseOrSuccessIf404(client.tryToGet(url("/logout")))

-    private suspend fun doLogout() = maybeResponse(client.delete(url("/api/session/current")))
+    private suspend fun doLogout() = maybeResponse(client.tryToDelete(url("/api/session/current")))

    suspend fun getItems(
        type: String,
@@ -119,7 +127,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
        updatedSince: String?,
        items: Int? = null
    ): StatusAndData<List<SelfossModel.Item>> =
-        bodyOrFailure(client.get(url("/items")) {
+        bodyOrFailure(client.tryToGet(url("/items")) {
            if (!shouldHavePostLogin()) {
                parameter("username", appSettingsService.getUserName())
                parameter("password", appSettingsService.getPassword())
@@ -133,8 +141,18 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
            parameter("offset", offset)
        })

+    suspend fun getItemsWithoutCatch(): StatusAndData<List<SelfossModel.Item>> =
+        bodyOrFailure(client.get(url("/items")) {
+            if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
+            }
+            parameter("type", "all")
+            parameter("items", 1)
+        })
+
    suspend fun stats(): StatusAndData<SelfossModel.Stats> =
-        bodyOrFailure(client.get(url("/stats")) {
+        bodyOrFailure(client.tryToGet(url("/stats")) {
            if (!shouldHavePostLogin()) {
                parameter("username", appSettingsService.getUserName())
                parameter("password", appSettingsService.getPassword())
@@ -142,7 +160,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
        })

    suspend fun tags(): StatusAndData<List<SelfossModel.Tag>> =
-        bodyOrFailure(client.get(url("/tags")) {
+        bodyOrFailure(client.tryToGet(url("/tags")) {
            if (!shouldHavePostLogin()) {
                parameter("username", appSettingsService.getUserName())
                parameter("password", appSettingsService.getPassword())
@@ -150,7 +168,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
        })

    suspend fun update(): StatusAndData<String> =
-        bodyOrFailure(client.get(url("/update")) {
+        bodyOrFailure(client.tryToGet(url("/update")) {
            if (!shouldHavePostLogin()) {
                parameter("username", appSettingsService.getUserName())
                parameter("password", appSettingsService.getPassword())
@@ -158,7 +176,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
        })

    suspend fun spouts(): StatusAndData<Map<String, SelfossModel.Spout>> =
-        bodyOrFailure(client.get(url("/sources/spouts")) {
+        bodyOrFailure(client.tryToGet(url("/sources/spouts")) {
            if (!shouldHavePostLogin()) {
                parameter("username", appSettingsService.getUserName())
                parameter("password", appSettingsService.getPassword())
@@ -166,7 +184,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
        })

    suspend fun sources(): StatusAndData<ArrayList<SelfossModel.Source>> =
-        bodyOrFailure(client.get(url("/sources/list")) {
+        bodyOrFailure(client.tryToGet(url("/sources/list")) {
            if (!shouldHavePostLogin()) {
                parameter("username", appSettingsService.getUserName())
                parameter("password", appSettingsService.getPassword())
@@ -174,10 +192,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
        })

    suspend fun version(): StatusAndData<SelfossModel.ApiVersion> =
-        bodyOrFailure(client.get(url("/api/about")))
+        bodyOrFailure(client.tryToGet(url("/api/about")))

    suspend fun markAsRead(id: String): SuccessResponse =
-        maybeResponse(client.post(url("/mark/$id")) {
+        maybeResponse(client.tryToPost(url("/mark/$id")) {
            if (!shouldHavePostLogin()) {
                parameter("username", appSettingsService.getUserName())
                parameter("password", appSettingsService.getPassword())
@@ -185,7 +203,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
        })

    suspend fun unmarkAsRead(id: String): SuccessResponse =
-        maybeResponse(client.post(url("/unmark/$id")) {
+        maybeResponse(client.tryToPost(url("/unmark/$id")) {
            if (!shouldHavePostLogin()) {
                parameter("username", appSettingsService.getUserName())
                parameter("password", appSettingsService.getPassword())
@@ -193,7 +211,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
        })

    suspend fun starr(id: String): SuccessResponse =
-        maybeResponse(client.post(url("/starr/$id")) {
+        maybeResponse(client.tryToPost(url("/starr/$id")) {
            if (!shouldHavePostLogin()) {
                parameter("username", appSettingsService.getUserName())
                parameter("password", appSettingsService.getPassword())
@@ -201,7 +219,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
        })

    suspend fun unstarr(id: String): SuccessResponse =
-        maybeResponse(client.post(url("/unstarr/$id")) {
+        maybeResponse(client.tryToPost(url("/unstarr/$id")) {
            if (!shouldHavePostLogin()) {
                parameter("username", appSettingsService.getUserName())
                parameter("password", appSettingsService.getPassword())
@@ -209,7 +227,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
        })

    suspend fun markAllAsRead(ids: List<String>): SuccessResponse =
-        maybeResponse(client.submitForm(
+        maybeResponse(client.tryToSubmitForm(
            url = url("/mark"),
            formParameters = Parameters.build {
                if (!shouldHavePostLogin()) {
@@ -225,27 +243,25 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
        url: String,
        spout: String,
        tags: String,
-        filter: String
    ): SuccessResponse =
        maybeResponse(
            if (appSettingsService.getApiVersion() > 1) {
-                createSource2(title, url, spout, tags, filter)
+                createSource("tags[]", title, url, spout, tags)
            } else {
-                createSource(title, url, spout, tags, filter)
+                createSource("tags", title, url, spout, tags)
            }
        )

    private suspend fun createSource(
+        tagsParamName: String,
        title: String,
        url: String,
        spout: String,
-        tags: String,
-        filter: String
-    ): HttpResponse =
-        client.submitForm(
+        tags: String
+    ): HttpResponse? =
+        client.tryToSubmitForm(
            url = url("/source"),
            formParameters = Parameters.build {
-                // TODO: test this
                if (!shouldHavePostLogin()) {
                    append("username", appSettingsService.getUserName())
                    append("password", appSettingsService.getPassword())
@@ -253,20 +269,35 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                append("title", title)
                append("url", url)
                append("spout", spout)
-                append("tags", tags)
-                append("filter", filter)
+                append(tagsParamName, tags)
            }
        )

-    private suspend fun createSource2(
+    suspend fun updateSourceForVersion(
+        id: Int,
+        title: String,
+        url: String,
+        spout: String,
+        tags: String
+    ): SuccessResponse =
+        maybeResponse(
+            if (appSettingsService.getApiVersion() > 1) {
+                updateSource(id, "tags[]", title, url, spout, tags)
+            } else {
+                updateSource(id, "tags", title, url, spout, tags)
+            }
+        )
+
+    private suspend fun updateSource(
+        id: Int,
+        tagsParamName: String,
        title: String,
        url: String,
        spout: String,
        tags: String,
-        filter: String
-    ): HttpResponse =
-        client.submitForm(
-            url = url("/source"),
+    ): HttpResponse? =
+        client.tryToSubmitForm(
+            url = url("/source/$id"),
            formParameters = Parameters.build {
                if (!shouldHavePostLogin()) {
                    append("username", appSettingsService.getUserName())
@@ -275,13 +306,12 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                append("title", title)
                append("url", url)
                append("spout", spout)
-                append("tags[]", tags)
-                append("filter", filter)
+                append(tagsParamName, tags)
            }
        )

    suspend fun deleteSource(id: Int): SuccessResponse =
-        maybeResponse(client.delete(url("/source/$id")) {
+        maybeResponse(client.tryToDelete(url("/source/$id")) {
            if (!shouldHavePostLogin()) {
                parameter("username", appSettingsService.getUserName())
                parameter("password", appSettingsService.getPassword())
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/AppSettingsService.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/AppSettingsService.kt
@@ -27,7 +27,6 @@ class AppSettingsService {
    private var _notifyNewItems: Boolean? = null
    private var _itemsNumber: Int? = null
    private var _apiTimeout: Long? = null
-    private var _hiddenTags: List<String>? = null
    private var _refreshMinutes: Long = 360
    private var _markOnScroll: Boolean? = null
    private var _activeAlignment: Int? = null
@@ -36,7 +35,6 @@ class AppSettingsService {
    private var _staticBar: Boolean? = null
    private var _font: String = ""
    private var _theme: Int? = null
-    private var _enableAnalytics: Boolean? = null


    init {
@@ -85,7 +83,13 @@ class AppSettingsService {
    }

    private fun refreshItemsNumber() {
-        _itemsNumber = settings.getString(API_ITEMS_NUMBER, "20").toInt()
+        _itemsNumber = try {
+            settings.getString(API_ITEMS_NUMBER, "20").toInt()
+        } catch (e: Exception) {
+            settings.remove(API_ITEMS_NUMBER)
+            20
+        }
+
    }

    fun getApiTimeout(): Long {
@@ -95,9 +99,21 @@ class AppSettingsService {
        return _apiTimeout!!
    }

+    private fun secToMs(n: Long) = n * 1000
+
    private fun refreshApiTimeout() {
-        val settingsTimeout = settings.getLong(API_TIMEOUT, HttpTimeout.INFINITE_TIMEOUT_MS)
-        _apiTimeout = if (settingsTimeout > 0) settingsTimeout else HttpTimeout.INFINITE_TIMEOUT_MS
+        _apiTimeout = secToMs(try {
+            val settingsTimeout = settings.getString(API_TIMEOUT, "60")
+            if (settingsTimeout.toLong() > 0) {
+                settingsTimeout.toLong()
+            } else {
+                settings.remove(API_TIMEOUT)
+                60
+            }
+        } catch (e: Exception) {
+            settings.remove(API_TIMEOUT)
+            60
+        })
    }

    private fun refreshBaseUrl() {
@@ -208,19 +224,6 @@ class AppSettingsService {
        return _refreshMinutes
    }

-    private fun refreshHiddenTags() {
-        if (settings.getString(HIDDEN_TAGS, "").isNotEmpty()) {
-            _hiddenTags = settings.getString(HIDDEN_TAGS, "").replace("\\s".toRegex(), "").split(",")
-        }
-    }
-
-    fun getHiddenTags(): List<String> {
-        if (_hiddenTags != null) {
-            refreshHiddenTags()
-        }
-        return _hiddenTags.orEmpty()
-    }
-
    private fun refreshInfiniteLoadingEnabled() {
        _infiniteLoading = settings.getBoolean(INFINITE_LOADING, false)
    }
@@ -305,17 +308,6 @@ class AppSettingsService {
        return _staticBar == true
    }

-    private fun refreshAnalyticsEnabled() {
-        _enableAnalytics = settings.getBoolean(ENABLE_ANALYTICS, true)
-    }
-
-    fun isAnalyticsEnabled(): Boolean {
-        if (_enableAnalytics != null) {
-            refreshAnalyticsEnabled()
-        }
-        return _enableAnalytics == true
-    }
-
    private fun refreshFont() {
        _font = settings.getString(READER_FONT, "")
    }
@@ -357,7 +349,6 @@ class AppSettingsService {
        refreshPeriodicRefreshEnabled()
        refreshRefreshWhenChargingOnlyEnabled()
        refreshRefreshMinutes()
-        refreshHiddenTags()
        refreshInfiniteLoadingEnabled()
        refreshItemCachingEnabled()
        refreshNotifyNewItemsEnabled()
@@ -367,7 +358,6 @@ class AppSettingsService {
        refreshFont()
        refreshStaticBarEnabled()
        refreshCurrentTheme()
-        refreshAnalyticsEnabled()
    }

    fun refreshLoginInformation(
@@ -461,7 +451,6 @@ class AppSettingsService {

        const val PERIODIC_REFRESH_MINUTES = "periodic_refresh_minutes"

-        const val HIDDEN_TAGS = "hidden_tags"

        const val INFINITE_LOADING = "infinite_loading"

@@ -469,6 +458,5 @@ class AppSettingsService {

        const val CURRENT_THEME = "currentMode"

-        const val ENABLE_ANALYTICS = "enable_analytics"
    }
 }
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/utils/EntityUtils.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/utils/EntityUtils.kt
@@ -19,7 +19,8 @@ fun SOURCE.toView(): SelfossModel.Source =
        this.tags.split(","),
        this.spout,
        this.error,
-        this.icon
+        this.icon,
+        if (this.url != null) SelfossModel.SourceParams(this.url) else null
    )

 fun SelfossModel.Source.toEntity(): SOURCE =
@@ -29,7 +30,8 @@ fun SelfossModel.Source.toEntity(): SOURCE =
        this.tags.joinToString(","),
        this.spout,
        this.error,
-        this.icon.orEmpty()
+        this.icon.orEmpty(),
+        this.params?.url
    )

 fun SelfossModel.Tag.toEntity(): TAG =
@@ -51,7 +53,8 @@ fun ITEM.toView(): SelfossModel.Item =
        this.icon,
        this.link,
        this.sourcetitle,
-        this.tags.split(",")
+        this.tags.split(","),
+        this.author
    )

 fun SelfossModel.Item.toEntity(): ITEM =
@@ -66,5 +69,6 @@ fun SelfossModel.Item.toEntity(): ITEM =
        this.icon,
        this.link,
        this.sourcetitle.getHtmlDecoded(),
-        this.tags.joinToString(",")
+        this.tags.joinToString(","),
+        this.author
    )
--- a/shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/1.sqm
+++ b/shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/1.sqm
@@ -0,0 +1,6 @@
+CREATE TABLE ITEM_BACKUP AS SELECT `id`, `datetime`, `title`, `content`,
+ `unread`, `starred`, `thumbnail`, `icon`, `link`, `sourcetitle`,
+ `tags` FROM ITEM;
+ALTER TABLE ITEM_BACKUP ADD COLUMN `author` TEXT;
+DROP TABLE ITEM;
+ALTER TABLE ITEM_BACKUP RENAME TO ITEM;
--- a/shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/2.sqm
+++ b/shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/2.sqm
@@ -0,0 +1 @@
+ALTER TABLE SOURCE ADD COLUMN `url` TEXT;
--- a/shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/Items.sq
+++ b/shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/Items.sq
@@ -10,6 +10,7 @@ CREATE TABLE ITEM (
    `link` TEXT NOT NULL,
    `sourcetitle` TEXT NOT NULL,
    `tags` TEXT NOT NULL,
+    `author` TEXT,
    PRIMARY KEY(`id`)
 );

@@ -26,5 +27,8 @@ INSERT OR REPLACE INTO ITEM VALUES ?;
 deleteItem:
 DELETE FROM ITEM WHERE `id` = ?;

+deleteItemsWhereSource:
+DELETE FROM ITEM WHERE `sourcetitle` = ?;
+
 updateItem:
-UPDATE ITEM SET `datetime` = ?, `title` = ?, `content` = ?, `unread` = ?, `starred` = ?, `thumbnail` = ?, `icon` = ?, `link` = ?, `sourcetitle` = ?, `tags` = ? WHERE `id` = ?;
+UPDATE ITEM SET `datetime` = ?, `title` = ?, `content` = ?, `unread` = ?, `starred` = ?, `thumbnail` = ?, `icon` = ?, `link` = ?, `sourcetitle` = ?, `tags` = ?, `author` = ? WHERE `id` = ?;
--- a/shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/Sources.sq
+++ b/shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/Sources.sq
@@ -5,6 +5,7 @@ CREATE TABLE SOURCE (
    `spout` TEXT NOT NULL,
    `error` TEXT NOT NULL,
    `icon` TEXT NOT NULL,
+    `url` TEXT,
    PRIMARY KEY(`id`)
 );

--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -0,0 +1,5 @@
+sonar.projectKey=RFS2
+sonar.coverage.jacoco.xmlReportPaths=build/reports/kover/merged/xml/report.xml
+sonar.sourceEncoding=UTF-8
+sonar.sources=.
+sonar.exclusions=shared/src/iosArm64Main/**, shared/src/iosX64Main/**, docs/**
Author	SHA1	Message	Date
aminecmi	e0c118a73e	Changelog for v122123641 [CI SKIP]	2023-01-04 19:27:56 +00:00
aminecmi	4e61b2aed6	feat: Disable the failing source in the filter sheet.	2023-01-03 21:35:21 +01:00
aminecmi	ba2758c0a3	feat: Display the source error in the sources list.	2023-01-03 21:28:40 +01:00
aminecmi	c718b966a1	Changelog for v122123631 [CI SKIP]	2022-12-30 19:24:48 +00:00
aminecmi	99438e142f	build: Added back maven repos (see `1fb9d60dc5 (note_1223925153)`)	2022-12-30 20:10:08 +01:00
aminecmi	4d8076c3cf	build: Added back maven repos (see `1fb9d60dc5 (note_1223925153)`)	2022-12-29 21:34:13 +01:00
aminecmi	db75c5b74a	debug: trying to resolve `Canvas: trying to use a recycled bitmap`.	2022-12-29 20:40:39 +01:00
aminecmi	966a082147	fix: NPE may be caused by the binding or the title that was null.	2022-12-29 20:35:03 +01:00
aminecmi	cd20a5ec29	chore: Skip drone pipeline on changelog push.	2022-12-29 14:11:29 +01:00
aminecmi	cc4c1c9201	Changelog for v122123621	2022-12-29 13:08:23 +00:00
aminecmi	ff021d572c	fix: Automatic CHANGELOG generation.	2022-12-29 13:11:23 +01:00
Amine Louveau	89992967be	Merge pull request 'Sources Upsert' (#119 ) from sources-edit into master Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/119	2022-12-28 21:31:49 +00:00
aminecmi	3c68bde62b	Source update screen.	2022-12-28 22:19:11 +01:00
aminecmi	c38251f5b3	Sources menu.	2022-12-28 21:45:00 +01:00
aminecmi	a01f6d2322	chore: Automatic CHANGELOG generation.	2022-12-28 21:43:56 +01:00
Amine Louveau	417a33eb25	Merge pull request 'Running migrations.' (#118 ) from fix-migration into master Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/118	2022-12-28 14:49:11 +00:00
aminecmi	2e7f7f23b3	No duplicate builds for PRs.	2022-12-28 15:34:22 +01:00
aminecmi	e5e182761e	Running migrations.	2022-12-28 15:27:17 +01:00
Amine Louveau	a094d88799	Merge pull request 'Make the author field nullable' (#117 ) from davidoskky/ReaderForSelfoss-multiplatform:author into master Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/117	2022-12-28 14:25:36 +00:00
davidoskky	e51915d1cd	Include author field when updating the database	2022-12-28 14:25:56 +01:00
davidoskky	3a654f6ede	Migrate the database table	2022-12-28 14:25:34 +01:00
davidoskky	5227751dca	Make the author field nullable	2022-12-28 11:02:43 +01:00
aminecmi	27eafe4ff4	Delete sources from DB and reload items on source deletion.	2022-12-26 22:27:28 +01:00
aminecmi	8c83a9408b	Drone should work better.	2022-12-26 22:26:28 +01:00
aminecmi	fe2410f719	Handling author field.	2022-12-26 21:49:55 +01:00
aminecmi	a5e86bfb77	Date format issues.	2022-12-26 15:02:19 +01:00
aminecmi	23be633798	Add api version to the reports.	2022-12-25 22:45:12 +01:00
aminecmi	813e0707d8	Date format issue.	2022-12-25 22:41:34 +01:00
aminecmi	9ed9bf07fc	Items in repository.	2022-12-23 22:53:16 +01:00
aminecmi	47265c10d0	Trying nexus build.	2022-12-23 14:59:58 +01:00
aminecmi	5cc633246a	Debugging images issues.	2022-12-22 20:28:49 +01:00
aminecmi	1f40385786	Context should not be null, but handle the case for now.	2022-12-19 22:08:28 +01:00
aminecmi	eb2876324a	This seems to be needed.	2022-12-19 20:47:04 +01:00
aminecmi	633b817d76	Remonving matomo.	2022-12-18 21:07:42 +01:00
aminecmi	2cfaa9b285	Logout fix.	2022-12-18 20:42:13 +01:00
aminecmi	f42ae97326	Explicitly failing for non selfoss rss files.	2022-12-18 20:41:17 +01:00
aminecmi	3b0028164b	Glide update + trying requests.	2022-12-17 22:25:23 +01:00
aminecmi	7420adeb5c	Do not ignore git version.	2022-12-14 21:42:56 +01:00
aminecmi	316027ca3b	Tag for build.	2022-12-14 21:26:33 +01:00
aminecmi	9d58fba5c9	Cleaning.	2022-12-14 21:07:03 +01:00
aminecmi	284c19ef89	More cleaning.	2022-12-14 20:54:48 +01:00
aminecmi	7cfd17231a	Cleaning.	2022-12-13 22:22:31 +01:00
aminecmi	527830a5ae	Merge branch 'sonar-qube'	2022-12-13 21:53:10 +01:00
aminecmi	c4ed30f594	Fixes #112 .	2022-12-13 21:32:48 +01:00
aminecmi	156c1681cf	Fixes #111 .	2022-12-13 21:19:05 +01:00
aminecmi	3593fbca78	Sonar scanner.	2022-12-13 21:11:38 +01:00
aminecmi	430fc8e8cb	Fixes #110 .	2022-12-13 20:40:50 +01:00
aminecmi	4fce19bad4	Trying to set code coverage.	2022-12-13 20:29:51 +01:00
Amine Louveau	49f5848e7b	Merge pull request 'Fixes #108.' (#109 ) from bug/lateinit into master Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/109	2022-12-12 20:15:44 +00:00
aminecmi	90452100a4	Fixes #108 .	2022-12-12 21:11:26 +01:00
aminecmi	bf1196dd0f	Translations.	2022-12-09 20:27:38 +01:00
aminecmi	4316dc6516	Removing hidden tags.	2022-12-09 20:23:01 +01:00