20 changed files with 558 additions and 678 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,13 +1,3 @@
-**v123010041**
-
- Merge pull request 'scroll-tag-filters' (#124) from scroll-tag-filters into master
- fix: added POST_NOTIFICATIONS to fix notifications issues.
- fix: scrollable filter sheet.
- enhancement: Ellipsize chips text.
- Cleaning.
-
--------------------------------------------------------------------
-
 **v122123641**

 - feat: Disable the failing source in the filter sheet.
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@ -66,7 +66,7 @@ android {
        jvmTarget = "11"
    }
    compileSdk = 33
-    buildToolsVersion = "33.0.0"
+    buildToolsVersion = "31.0.0"
    buildFeatures {
        viewBinding = true
    }
--- a/androidApp/src/main/AndroidManifest.xml
+++ b/androidApp/src/main/AndroidManifest.xml
@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
@ -366,6 +366,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar

    fun fetchOnEmptyList() {
        binding.recyclerView.doOnNextLayout {
+            // TODO: do if last element (or is empty ?)
            getElementsAccordingToTab(true)
        }
    }
@ -538,9 +539,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
            R.id.refresh -> {
                needsConfirmation(R.string.menu_home_refresh, R.string.refresh_dialog_message) {
                    Toast.makeText(this, R.string.refresh_in_progress, Toast.LENGTH_SHORT).show()
+                    // TODO: Use Dispatchers.IO
                    CoroutineScope(Dispatchers.Main).launch {
                        val updatedRemote = repository.updateRemote()
                        if (updatedRemote) {
+                            // TODO: Send toast messages from the repository
                            Toast.makeText(
                                this@HomeActivity,
                                R.string.refresh_success_response, Toast.LENGTH_LONG
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt
@ -27,6 +27,7 @@ import org.acra.ACRA
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
+import java.security.MessageDigest


 class LoginActivity : AppCompatActivity(), DIAware {
@ -156,9 +157,44 @@ class LoginActivity : AppCompatActivity(), DIAware {
        val login = binding.loginView.text.toString().trim()
        val password = binding.passwordView.text.toString().trim()

-        failInvalidUrl(url)
-        failLoginDetails(password, login)
+        var cancel = false
+        var focusView: View? = null

+        if (url.isBaseUrlInvalid()) {
+            binding.urlView.error = getString(R.string.login_url_problem)
+            focusView = binding.urlView
+            cancel = true
+            inValidCount++
+            if (inValidCount == 3) {
+                val alertDialog = AlertDialog.Builder(this).create()
+                alertDialog.setTitle(getString(R.string.warning_wrong_url))
+                alertDialog.setMessage(getString(R.string.text_wrong_url))
+                alertDialog.setButton(
+                    AlertDialog.BUTTON_NEUTRAL,
+                    "OK"
+                ) { dialog, _ -> dialog.dismiss() }
+                alertDialog.show()
+                inValidCount = 0
+            }
+        }
+
+        if (isWithLogin) {
+            if (TextUtils.isEmpty(password)) {
+                binding.passwordView.error = getString(R.string.error_invalid_password)
+                focusView = binding.passwordView
+                cancel = true
+            }
+
+            if (TextUtils.isEmpty(login)) {
+                binding.loginView.error = getString(R.string.error_field_required)
+                focusView = binding.loginView
+                cancel = true
+            }
+        }
+
+        if (cancel) {
+            focusView?.requestFocus()
+        } else {
            showProgress(true)

            repository.refreshLoginInformation(url, login, password)
@ -185,55 +221,6 @@ class LoginActivity : AppCompatActivity(), DIAware {
                showProgress(false)
            }
        }
-
-    private fun failLoginDetails(
-        password: String,
-        login: String
-    ) {
-        var lastFocusedView: View? = null
-        var cancel = false
-        if (isWithLogin) {
-            if (TextUtils.isEmpty(password)) {
-                binding.passwordView.error = getString(R.string.error_invalid_password)
-                lastFocusedView = binding.passwordView
-                cancel = true
-            }
-
-            if (TextUtils.isEmpty(login)) {
-                binding.loginView.error = getString(R.string.error_field_required)
-                lastFocusedView = binding.loginView
-                cancel = true
-            }
-        }
-        maybeCancelAndFocusView(cancel, lastFocusedView)
-    }
-
-    private fun failInvalidUrl(url: String) {
-        val focusView = binding.urlView
-        var cancel = false
-        if (url.isBaseUrlInvalid()) {
-            cancel = true
-            binding.urlView.error = getString(R.string.login_url_problem)
-            inValidCount++
-            if (inValidCount == 3) {
-                val alertDialog = AlertDialog.Builder(this).create()
-                alertDialog.setTitle(getString(R.string.warning_wrong_url))
-                alertDialog.setMessage(getString(R.string.text_wrong_url))
-                alertDialog.setButton(
-                    AlertDialog.BUTTON_NEUTRAL,
-                    "OK"
-                ) { dialog, _ -> dialog.dismiss() }
-                alertDialog.show()
-                inValidCount = 0
-            }
-        }
-        maybeCancelAndFocusView(cancel, focusView)
-    }
-
-    private fun maybeCancelAndFocusView(cancel: Boolean, focusView: View?) {
-        if (cancel) {
-            focusView?.requestFocus()
-        }
    }

    private fun showProgress(show: 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
@ -37,14 +37,7 @@ class MyApp : MultiDexApplication(), DIAware {
        import(networkModule)
        bind<DriverFactory>() with singleton { DriverFactory(applicationContext) }
        bind<ReaderForSelfossDB>() with singleton { ReaderForSelfossDB(driverFactory.createDriver()) }
-        bind<Repository>() with singleton {
-            Repository(
-                instance(),
-                instance(),
-                isConnectionAvailable,
-                instance()
-            )
-        }
+        bind<Repository>() with singleton { Repository(instance(), instance(), isConnectionAvailable, instance()) }
        bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
        bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
    }
@ -66,12 +59,7 @@ class MyApp : MultiDexApplication(), DIAware {

            handleNotificationChannels()

-            ProcessLifecycleOwner.get().lifecycle.addObserver(
-                AppLifeCycleObserver(
-                    connectivityStatus,
-                    repository
-                )
-            )
+            ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(connectivityStatus, repository))

            CoroutineScope(Dispatchers.Main).launch {
                viewModel.networkAvailableProvider.collect { networkAvailable ->
@ -100,36 +88,20 @@ class MyApp : MultiDexApplication(), DIAware {
        initAcra {
            reportFormat = StringFormat.JSON
            reportContent = listOf(
-                ReportField.REPORT_ID,
-                ReportField.INSTALLATION_ID,
-                ReportField.APP_VERSION_CODE,
-                ReportField.APP_VERSION_NAME,
-                ReportField.BUILD,
-                ReportField.ANDROID_VERSION,
-                ReportField.BRAND,
-                ReportField.PHONE_MODEL,
-                ReportField.AVAILABLE_MEM_SIZE,
-                ReportField.TOTAL_MEM_SIZE,
-                ReportField.STACK_TRACE,
-                ReportField.APPLICATION_LOG,
-                ReportField.LOGCAT,
-                ReportField.INITIAL_CONFIGURATION,
-                ReportField.CRASH_CONFIGURATION,
-                ReportField.IS_SILENT,
-                ReportField.USER_APP_START_DATE,
-                ReportField.USER_COMMENT,
-                ReportField.USER_CRASH_DATE,
-                ReportField.USER_EMAIL,
-                ReportField.CUSTOM_DATA
-            )
+                ReportField.REPORT_ID, ReportField.INSTALLATION_ID,
+                ReportField.APP_VERSION_CODE, ReportField.APP_VERSION_NAME,
+                ReportField.BUILD, ReportField.ANDROID_VERSION, ReportField.BRAND, ReportField.PHONE_MODEL,
+                ReportField.AVAILABLE_MEM_SIZE, ReportField.TOTAL_MEM_SIZE,
+                ReportField.STACK_TRACE, ReportField.APPLICATION_LOG, ReportField.LOGCAT,
+                ReportField.INITIAL_CONFIGURATION, ReportField.CRASH_CONFIGURATION, ReportField.IS_SILENT,
+                ReportField.USER_APP_START_DATE, ReportField.USER_COMMENT, ReportField.USER_CRASH_DATE, ReportField.USER_EMAIL, ReportField.CUSTOM_DATA)
            toast {
                //required
                text = getString(R.string.crash_toast_text)
                length = Toast.LENGTH_SHORT
            }
            httpSender {
-                uri =
-                    "https://bugs.amine-louveau.fr/report" /*best guess, you may need to adjust this*/
+                uri = "https://bugs.amine-louveau.fr/report" /*best guess, you may need to adjust this*/
                basicAuthLogin = "LMTlLZuazADohTCm"
                basicAuthPassword = "he6ghHp83F0PYPfh"
                httpMethod = HttpSender.Method.POST
@ -147,11 +119,7 @@ class MyApp : MultiDexApplication(), DIAware {

            val newItemsChannelname = getString(R.string.new_items_channel_sync)
            val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT
-            val newItemsChannelmChannel = NotificationChannel(
-                AppSettingsService.newItemsChannelId,
-                newItemsChannelname,
-                newItemsChannelimportance
-            )
+            val newItemsChannelmChannel = NotificationChannel(AppSettingsService.newItemsChannelId, newItemsChannelname, newItemsChannelimportance)

            notificationManager.createNotificationChannel(mChannel)
            notificationManager.createNotificationChannel(newItemsChannelmChannel)
@ -165,17 +133,13 @@ class MyApp : MultiDexApplication(), DIAware {
            if (e is NoClassDefFoundError && e.stackTrace.asList().any {
                    it.toString().contains("android.view.ViewDebug")
                }) {
-                // Nothing
            } else {
                oldHandler.uncaughtException(thread, e)
            }
        }
    }

-    class AppLifeCycleObserver(
-        val connectivityStatus: ConnectivityStatus,
-        val repository: Repository
-    ) : DefaultLifecycleObserver {
+    class AppLifeCycleObserver(val connectivityStatus: ConnectivityStatus, val repository: Repository) : DefaultLifecycleObserver {

        override fun onResume(owner: LifecycleOwner) {
            super.onResume(owner)
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt
@ -184,11 +184,13 @@ class ReaderActivity : AppCompatActivity(), DIAware {
                if (allItems[binding.pager.currentItem].starred) {
                    CoroutineScope(Dispatchers.IO).launch {
                        repository.unstarr(allItems[binding.pager.currentItem])
+                        // TODO: Handle failure
                    }
                    afterUnsave()
                } else {
                    CoroutineScope(Dispatchers.IO).launch {
                        repository.starr(allItems[binding.pager.currentItem])
+                        // TODO: Handle failure
                    }
                    afterSave()
                }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/background/background.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/background/background.kt
@ -26,14 +26,13 @@ import org.kodein.di.instance
 import java.util.*
 import kotlin.concurrent.schedule

-class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params),
-    DIAware {
+class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params), DIAware {

    override val di by lazy { (applicationContext as MyApp).di }
-    private val repository: Repository by instance()
-    private val appSettingsService: AppSettingsService by instance()
+    private val repository : Repository by instance()
+    private val appSettingsService : AppSettingsService by instance()

-    override fun doWork(): Result {
+override fun doWork(): Result {
    if (appSettingsService.isPeriodicRefreshEnabled() && isNetworkAccessible(context)) {

        CoroutineScope(Dispatchers.IO).launch {
@ -63,12 +62,13 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
        }
    }
    return Result.success()
-    }
+}

    private fun handleNewItemsNotification(
        newItems: List<SelfossModel.Item>?,
        notificationManager: NotificationManager
    ) {
+        // TODO: Check if this coroutine is actually required
        CoroutineScope(Dispatchers.IO).launch {
                val apiItems = newItems.orEmpty()

@ -84,14 +84,10 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
                    } else {
                        0
                    }
-                val pendingIntent: PendingIntent =
-                    PendingIntent.getActivity(context, 0, intent, pflags)
+                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, pflags)

                    val newItemsNotification =
-                    NotificationCompat.Builder(
-                        applicationContext,
-                        AppSettingsService.newItemsChannelId
-                    )
+                        NotificationCompat.Builder(applicationContext, AppSettingsService.newItemsChannelId)
                            .setContentTitle(context.getString(R.string.new_items_notification_title))
                            .setContentText(
                                context.getString(
--- 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
@ -28,9 +28,7 @@ import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
 import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
-import bou.amine.apps.readerforselfossv2.model.MercuryModel
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
-import bou.amine.apps.readerforselfossv2.model.StatusAndData
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.MercuryApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@ -57,8 +55,6 @@ import java.util.*
 import java.util.concurrent.ExecutionException


-private const val IMAGE_JPG = "image/jpg"
-
 class ArticleFragment : Fragment(), DIAware {
    private var fontSize: Int = 16
    private lateinit var item: SelfossModel.Item
@ -67,12 +63,12 @@ class ArticleFragment : Fragment(), DIAware {
    private lateinit var contentSource: String
    private lateinit var contentImage: String
    private lateinit var contentTitle: String
-    private lateinit var allImages: ArrayList<String>
+    private lateinit var allImages : ArrayList<String>
    private lateinit var fab: FloatingActionButton
    private lateinit var textAlignment: String
    private lateinit var binding: FragmentArticleBinding

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

@ -81,7 +77,7 @@ class ArticleFragment : Fragment(), DIAware {
    private var font = ""
    private var staticBar = false

-    private val mercuryApi: MercuryApi by instance()
+    private val mercuryApi : MercuryApi by instance()


    override fun onCreate(savedInstanceState: Bundle?) {
@ -119,81 +115,6 @@ class ArticleFragment : Fragment(), DIAware {

            fab.rippleColor = resources.getColor(R.color.colorAccentDark)

-            val floatingToolbar: FloatingToolbar = handleFloatingToolbar()
-
-            if (staticBar) {
-                fab.hide()
-                floatingToolbar.show()
-            }
-
-            binding.source.text = contentSource
-            if (typeface != null) {
-                binding.source.typeface = typeface
-            }
-
-            handleContent()
-
-            binding.nestedScrollView.setOnScrollChangeListener(
-                NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
-                    if (scrollY > oldScrollY) {
-                        floatingToolbar.hide()
-                        fab.hide()
-                    } else {
-                        if (staticBar) {
-                            floatingToolbar.show()
-                        } else {
-                            if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
-                        }
-                    }
-                }
-            )
-
-        } catch (e: InflateException) {
-            e.sendSilentlyWithAcraWithName("webview not available")
-            AlertDialog.Builder(requireContext())
-                .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
-                .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
-                .setPositiveButton(
-                    android.R.string.ok
-                ) { _, _ ->
-                    appSettingsService.disableArticleViewer()
-                    requireActivity().finish()
-                }
-                .create()
-                .show()
-        }
-
-        return binding.root
-    }
-
-    private fun handleContent() {
-        if (contentText.isEmptyOrNullOrNullString()) {
-            if (repository.isNetworkAvailable()) {
-                getContentFromMercury()
-            }
-        } else {
-            binding.titleView.text = contentTitle
-            if (typeface != null) {
-                binding.titleView.typeface = typeface
-            }
-
-            htmlToWebview()
-
-            if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
-                binding.imageView.visibility = View.VISIBLE
-                Glide
-                    .with(requireContext())
-                    .asBitmap()
-                    .load(contentImage)
-                    .apply(RequestOptions.fitCenterTransform())
-                    .into(binding.imageView)
-            } else {
-                binding.imageView.visibility = View.GONE
-            }
-        }
-    }
-
-    private fun handleFloatingToolbar(): FloatingToolbar {
            val floatingToolbar: FloatingToolbar = binding.floatingToolbar
            floatingToolbar.attachFab(fab)

@ -233,11 +154,73 @@ class ArticleFragment : Fragment(), DIAware {
                    }

                    override fun onItemLongClick(item: MenuItem?) {
-                    // We do nothing
                    }
                }
            )
-        return floatingToolbar
+
+            if (staticBar) {
+                fab.hide()
+                floatingToolbar.show()
+            }
+
+            binding.source.text = contentSource
+            if (typeface != null) {
+                binding.source.typeface = typeface
+            }
+
+            if (contentText.isEmptyOrNullOrNullString()) {
+                getContentFromMercury()
+            } else {
+                binding.titleView.text = contentTitle
+                if (typeface != null) {
+                    binding.titleView.typeface = typeface
+                }
+
+                htmlToWebview()
+
+                if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
+                    binding.imageView.visibility = View.VISIBLE
+                    Glide
+                        .with(requireContext())
+                        .asBitmap()
+                        .load(contentImage)
+                        .apply(RequestOptions.fitCenterTransform())
+                        .into(binding.imageView)
+                } else {
+                    binding.imageView.visibility = View.GONE
+                }
+            }
+
+            binding.nestedScrollView.setOnScrollChangeListener(
+                NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+                    if (scrollY > oldScrollY) {
+                        floatingToolbar.hide()
+                        fab.hide()
+                    } else {
+                        if (staticBar) {
+                            floatingToolbar.show()
+                        } else {
+                            if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
+                        }
+                    }
+                }
+            )
+
+        } catch (e: InflateException) {
+            e.sendSilentlyWithAcraWithName("webview not available")
+            AlertDialog.Builder(requireContext())
+                .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
+                .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
+                .setPositiveButton(android.R.string.ok
+                ) { _, _ ->
+                    appSettingsService.disableArticleViewer()
+                    requireActivity().finish()
+                }
+                .create()
+                .show()
+        }
+
+        return binding.root
    }

    private fun refreshAlignment() {
@ -249,6 +232,7 @@ class ArticleFragment : Fragment(), DIAware {
    }

    private fun getContentFromMercury() {
+        if (repository.isNetworkAvailable()) {
            binding.progressBar.visibility = View.VISIBLE

            CoroutineScope(Dispatchers.Main).launch {
@ -256,34 +240,34 @@ class ArticleFragment : Fragment(), DIAware {
                    val response = mercuryApi.query(url)
                    if (response.success && response.data != null && !response.data?.content.isNullOrEmpty()) {
                        binding.titleView.text = response.data!!.title.orEmpty()
+                        try {
                            if (typeface != null) {
                                binding.titleView.typeface = typeface
                            }
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > typeface")
+                        }
+
+                        try {
+                            // Note: Mercury may return relative urls... If it does the url val will not be changed.
                            URL(response.data!!.url)
                            url = response.data!!.url
+                        } catch (e: MalformedURLException) {
+                            // Mercury returned a relative url
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > malformedurlexception")
+                        }

+                        try {
                            contentText = response.data!!.content.orEmpty()
                            htmlToWebview()
-
-                    handleLeadImage(response)
-
-                    binding.nestedScrollView.scrollTo(0, 0)
-                    binding.progressBar.visibility = View.GONE
-                } else {
-                    openInBrowserAfterFailing()
-                }
-            } catch (e: SocketTimeoutException) {
-                openInBrowserAfterFailing()
                        } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("getContentFromMercury > $url")
-                openInBrowserAfterFailing()
-            }
-        }
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > contenttext or html")
                        }

-    private fun handleLeadImage(response: StatusAndData<MercuryModel.ParsedContent>) {
                        if (!response.data?.lead_image_url.isNullOrEmpty() && context != null) {
+                            try {
                                binding.imageView.visibility = View.VISIBLE
+                                try {
                                    Glide
                                        .with(requireContext())
                                        .asBitmap()
@ -292,66 +276,32 @@ class ArticleFragment : Fragment(), DIAware {
                                        )
                                        .apply(RequestOptions.fitCenterTransform())
                                        .into(binding.imageView)
+                                } catch (e: Exception) {
+                                    e.sendSilentlyWithAcraWithName("getContentFromMercury > glide lead image")
+                                }
+                            } catch (e: Exception) {
+                                e.sendSilentlyWithAcraWithName("getContentFromMercury > outside glide lead image")
+                            }
                        } else {
                            binding.imageView.visibility = View.GONE
                        }
-    }

-    private fun handleImageLoading() {
-        binding.webcontent.webViewClient = object : WebViewClient() {
-            @Deprecated("Deprecated in Java")
-            override fun shouldOverrideUrlLoading(view: WebView?, url: String): Boolean {
-                if (binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-                    requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
-                }
-                return true
-            }
-
-            @Deprecated("Deprecated in Java")
-            override fun shouldInterceptRequest(view: WebView, url: String): WebResourceResponse? {
-                val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
-                if (url.lowercase(Locale.US).contains(".jpg") || url.lowercase(Locale.US)
-                        .contains(".jpeg")
-                ) {
                        try {
-                        val image =
-                            Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                        return WebResourceResponse(
-                            IMAGE_JPG,
-                            "UTF-8",
-                            getBitmapInputStream(image, Bitmap.CompressFormat.JPEG)
-                        )
-                    } catch (e: ExecutionException) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg > $url")
+                            binding.nestedScrollView.scrollTo(0, 0)
+                            binding.progressBar.visibility = View.GONE
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > scrollview")
                        }
-                } else if (url.lowercase(Locale.US).contains(".png")) {
-                    try {
-                        val image =
-                            Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                        return WebResourceResponse(
-                            IMAGE_JPG,
-                            "UTF-8",
-                            getBitmapInputStream(image, Bitmap.CompressFormat.PNG)
-                        )
-                    } catch (e: ExecutionException) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png > $url")
+                    } else {
+                        openInBrowserAfterFailing()
                    }
-                } else if (url.lowercase(Locale.US).contains(".webp")) {
-                    try {
-                        val image =
-                            Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                        return WebResourceResponse(
-                            IMAGE_JPG,
-                            "UTF-8",
-                            getBitmapInputStream(image, Bitmap.CompressFormat.WEBP)
-                        )
-                    } catch (e: ExecutionException) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp > $url")
+                } catch (e: SocketTimeoutException) {
+                    openInBrowserAfterFailing()
+                } catch (e: Exception) {
+                    e.sendSilentlyWithAcraWithName("getContentFromMercury > whole thing")
+                    openInBrowserAfterFailing()
                }
            }
-
-                return super.shouldInterceptRequest(view, url)
-            }
        }
    }

@ -374,16 +324,54 @@ class ArticleFragment : Fragment(), DIAware {
        binding.webcontent.settings.loadWithOverviewMode = true
        binding.webcontent.settings.javaScriptEnabled = false

-        handleImageLoading()
+        binding.webcontent.webViewClient = object : WebViewClient() {
+            @Deprecated("Deprecated in Java")
+            override fun shouldOverrideUrlLoading(view: WebView?, url : String): Boolean {
+                if (binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+                    requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+                }
+                return true
+            }

-        val gestureDetector =
-            GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
+            @Deprecated("Deprecated in Java")
+            override fun shouldInterceptRequest(view: WebView, url: String): WebResourceResponse? {
+                val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
+                if (url.lowercase(Locale.US).contains(".jpg") || url.lowercase(Locale.US).contains(".jpeg")) {
+                    try {
+                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.JPEG))
+                    } catch ( e : ExecutionException) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg > $url")
+                    }
+                }
+                else if (url.lowercase(Locale.US).contains(".png")) {
+                    try {
+                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
+                    } catch ( e : ExecutionException) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png > $url")
+                    }
+                }
+                else if (url.lowercase(Locale.US).contains(".webp")) {
+                    try {
+                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
+                    } catch ( e : ExecutionException) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp > $url")
+                    }
+                }
+
+                return super.shouldInterceptRequest(view, url)
+            }
+        }
+
+        val gestureDetector = GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
            override fun onSingleTapUp(e: MotionEvent): Boolean {
                return performClick()
            }
        })

-        binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event) }
+        binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}

        binding.webcontent.settings.layoutAlgorithm =
                WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
@ -405,12 +393,7 @@ class ArticleFragment : Fragment(), DIAware {
        }

        val fontLinkAndStyle = if (font.isNotEmpty()) {
-            """<link href="https://fonts.googleapis.com/css?family=${
-                fontName.replace(
-                    " ",
-                    "+"
-                )
-            }" rel="stylesheet">
+            """<link href="https://fonts.googleapis.com/css?family=${fontName.replace(" ", "+")}" rel="stylesheet">
                |<style>
                |   * {
                |       font-family: '$fontName';
@ -434,12 +417,7 @@ class ArticleFragment : Fragment(), DIAware {
                |        max-width: 100%;
                |      }
                |      a {
-                |        color: ${
-                String.format(
-                    "#%06X",
-                    0xFFFFFF and resources.getColor(R.color.colorAccent)
-                )
-            } !important;
+                |        color: ${String.format("#%06X", 0xFFFFFF and resources.getColor(R.color.colorAccent))} !important;
                |      }
                |      *:not(a) {
                |        color: ${String.format("#%06X", 0xFFFFFF and colorOnSurface.data)};
@ -450,26 +428,11 @@ class ArticleFragment : Fragment(), DIAware {
                |        word-break: break-word;
                |        overflow:hidden;
                |        line-height: 1.5em;
-                |        background-color: ${
-                String.format(
-                    "#%06X",
-                    0xFFFFFF and colorSurface.data
-                )
-            };
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)};
                |      }
                |      body, html {
-                |        background-color: ${
-                String.format(
-                    "#%06X",
-                    0xFFFFFF and colorSurface.data
-                )
-            } !important;
-                |        border-color: ${
-                String.format(
-                    "#%06X",
-                    0xFFFFFF and colorSurface.data
-                )
-            }  !important;
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)} !important;
+                |        border-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)}  !important;
                |        padding: 0 !important;
                |        margin: 0 !important;
                |      }
@ -479,12 +442,7 @@ class ArticleFragment : Fragment(), DIAware {
                |      pre, code {
                |        white-space: pre-wrap;
                |        width:100%;
-                |        background-color: ${
-                String.format(
-                    "#%06X",
-                    0xFFFFFF and colorSurface.data
-                )
-            };
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)};
                |      }
                |   </style>
                |   $fontLinkAndStyle
@ -500,12 +458,12 @@ class ArticleFragment : Fragment(), DIAware {

    fun scrollDown() {
        val height = binding.nestedScrollView.measuredHeight
-        binding.nestedScrollView.smoothScrollBy(0, height / 2)
+        binding.nestedScrollView.smoothScrollBy(0, height/2)
    }

    fun scrollUp() {
        val height = binding.nestedScrollView.measuredHeight
-        binding.nestedScrollView.smoothScrollBy(0, -height / 2)
+        binding.nestedScrollView.smoothScrollBy(0, -height/2)
    }

    private fun openInBrowserAfterFailing() {
@ -529,10 +487,9 @@ class ArticleFragment : Fragment(), DIAware {

    fun performClick(): Boolean {
        if (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
-            binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
-        ) {
+                binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {

-            val position: Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
+            val position : Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)

            val intent = Intent(activity, ImageActivity::class.java)
            intent.putExtra("allImages", allImages)
--- 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
@ -6,7 +6,6 @@ import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
@ -14,7 +13,6 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import bou.amine.apps.readerforselfossv2.android.HomeActivity
 import bou.amine.apps.readerforselfossv2.android.R
-import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding
 import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
@ -37,7 +35,6 @@ import org.kodein.di.instance

 class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {

-    private lateinit var binding: FilterFragmentBinding
    override val di: DI by closestDI()
    private val repository: Repository by instance()

@ -48,8 +45,8 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View {
-        binding =
-            FilterFragmentBinding.inflate(
+        val binding =
+            bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding.inflate(
                inflater,
                container,
                false
@ -57,36 +54,64 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {

        val context: Context? = context

+        val tagGroup = binding.tagsGroup
+        val sourceGroup = binding.sourcesGroup

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

-                binding.progressBar2.visibility = GONE
-                binding.filterView.visibility = VISIBLE
+                tags.forEach { tag ->
+                    val c = Chip(context)
+                    c.text = tag.tag
+
+                    try {
+                        val gd = GradientDrawable()
+                        val gdColor = try {
+                            Color.parseColor(tag.color)
+                        } catch (e: IllegalArgumentException) {
+                            e.sendSilentlyWithAcraWithName("color issue " + tag.color)
+                            resources.getColor(R.color.colorPrimary)
                        }
+                        gd.setColor(gdColor)
+                        gd.shape = GradientDrawable.RECTANGLE
+                        gd.setSize(30, 30)
+                        gd.cornerRadius = 30F
+                        c.chipIcon = gd
+                    } catch (e: Exception) {
+                        e.sendSilentlyWithAcraWithName("tags > GradientDrawable")
                    }

-        binding.floatingActionButton2.setOnClickListener {
-            (activity as HomeActivity).getElementsAccordingToTab()
-            (activity as HomeActivity).fetchOnEmptyList()
-            dismiss()
-        }
-        return binding.root
+                    c.setOnCloseIconClickListener {
+                        (it as Chip).isCloseIconVisible = false
+                        selectedChip = null
+                        repository.setTagFilter(null)
                    }

-    private suspend fun handleSourceChips(
-        context: Context
-    ) {
-        val sourceGroup = binding.sourcesGroup
+                    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)
-            c.ellipsize = TextUtils.TruncateAt.END

                    Glide.with(context)
                        .load(source.getIcon(repository.baseUrl))
@ -149,61 +174,18 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {

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

-    private suspend fun handleTagChips(
-        context: Context,
-    ) {
-        val tagGroup = binding.tagsGroup
-
-        val tags = repository.getTags()
-
-        tags.forEach { tag ->
-            val c = Chip(context)
-            c.ellipsize = TextUtils.TruncateAt.END
-            c.text = tag.tag
-
-            try {
-                val gd = GradientDrawable()
-                val gdColor = try {
-                    Color.parseColor(tag.color)
-                } catch (e: IllegalArgumentException) {
-                    e.sendSilentlyWithAcraWithName("color issue " + tag.color)
-                    resources.getColor(R.color.colorPrimary)
-                }
-                gd.setColor(gdColor)
-                gd.shape = GradientDrawable.RECTANGLE
-                gd.setSize(30, 30)
-                gd.cornerRadius = 30F
-                c.chipIcon = gd
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("tags > GradientDrawable")
-            }
-
-            c.setOnCloseIconClickListener {
-                (it as Chip).isCloseIconVisible = false
-                selectedChip = null
-                repository.setTagFilter(null)
-            }
-
-            c.setOnClickListener {
-                if (selectedChip != null) {
-                    selectedChip!!.isCloseIconVisible = false
-                }
-                (it as Chip).isCloseIconVisible = true
-                selectedChip = it
-                repository.setTagFilter(tag)
-
-                repository.setSourceFilter(null)
-            }
-
-            if (repository.tagFilter.value?.equals(tag) == true) {
-                c.isCloseIconVisible = true
-                selectedChip = c
-            }
-
-            tagGroup.addView(c)
+        binding.floatingActionButton2.setOnClickListener {
+            (activity as HomeActivity).getElementsAccordingToTab()
+            (activity as HomeActivity).fetchOnEmptyList()
+            dismiss()
        }
+        return binding.root
    }

    companion object {
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/AndroidIModelUtils.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/AndroidIModelUtils.kt
@ -8,6 +8,7 @@ import bou.amine.apps.readerforselfossv2.utils.getImages
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
+import org.acra.ktx.sendSilentlyWithAcra

 fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
    val imageUrls = this.getImages()
--- 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
@ -21,6 +21,7 @@ import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import com.mikepenz.aboutlibraries.LibsBuilder
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
+import org.kodein.di.instance

 private const val TITLE_TAG = "settingsActivityTitle"

@ -145,12 +146,8 @@ class SettingsActivity : AppCompatActivity(),
            fontSize?.setOnBindEditTextListener { editText ->
                editText.inputType = InputType.TYPE_CLASS_NUMBER
                editText.addTextChangedListener { object : TextWatcher {
-                    override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
-                        // We do nothing
-                    }
-                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
-                        // We do nothing
-                    }
+                    override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
                    override fun afterTextChanged(editable: Editable) {
                        try {
                            editText.textSize = editable.toString().toInt().toFloat()
--- a/androidApp/src/main/res/layout/filter_fragment.xml
+++ b/androidApp/src/main/res/layout/filter_fragment.xml
@ -17,65 +17,13 @@
        app:layout_constraintTop_toTopOf="parent"
        tools:visibility="gone" />

-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
-
    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/filterView"
        android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+        android:layout_height="match_parent"
        android:visibility="gone"
        tools:visibility="visible">

-            <TextView
-                android:id="@+id/filterTagsTitle"
-                style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="16dp"
-                android:text="@string/filter_item_tags"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/filterSourcesTitle"
-                style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="24dp"
-                android:text="@string/filter_item_sources"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tagsGroup" />
-
-
-            <com.google.android.material.chip.ChipGroup
-                android:id="@+id/tagsGroup"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="24dp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/filterTagsTitle"
-                app:singleSelection="true">
-
-            </com.google.android.material.chip.ChipGroup>
-
-            <com.google.android.material.chip.ChipGroup
-                android:id="@+id/sourcesGroup"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="24dp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/filterSourcesTitle">
-
-            </com.google.android.material.chip.ChipGroup>
-
-
        <com.google.android.material.floatingactionbutton.FloatingActionButton
            android:id="@+id/floatingActionButton2"
            android:layout_width="wrap_content"
@ -90,7 +38,52 @@
            app:rippleColor="@color/colorAccentDark"
            app:srcCompat="@drawable/ic_menu_search_white_24dp" />

-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.core.widget.NestedScrollView>
+        <TextView
+            android:id="@+id/filterTagsTitle"
+            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="16dp"
+            android:text="@string/filter_item_tags"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />

+
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/tagsGroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="24dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/filterTagsTitle"
+            app:singleSelection="true">
+
+        </com.google.android.material.chip.ChipGroup>
+
+        <TextView
+            android:id="@+id/filterSourcesTitle"
+            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="24dp"
+            android:text="@string/filter_item_sources"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tagsGroup" />
+
+
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/sourcesGroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="24dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/filterSourcesTitle">
+
+        </com.google.android.material.chip.ChipGroup>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/androidApp/src/test/kotlin/RepositoryTest.kt
+++ b/androidApp/src/test/kotlin/RepositoryTest.kt
@ -18,18 +18,6 @@ import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test

-private const val BASE_URL = "https://test.com/selfoss/"
-
-private const val SPOUT = "spouts\\rss\\fulltextrss"
-
-private const val IMAGE_URL = "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-
-private const val IMAGE_URL_2 = "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-
-private const val FEED_URL = "https://test.com/feed"
-
-private const val TAGS = "Test, New"
-
 class RepositoryTest {
    private val db = mockk<ReaderForSelfossDB>(relaxed = true)
    private val appSettingsService = mockk<AppSettingsService>()
@ -57,7 +45,7 @@ class RepositoryTest {
    fun setup() {
        clearAllMocks()
        every { appSettingsService.getApiVersion() } returns 4
-        every { appSettingsService.getBaseUrl() } returns BASE_URL
+        every { appSettingsService.getBaseUrl() } returns "https://test.com/selfoss/"
        every { appSettingsService.isItemCachingEnabled() } returns false
        every { appSettingsService.isUpdateSourcesEnabled() } returns false

@ -241,9 +229,9 @@ class RepositoryTest {
            1,
            "Test",
            listOf("tags"),
-            SPOUT,
+            "spouts\\rss\\fulltextrss",
            "",
-            IMAGE_URL,
+            "b3aa8a664d08eb15d6ff1db2fa83e0d9.png",
            SelfossModel.SourceParams("url")
        ))
        runBlocking {
@ -562,18 +550,18 @@ class RepositoryTest {
                1,
                "First source",
                listOf("Test", "second"),
-                SPOUT,
+                "spouts\\rss\\fulltextrss",
                "",
-                IMAGE_URL_2,
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png",
                SelfossModel.SourceParams("url")
            ),
            SelfossModel.Source(
                2,
                "Second source",
                listOf("second"),
-                SPOUT,
+                "spouts\\rss\\fulltextrss",
                "",
-                IMAGE_URL,
+                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png",
                SelfossModel.SourceParams("url")
            )
        )
@ -582,18 +570,18 @@ class RepositoryTest {
                "1",
                "First DB source",
                "Test,second",
-                SPOUT,
+                "spouts\\rss\\fulltextrss",
                "",
-                IMAGE_URL_2,
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png",
                "url"
            ),
            SOURCE(
                "2",
                "Second source",
                "second",
-                SPOUT,
+                "spouts\\rss\\fulltextrss",
                "",
-                IMAGE_URL,
+                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png",
                "url"
            )
        )
@ -732,9 +720,9 @@ class RepositoryTest {
        runBlocking {
            response = repository.createSource(
                "test",
-                FEED_URL,
-                SPOUT,
-                TAGS,
+                "https://test.com/feed",
+                "spouts\\rss\\fulltextrss",
+                "Test, New",
            )
        }

@ -759,9 +747,9 @@ class RepositoryTest {
        runBlocking {
            response = repository.createSource(
                "test",
-                FEED_URL,
-                SPOUT,
-                TAGS
+                "https://test.com/feed",
+                "spouts\\rss\\fulltextrss",
+                "Test, New"
            )
        }

@ -786,9 +774,9 @@ class RepositoryTest {
        runBlocking {
            response = repository.createSource(
                "test",
-                FEED_URL,
-                SPOUT,
-                TAGS
+                "https://test.com/feed",
+                "spouts\\rss\\fulltextrss",
+                "Test, New"
            )
        }

@ -964,12 +952,12 @@ class RepositoryTest {
        coEvery { appSettingsService.refreshLoginInformation(any(), any(), any()) } returns Unit

        initializeRepository()
-        repository.refreshLoginInformation(BASE_URL, "login", "password")
+        repository.refreshLoginInformation("https://test.com/selfoss/", "login", "password")

        coVerify(exactly = 1) { api.refreshLoginInformation() }
        coVerify(exactly = 1) {
            appSettingsService.refreshLoginInformation(
-                BASE_URL,
+                "https://test.com/selfoss/",
                "login",
                "password"
            )
@ -1043,9 +1031,9 @@ class RepositoryTest {
                1,
                "First source",
                listOf("Test", "second"),
-                SPOUT,
+                "spouts\\rss\\fulltextrss",
                "",
-                IMAGE_URL_2,
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png",
                SelfossModel.SourceParams("url")
            )
        )
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -7,8 +7,8 @@ buildscript {

 plugins {
    //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("7.4.0").apply(false)
-    id("com.android.library").version("7.4.0").apply(false)
+    id("com.android.application").version("7.3.1").apply(false)
+    id("com.android.library").version("7.3.1").apply(false)
    kotlin("android").version("1.7.20").apply(false)
    kotlin("multiplatform").version("1.7.20").apply(false)
    id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Mon Jan 23 20:47:46 CET 2023
+#Wed Feb 09 17:05:19 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/MercuryModel.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/MercuryModel.kt
@ -8,7 +8,7 @@ class MercuryModel {
    class ParsedContent(
        val title: String?,
        val content: String?,
-        val lead_image_url: String?, // NOSONAR
+        val lead_image_url: String?,
        val url: String
    )
 }
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt
@ -81,13 +81,19 @@ class SelfossModel {
        val tags: List<String>,
        val author: String?
    ) {
+        // TODO: maybe find a better way to handle these kind of urls
        fun getLinkDecoded(): String {
            var stringUrl: String
-            stringUrl = if (link.contains("//news.google.com/news/") && link.contains("&amp;url=")) {
+            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")) {
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
@ -51,7 +51,9 @@ class Repository(
    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()
+        var fromDB = false
        if (isNetworkAvailable()) {
            fetchedItems = api.getItems(
                displayedItems.type,
@ -61,7 +63,9 @@ class Repository(
                searchFilter,
                null
            )
-        } else if (appSettingsService.isItemCachingEnabled()) {
+        } else {
+            if (appSettingsService.isItemCachingEnabled()) {
+                fromDB = true
                var dbItems = getDBItems().filter {
                    displayedItems == ItemType.ALL ||
                            (it.unread && displayedItems == ItemType.UNREAD) ||
@ -73,15 +77,17 @@ class Repository(
                if (sourceFilter.value != null) {
                    dbItems = dbItems.filter { it.sourcetitle == sourceFilter.value!!.title }
                }
-            val itemsList = ArrayList(dbItems.map { it.toView() })
-            itemsList.sortByDescending { DateUtils.parseDate(it.datetime) }
                fetchedItems = StatusAndData.succes(
-                itemsList
+                    dbItems.map { it.toView() }
                )
            }
+        }

        if (fetchedItems.success && fetchedItems.data != null) {
            items = ArrayList(fetchedItems.data!!)
+            if (fromDB) {
+                items.sortByDescending { DateUtils.parseDate(it.datetime) }
+            }
        }
        return items
    }
@ -167,13 +173,14 @@ class Repository(
        }
    }

+    // TODO: Add tests
    suspend fun getSpouts(): Map<String, SelfossModel.Spout> {
        return if (isNetworkAvailable()) {
            val spouts = api.spouts()
            if (spouts.success && spouts.data != null) {
                spouts.data
            } else {
-                emptyMap()
+                emptyMap() // TODO: do something here
            }
        } else {
            throw NetworkUnavailableException()
@ -199,6 +206,7 @@ class Repository(
        }
    }

+    // TODO: Add tests
    suspend fun markAsRead(item: SelfossModel.Item): Boolean {
        val success = markAsReadById(item.id)

@ -217,6 +225,7 @@ class Repository(
        }
    }

+    // TODO: Add tests
    suspend fun unmarkAsRead(item: SelfossModel.Item): Boolean {
        val success = unmarkAsReadById(item.id)

@ -235,6 +244,7 @@ class Repository(
        }
    }

+    // TODO: Add tests
    suspend fun starr(item: SelfossModel.Item): Boolean {
        val success = starrById(item.id)

@ -253,6 +263,7 @@ class Repository(
        }
    }

+    // TODO: Add tests
    suspend fun unstarr(item: SelfossModel.Item): Boolean {
        val success = unstarrById(item.id)

@ -271,6 +282,7 @@ class Repository(
        }
    }

+    // TODO: Add tests
    suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
        var success = false

@ -530,6 +542,7 @@ class Repository(
        return emptyList()
    }

+    // TODO: Add tests
    suspend fun handleDBActions() {

        val actions: List<ACTION> = getDBActions()
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/AppSettingsService.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/AppSettingsService.kt
@ -1,6 +1,8 @@
 package bou.amine.apps.readerforselfossv2.service

 import com.russhwolf.settings.Settings
+import io.github.aakira.napier.Napier
+import io.ktor.client.plugins.*

 class AppSettingsService {
    val settings: Settings = Settings()