fix: url required issue.

fix: Canvas reused issue.
Changelog for v123020572 [CI SKIP]
2023-03-03 20:39:33 +01:00 · 2023-03-03 20:39:20 +01:00 · 2023-02-26 19:13:41 +00:00 · 2023-02-26 16:05:26 +01:00 · 2023-02-26 15:40:58 +01:00 · 2023-02-26 07:49:16 +00:00
108 changed files with 2876 additions and 2467 deletions
@@ -3,27 +3,35 @@ 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\nappLoginUrl=\"URL\"\nappLoginUsername=\"LOGIN\"\nappLoginPassword=\"PASS\"\npushCache=false" >> ~/.gradle/gradle.properties
-      - echo "---------------------------------------------------------"
-      - echo "Analysing..."
-      - ./gradlew sonarqube -Dsonar.projectKey=RFS2 -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN
+      - 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 "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
@@ -35,14 +43,23 @@ 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
+      - PREV=$(git describe --tags --abbrev=0)
      - ./build.sh --publish --from-ci
      - git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git
+      - VER=$(git describe --tags --abbrev=0)
+      - CHANGELOG=$(git log $PREV..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]"
+      - git push pushing master
      - git push pushing --tags
    environment:
+      TZ: Europe/Paris
      GITEA_USR:
        from_secret: giteaUsr
      GITEA_PASS:
@@ -68,10 +85,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 +102,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\nappLoginUrl=\"URL\"\nappLoginUsername=\"LOGIN\"\nappLoginPassword=\"PASS\"\npushCache=false" >> ~/.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 +124,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:
@@ -46,28 +46,3 @@ Always check if the web version of your instance is working.
 I won't provide any selfoss instance url. If you want to help, but to not have one, you'll have to install one, and use it.

 All the details to need are [here](https://selfoss.aditu.de/).
-
-# Build the project
-
-You can directly import this project into IntellIJ/Android Studio.
-
-You'll have to:
-
- Define some parameters either in `~/.gradle/gradle.properties` or as gradle parameters (see the examples)
-
-    - appLoginUrl, appLoginUsername and appLoginPassword: url, username and password of a selfoss instance. **These are only used for tests. They can be empty if you don't test API calls.**
-
-### Examples:
-#### Inside ~/.gradle/gradle.properties
-
-```
-appLoginUrl="URL" # It can be empty.
-appLoginUsername="LOGIN" # It can be empty.
-appLoginPassword="PASS" # It can be empty.
-```
-
-#### As gradle parameters
-
-```
-./gradlew .... -P appLoginUrl="URL" -P appLoginUsername="LOGIN" -P appLoginPassword="PASS"
-```
@@ -1,3 +1,106 @@
+**v123020572**
+
+- fix: requirecontext issues ?
+- debug: activity not found exception.
+- Changelog for v123020571 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123020571**
+
+- chore: remove errors logging.
+- fix: quickfix for url param not provided for some sources.
+- Update 'CHANGELOG.md'
+- Changelog for v123020523 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123020523**
+
+- fix: Git changelog.
+
+--------------------------------------------------------------------
+
+**v123020491**
+
+- fix: Fixed acra bug reporting.
+
+--------------------------------------------------------------------
+
+**v123010301**
+
+- Chore: acra config.
+
+--------------------------------------------------------------------
+
+**v123010281**
+
+- improvement: Improve right to left support (#130) Co-authored-by: davidoskky <davidoskky@hidden.hidden> Co-committed-by: davidoskky <davidoskky@hidden.hidden>
+
+--------------------------------------------------------------------
+
+**v123010261**
+
+- feat: Handle public instances (#126) Co-authored-by: davidoskky <davidoskky@hidden.hidden> Co-committed-by: davidoskky <davidoskky@hidden.hidden>
+- ci: Pull request should trigger ci.
+- fix: Complete the disconnection before redirecting to the login screen
+- Complete the disconnection before redirecting to the login screen
+
+--------------------------------------------------------------------
+
+**v123010241**
+
+- Merge pull request 'feat: swipe down to close images' (#122) from davidoskky/ReaderForSelfoss-multiplatform:swipe_down into master
+- Remove unnecessary definition
+- Remove unused import
+- Adjust the image closing animation
+- Add a dark hue to the underlying article when swiping to close images
+- Rename activity style to avoid interferences
+- Adapt the style of the image activity to the rest of the application
+- Resolve issues when swiping down to close images
+- Close the image fragment only if the image has been dragged down
+- Animate swipe down to close images
+- Swipe down to close images
+
+--------------------------------------------------------------------
+
+**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.
+- 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**
@@ -1,12 +1,14 @@
 import java.io.ByteArrayOutputStream

 val ignoreGitVersion: String by project
+val acraVersion = "5.9.7"

 plugins {
    id("com.android.application")
    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 {
@@ -64,7 +66,7 @@ android {
        jvmTarget = "11"
    }
    compileSdk = 33
-    buildToolsVersion = "31.0.0"
+    buildToolsVersion = "33.0.0"
    buildFeatures {
        viewBinding = true
    }
@@ -96,9 +98,6 @@ android {
            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
        }
        getByName("debug") {
-            buildConfigField("String", "LOGIN_URL", properties["appLoginUrl"] as String)
-            buildConfigField("String", "LOGIN_PASSWORD", properties["appLoginPassword"] as String)
-            buildConfigField("String", "LOGIN_USERNAME", properties["appLoginUsername"] as String)
        }
    }
    flavorDimensions.add("build")
@@ -116,7 +115,6 @@ dependencies {
    implementation(project(":shared"))
    implementation("com.google.android.material:material:1.5.0")
    implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")

    implementation("androidx.preference:preference-ktx:1.1.1")
@@ -132,7 +130,7 @@ dependencies {
    implementation("androidx.cardview:cardview:1.0.0")
    implementation("androidx.annotation:annotation:1.3.0")
    implementation("androidx.work:work-runtime-ktx:2.7.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
    implementation("org.jsoup:jsoup:1.14.3")

    //multidex
@@ -142,22 +140,13 @@ dependencies {
    implementation("com.mikepenz:aboutlibraries-core:10.5.1")
    implementation("com.mikepenz:aboutlibraries:10.5.1")

-    // Retrofit + http logging + okhttp
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
-    implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.3")
-    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
-    implementation("com.burgstaller:okhttp-digest:2.5")
-
    // Material-ish things
    implementation("com.ashokvarma.android:bottom-navigation-bar:2.2.0")
    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")
-
-    // Drawer
-    implementation("com.mikepenz:materialdrawer:8.4.5")
+    kapt("com.github.bumptech.glide:compiler:4.15.0")
+    implementation("com.github.bumptech.glide:okhttp3-integration:4.15.0")

    // Themes
    implementation("com.github.rubensousa:floatingtoolbar:1.5.1")
@@ -195,6 +184,9 @@ dependencies {
    testImplementation("io.mockk:mockk:1.12.0")
    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
+
+    implementation("ch.acra:acra-http:$acraVersion")
+    implementation("ch.acra:acra-toast:$acraVersion")
 }

 tasks.withType<Test> {
@@ -30,15 +30,8 @@
    <fields>;
 }

-dontwarn okio.**
-dontwarn retrofit2.Platform$Java8
-keep class retrofit.** { *; }
-keepclasseswithmembers class * {
-    @retrofit.http.* <methods>;
-}
 -keepattributes *Annotation*,Signature
 -keepattributes Exceptions
-dontwarn okio.**
 -dontwarn javax.annotation.Nullable
 -dontwarn javax.annotation.ParametersAreNonnullByDefault

@@ -2,6 +2,7 @@
 <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" />

@@ -15,7 +16,8 @@
        android:supportsRtl="true"
        android:networkSecurityConfig="@xml/network_security_config"
        android:theme="@style/NoBar"
-        android:dataExtractionRules="@xml/data_extraction_rules">
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:configChanges="uiMode">
        <activity
            android:name=".MainActivity"
            android:theme="@style/SplashTheme"
@@ -51,7 +53,7 @@
                android:value=".HomeActivity" />
        </activity>
        <activity
-            android:name=".AddSourceActivity"
+            android:name=".UpsertSourceActivity"
            android:parentActivityName=".SourcesActivity"
            android:exported="true">
            <meta-data
@@ -68,7 +70,8 @@
            android:name=".ReaderActivity">
        </activity>
        <activity
-            android:name=".ImageActivity">
+            android:name=".ImageActivity"
+            android:theme="@style/Theme.AppCompat.ImageActivity">
        </activity>

        <meta-data android:name="android.webkit.WebView.MetricsOptOut"
@@ -78,8 +81,5 @@
            android:value="true" />

        <meta-data android:name="android.max_aspect" android:value="2.1" />
-        <meta-data
-            android:name="preloaded_fonts"
-            android:resource="@array/preloaded_fonts" />
    </application>
 </manifest>
@@ -0,0 +1,9 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import org.acra.ACRA
+import org.acra.ktx.sendSilentlyWithAcra
+
+fun Throwable.sendSilentlyWithAcraWithName(name: String) {
+    ACRA.errorReporter.putCustomData("error_source", name)
+    this.sendSilentlyWithAcra()
+}
@@ -1,23 +1,16 @@
 package bou.amine.apps.readerforselfossv2.android

 import android.content.Intent
-import android.graphics.Color
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.GradientDrawable
-import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.ImageView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.doOnNextLayout
-import androidx.drawerlayout.widget.DrawerLayout
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.*
 import androidx.work.Constraints
@@ -29,46 +22,30 @@ import bou.amine.apps.readerforselfossv2.android.adapters.ItemListAdapter
 import bou.amine.apps.readerforselfossv2.android.adapters.ItemsAdapter
 import bou.amine.apps.readerforselfossv2.android.background.LoadingWorker
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivityHomeBinding
+import bou.amine.apps.readerforselfossv2.android.fragments.FilterSheetFragment
 import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.maybeShow
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.removeBadge
 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.*
+import bou.amine.apps.readerforselfossv2.utils.ItemType
 import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestOptions
-import com.mikepenz.aboutlibraries.LibsBuilder
-import com.mikepenz.materialdrawer.holder.BadgeStyle
-import com.mikepenz.materialdrawer.holder.ColorHolder
-import com.mikepenz.materialdrawer.holder.StringHolder
-import com.mikepenz.materialdrawer.model.DividerDrawerItem
-import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
-import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
-import com.mikepenz.materialdrawer.model.interfaces.*
-import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
-import com.mikepenz.materialdrawer.util.DrawerImageLoader
-import com.mikepenz.materialdrawer.util.addStickyFooterItem
-import com.mikepenz.materialdrawer.util.updateBadge
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
+import java.security.MessageDigest
 import java.util.concurrent.TimeUnit


 class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAware {

-    private val DRAWER_ID_TAGS = 100101L
-    private val DRAWER_ID_HIDDEN_TAGS = 101100L
-    private val DRAWER_ID_SOURCES = 100110L
-    private val DRAWER_ID_FILTERS = 100111L
-
    private var items: ArrayList<SelfossModel.Item> = ArrayList()

    private var elementsShown: ItemType = ItemType.UNREAD
@@ -86,8 +63,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()
    }
@@ -96,6 +71,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
    private val repository : Repository by instance()
    private val appSettingsService : AppSettingsService by instance()

+
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        binding = ActivityHomeBinding.inflate(layoutInflater)
@@ -111,14 +87,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        setContentView(view)

        setSupportActionBar(binding.toolBar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        supportActionBar?.setHomeButtonEnabled(true)
-        val mDrawerToggle = ActionBarDrawerToggle(this, binding.drawerContainer, binding.toolBar, R.string.material_drawer_open, R.string.material_drawer_close)
-        binding.drawerContainer.addDrawerListener(mDrawerToggle)
-        mDrawerToggle.syncState()

        handleBottomBar()
-        initDrawer()

        handleSwipeRefreshLayout()

@@ -139,17 +109,22 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        binding.swipeRefreshLayout.setOnRefreshListener {
            repository.offlineOverride = false
            lastFetchDone = false
-            handleDrawerItems()
            CoroutineScope(Dispatchers.Main).launch {
                getElementsAccordingToTab()
                binding.swipeRefreshLayout.isRefreshing = false
            }
        }

+        val swipeDirs = if (appSettingsService.getPublicAccess()) {
+            0
+        } else {
+            ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
+        }
+
        val simpleItemTouchCallback =
            object : ItemTouchHelper.SimpleCallback(
                0,
-                ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
+                swipeDirs
            ) {
                override fun getSwipeDirs(
                    recyclerView: RecyclerView,
@@ -179,16 +154,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()
-                        reloadTagsBadges()
-
                        // Just load everythin
                        if (items.size <= 0) {
                            getElementsAccordingToTab()
@@ -285,8 +250,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
    override fun onResume() {
        super.onResume()

-        handleDrawerItems()
-
        reloadLayoutManager()

        if (appSettingsService.isInfiniteLoadingEnabled()) {
@@ -297,6 +260,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar

        handleBottomBarActions()

+        handleGDPRDialog(appSettingsService.settings.getBoolean("GDPR_shown", false))
+
        handleRecurringTask()

        CoroutineScope(Dispatchers.Main).launch {
@@ -306,245 +271,22 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        getElementsAccordingToTab()
    }

-    private fun initDrawer() {
-        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
-            override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
-                Glide.with(this@HomeActivity)
-                    .asBitmap()
-                    .load(uri)
-                    .apply(RequestOptions()
-                        .placeholder(R.mipmap.ic_launcher)
-                        .fallback(R.mipmap.ic_launcher)
-                        .fitCenter())
-                    .into(imageView)
+
+    private fun handleGDPRDialog(GDPRShown: Boolean) {
+        val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
+        messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
+        if (!GDPRShown) {
+            val alertDialog = AlertDialog.Builder(this).create()
+            alertDialog.setTitle(getString(R.string.gdpr_dialog_title))
+            alertDialog.setMessage(getString(R.string.gdpr_dialog_message))
+            alertDialog.setButton(
+                AlertDialog.BUTTON_NEUTRAL,
+                "OK"
+            ) { dialog, _ ->
+                appSettingsService.settings.putBoolean("GDPR_shown", true)
+                dialog.dismiss()
            }
-
-            override fun cancel(imageView: ImageView) {
-                Glide.with(this@HomeActivity).clear(imageView)
-            }
-        })
-
-        val drawerListener = object : DrawerLayout.DrawerListener {
-            override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
-                // We do nothing
-            }
-
-            override fun onDrawerOpened(drawerView: View) {
-                binding.bottomBar.hide()
-            }
-
-            override fun onDrawerClosed(drawerView: View) {
-                binding.bottomBar.show()
-            }
-
-            override fun onDrawerStateChanged(newState: Int) {
-                // We do nothing
-            }
-
-        }
-
-        binding.drawerContainer.addDrawerListener(drawerListener)
-
-        // Sticky items
-        addStickyPrimaryItem(R.string.drawer_report_bug, R.drawable.ic_bug_report_black_24dp) { _, _, _ ->
-            val browserIntent =
-                Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
-            startActivity(browserIntent)
-            false
-        }
-        addStickyPrimaryItem(R.string.title_activity_settings, R.drawable.ic_settings_black_24dp) { _, _, _ ->
-            settingsLauncher.launch(Intent(this, SettingsActivity::class.java))
-            false
-        }
-    }
-
-    private fun addStickyPrimaryItem(name: Int, icon: Int, clickListener: ((v: View?, item: IDrawerItem<*>, position: Int) -> Boolean)?) {
-        binding.mainDrawer.addStickyFooterItem(
-            PrimaryDrawerItem().apply {
-                nameRes = name
-                iconRes = icon
-                isIconTinted = true
-                onDrawerItemClickListener = clickListener
-            })
-    }
-
-    private fun handleDrawerItems() {
-        tagsBadge = emptyMap()
-        binding.mainDrawer.itemAdapter.add(
-            PrimaryDrawerItem().apply {
-                nameRes = R.string.drawer_loading
-                isSelectable = false
-            }
-        )
-
-        CoroutineScope(Dispatchers.IO).launch {
-            val tags = repository.getTags()
-            val sources = repository.getSources()
-            runOnUiThread {
-                handleDrawerData(tags, sources)
-            }
-        }
-    }
-
-    private fun handleDrawerData(tags: List<SelfossModel.Tag>, sources: List<SelfossModel.Source>) {
-        binding.mainDrawer.itemAdapter.clear()
-
-        // Filters title with clear action
-        secondaryItem(withDivider = false, R.string.drawer_item_filters, DRAWER_ID_FILTERS, R.string.drawer_action_clear) { _,_,_ ->
-            repository.sourceFilter = null
-            repository.tagFilter = null
-            binding.mainDrawer.setSelectionAtPosition(-1)
-            getElementsAccordingToTab()
-            fetchOnEmptyList()
-            false
-        }
-
-        // Hidden tags
-        if (tags.isNotEmpty() && appSettingsService.getHiddenTags().isNotEmpty()) {
-            secondaryItem(
-                withDivider = true,
-                R.string.drawer_item_hidden_tags,
-                DRAWER_ID_HIDDEN_TAGS
-            )
-            handleHiddenTags(tags)
-        }
-
-        // Tags
-        secondaryItem(withDivider = true, R.string.drawer_item_tags, DRAWER_ID_TAGS)
-        if (tags.isEmpty()) {
-            binding.mainDrawer.itemAdapter.add(
-                SecondaryDrawerItem()
-                    .apply { nameRes = R.string.drawer_error_loading_tags; isSelectable = false }
-            )
-        } else {
-            handleTags(tags)
-        }
-
-        // Sources
-        secondaryItem(withDivider = true, R.string.drawer_item_sources, DRAWER_ID_SOURCES, R.string.drawer_action_edit) { v, _, _ ->
-            startActivity(Intent(v!!.context, SourcesActivity::class.java))
-            false
-        }
-        if (sources.isEmpty()) {
-            binding.mainDrawer.itemAdapter.add(
-                SecondaryDrawerItem().apply {
-                    nameRes = R.string.drawer_error_loading_sources
-                    isSelectable = false
-                }
-            )
-        } else {
-            handleSources(sources)
-        }
-
-        // About action
-        binding.mainDrawer.itemAdapter.add(
-            DividerDrawerItem(),
-            PrimaryDrawerItem().apply {
-                nameRes = R.string.action_about
-                isSelectable = false
-                iconRes = R.drawable.ic_info_outline_white_24dp
-                isIconTinted = true
-                onDrawerItemClickListener = { _,_,_ ->
-                    LibsBuilder()
-                        .withAboutIconShown(true)
-                        .withAboutVersionShown(true)
-                        .start(this@HomeActivity)
-                    false
-                }
-            }
-        )
-    }
-
-    private fun secondaryItem(withDivider: Boolean, name: Int, id: Long, badgeId: Int? = null, clickListener: ((v: View?, item: IDrawerItem<*>, position: Int) -> Boolean)? = null) {
-        if (withDivider) {
-            binding.mainDrawer.itemAdapter.add(DividerDrawerItem())
-        }
-
-        binding.mainDrawer.itemAdapter.add(
-            SecondaryDrawerItem().apply {
-                nameRes = name
-                identifier = id
-                isSelectable = false
-                if (badgeId != null) {
-                    badgeRes = badgeId
-                }
-                onDrawerItemClickListener = clickListener
-            }
-        )
-    }
-
-    private fun createDrawerItem(it: SelfossModel.Tag) {
-        val gd = GradientDrawable()
-        val gdColor = try {
-            Color.parseColor(it.color)
-        } catch (e: IllegalArgumentException) {
-            resources.getColor(R.color.colorPrimary)
-        }
-        gd.setColor(gdColor)
-        gd.shape = GradientDrawable.RECTANGLE
-        gd.setSize(30, 30)
-        gd.cornerRadius = 30F
-
-        val drawerItem = PrimaryDrawerItem()
-            .apply {
-                nameText = it.tag.getHtmlDecoded()
-                identifier = it.tag.longHash()
-                iconDrawable = gd
-                badgeStyle = BadgeStyle().apply {
-                    textColor = ColorHolder.fromColor(Color.WHITE)
-                    color = ColorHolder.fromColor(resources.getColor(R.color.colorAccent))
-                }
-                onDrawerItemClickListener = { _, _, _ ->
-                    repository.tagFilter = it
-                    repository.sourceFilter = null
-                    getElementsAccordingToTab()
-                    fetchOnEmptyList()
-                    false
-                }
-            }
-        if (it.unread > 0) {
-            drawerItem.badgeText = it.unread.toString()
-        }
-
-        binding.mainDrawer.itemAdapter.add(drawerItem)
-    }
-
-    private fun handleTags(tags: List<SelfossModel.Tag>) {
-        val filteredTags = tags
-            .filterNot { appSettingsService.getHiddenTags().contains(it.tag) }
-            .sortedBy { it.tag }
-        createTagItems(filteredTags)
-    }
-
-    private fun handleHiddenTags(tags: List<SelfossModel.Tag>) {
-        val filteredHiddenTags: List<SelfossModel.Tag> =
-            tags.filter { appSettingsService.getHiddenTags().contains(it.tag) }
-        createTagItems(filteredHiddenTags)
-    }
-
-    private fun createTagItems(tags: List<SelfossModel.Tag>) {
-        tagsBadge = tags.associate {
-            createDrawerItem(it)
-
-            (it.tag.longHash() to it.unread)
-        }
-    }
-
-    private fun handleSources(sources: List<SelfossModel.Source>) {
-        for (source in sources) {
-            val item = PrimaryDrawerItem().apply {
-                nameText = source.title.getHtmlDecoded()
-                identifier = source.id.toLong()
-                iconUrl = source.getIcon(repository.baseUrl)
-                onDrawerItemClickListener = { _,_,_ ->
-                    repository.sourceFilter = source
-                    repository.tagFilter = null
-                    getElementsAccordingToTab()
-                    fetchOnEmptyList()
-                    false
-                }
-            }
-            binding.mainDrawer.itemAdapter.add(item)
+            alertDialog.show()
        }
    }

@@ -629,9 +371,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        })
    }

-    private fun fetchOnEmptyList() {
+    fun fetchOnEmptyList() {
        binding.recyclerView.doOnNextLayout {
-            // TODO: do if last element (or is empty ?)
            getElementsAccordingToTab(true)
        }
    }
@@ -670,7 +411,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
            binding.emptyText.visibility = View.GONE
        }

-    private fun getElementsAccordingToTab(
+    fun getElementsAccordingToTab(
        appendResults: Boolean = false
    ) {
        offset = if (appendResults && items.size > 0) {
@@ -751,13 +492,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        }
    }

-    private fun reloadTagsBadges() {
-        tagsBadge.forEach {
-            binding.mainDrawer.updateBadge(it.key, StringHolder(it.value.toString()))
-        }
-        binding.mainDrawer.resetDrawerContent()
-    }
-
    private fun calculateNoOfColumns(): Int {
        val displayMetrics = resources.displayMetrics
        val dpWidth = displayMetrics.widthPixels / displayMetrics.density
@@ -783,6 +517,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        val inflater = menuInflater
        inflater.inflate(R.menu.home_menu, menu)
+        if (appSettingsService.getPublicAccess()) {
+            menu.removeItem(R.id.readAll)
+            menu.removeItem(R.id.action_sources)
+        }

        val searchItem = menu.findItem(R.id.action_search)
        val searchView = searchItem.getActionView() as SearchView
@@ -803,14 +541,17 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when (item.itemId) {
+            R.id.action_filter -> {
+                val filterSheetFragment = FilterSheetFragment()
+                filterSheetFragment.show(supportFragmentManager, FilterSheetFragment.TAG)
+                return true
+            }
            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
@@ -842,8 +583,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                                ).show()
                                tabNewBadge.removeBadge()

-                                handleDrawerItems()
-
                                getElementsAccordingToTab()
                            } else {
                                Toast.makeText(
@@ -860,10 +599,20 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                return true
            }
            R.id.action_disconnect -> {
-                appSettingsService.clearAll()
+                runBlocking {
+                    repository.logout()
+                }
                val intent = Intent(this, LoginActivity::class.java)
                this.startActivity(intent)
-                this@HomeActivity.finish()
+                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)
@@ -3,6 +3,7 @@ package bou.amine.apps.readerforselfossv2.android
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
+import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
@@ -23,7 +24,6 @@ class ImageActivity : AppCompatActivity() {
        setContentView(view)

        setSupportActionBar(binding.toolBar)
-        supportActionBar?.setDisplayShowTitleEnabled(false)
        supportActionBar?.setDisplayHomeAsUpEnabled(true)

        allImages = intent.getStringArrayListExtra("allImages") as ArrayList<String>
@@ -31,12 +31,35 @@ class ImageActivity : AppCompatActivity() {

        binding.pager.adapter = ScreenSlidePagerAdapter(this)
        binding.pager.setCurrentItem(position, false)
+
+        val transitionListener = object : MotionLayout.TransitionListener {
+            override fun onTransitionStarted(motionLayout: MotionLayout?, startId: Int, endId: Int) {
+                // Nothing
+            }
+
+            override fun onTransitionChange(motionLayout: MotionLayout?, startId: Int, endId: Int, progress: Float
+            ) {
+                // Nothing
+            }
+
+            override fun onTransitionCompleted(motionLayout: MotionLayout?, currentId: Int) {
+                if (motionLayout?.currentState == binding.root.endState) {
+                    onBackPressedDispatcher.onBackPressed()
+                    overridePendingTransition(0, 0)
+                }
+            }
+
+            override fun onTransitionTrigger(motionLayout: MotionLayout?, triggerId: Int, positive: Boolean, progress: Float) {
+                // Nothing
+            }
+        }
+        binding.root.setTransitionListener(transitionListener)
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when (item.itemId) {
            android.R.id.home -> {
-                onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
                return true
            }
        }
@@ -2,6 +2,7 @@ package bou.amine.apps.readerforselfossv2.android

 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
@@ -10,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
@@ -21,10 +23,12 @@ 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

+
 class LoginActivity : AppCompatActivity(), DIAware {

    private var inValidCount: Int = 0
@@ -33,12 +37,14 @@ 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 repository: Repository by instance()
+    private val appSettingsService: AppSettingsService by instance()
+

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+
+        handleTheme()

        binding = ActivityLoginBinding.inflate(layoutInflater)
        val view = binding.root
@@ -50,12 +56,40 @@ 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()
    }

+    @SuppressLint("WrongConstant") // Constant is fetched from the settings
+    private fun handleTheme() {
+        AppCompatDelegate.setDefaultNightMode(appSettingsService.getCurrentTheme())
+    }
+
    private fun handleActions() {

        binding.passwordView.setOnEditorActionListener(
@@ -94,7 +128,8 @@ class LoginActivity : AppCompatActivity(), DIAware {

    private fun goToMain() {
        CoroutineScope(Dispatchers.Main).launch {
-            repository.updateApiVersion()
+            repository.updateApiInformation()
+            ACRA.errorReporter.putCustomData("SELFOSS_API_VERSION", appSettingsService.getApiVersion().toString())
        }
        val intent = Intent(this, HomeActivity::class.java)
        startActivity(intent)
@@ -121,13 +156,64 @@ class LoginActivity : AppCompatActivity(), DIAware {
        val login = binding.loginView.text.toString().trim()
        val password = binding.passwordView.text.toString().trim()

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

+        showProgress(true)
+
+        repository.refreshLoginInformation(url, login, password)
+
+        CoroutineScope(Dispatchers.Main).launch {
+            val result = repository.login()
+            if (result) {
+                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)
+        }
+    }
+
+    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()) {
-            binding.urlView.error = getString(R.string.login_url_problem)
-            focusView = binding.urlView
            cancel = true
+            binding.urlView.error = getString(R.string.login_url_problem)
            inValidCount++
            if (inValidCount == 3) {
                val alertDialog = AlertDialog.Builder(this).create()
@@ -141,39 +227,12 @@ class LoginActivity : AppCompatActivity(), DIAware {
                inValidCount = 0
            }
        }
+        maybeCancelAndFocusView(cancel, focusView)
+    }

-        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
-            }
-        }
-
+    private fun maybeCancelAndFocusView(cancel: Boolean, focusView: View?) {
        if (cancel) {
            focusView?.requestFocus()
-        } else {
-            showProgress(true)
-
-            repository.refreshLoginInformation(url, login, password)
-
-            CoroutineScope(Dispatchers.IO).launch {
-                val result = repository.login()
-                if (result) {
-                    goToMain()
-                } else {
-                    CoroutineScope(Dispatchers.Main).launch {
-                        preferenceError()
-                    }
-                }
-            }
-            showProgress(false)
        }
    }

@@ -187,11 +246,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
@@ -200,11 +259,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 {
@@ -3,43 +3,49 @@ 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
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.multidex.MultiDexApplication
-import androidx.preference.PreferenceManager
 import bou.amine.apps.readerforselfossv2.DI.networkModule
-import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
 import bou.amine.apps.readerforselfossv2.android.viewmodel.AppViewModel
 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 com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
-import com.mikepenz.materialdrawer.util.DrawerImageLoader
 import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
+import org.acra.ACRA
+import org.acra.ReportField
+import org.acra.config.httpSender
+import org.acra.config.toast
+import org.acra.data.StringFormat
+import org.acra.ktx.initAcra
+import org.acra.sender.HttpSender
 import org.kodein.di.*

 class MyApp : MultiDexApplication(), DIAware {

    override val di by DI.lazy {
+        bind<AppSettingsService>() with singleton { AppSettingsService(ACRA.isACRASenderServiceProcess()) }
        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()) }
    }
@@ -56,28 +62,78 @@ class MyApp : MultiDexApplication(), DIAware {
        super.onCreate()
        Napier.base(DebugAntilog())

-        initDrawerImageLoader()
+        if (!ACRA.isACRASenderServiceProcess()) {
+            tryToHandleBug()

-        tryToHandleBug()
+            handleNotificationChannels()

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

-        ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(connectivityStatus, repository))
+            CoroutineScope(Dispatchers.Main).launch {
+                viewModel.networkAvailableProvider.collect { networkAvailable ->
+                    val toastMessage = if (networkAvailable) {
+                        repository.handleDBActions()
+                        R.string.network_connectivity_retrieved
+                    } else {
+                        R.string.network_connectivity_lost
+                    }

-        CoroutineScope(Dispatchers.Main).launch {
-            viewModel.networkAvailableProvider.collect { networkAvailable ->
-                val toastMessage = if (networkAvailable) {
-                    repository.handleDBActions()
-                    R.string.network_connectivity_retrieved
-                } else {
-                    R.string.network_connectivity_lost
+                    Toast.makeText(
+                        applicationContext,
+                        toastMessage,
+                        Toast.LENGTH_SHORT
+                    ).show()
                }
+            }
+        }

-                Toast.makeText(
-                    applicationContext,
-                    toastMessage,
-                    Toast.LENGTH_SHORT
-                ).show()
+        repository.migrate(driverFactory)
+    }
+
+    override fun attachBaseContext(base: Context?) {
+        super.attachBaseContext(base)
+
+        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
+            )
+            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*/
+                basicAuthLogin = "qMEscjj89Gwt6cPR"
+                basicAuthPassword = "Yo58QFlGzFaWlBzP"
+                httpMethod = HttpSender.Method.POST
            }
        }
    }
@@ -92,47 +148,35 @@ 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)
        }
    }

-    private fun initDrawerImageLoader() {
-        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
-            override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
-                Glide.with(imageView.context)
-                    .load(uri.toString())
-                    .apply(RequestOptions.fitCenterTransform().placeholder(placeholder))
-                    .into(imageView)
-            }
-
-            override fun cancel(imageView: ImageView) {
-                Glide.with(imageView.context).clear(imageView)
-            }
-
-            override fun placeholder(ctx: Context, tag: String?): Drawable {
-                return baseContext.resources.getDrawable(R.mipmap.ic_launcher)
-            }
-        })
-    }
-
    private fun tryToHandleBug() {
        val oldHandler = Thread.getDefaultUncaughtExceptionHandler()

        Thread.setDefaultUncaughtExceptionHandler { thread, e ->
-            if (e is java.lang.NoClassDefFoundError && e.stackTrace.asList().any {
+            if (e is NoClassDefFoundError && e.stackTrace.asList().any {
                    it.toString().contains("android.view.ViewDebug")
                }) {
-                Unit
+                // 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)
@@ -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)
@@ -80,7 +84,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {
    }

    private fun readItem(item: SelfossModel.Item) {
-        if (appSettingsService.isMarkOnScrollEnabled()) {
+        if (appSettingsService.isMarkOnScrollEnabled() && !appSettingsService.getPublicAccess()) {
            CoroutineScope(Dispatchers.IO).launch {
                repository.markAsRead(item)
            }
@@ -133,28 +137,34 @@ class ReaderActivity : AppCompatActivity(), DIAware {
        inflater.inflate(R.menu.reader_menu, menu)
        toolbarMenu = menu

-        if (allItems.isNotEmpty() && allItems[currentItem].starred) {
-            canRemoveFromFavorite()
-        } else {
-            canFavorite()
-        }
        alignmentMenu()

-        binding.pager.registerOnPageChangeCallback(
-            object : ViewPager2.OnPageChangeCallback() {
-
-                override fun onPageSelected(position: Int) {
-                    super.onPageSelected(position)
-
-                    if (allItems[position].starred) {
-                        canRemoveFromFavorite()
-                    } else {
-                        canFavorite()
-                    }
-                    readItem(allItems[position])
-                }
+        if (appSettingsService.getPublicAccess()) {
+            menu.removeItem(R.id.star)
+        } else {
+            if (allItems.isNotEmpty() && allItems[currentItem].starred) {
+                canRemoveFromFavorite()
+            } else {
+                canFavorite()
            }
-        )
+
+
+            binding.pager.registerOnPageChangeCallback(
+                object : ViewPager2.OnPageChangeCallback() {
+
+                    override fun onPageSelected(position: Int) {
+                        super.onPageSelected(position)
+
+                        if (allItems[position].starred) {
+                            canRemoveFromFavorite()
+                        } else {
+                            canFavorite()
+                        }
+                        readItem(allItems[position])
+                    }
+                }
+            )
+        }

        return true
    }
@@ -173,20 +183,18 @@ class ReaderActivity : AppCompatActivity(), DIAware {

        when (item.itemId) {
            android.R.id.home -> {
-                onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
                return true
            }
            R.id.star -> {
                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()
                }
@@ -214,8 +222,4 @@ class ReaderActivity : AppCompatActivity(), DIAware {
        startActivity(intent)
        overridePendingTransition(0, 0)
    }
-
-    companion object {
-        var allItems: ArrayList<SelfossModel.Item> = ArrayList()
-    }
 }
@@ -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))
        }
    }
 }
@@ -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()
+    }
 }
@@ -56,13 +56,17 @@ class ItemCardAdapter(
            val itm = items[position]

            binding.favButton.isSelected = itm.starred
+            if (appSettingsService.getPublicAccess()) {
+                binding.favButton.visibility = View.GONE
+            }
+
            binding.title.text = itm.title.getHtmlDecoded()

            binding.title.setOnTouchListener(LinkOnTouchListener())

            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 +136,8 @@ class ItemCardAdapter(

        private fun handleLinkOpening() {
            binding.root.setOnClickListener {
+                repository.setReaderItems(items)
                c.openItemUrl(
-                    items,
                    bindingAdapterPosition,
                    items[bindingAdapterPosition].getLinkDecoded(),
                    appSettingsService.isArticleViewerEnabled(),
@@ -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(),
@@ -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
@@ -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))
+
+            }
        }
    }
 }
@@ -1,35 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.api.mercury
-
-import com.google.gson.GsonBuilder
-import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
-import retrofit2.Call
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-class MercuryApi() {
-    private val service: MercuryService
-
-    init {
-
-        val interceptor = HttpLoggingInterceptor()
-        interceptor.level = HttpLoggingInterceptor.Level.NONE
-        val client = OkHttpClient.Builder().addInterceptor(interceptor).build()
-
-        val gson = GsonBuilder()
-            .setLenient()
-            .create()
-        val retrofit =
-            Retrofit
-                .Builder()
-                .baseUrl("https://www.amine-louveau.fr")
-                .client(client)
-                .addConverterFactory(GsonConverterFactory.create(gson))
-                .build()
-        service = retrofit.create(MercuryService::class.java)
-    }
-
-    fun parseUrl(url: String): Call<ParsedContent> {
-        return service.parseUrl(url)
-    }
-}
@@ -1,59 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.api.mercury
-
-import android.os.Parcel
-import android.os.Parcelable
-import com.google.gson.annotations.SerializedName
-
-class ParsedContent(
-    @SerializedName("title") val title: String,
-    @SerializedName("content") val content: String?,
-    @SerializedName("date_published") val date_published: String,
-    @SerializedName("lead_image_url") val lead_image_url: String?,
-    @SerializedName("dek") val dek: String,
-    @SerializedName("url") val url: String,
-    @SerializedName("domain") val domain: String,
-    @SerializedName("excerpt") val excerpt: String,
-    @SerializedName("total_pages") val total_pages: Int,
-    @SerializedName("rendered_pages") val rendered_pages: Int,
-    @SerializedName("next_page_url") val next_page_url: String
-) : Parcelable {
-
-    companion object {
-        @JvmField
-        val CREATOR: Parcelable.Creator<ParsedContent> =
-            object : Parcelable.Creator<ParsedContent> {
-                override fun createFromParcel(source: Parcel): ParsedContent = ParsedContent(source)
-                override fun newArray(size: Int): Array<ParsedContent?> = arrayOfNulls(size)
-            }
-    }
-
-    constructor(source: Parcel) : this(
-        title = source.readString().orEmpty(),
-        content = source.readString(),
-        date_published = source.readString().orEmpty(),
-        lead_image_url = source.readString(),
-        dek = source.readString().orEmpty(),
-        url = source.readString().orEmpty(),
-        domain = source.readString().orEmpty(),
-        excerpt = source.readString().orEmpty(),
-        total_pages = source.readInt(),
-        rendered_pages = source.readInt(),
-        next_page_url = source.readString().orEmpty()
-    )
-
-    override fun describeContents() = 0
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeString(title)
-        dest.writeString(content)
-        dest.writeString(date_published)
-        dest.writeString(lead_image_url)
-        dest.writeString(dek)
-        dest.writeString(url)
-        dest.writeString(domain)
-        dest.writeString(excerpt)
-        dest.writeInt(total_pages)
-        dest.writeInt(rendered_pages)
-        dest.writeString(next_page_url)
-    }
-}
@@ -1,10 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.api.mercury
-
-import retrofit2.Call
-import retrofit2.http.GET
-import retrofit2.http.Query
-
-interface MercuryService {
-    @GET("parser.php")
-    fun parseUrl(@Query("link") link: String): Call<ParsedContent>
-}
@@ -26,85 +26,89 @@ 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 {
-    if (appSettingsService.isPeriodicRefreshEnabled() && isNetworkAccessible(context)) {
+    override fun doWork(): Result {
+        if (appSettingsService.isPeriodicRefreshEnabled() && isNetworkAccessible(context)) {

-        CoroutineScope(Dispatchers.IO).launch {
-            val notificationManager =
-                applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            CoroutineScope(Dispatchers.IO).launch {
+                val notificationManager =
+                    applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager

-            val notification =
-                NotificationCompat.Builder(applicationContext, AppSettingsService.syncChannelId)
-                    .setContentTitle(context.getString(R.string.loading_notification_title))
-                    .setContentText(context.getString(R.string.loading_notification_text))
-                    .setOngoing(true)
-                    .setPriority(PRIORITY_LOW)
-                    .setChannelId(AppSettingsService.syncChannelId)
-                    .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
+                val notification =
+                    NotificationCompat.Builder(applicationContext, AppSettingsService.syncChannelId)
+                        .setContentTitle(context.getString(R.string.loading_notification_title))
+                        .setContentText(context.getString(R.string.loading_notification_text))
+                        .setOngoing(true)
+                        .setPriority(PRIORITY_LOW)
+                        .setChannelId(AppSettingsService.syncChannelId)
+                        .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)

-            notificationManager.notify(1, notification.build())
+                notificationManager.notify(1, notification.build())

-            repository.handleDBActions()
+                repository.handleDBActions()

-            val apiItems = repository.tryToCacheItemsAndGetNewOnes()
-            if (appSettingsService.isNotifyNewItemsEnabled()) {
-                launch {
-                    handleNewItemsNotification(apiItems, notificationManager)
+                val apiItems = repository.tryToCacheItemsAndGetNewOnes()
+                if (appSettingsService.isNotifyNewItemsEnabled()) {
+                    launch {
+                        handleNewItemsNotification(apiItems, notificationManager)
+                    }
                }
+                apiItems.map { it.preloadImages(context) }
            }
-            apiItems.map { it.preloadImages(context) }
        }
+        return Result.success()
    }
-    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()
+            val apiItems = newItems.orEmpty()


-                val newSize = apiItems.filter { it.unread }.size
-                if (newSize > 0) {
+            val newSize = apiItems.filter { it.unread }.size
+            if (newSize > 0) {

-                    val intent = Intent(context, MainActivity::class.java).apply {
-                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                    }
-                    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                        PendingIntent.FLAG_IMMUTABLE
-                    } else {
-                        0
-                    }
-                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, pflags)
-
-                    val newItemsNotification =
-                        NotificationCompat.Builder(applicationContext, AppSettingsService.newItemsChannelId)
-                            .setContentTitle(context.getString(R.string.new_items_notification_title))
-                            .setContentText(
-                                context.getString(
-                                    R.string.new_items_notification_text,
-                                    newSize
-                                )
-                            )
-                            .setPriority(PRIORITY_DEFAULT)
-                            .setChannelId(AppSettingsService.newItemsChannelId)
-                            .setContentIntent(pendingIntent)
-                            .setAutoCancel(true)
-                            .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
-
-                    Timer("", false).schedule(4000) {
-                        notificationManager.notify(2, newItemsNotification.build())
-                    }
+                val intent = Intent(context, MainActivity::class.java).apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                }
+                val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    PendingIntent.FLAG_IMMUTABLE
+                } else {
+                    0
+                }
+                val pendingIntent: PendingIntent =
+                    PendingIntent.getActivity(context, 0, intent, pflags)
+
+                val newItemsNotification =
+                    NotificationCompat.Builder(
+                        applicationContext,
+                        AppSettingsService.newItemsChannelId
+                    )
+                        .setContentTitle(context.getString(R.string.new_items_notification_title))
+                        .setContentText(
+                            context.getString(
+                                R.string.new_items_notification_text,
+                                newSize
+                            )
+                        )
+                        .setPriority(PRIORITY_DEFAULT)
+                        .setChannelId(AppSettingsService.newItemsChannelId)
+                        .setContentIntent(pendingIntent)
+                        .setAutoCancel(true)
+                        .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
+
+                Timer("", false).schedule(4000) {
+                    notificationManager.notify(2, newItemsNotification.build())
+                }
+            }
            Timer("", false).schedule(4000) {
                notificationManager.cancel(1)
            }
@@ -1,5 +1,6 @@
 package bou.amine.apps.readerforselfossv2.android.fragments

+import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.TypedArray
@@ -16,22 +17,23 @@ 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
 import bou.amine.apps.readerforselfossv2.android.R
-import bou.amine.apps.readerforselfossv2.android.api.mercury.MercuryApi
-import bou.amine.apps.readerforselfossv2.android.api.mercury.ParsedContent
 import bou.amine.apps.readerforselfossv2.android.databinding.FragmentArticleBinding
 import bou.amine.apps.readerforselfossv2.android.model.ParecelableItem
 import bou.amine.apps.readerforselfossv2.android.model.toModel
 import bou.amine.apps.readerforselfossv2.android.model.toParcelable
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
 import bou.amine.apps.readerforselfossv2.android.utils.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
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getImages
@@ -49,15 +51,15 @@ import org.kodein.di.DI
 import org.kodein.di.DIAware
 import org.kodein.di.android.x.closestDI
 import org.kodein.di.instance
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
 import java.net.MalformedURLException
+import java.net.SocketTimeoutException
 import java.net.URL
 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
@@ -66,13 +68,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 var _binding: FragmentArticleBinding? = null
-    private val binding get() = _binding!!
+    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,6 +82,9 @@ class ArticleFragment : Fragment(), DIAware {
    private var font = ""
    private var staticBar = false

+    private val mercuryApi: MercuryApi by instance()
+
+
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

@@ -95,29 +99,19 @@ 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()
            staticBar = appSettingsService.isStaticBarEnabled()
            font = appSettingsService.getFont()

-            if (font.isNotEmpty()) {
-                resId = requireContext().resources.getIdentifier(font, "font", requireContext().packageName)
-                typeface = try {
-                    ResourcesCompat.getFont(requireContext(), resId)!!
-                } catch (e: java.lang.Exception) {
-                    // Just to be sure
-                    null
-                }
-            }
-
            refreshAlignment()

            fab = binding.fab
@@ -126,48 +120,7 @@ class ArticleFragment : Fragment(), DIAware {

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

-            val floatingToolbar: FloatingToolbar = binding.floatingToolbar
-            floatingToolbar.attachFab(fab)
-
-            floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent))
-
-            floatingToolbar.setClickListener(
-                object : FloatingToolbar.ItemClickListener {
-                    override fun onItemClick(item: MenuItem) {
-                        when (item.itemId) {
-                            R.id.share_action -> requireActivity().shareLink(url, contentTitle)
-                            R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
-                            R.id.unread_action -> if (context != null) {
-                                if (this@ArticleFragment.item.unread) {
-                                    CoroutineScope(Dispatchers.IO).launch {
-                                        repository.markAsRead(this@ArticleFragment.item)
-                                    }
-                                    this@ArticleFragment.item.unread = false
-                                    Toast.makeText(
-                                        context,
-                                        R.string.marked_as_read,
-                                        Toast.LENGTH_LONG
-                                    ).show()
-                                } else {
-                                    CoroutineScope(Dispatchers.IO).launch {
-                                        repository.unmarkAsRead(this@ArticleFragment.item)
-                                    }
-                                    this@ArticleFragment.item.unread = true
-                                    Toast.makeText(
-                                        context,
-                                        R.string.marked_as_unread,
-                                        Toast.LENGTH_LONG
-                                    ).show()
-                                }
-                            }
-                            else -> Unit
-                        }
-                    }
-
-                    override fun onItemLongClick(item: MenuItem?) {
-                    }
-                }
-            )
+            val floatingToolbar: FloatingToolbar = handleFloatingToolbar()

            if (staticBar) {
                fab.hide()
@@ -179,28 +132,7 @@ class ArticleFragment : Fragment(), DIAware {
                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
-                }
-            }
+            handleContent()

            binding.nestedScrollView.setOnScrollChangeListener(
                NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
@@ -218,24 +150,100 @@ class ArticleFragment : Fragment(), DIAware {
            )

        } catch (e: InflateException) {
-            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()
+            e.sendSilentlyWithAcraWithName("webview not available")
+            if (context != null) {
+                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
    }

-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    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
+        if (appSettingsService.getPublicAccess()) {
+            floatingToolbar.setMenu(R.menu.reader_toolbar_no_read)
+        }
+        floatingToolbar.attachFab(fab)
+
+        floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent))
+
+        floatingToolbar.setClickListener(
+            object : FloatingToolbar.ItemClickListener {
+                override fun onItemClick(item: MenuItem) {
+                    when (item.itemId) {
+                        R.id.share_action -> requireActivity().shareLink(url, contentTitle)
+                        R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
+                        R.id.unread_action -> if (context != null) {
+                            if (this@ArticleFragment.item.unread) {
+                                CoroutineScope(Dispatchers.IO).launch {
+                                    repository.markAsRead(this@ArticleFragment.item)
+                                }
+                                this@ArticleFragment.item.unread = false
+                                Toast.makeText(
+                                    context,
+                                    R.string.marked_as_read,
+                                    Toast.LENGTH_LONG
+                                ).show()
+                            } else {
+                                CoroutineScope(Dispatchers.IO).launch {
+                                    repository.unmarkAsRead(this@ArticleFragment.item)
+                                }
+                                this@ArticleFragment.item.unread = true
+                                Toast.makeText(
+                                    context,
+                                    R.string.marked_as_unread,
+                                    Toast.LENGTH_LONG
+                                ).show()
+                            }
+                        }
+                        else -> Unit
+                    }
+                }
+
+                override fun onItemLongClick(item: MenuItem?) {
+                    // We do nothing
+                }
+            }
+        )
+        return floatingToolbar
    }

    private fun refreshAlignment() {
@@ -247,187 +255,187 @@ class ArticleFragment : Fragment(), DIAware {
    }

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

-            parser.parseUrl(url).enqueue(
-                object : Callback<ParsedContent> {
-                    override fun onResponse(
-                        call: Call<ParsedContent>,
-                        response: Response<ParsedContent>
-                    ) {
-                        // TODO: clean all the following after finding the mercury content issue
-                        try {
-                            if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) {
-                                try {
-                                    binding.titleView.text = response.body()!!.title
-                                    if (typeface != null) {
-                                        binding.titleView.typeface = typeface
-                                    }
-                                    try {
-                                        // Note: Mercury may return relative urls... If it does the url val will not be changed.
-                                        URL(response.body()!!.url)
-                                        url = response.body()!!.url
-                                    } catch (e: MalformedURLException) {
-                                        // Mercury returned a relative url. We do nothing.
-                                    }
-                                } catch (e: Exception) {
-                                }
-
-                                try {
-                                    contentText = response.body()!!.content.orEmpty()
-                                    htmlToWebview()
-                                } catch (e: Exception) {
-                                }
-
-                                try {
-                                    if (response.body()!!.lead_image_url != null && !response.body()!!.lead_image_url.isNullOrEmpty() && context != null) {
-                                        binding.imageView.visibility = View.VISIBLE
-                                        try {
-                                            Glide
-                                                .with(requireContext())
-                                                .asBitmap()
-                                                .load(
-                                                    response.body()!!.lead_image_url.orEmpty()
-                                                )
-                                                .apply(RequestOptions.fitCenterTransform())
-                                                .into(binding.imageView)
-                                        } catch (e: Exception) {
-                                        }
-                                    } else {
-                                        binding.imageView.visibility = View.GONE
-                                    }
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                    }
-                                }
-
-                                try {
-                                    binding.nestedScrollView.scrollTo(0, 0)
-
-                                    binding.progressBar.visibility = View.GONE
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                    }
-                                }
-                            } else {
-                                try {
-                                    openInBrowserAfterFailing()
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                    }
-                                }
-                            }
-                        } catch (e: Exception) {
-                            if (context != null) {
-                            }
-                        }
+        CoroutineScope(Dispatchers.Main).launch {
+            try {
+                val response = mercuryApi.query(url)
+                if (response.success && response.data != null && !response.data?.content.isNullOrEmpty()) {
+                    binding.titleView.text = response.data!!.title.orEmpty()
+                    if (typeface != null) {
+                        binding.titleView.typeface = typeface
                    }
+                    URL(response.data!!.url)
+                    url = response.data!!.url

-                    override fun onFailure(
-                        call: Call<ParsedContent>,
-                        t: Throwable
-                    ) = openInBrowserAfterFailing()
+                    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()
+            }
        }
    }

-    private fun htmlToWebview() {
-
-        val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
-        val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
-
-
-        binding.webcontent.settings.standardFontFamily = a.getString(0)
-        binding.webcontent.visibility = View.VISIBLE
-
-        val colorOnSurface = TypedValue()
-        requireContext().theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true)
-
-        val colorSurface = TypedValue()
-        requireContext().theme.resolveAttribute(R.attr.colorSurface, colorSurface, true)
-
-        binding.webcontent.settings.useWideViewPort = true
-        binding.webcontent.settings.loadWithOverviewMode = true
-        binding.webcontent.settings.javaScriptEnabled = false
+    private fun handleLeadImage(response: StatusAndData<MercuryModel.ParsedContent>) {
+        if (!response.data?.lead_image_url.isNullOrEmpty() && context != null) {
+            binding.imageView.visibility = View.VISIBLE
+            Glide
+                .with(requireContext())
+                .asBitmap()
+                .load(
+                    response.data!!.lead_image_url.orEmpty()
+                )
+                .apply(RequestOptions.fitCenterTransform())
+                .into(binding.imageView)
+        } 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)))
+            override fun shouldOverrideUrlLoading(view: WebView?, url: String): Boolean {
+                return if (context != null && binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+                    try {
+                        requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+                    } catch (e: ActivityNotFoundException) {
+                        e.sendSilentlyWithAcraWithName("activityNotFound > $url")
+                    }
+                    true
+                } else {
+                    false
                }
-                return true
            }

            @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")) {
+                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) {}
-                }
-                else if (url.lowercase(Locale.US).contains(".png")) {
+                        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) {
+                        // Do nothing
+                    }
+                } 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) {}
-                }
-                else if (url.lowercase(Locale.US).contains(".webp")) {
+                        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) {
+                        // Do nothing
+                    }
+                } 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) {}
+                        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) {
+                        // Do nothing
+                    }
                }

                return super.shouldInterceptRequest(view, url)
            }
        }
+    }

-        val gestureDetector = GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
-            override fun onSingleTapUp(e: MotionEvent): Boolean {
-                return performClick()
-            }
-        })
+    private fun htmlToWebview() {
+        if (context != null) {
+            val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
+            val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)

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

-        binding.webcontent.settings.layoutAlgorithm =
+            binding.webcontent.settings.standardFontFamily = a.getString(0)
+            binding.webcontent.visibility = View.VISIBLE
+
+            val colorOnSurface = TypedValue()
+            requireContext().theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true)
+
+            val colorSurface = TypedValue()
+            requireContext().theme.resolveAttribute(R.attr.colorSurface, colorSurface, true)
+
+            binding.webcontent.settings.useWideViewPort = true
+            binding.webcontent.settings.loadWithOverviewMode = true
+            binding.webcontent.settings.javaScriptEnabled = false
+
+            handleImageLoading()
+
+            val gestureDetector =
+                GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
+                    override fun onSingleTapUp(e: MotionEvent): Boolean {
+                        return performClick()
+                    }
+                })
+
+            binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event) }
+
+            binding.webcontent.settings.layoutAlgorithm =
                WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING

-        var baseUrl: String? = null
+            var baseUrl: String? = null

-        try {
-            val itemUrl = URL(url)
-            baseUrl = itemUrl.protocol + "://" + itemUrl.host
-        } catch (e: MalformedURLException) {
-        }
+            try {
+                val itemUrl = URL(url)
+                baseUrl = itemUrl.protocol + "://" + itemUrl.host
+            } catch (e: MalformedURLException) {
+                e.sendSilentlyWithAcraWithName("htmlToWebview > item url")
+            }

-        val fontName =  when (font) {
-            getString(R.string.open_sans_font_id) -> "Open Sans"
-            getString(R.string.roboto_font_id) -> "Roboto"
-            else -> ""
-        }
+            val fontName = when (font) {
+                getString(R.string.open_sans_font_id) -> "Open Sans"
+                getString(R.string.roboto_font_id) -> "Roboto"
+                getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
+                else -> ""
+            }

-        val fontLinkAndStyle = if (font.isNotEmpty()) {
-            """<link href="https://fonts.googleapis.com/css?family=${fontName.replace(" ", "+")}" rel="stylesheet">
+            val fontLinkAndStyle = if (font.isNotEmpty()) {
+                """<link href="https://fonts.googleapis.com/css?family=${
+                    fontName.replace(
+                        " ",
+                        "+"
+                    )
+                }" rel="stylesheet">
                |<style>
                |   * {
                |       font-family: '$fontName';
                |   }
                |</style>
            """.trimMargin()
-        } else {
-            ""
-        }
+            } else {
+                ""
+            }

-        binding.webcontent.loadDataWithBaseURL(
-            baseUrl,
-            """<html>
+            binding.webcontent.loadDataWithBaseURL(
+                baseUrl,
+                """<html>
                |<head>
                |   <meta name="viewport" content="width=device-width, initial-scale=1">
                |   <style>
@@ -438,7 +446,12 @@ 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)};
@@ -449,11 +462,26 @@ 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;
                |      }
@@ -463,7 +491,12 @@ 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
@@ -471,20 +504,21 @@ class ArticleFragment : Fragment(), DIAware {
                |<body>
                |   $contentText
                |</body>""".trimMargin(),
-            "text/html",
-            "utf-8",
-            null
-        )
+                "text/html",
+                "utf-8",
+                null
+            )
+        }
    }

    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() {
@@ -496,7 +530,7 @@ class ArticleFragment : Fragment(), DIAware {
        private const val ARG_ITEMS = "items"

        fun newInstance(
-                item: SelfossModel.Item
+            item: SelfossModel.Item
        ): ArticleFragment {
            val fragment = ArticleFragment()
            val args = Bundle()
@@ -508,9 +542,10 @@ 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)
@@ -0,0 +1,200 @@
+package bou.amine.apps.readerforselfossv2.android.fragments
+
+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.text.TextUtils
+import android.view.LayoutInflater
+import android.view.View
+import android.view.View.GONE
+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
+import bou.amine.apps.readerforselfossv2.utils.getIcon
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.target.ViewTarget
+import com.bumptech.glide.request.transition.Transition
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.google.android.material.chip.Chip
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+import org.kodein.di.android.x.closestDI
+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()
+
+    private var selectedChip: Chip? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding =
+            FilterFragmentBinding.inflate(
+                inflater,
+                container,
+                false
+            )
+
+        val context: Context? = context
+
+
+        if (context == null) {
+            dismiss()
+            Exception("FilterSheetFragment context is null").sendSilentlyWithAcraWithName("FilterSheetFragment > onCreateView")
+        } else {
+            CoroutineScope(Dispatchers.Main).launch {
+                handleTagChips(context)
+                handleSourceChips(context)
+
+                binding.progressBar2.visibility = GONE
+                binding.filterView.visibility = VISIBLE
+            }
+        }
+
+        binding.floatingActionButton2.setOnClickListener {
+            (activity as HomeActivity).getElementsAccordingToTab()
+            (activity as HomeActivity).fetchOnEmptyList()
+            dismiss()
+        }
+        return binding.root
+    }
+
+    private suspend fun handleSourceChips(
+        context: Context
+    ) {
+        val sourceGroup = binding.sourcesGroup
+
+        repository.getSources().forEach { source ->
+            val c = Chip(context)
+            c.ellipsize = TextUtils.TruncateAt.END
+
+            Glide.with(context)
+                .load(source.getIcon(repository.baseUrl))
+                .into(object : ViewTarget<Chip?, Drawable?>(c) {
+                    override fun onResourceReady(
+                        resource: Drawable,
+                        transition: Transition<in Drawable?>?
+                    ) {
+                        try {
+                            c.chipIcon = resource
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("sources > onResourceReady")
+                        }
+                    }
+
+                })
+
+            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)
+        }
+    }
+
+    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)
+        }
+    }
+
+    companion object {
+        const val TAG = "FilterModalBottomSheet"
+    }
+
+
+}
@@ -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)
@@ -2,6 +2,7 @@ package bou.amine.apps.readerforselfossv2.android.model

 import android.content.Context
 import android.webkit.URLUtil
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.getImages
 import com.bumptech.glide.Glide
@@ -23,6 +24,7 @@ fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
            }
        }
    } catch (e : Error) {
+        e.sendSilentlyWithAcraWithName("preloadImages")
        return false
    }

@@ -35,7 +37,7 @@ fun String.toTextDrawableString(): String {
        try {
            textDrawable.append(s[0])
        } catch (e: StringIndexOutOfBoundsException) {
-            // We do nothing
+            e.sendSilentlyWithAcraWithName("toTextDrawableString")
        }
    }
    return textDrawable.toString()
@@ -3,7 +3,6 @@ package bou.amine.apps.readerforselfossv2.android.model
 import android.os.Parcel
 import android.os.Parcelable
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
-import com.google.gson.annotations.SerializedName

 fun SelfossModel.Item.toParcelable() : ParecelableItem =
    ParecelableItem(
@@ -17,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(
@@ -31,20 +31,22 @@ fun ParecelableItem.toModel() : SelfossModel.Item =
        this.icon,
        this.link,
        this.sourcetitle,
-        this.tags.split(",")
+        this.tags.split(","),
+        this.author
    )
 data class ParecelableItem(
-    @SerializedName("id") val id: Int,
-    @SerializedName("datetime") val datetime: String,
-    @SerializedName("title") val title: String,
-    @SerializedName("content") val content: String,
-    @SerializedName("unread") var unread: Boolean,
-    @SerializedName("starred") var starred: Boolean,
-    @SerializedName("thumbnail") val thumbnail: String?,
-    @SerializedName("icon") val icon: String?,
-    @SerializedName("link") val link: String,
-    @SerializedName("sourcetitle") val sourcetitle: String,
-    @SerializedName("tags") val tags: String
+    val id: Int,
+    val datetime: String,
+    val title: String,
+    val content: String,
+    var unread: Boolean,
+    var starred: Boolean,
+    val thumbnail: String?,
+    val icon: String?,
+    val link: String,
+    val sourcetitle: String,
+    val tags: String,
+    val author: String?
 ) : Parcelable {

    companion object {
@@ -66,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
@@ -83,5 +86,6 @@ data class ParecelableItem(
        dest.writeString(link)
        dest.writeString(sourcetitle)
        dest.writeString(tags)
+        dest.writeString(author)
    }
 }
@@ -16,12 +16,17 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySettingsBinding
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import com.mikepenz.aboutlibraries.LibsBuilder
+import org.kodein.di.DIAware
+import org.kodein.di.android.closestDI

 private const val TITLE_TAG = "settingsActivityTitle"

 class SettingsActivity : AppCompatActivity(),
-        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
+        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, DIAware {
+    override val di by closestDI()

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -91,6 +96,21 @@ class SettingsActivity : AppCompatActivity(),
    class MainPreferenceFragment : PreferenceFragmentCompat() {
        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
            setPreferencesFromResource(R.xml.pref_main, rootKey)
+
+            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
+                true
+            }
+
+            preferenceManager.findPreference<Preference>("action_about")?.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
+                context?.let {
+                    LibsBuilder()
+                        .withAboutIconShown(true)
+                        .withAboutVersionShown(true)
+                        .start(it)
+                }
+                true
+            }
        }
    }

@@ -107,6 +127,7 @@ class SettingsActivity : AppCompatActivity(),
                                val input: Int = (dest.toString() + source.toString()).toInt()
                                if (input in 1..200) return@InputFilter null
                            } catch (nfe: NumberFormatException) {
+                                nfe.sendSilentlyWithAcraWithName("GeneralPreferenceFragment")
                                Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
                            }
                            ""
@@ -124,12 +145,17 @@ 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) {}
-                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+                    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 afterTextChanged(editable: Editable) {
                        try {
                            editText.textSize = editable.toString().toInt().toFloat()
                        } catch (e: NumberFormatException) {
+                            e.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > afterTextChanged")
                        }
                    }
                } }
@@ -139,6 +165,7 @@ class SettingsActivity : AppCompatActivity(),
                                val input = (dest.toString() + source.toString()).toInt()
                                if (input > 0) return@InputFilter null
                            } catch (nfe: NumberFormatException) {
+                                nfe.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > filters")
                            }
                            ""
                        }
@@ -1,13 +1,9 @@
 package bou.amine.apps.readerforselfossv2.android.utils

 import android.app.Activity
-import android.app.PendingIntent
-import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
-import android.graphics.BitmapFactory
 import android.net.Uri
-import android.os.Build
 import android.text.Spannable
 import android.text.style.ClickableSpan
 import android.util.Patterns
@@ -22,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,
@@ -37,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)
@@ -1,14 +0,0 @@
-/* From https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/CustomBaseViewHolder.java */
-package bou.amine.apps.readerforselfossv2.android.utils.drawer
-
-import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import bou.amine.apps.readerforselfossv2.android.R
-
-open class CustomBaseViewHolder(var view: View) : RecyclerView.ViewHolder(view) {
-    var icon: ImageView = view.findViewById(R.id.material_drawer_icon)
-    var name: TextView = view.findViewById(R.id.material_drawer_name)
-    var description: TextView = view.findViewById(R.id.material_drawer_description)
-}
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2015 Google Inc. All Rights Reserved.
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-         http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="100%p" android:toXDelta="0"
-               android:duration="@android:integer/config_mediumAnimTime"/>
-</set>
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2015 Google Inc. All Rights Reserved.
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-         http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="0" android:toXDelta="-100%p"
-               android:duration="@android:integer/config_mediumAnimTime"/>
-</set>
@@ -0,0 +1,5 @@
+<bitmap
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:dither="true"
+    android:src="@drawable/checktile"
+    android:tileMode="repeat"/>