Trying fastlane for f-droid repository. Fixes #321 .

Bakcground image caching issues should be fixed.
Fix crash when loading image that doesn't exist (#329 )
2021-01-10 21:40:17 +01:00 · 2021-01-10 21:20:33 +01:00 · 2021-01-10 21:14:23 +01:00 · 2021-01-10 12:13:19 +01:00 · 2021-01-10 05:08:40 +01:00 · 2021-01-09 15:01:59 +01:00
276 changed files with 5618 additions and 6112 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -41,6 +41,12 @@ Always check if the web version of your instance is working.
 * Remember that PR review can take time.


+# Install Selfoss (if you don't have an instance)
+
+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.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,47 @@
 **1.7.x**

+- Hiding tags with 0 articles
+
+- Fixed issue with basic auth and images loading
+
+- Added the ability to justify or left align the reader text
+
+- Fixed #251
+
+- Added experimental issue to set a default timeout. Should work for #238.
+
+- Closing #220.
+
+- Start of #238. "Add a quick shortcut to open the app on offline mode ?"
+
+- Closes #216. Issue with selfoss version 2.19.
+
+- Closes #179. Sync of read/unread/star/unstar items on background task or on app reload with network available.
+
+- Closes #33. Background sync with settings.
+
 - Closing #1. Initial article caching.

+- Closing #228 by removing the list action bar. Action buttons are exclusively on the card view from now on.
+
+- Closing #38. Only doing api calls on network available.
+
+- Closing #298 and #287. Issues with Listview rendering
+
+- Closing #290. Fixing back button issue in Settings
+
+- Closing #300. Fixing issues when displaying some special characters.
+
+- Closing #310. Some feeds don't have icons nor thumbnails.
+
+- Closing #178. Expending images on tap.
+
+- Closing #323. Old issue with textview not having the right color.
+
+- Closing #324. Svg images loading crashes the app.
+
+- Closing #322. App crashed because of svg images.
+
 **1.6.x**

 - Handling hidden tags.
@@ -22,6 +62,8 @@

 - Fixes #215, #208.

+- Fixes #328.
+
 **1.5.7.x**

 - Added confirmation to the mark as read and update menues.
--- a/README.md
+++ b/README.md
@@ -1,24 +1,34 @@
-# ReaderForSelfoss
+# ReaderForSelfoss **(Only available from F-Droid)**

-[![Slack Channel](https://img.shields.io/badge/chat-slack-green.svg)](https://join.slack.com/t/readerforselfoss/shared_invite/enQtMjkyNzc3NjM2Mjc1LTUzZTZhOGM5YjQ1MTI5MWZiODRjMjE1ZDBmMzQxZmQ3NWZhYTNhMTBjNGEwNmE2ZGFjODU5NjUxZjBkMWJmMDQ) [![Build Status](https://jenkins.amine-bou.fr/job/ReaderForSelfoss/badge/icon)](https://jenkins.amine-bou.fr/job/ReaderForSelfoss/) [![Code Triagers Badge](https://www.codetriage.com/aminecmi/readerforselfoss/badges/users.svg)](https://www.codetriage.com/aminecmi/readerforselfoss) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/readerforselfoss/localized.svg)](https://crowdin.com/project/readerforselfoss)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/readerforselfoss/localized.svg)](https://crowdin.com/project/readerforselfoss)

 It's an RSS Reader for Android, that **only** works with [Selfoss](https://selfoss.aditu.de/)

-<a href='https://play.google.com/store/apps/details?id=apps.amine.bou.readerforselfoss'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="100"/></a> <a href="https://f-droid.org/packages/apps.amine.bou.readerforselfoss"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a>
+**The project is not dead at all.** 

-Also, the last APK built from source is available [here](https://jenkins.amine-bou.fr/job/ReaderForSelfoss/lastSuccessfulBuild/artifact/SignApksBuilder-out/selfoss-key/selfoss/app-githubConfig-release-unsigned.apk/app-githubConfig-release.apk).
+I still want to work on it, but for the last few months, I didn't have that much time to do so. 

-## Join the alpha channel
+If you are a developer, don't hesitate to help with PRs.

-**Keep in mind, it could be instable, but you'll have the new updates faster**
+If you are a user, you can still create new issues. I'll fix them when I can.

- First, join the google [group](https://groups.google.com/d/forum/reader-for-selfoss-alpha-testing).
- Then, join the [alpha channel](https://play.google.com/apps/testing/apps.amine.bou.readerforselfoss) of the app.
- You'll be able to update the app for the current alpha version.
+<a href="https://f-droid.org/packages/apps.amine.bou.readerforselfoss"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a>
+
+## Screen captures
+
+<img src="res//fr-card.png?raw=true" alt="card view" width="400"/> <img src="res//fr-list.png?raw=true" alt="list view" width="400"/>
+
+## Like my app ?
+
+<a href="https://www.buymeacoffee.com/aminecmi" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/lato-orange.png" alt="Buy Me A Coffee" style="height: 51px !important;width: 217px !important;" ></a>

 ## Want to help ?

-Check the [Contribution guide](https://github.com/aminecmi/ReaderforSelfoss/blob/master/.github/CONTRIBUTING.md)
+1. **You'll have to have a Selfoss instance running.** You'll find everything you need to install it [here](https://selfoss.aditu.de/).
+
+2. Check the [Contribution guide](https://github.com/aminecmi/ReaderforSelfoss/blob/master/.github/CONTRIBUTING.md).
+
+3. Build the project by following [these steps](https://github.com/aminecmi/ReaderforSelfoss/blob/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide)

 ## Useful links

@@ -26,4 +36,3 @@ Check the [Contribution guide](https://github.com/aminecmi/ReaderforSelfoss/blob
 - [See what I'm doing](https://github.com/aminecmi/ReaderforSelfoss/projects/1)
 - [Create an issue, or request a new feature](https://github.com/aminecmi/ReaderforSelfoss/issues)
 - [Help translation the app](https://crowdin.com/project/readerforselfoss)
- [Ask for help](https://join.slack.com/t/readerforselfoss/shared_invite/enQtMjkyNzc3NjM2Mjc1LTUzZTZhOGM5YjQ1MTI5MWZiODRjMjE1ZDBmMzQxZmQ3NWZhYTNhMTBjNGEwNmE2ZGFjODU5NjUxZjBkMWJmMDQ)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,17 +1,17 @@
 buildscript {
 }

-ext {
-    configuration = [
-            buildDate: new Date()
-    ]
-    // This will make me able to build multiple times a day. May break thinks. I may forget it.
-    todaysBuilds = "1"
-}
-
 def gitVersion() {
-    def process = "git describe --abbrev=0 --tags".execute()
-    return process.text.substring(1).replaceAll("\\.", "").trim()
+    def process
+    def maybeTagOfCurrentCommit = 'git describe --contains HEAD'.execute()
+    if (maybeTagOfCurrentCommit.text.isEmpty()) {
+        println "No tag on current commit. Will take the latest one."
+        process = "git for-each-ref refs/tags --sort=-authordate --format='%(refname:short)' --count=1".execute()
+    } else {
+        println "Tag found on current commit"
+        process = 'git describe --contains HEAD'.execute()
+    }
+    return process.text.replaceAll("'", "").substring(1).replaceAll("\\.", "").trim()
 }

 def versionCodeFromGit() {
@@ -24,12 +24,12 @@ def versionNameFromGit() {
    return gitVersion()
 }

-apply plugin: 'kotlin-kapt'
-
 apply plugin: 'com.android.application'

 apply plugin: 'kotlin-android'

+apply plugin: 'kotlin-kapt'
+
 apply plugin: 'kotlin-android-extensions'

 android {
@@ -37,12 +37,12 @@ android {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
    defaultConfig {
        applicationId "apps.amine.bou.readerforselfoss"
        minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 30
        versionCode versionCodeFromGit()
        versionName versionNameFromGit()

@@ -67,15 +67,11 @@ android {
    buildTypes {
        release {
            minifyEnabled true
-            shrinkResources true
+            shrinkResources false
            proguardFiles getDefaultProguardFile('proguard-android.txt'),
                    'proguard-rules.pro'
        }
        debug {
-            buildConfigField "String", "LOGIN_URL", appLoginUrl
-            buildConfigField "String", "LOGIN_USERNAME", appLoginUsername
-            buildConfigField "String", "LOGIN_PASSWORD", appLoginPassword
-            applicationIdSuffix ".dev"
        }
    }
    flavorDimensions "build"
@@ -84,36 +80,32 @@ android {
            versionNameSuffix '-github'
            dimension "build"
        }
-        storeConfig {
-            // As jenkins publishes to alpha first, this is the default suffix now.
-            versionNameSuffix '-store'
-            dimension "build"
-        }
    }
 }

 dependencies {
    // Testing
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-beta02'
-    androidTestImplementation 'androidx.test:runner:1.1.0-beta02'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0-alpha02'
+    androidTestImplementation 'androidx.test:runner:1.3.1-alpha02'
    // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0-beta02'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0-alpha02'
    // Espresso-intents for validation and stubbing of Intents
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0-beta02'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0-alpha02'
    implementation fileTree(include: ['*.jar'], dir: 'libs')
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
    // Android Support
-    implementation "androidx.appcompat:appcompat:$android_version"
-    implementation "com.google.android.material:material:$android_version"
-    implementation "androidx.recyclerview:recyclerview:$android_version"
+    implementation "androidx.appcompat:appcompat:1.3.0-alpha02"
+    implementation 'com.google.android.material:material:1.3.0-beta01'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-beta01'
    implementation "androidx.legacy:legacy-support-v4:$android_version"
-    implementation "androidx.vectordrawable:vectordrawable:$android_version"
-    implementation "androidx.browser:browser:$android_version"
+    implementation 'androidx.vectordrawable:vectordrawable:1.2.0-alpha02'
+    implementation "androidx.browser:browser:1.3.0"
    implementation "androidx.cardview:cardview:$android_version"
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0-alpha2'
+    implementation 'org.jsoup:jsoup:1.13.1'

    //multidex
-    implementation 'androidx.multidex:multidex:2.0.0'
+    implementation 'androidx.multidex:multidex:2.0.1'

    // About
    implementation('com.mikepenz:aboutlibraries:6.2.0@aar') {
@@ -127,7 +119,7 @@ dependencies {
    implementation 'com.burgstaller:okhttp-digest:1.12'

    // Material-ish things
-    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.0.5'
+    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.1.0'
    implementation 'com.github.jd-alexander:LikeButton:0.2.3'
    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'

@@ -135,11 +127,8 @@ dependencies {
    implementation 'com.github.bumptech.glide:glide:4.1.1'
    implementation 'com.github.bumptech.glide:okhttp3-integration:4.1.1'

-    // Asking politely users to rate the app
-    implementation 'com.github.stkent:amplify:2.2.0'
-
    // Drawer
-    implementation 'co.zsmb:materialdrawer-kt:2.0.1'
+    implementation 'co.zsmb:materialdrawer-kt:2.0.2'

    // Themes
    implementation 'com.52inc:scoops:1.0.0'
@@ -149,32 +138,16 @@ dependencies {
    // Pager
    implementation 'me.relex:circleindicator:2.0.0@aar'

-    implementation 'androidx.core:core-ktx:1.0.0'
+    //PhotoView
+    implementation 'com.github.chrisbanes:PhotoView:2.0.0'

-    // Crash
-    implementation 'ch.acra:acra-http:5.1.3'
-    implementation 'ch.acra:acra-dialog:5.1.3'
+    implementation 'androidx.core:core-ktx:1.5.0-alpha05'

-    implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata:2.3.0-rc01"
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.3.0-rc01"

-    implementation "androidx.room:room-runtime:$room_version"
-    kapt "androidx.room:room-compiler:$room_version"
-}
-
-
-afterEvaluate {
-    initAppLoginPropertiesIfNeeded()
-}
-
-def initAppLoginPropertiesIfNeeded() {
-    def propertiesFile = file(System.getProperty("user.home") + '/.gradle/gradle.properties')
-    if (!propertiesFile.exists()) {
-        def commentMessage = "This is autogenerated local property from system environment to prevent key to be committed to source control."
-        ant.propertyfile(file: System.getProperty("user.home") + "/.gradle/gradle.properties", comment: commentMessage) {
-            entry(key: "appLoginUrl", value: System.getProperty("appLoginUrl"))
-            entry(key: "appLoginUsername", value: System.getProperty("appLoginUsername"))
-            entry(key: "appLoginPassword", value: System.getProperty("appLoginPassword"))
-        }
-    }
+    implementation "androidx.room:room-runtime:2.3.0-alpha04"
+    kapt "androidx.room:room-compiler:2.3.0-alpha04"
+
+    implementation "android.arch.work:work-runtime-ktx:$work_version"
 }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -30,22 +30,6 @@
    <fields>;
 }

-
-##Retrofit
-#-keep class com.google.gson.** { *; }
-#-keep class com.google.inject.** { *; }
-#-keep class org.apache.http.** { *; }
-#-keep class org.apache.james.mime4j.** { *; }
-#-keep class javax.inject.** { *; }
-#-keep class retrofit.** { *; }
-#-keepclassmembernames interface * {
-#    @retrofit.http.* <methods>;
-#}
-#-keep class retrofit.** { *; }
-#-keep class apps.amine.bou.readerforselfoss.api.selfoss.model.** { *; }
-#-keepclassmembernames interface * {
-#    @retrofit.http.* <methods>;
-#}
 -dontwarn okio.**
 -dontwarn retrofit2.Platform$Java8
 -keep class retrofit.** { *; }
@@ -76,3 +60,6 @@
 -dontwarn javax.annotation.**

 -keep class android.support.v7.widget.SearchView { *; }
+
+# maybe remove later ?
+-keep class * extends androidx.fragment.app.Fragment
--- a/app/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/3.json
+++ b/app/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/3.json
@@ -0,0 +1,226 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "7ad9c4961992c13b670128485ebb3efc",
+    "entities": [
+      {
+        "tableName": "tags",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
+        "fields": [
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "tag"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "sources",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "spout",
+            "columnName": "spout",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "error",
+            "columnName": "error",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "items",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT NOT NULL, `icon` TEXT NOT NULL, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datetime",
+            "columnName": "datetime",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "starred",
+            "columnName": "starred",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thumbnail",
+            "columnName": "thumbnail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "link",
+            "columnName": "link",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourcetitle",
+            "columnName": "sourcetitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "actions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "articleId",
+            "columnName": "articleid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "read",
+            "columnName": "read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "starred",
+            "columnName": "starred",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unstarred",
+            "columnName": "unstarred",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"7ad9c4961992c13b670128485ebb3efc\")"
+    ]
+  }
+}
--- a/app/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/4.json
+++ b/app/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/4.json
@@ -0,0 +1,226 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 4,
+    "identityHash": "9cf8b03d32f80dfd58160599a1df197d",
+    "entities": [
+      {
+        "tableName": "tags",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
+        "fields": [
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "tag"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "sources",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "spout",
+            "columnName": "spout",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "error",
+            "columnName": "error",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "items",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT, `icon` TEXT, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datetime",
+            "columnName": "datetime",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "starred",
+            "columnName": "starred",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thumbnail",
+            "columnName": "thumbnail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "link",
+            "columnName": "link",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourcetitle",
+            "columnName": "sourcetitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "actions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "articleId",
+            "columnName": "articleid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "read",
+            "columnName": "read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "starred",
+            "columnName": "starred",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unstarred",
+            "columnName": "unstarred",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"9cf8b03d32f80dfd58160599a1df197d\")"
+    ]
+  }
+}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="apps.amine.bou.readerforselfoss"
-    xmlns:tools="http://schemas.android.com/tools">
+    package="apps.amine.bou.readerforselfoss">

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

    <application
@@ -11,15 +11,19 @@
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_security_config"
        android:theme="@style/NoBar">
        <activity
            android:name=".MainActivity"
            android:theme="@style/SplashTheme">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
-
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
        </activity>
        <activity
            android:name=".LoginActivity"
@@ -33,7 +37,7 @@
            android:parentActivityName=".HomeActivity">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
-                android:value="apps.amine.bou.readerforselfoss.HomeActivity" />
+                android:value=".HomeActivity" />
        </activity>
        <activity
            android:name=".SourcesActivity"
@@ -51,15 +55,16 @@

            <intent-filter>
                <action android:name="android.intent.action.SEND" />
-
                <category android:name="android.intent.category.DEFAULT" />
-
                <data android:mimeType="text/plain" />
            </intent-filter>
        </activity>
        <activity
            android:name=".ReaderActivity">
        </activity>
+        <activity
+            android:name=".ImageActivity">
+        </activity>

        <meta-data
            android:name="apps.amine.bou.readerforselfoss.utils.glide.SelfSignedGlideModule"
@@ -72,6 +77,9 @@
            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>
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt
@@ -1,5 +1,6 @@
 package apps.amine.bou.readerforselfoss

+import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
@@ -85,11 +86,13 @@ class AddSourceActivity : AppCompatActivity() {

        try {
            val prefs = PreferenceManager.getDefaultSharedPreferences(this)
+            val settings =
+                getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
            api = SelfossApi(
                this,
                this@AddSourceActivity,
-                prefs.getBoolean("isSelfSignedCert", false),
-                prefs.getBoolean("should_log_everything", false)
+                settings.getBoolean("isSelfSignedCert", false),
+                prefs.getString("api_timeout", "-1")!!.toLong()
            )
        } catch (e: IllegalArgumentException) {
            mustLoginToAddSource()
@@ -108,7 +111,7 @@ class AddSourceActivity : AppCompatActivity() {
        super.onResume()
        val config = Config(this)

-        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid()) {
+        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid(this@AddSourceActivity)) {
            mustLoginToAddSource()
        } else {
            handleSpoutsSpinner(spoutsSpinner, api, progress, formContainer)
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
@@ -4,38 +4,36 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.graphics.Color
+import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.GradientDrawable
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
-import androidx.core.view.MenuItemCompat
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.appcompat.widget.SearchView
-import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import androidx.recyclerview.widget.ItemTouchHelper
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.SearchView
+import androidx.core.view.MenuItemCompat
+import androidx.recyclerview.widget.*
 import androidx.room.Room
-import androidx.room.RoomDatabase
+import androidx.work.Constraints
+import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkManager
 import apps.amine.bou.readerforselfoss.adapters.ItemCardAdapter
 import apps.amine.bou.readerforselfoss.adapters.ItemListAdapter
 import apps.amine.bou.readerforselfoss.adapters.ItemsAdapter
-import apps.amine.bou.readerforselfoss.api.selfoss.Item
-import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.Source
-import apps.amine.bou.readerforselfoss.api.selfoss.Stats
-import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
-import apps.amine.bou.readerforselfoss.api.selfoss.Tag
+import apps.amine.bou.readerforselfoss.api.selfoss.*
+import apps.amine.bou.readerforselfoss.background.LoadingWorker
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
 import apps.amine.bou.readerforselfoss.settings.SettingsActivity
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
@@ -43,10 +41,9 @@ import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.bottombar.maybeShow
 import apps.amine.bou.readerforselfoss.utils.bottombar.removeBadge
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
-import apps.amine.bou.readerforselfoss.utils.drawer.CustomUrlPrimaryDrawerItem
 import apps.amine.bou.readerforselfoss.utils.flattenTags
 import apps.amine.bou.readerforselfoss.utils.longHash
-import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
 import apps.amine.bou.readerforselfoss.utils.persistence.toView
 import co.zsmb.materialdrawerkt.builders.accountHeader
@@ -57,9 +54,8 @@ import co.zsmb.materialdrawerkt.draweritems.profile.profile
 import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
+import com.bumptech.glide.Glide
 import com.ftinc.scoop.Scoop
-import com.github.stkent.amplify.tracking.Amplify
-import com.google.gson.reflect.TypeToken
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
 import com.mikepenz.materialdrawer.Drawer
@@ -69,11 +65,10 @@ import com.mikepenz.materialdrawer.model.DividerDrawerItem
 import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
 import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
 import kotlinx.android.synthetic.main.activity_home.*
-import kotlinx.android.synthetic.main.fragment_article.*
-import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import java.util.concurrent.TimeUnit
 import kotlin.concurrent.thread

 class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
@@ -90,8 +85,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    private var items: ArrayList<Item> = ArrayList()
    private var allItems: ArrayList<Item> = ArrayList()

-    private var debugReadingItems = false
-    private var shouldLogEverything = false
    private var internalBrowser = false
    private var articleViewer = false
    private var shouldBeCardView = false
@@ -110,6 +103,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    private var itemsCaching: Boolean = false
    private var hiddenTags: List<String> = emptyList()

+    private var periodicRefresh = false
+    private var refreshMinutes: Long = 360L
+    private var refreshWhenChargingOnly = false
+
    private lateinit var tabNewBadge: TextBadgeItem
    private lateinit var tabArchiveBadge: TextBadgeItem
    private lateinit var tabStarredBadge: TextBadgeItem
@@ -130,10 +127,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    private var badgeAll: Int = -1
    private var badgeFavs: Int = -1

+    private var fromTabShortcut: Boolean = false
+    private var offlineShortcut: Boolean = false
+
    private lateinit var tagsBadge: Map<Long, Int>

    private lateinit var db: AppDatabase

+    private lateinit var config: Config
+
    data class DrawerData(val tags: List<Tag>?, val sources: List<Source>?)

    override fun onStart() {
@@ -143,22 +145,27 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {

    override fun onCreate(savedInstanceState: Bundle?) {
        appColors = AppColors(this@HomeActivity)
+        config = Config(this@HomeActivity)

        super.onCreate(savedInstanceState)

+        fromTabShortcut =  intent.getIntExtra("shortcutTab", -1) != -1
+        offlineShortcut =  intent.getBooleanExtra("startOffline", false)
+
+        if (fromTabShortcut) {
+            elementsShown = intent.getIntExtra("shortcutTab", UNREAD_SHOWN)
+        }
+
        setContentView(R.layout.activity_home)

        handleThemeBinding()

        setSupportActionBar(toolBar)
-        if (savedInstanceState == null) {
-            Amplify.getSharedInstance().promptIfReady(promptView)
-        }

        db = Room.databaseBuilder(
            applicationContext,
            AppDatabase::class.java, "selfoss-database"
-        ).addMigrations(MIGRATION_1_2).build()
+        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()


        customTabActivityHelper = CustomTabActivityHelper()
@@ -170,7 +177,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            this,
            this@HomeActivity,
            settings.getBoolean("isSelfSignedCert", false),
-            shouldLogEverything
+            sharedPref.getString("api_timeout", "-1")!!.toLong()
        )
        items = ArrayList()
        allItems = ArrayList()
@@ -188,6 +195,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            R.color.refresh_progress_3
        )
        swipeRefreshLayout.setOnRefreshListener {
+            offlineShortcut = false
            allItems = ArrayList()
            lastFetchDone = false
            handleDrawerItems()
@@ -203,7 +211,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                    recyclerView: RecyclerView,
                    viewHolder: RecyclerView.ViewHolder
                ): Int =
-                    if (elementsShown != UNREAD_SHOWN) {
+                    if (elementsShown != UNREAD_SHOWN && elementsShown != READ_SHOWN) {
                        0
                    } else {
                        super.getSwipeDirs(
@@ -223,17 +231,21 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                    val i = items.elementAtOrNull(position)

                    if (i != null) {
-                        val adapter = recyclerView.adapter
+                        val adapter = recyclerView.adapter as ItemsAdapter<*>

-                        when (adapter) {
-                            is ItemCardAdapter -> adapter.removeItemAtIndex(position)
-                            is ItemListAdapter -> adapter.removeItemAtIndex(position)
+                        val wasItemUnread = adapter.unreadItemStatusAtIndex(position)
+
+                        adapter.handleItemAtIndex(position)
+
+                        if (wasItemUnread) {
+                            badgeNew--
+                        } else {
+                            badgeNew++
                        }

-                        badgeNew--
                        reloadBadgeContent()

-                        val tagHashes = i.tags.split(",").map { it.longHash() }
+                        val tagHashes = i.tags.tags.split(",").map { it.longHash() }
                        tagsBadge = tagsBadge.map {
                            if (tagHashes.contains(it.key)) {
                                (it.key to (it.value - 1))
@@ -277,19 +289,19 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {

        val tabNew =
            BottomNavigationItem(
-                R.drawable.ic_fiber_new_black_24dp,
+                R.drawable.ic_tab_fiber_new_black_24dp,
                getString(R.string.tab_new)
            ).setActiveColor(appColors.colorAccent)
                .setBadgeItem(tabNewBadge)
        val tabArchive =
            BottomNavigationItem(
-                R.drawable.ic_archive_black_24dp,
+                R.drawable.ic_tab_archive_black_24dp,
                getString(R.string.tab_read)
            ).setActiveColor(appColors.colorAccentDark)
                .setBadgeItem(tabArchiveBadge)
        val tabStarred =
            BottomNavigationItem(
-                R.drawable.ic_favorite_black_24dp,
+                R.drawable.ic_tab_favorite_black_24dp,
                getString(R.string.tab_favs)
            ).setActiveColorResource(R.color.pink)
                .setBadgeItem(tabStarredBadge)
@@ -303,6 +315,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {

        bottomBar.setMode(BottomNavigationBar.MODE_SHIFTING)
        bottomBar.setBackgroundStyle(BottomNavigationBar.BACKGROUND_STYLE_STATIC)
+
+        if (fromTabShortcut) {
+            bottomBar.selectTab(elementsShown - 1)
+        }
    }

    override fun onResume() {
@@ -333,8 +349,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {

        getElementsAccordingToTab()

+        handleRecurringTask()

-        handleGDPRDialog(sharedPref.getBoolean("GDPR_shown", false))
+        handleOfflineActions()
    }

    private fun getAndStoreAllItems() {
@@ -349,7 +366,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                thread {
                    if (response.body() != null) {
                        val apiItems = (response.body() as ArrayList<Item>).filter {
-                            maybeTagFilter != null || filter(it.tags)
+                            maybeTagFilter != null || filter(it.tags.tags)
                        } as ArrayList<Item>
                        db.itemsDao().deleteAllItems()
                        db.itemsDao()
@@ -366,24 +383,29 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    }

    private fun handleSharedPrefs() {
-        debugReadingItems = sharedPref.getBoolean("read_debug", false)
-        shouldLogEverything = sharedPref.getBoolean("should_log_everything", false)
        internalBrowser = sharedPref.getBoolean("prefer_internal_browser", true)
        articleViewer = sharedPref.getBoolean("prefer_article_viewer", true)
        shouldBeCardView = sharedPref.getBoolean("card_view_active", false)
        displayUnreadCount = sharedPref.getBoolean("display_unread_count", true)
        displayAllCount = sharedPref.getBoolean("display_other_count", false)
        fullHeightCards = sharedPref.getBoolean("full_height_cards", false)
-        itemsNumber = sharedPref.getString("prefer_api_items_number", "200").toInt()
-        userIdentifier = sharedPref.getString("unique_id", "")
+        itemsNumber = sharedPref.getString("prefer_api_items_number", "200")!!.toInt()
+        userIdentifier = sharedPref.getString("unique_id", "")!!
        displayAccountHeader = sharedPref.getBoolean("account_header_displaying", false)
        infiniteScroll = sharedPref.getBoolean("infinite_loading", false)
        itemsCaching = sharedPref.getBoolean("items_caching", false)
-        hiddenTags = if (sharedPref.getString("hidden_tags", "").isNotEmpty()) {
-            sharedPref.getString("hidden_tags", "").replace("\\s".toRegex(), "").split(",")
+        hiddenTags = if (sharedPref.getString("hidden_tags", "")!!.isNotEmpty()) {
+            sharedPref.getString("hidden_tags", "")!!.replace("\\s".toRegex(), "").split(",")
        } else {
            emptyList()
        }
+        periodicRefresh = sharedPref.getBoolean("periodic_refresh", false)
+        refreshWhenChargingOnly = sharedPref.getBoolean("refresh_when_charging", false)
+        refreshMinutes = sharedPref.getString("periodic_refresh_minutes", "360")!!.toLong()
+
+        if (refreshMinutes <= 15) {
+            refreshMinutes = 15
+        }
    }

    private fun handleThemeBinding() {
@@ -428,7 +450,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            if (displayAccountHeader) {
                accountHeader {
                    background = R.drawable.bg
-                    profile(settings.getString("url", "")) {
+                    profile(settings.getString("url", "")!!) {
                        iconDrawable = resources.getDrawable(R.mipmap.ic_launcher)
                    }
                    selectionListEnabledForSingleProfile = false
@@ -437,7 +459,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {

            footer {
                primaryItem(R.string.drawer_report_bug) {
-                    icon = R.drawable.ic_bug_report
+                    icon = R.drawable.ic_bug_report_black_24dp
                    iconTintingEnabled = true
                    onClick { _ ->
                        val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(Config.trackerUrl))
@@ -447,7 +469,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                }

                primaryItem(R.string.title_activity_settings) {
-                    icon = R.drawable.ic_settings
+                    icon = R.drawable.ic_settings_black_24dp
                    iconTintingEnabled = true
                    onClick { _ ->
                        startActivityForResult(
@@ -477,7 +499,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        )
                    }
                } else {
-                    val filteredTags = maybeTags.filterNot { hiddenTags.contains(it.tag) }
+                    val filteredTags = maybeTags
+                        .filterNot { hiddenTags.contains(it.tag) }
+                        .sortedBy { it.unread == 0 }
                    tagsBadge = filteredTags.map {
                        val gd = GradientDrawable()
                        val color = try {
@@ -490,12 +514,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        gd.shape = GradientDrawable.RECTANGLE
                        gd.setSize(30, 30)
                        gd.cornerRadius = 30F
-                        drawer.addItem(
+                        var drawerItem =
                            PrimaryDrawerItem()
                                .withName(it.tag)
                                .withIdentifier(it.tag.longHash())
                                .withIcon(gd)
-                                .withBadge("${it.unread}")
                                .withBadgeStyle(
                                    BadgeStyle().withTextColor(Color.WHITE)
                                        .withColor(appColors.colorAccent)
@@ -506,6 +529,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                    getElementsAccordingToTab()
                                    false
                                }
+                        if (it.unread > 0) {
+                            drawerItem = drawerItem.withBadge("${it.unread}")
+                        }
+                        drawer.addItem(
+                            drawerItem
                        )

                        (it.tag.longHash() to it.unread)
@@ -537,12 +565,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        gd.shape = GradientDrawable.RECTANGLE
                        gd.setSize(30, 30)
                        gd.cornerRadius = 30F
-                        drawer.addItem(
+                        var drawerItem =
                            PrimaryDrawerItem()
                                .withName(it.tag)
                                .withIdentifier(it.tag.longHash())
                                .withIcon(gd)
-                                .withBadge("${it.unread}")
                                .withBadgeStyle(
                                    BadgeStyle().withTextColor(Color.WHITE)
                                        .withColor(appColors.colorAccent)
@@ -553,6 +580,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                    getElementsAccordingToTab()
                                    false
                                }
+                        if (it.unread > 0) {
+                            drawerItem = drawerItem.withBadge("${it.unread}")
+                        }
+                        drawer.addItem(
+                            drawerItem
                        )

                        (it.tag.longHash() to it.unread)
@@ -571,18 +603,27 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                    }
                } else {
                    for (tag in maybeSources) {
-                        drawer.addItem(
-                            CustomUrlPrimaryDrawerItem()
-                                .withName(tag.title)
+                        val item = PrimaryDrawerItem()
+                                .withName(tag.getTitleDecoded())
                                .withIdentifier(tag.id.toLong())
-                                .withIcon(tag.getIcon(this@HomeActivity))
                                .withOnDrawerItemClickListener { _, _, _ ->
                                    allItems = ArrayList()
                                    maybeSourceFilter = tag
                                    getElementsAccordingToTab()
                                    false
                                }
-                        )
+                        if (tag.getIcon(this@HomeActivity).isNotBlank()) {
+                            thread {
+                                try {
+                                    item.withIcon(BitmapDrawable(resources, Glide.with(this@HomeActivity).asBitmap().load(tag.getIcon(this@HomeActivity)).submit(100, 100).get()))
+                                } catch (e: Exception) {
+                                }
+                            }
+                        } else {
+                            item.withIcon(R.mipmap.ic_launcher)
+                        }
+                        drawer.addItem(item)
+
                    }
                }
            }
@@ -603,14 +644,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                            false
                        }
                )
-                drawer.addItem(DividerDrawerItem())
-                drawer.addItem(
-                    SecondaryDrawerItem()
-                        .withName(getString(R.string.drawer_item_tags))
-                        .withIdentifier(DRAWER_ID_TAGS)
-                        .withSelectable(false)
-                )
-                handleTags(maybeDrawerData.tags)
                if (hiddenTags.isNotEmpty()) {
                    drawer.addItem(DividerDrawerItem())
                    drawer.addItem(
@@ -622,6 +655,14 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                    handleHiddenTags(maybeDrawerData.tags)
                }
                drawer.addItem(DividerDrawerItem())
+                drawer.addItem(
+                    SecondaryDrawerItem()
+                        .withName(getString(R.string.drawer_item_tags))
+                        .withIdentifier(DRAWER_ID_TAGS)
+                        .withSelectable(false)
+                )
+                handleTags(maybeDrawerData.tags)
+                drawer.addItem(DividerDrawerItem())
                drawer.addItem(
                    SecondaryDrawerItem()
                        .withName(getString(R.string.drawer_item_sources))
@@ -639,17 +680,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                    PrimaryDrawerItem()
                        .withName(R.string.action_about)
                        .withSelectable(false)
-                        .withIcon(R.drawable.ic_info_outline)
+                        .withIcon(R.drawable.ic_info_outline_white_24dp)
                        .withIconTintingEnabled(true)
                        .withOnDrawerItemClickListener { _, _, _ ->
                            LibsBuilder()
-                                .withActivityStyle(
-                                    if (appColors.isDarkTheme) {
-                                        Libs.ActivityStyle.DARK
-                                    } else {
-                                        Libs.ActivityStyle.LIGHT_DARK_TOOLBAR
-                                    }
-                                )
                                .withAboutIconShown(true)
                                .withAboutVersionShown(true)
                                .start(this@HomeActivity)
@@ -696,6 +730,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            var sources: List<Source>?

            fun sourcesApiCall() {
+                if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
                    api.sources.enqueue(object : Callback<List<Source>> {
                        override fun onResponse(
                            call: Call<List<Source>>?,
@@ -709,10 +744,16 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        }

                        override fun onFailure(call: Call<List<Source>>?, t: Throwable?) {
+                            val apiDrawerData = DrawerData(tags, null)
+                            if ((maybeDrawerData != null && maybeDrawerData != apiDrawerData) || maybeDrawerData == null) {
+                                handleDrawerData(apiDrawerData)
+                            }
                        }
                    })
                }
+            }

+            if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
                api.tags.enqueue(object : Callback<List<Tag>> {
                    override fun onResponse(
                        call: Call<List<Tag>>,
@@ -727,6 +768,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                    }
                })
            }
+        }

        drawer.addItem(
            PrimaryDrawerItem().withName(getString(R.string.drawer_loading)).withSelectable(
@@ -817,12 +859,52 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            override fun onTabSelected(position: Int) {
                offset = 0
                lastFetchDone = false
+
+                if (itemsCaching) {
+
+                    if (!swipeRefreshLayout.isRefreshing) {
+                        swipeRefreshLayout.post { swipeRefreshLayout.isRefreshing = true }
+                    }
+
+                    thread {
+                        val dbItems = db.itemsDao().items().map { it.toView() }
+                        runOnUiThread {
+                            if (dbItems.isNotEmpty()) {
+                                items = when (position) {
+                                    0 -> ArrayList(dbItems.filter { it.unread })
+                                    1 -> ArrayList(dbItems.filter { !it.unread })
+                                    2 -> ArrayList(dbItems.filter { it.starred })
+                                    else -> ArrayList(dbItems.filter { it.unread })
+                                }
+                                handleListResult()
                                when (position) {
                                    0 -> getUnRead()
                                    1 -> getRead()
                                    2 -> getStarred()
                                    else -> Unit
                                }
+                            } else {
+                                if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)) {
+                                    when (position) {
+                                        0 -> getUnRead()
+                                        1 -> getRead()
+                                        2 -> getStarred()
+                                        else -> Unit
+                                    }
+                                    getAndStoreAllItems()
+                                }
+                            }
+                        }
+                    }
+
+                } else {
+                    when (position) {
+                        0 -> getUnRead()
+                        1 -> getRead()
+                        2 -> getStarred()
+                        else -> Unit
+                    }
+                }
            }
        })
    }
@@ -899,11 +981,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        handleListResult()
                        doGetAccordingToTab()
                    } else {
+                        if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)) {
                            doGetAccordingToTab()
                            getAndStoreAllItems()
                        }
                    }
                }
+            }

        } else {
            doGetAccordingToTab()
@@ -928,7 +1012,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                    getAndStoreAllItems()
                    items = response.body() as ArrayList<Item>
                    items = items.filter {
-                        maybeTagFilter != null || filter(it.tags)
+                        maybeTagFilter != null || filter(it.tags.tags)
                    } as ArrayList<Item>

                    if (allItems.isEmpty()) {
@@ -956,6 +1040,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            swipeRefreshLayout.post { swipeRefreshLayout.isRefreshing = true }
        }

+        if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)) {
            call(maybeTagFilter?.tag, maybeSourceFilter?.id?.toLong(), maybeSearchFilter)
                .enqueue(object : Callback<List<Item>> {
                    override fun onResponse(
@@ -974,6 +1059,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        ).show()
                    }
                })
+        } else {
+            swipeRefreshLayout.post { swipeRefreshLayout.isRefreshing = false }
+        }
    }

    private fun getUnRead(appendResults: Boolean = false) {
@@ -1034,13 +1122,14 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                            this,
                            items,
                            api,
+                            db,
                            customTabActivityHelper,
                            internalBrowser,
                            articleViewer,
                            fullHeightCards,
                            appColors,
-                            debugReadingItems,
-                            userIdentifier
+                            userIdentifier,
+                            config
                        ) {
                            updateItems(it)
                        }
@@ -1050,12 +1139,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                            this,
                            items,
                            api,
+                            db,
                            customTabActivityHelper,
                            internalBrowser,
                            articleViewer,
-                            debugReadingItems,
                            userIdentifier,
-                            appColors
+                            appColors,
+                            config
                        ) {
                            updateItems(it)
                        }
@@ -1080,7 +1170,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    }

    private fun reloadBadges() {
-        if (displayUnreadCount || displayAllCount) {
+        if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut) && (displayUnreadCount || displayAllCount)) {
            api.stats.enqueue(object : Callback<Stats> {
                override fun onResponse(call: Call<Stats>, response: Response<Stats>) {
                    if (response.body() != null) {
@@ -1186,6 +1276,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when (item.itemId) {
            R.id.refresh -> {
+                if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
                    needsConfirmation(R.string.menu_home_refresh, R.string.refresh_dialog_message) {
                        api.update().enqueue(object : Callback<String> {
                            override fun onResponse(
@@ -1210,6 +1301,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        Toast.makeText(this, R.string.refresh_in_progress, Toast.LENGTH_SHORT).show()
                    }
                    return true
+                } else {
+                    return false
+                }
            }
            R.id.readAll -> {
                if (elementsShown == UNREAD_SHOWN) {
@@ -1218,15 +1312,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        val ids = allItems.map { it.id }
                        val itemsByTag: Map<Long, Int> =
                            allItems.flattenTags()
-                                .groupBy { it.tags.longHash() }
+                                .groupBy { it.tags.tags.longHash() }
                                .map { it.key to it.value.size }
                                .toMap()

-                        fun readAllDebug(e: Throwable) {
-                            ACRA.getErrorReporter().maybeHandleSilentException(e, this@HomeActivity)
-                        }
-
-                        if (ids.isNotEmpty()) {
+                        if (ids.isNotEmpty() && this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
                            api.readAll(ids).enqueue(object : Callback<SuccessResponse> {
                                override fun onResponse(
                                    call: Call<SuccessResponse>,
@@ -1240,12 +1330,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                        ).show()
                                        tabNewBadge.removeBadge()

-
-                                        tagsBadge = itemsByTag.map {
-                                            (it.key to ((tagsBadge[it.key] ?: it.value) - it.value))
-                                        }.toMap()
-
-                                        reloadTagsBadges()
+                                        handleDrawerItems()

                                        getElementsAccordingToTab()
                                    } else {
@@ -1255,14 +1340,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                            Toast.LENGTH_SHORT
                                        ).show()

-                                        if (debugReadingItems) {
-                                            readAllDebug(
-                                                Throwable(
-                                                    "Got response, but : response.body() (${response.body()}) != null && response.body()!!.isSuccess (${response.body()?.isSuccess})." +
-                                                            "Request url was (${call.request().url()}), ids were $ids"
-                                                )
-                                            )
-                                        }
+
                                    }

                                    swipeRefreshLayout.isRefreshing = false
@@ -1275,10 +1353,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                        Toast.LENGTH_SHORT
                                    ).show()
                                    swipeRefreshLayout.isRefreshing = false
-
-                                    if (debugReadingItems) {
-                                        readAllDebug(t)
-                                    }
                                }
                            })
                            items = ArrayList()
@@ -1315,21 +1389,55 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
        items = adapterItems
    }

-    private fun handleGDPRDialog(GDPRShown: Boolean) {
-        val sharedEditor = sharedPref.edit()
-        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, _ ->
-                sharedEditor.putBoolean("GDPR_shown", true)
-                sharedEditor.commit()
-                dialog.dismiss()
+    private fun handleRecurringTask() {
+        if (periodicRefresh) {
+            val myConstraints = Constraints.Builder()
+                .setRequiresBatteryNotLow(true)
+                .setRequiresCharging(refreshWhenChargingOnly)
+                .setRequiresStorageNotLow(true)
+                .build()
+
+            val backgroundWork =
+                PeriodicWorkRequestBuilder<LoadingWorker>(refreshMinutes, TimeUnit.MINUTES)
+                    .setConstraints(myConstraints)
+                    .addTag("selfoss-loading")
+                    .build()
+
+
+            WorkManager.getInstance().enqueueUniquePeriodicWork("selfoss-loading", ExistingPeriodicWorkPolicy.KEEP, backgroundWork)
+        }
+    }
+
+    private fun handleOfflineActions() {
+        fun <T>doAndReportOnFail(call: Call<T>, action: ActionEntity) {
+           call.enqueue(object: Callback<T> {
+               override fun onResponse(
+                   call: Call<T>,
+                   response: Response<T>
+               ) {
+                   thread {
+                       db.actionsDao().delete(action)
+                   }
+               }
+
+               override fun onFailure(call: Call<T>, t: Throwable) {
+               }
+           })
+        }
+
+        if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
+            thread {
+                val actions = db.actionsDao().actions()
+
+                actions.forEach { action ->
+                    when {
+                        action.read -> doAndReportOnFail(api.markItem(action.articleId), action)
+                        action.unread -> doAndReportOnFail(api.unmarkItem(action.articleId), action)
+                        action.starred -> doAndReportOnFail(api.starrItem(action.articleId), action)
+                        action.unstarred -> doAndReportOnFail(api.unstarrItem(action.articleId), action)
+                    }
+                }
            }
-            alertDialog.show()
        }
    }
 }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/ImageActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ImageActivity.kt
@@ -0,0 +1,52 @@
+package apps.amine.bou.readerforselfoss
+
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
+import apps.amine.bou.readerforselfoss.fragments.ImageFragment
+import kotlinx.android.synthetic.main.activity_reader.*
+
+class ImageActivity : AppCompatActivity() {
+    private lateinit var allImages : ArrayList<String>
+    private var position : Int = 0
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.activity_image)
+
+        setSupportActionBar(toolBar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        allImages = intent.getStringArrayListExtra("allImages") as ArrayList<String>
+        position = intent.getIntExtra("position", 0)
+
+        pager.adapter = ScreenSlidePagerAdapter(supportFragmentManager)
+        pager.currentItem = position
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> {
+                onBackPressed()
+                return true
+            }
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+    private inner class ScreenSlidePagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm, FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+
+        override fun getCount(): Int {
+            return allImages.size
+        }
+
+        override fun getItem(position: Int): ImageFragment {
+            return ImageFragment.newInstance(allImages[position])
+        }
+    }
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt
@@ -20,11 +20,10 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid
-import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
 import kotlinx.android.synthetic.main.activity_login.*
-import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -39,7 +38,6 @@ class LoginActivity : AppCompatActivity() {
    private lateinit var settings: SharedPreferences
    private lateinit var editor: SharedPreferences.Editor
    private lateinit var userIdentifier: String
-    private var logErrors: Boolean = false
    private lateinit var appColors: AppColors

    override fun onCreate(savedInstanceState: Bundle?) {
@@ -53,14 +51,12 @@ class LoginActivity : AppCompatActivity() {

        handleBaseUrlFail()

-
        settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-        userIdentifier = settings.getString("unique_id", "")
-        logErrors = settings.getBoolean("login_debug", false)
+        userIdentifier = settings.getString("unique_id", "")!!

        editor = settings.edit()

-        if (settings.getString("url", "").isNotEmpty()) {
+        if (settings.getString("url", "")!!.isNotEmpty()) {
            goToMain()
        }

@@ -144,7 +140,7 @@ class LoginActivity : AppCompatActivity() {
        var cancel = false
        var focusView: View? = null

-        if (!url.isBaseUrlValid()) {
+        if (!url.isBaseUrlValid(this@LoginActivity)) {
            urlView.error = getString(R.string.login_url_problem)
            focusView = urlView
            cancel = true
@@ -163,7 +159,7 @@ class LoginActivity : AppCompatActivity() {
            }
        }

-        if (isWithLogin || isWithHTTPLogin) {
+        if (isWithLogin) {
            if (TextUtils.isEmpty(password)) {
                passwordView.error = getString(R.string.error_invalid_password)
                focusView = passwordView
@@ -177,6 +173,20 @@ class LoginActivity : AppCompatActivity() {
            }
        }

+        if (isWithHTTPLogin) {
+            if (TextUtils.isEmpty(httpPassword)) {
+                httpPasswordView.error = getString(R.string.error_invalid_password)
+                focusView = httpPasswordView
+                cancel = true
+            }
+
+            if (TextUtils.isEmpty(httpLogin)) {
+                httpLoginView.error = getString(R.string.error_field_required)
+                focusView = httpLoginView
+                cancel = true
+            }
+        }
+
        if (cancel) {
            focusView?.requestFocus()
        } else {
@@ -194,8 +204,10 @@ class LoginActivity : AppCompatActivity() {
                this,
                this@LoginActivity,
                isWithSelfSignedCert,
-                isWithSelfSignedCert
+                -1L
            )
+
+            if (this@LoginActivity.isNetworkAccessible(this@LoginActivity.findViewById(R.id.loginForm))) {
                api.login().enqueue(object : Callback<SuccessResponse> {
                    private fun preferenceError(t: Throwable) {
                        editor.remove("url")
@@ -209,14 +221,6 @@ class LoginActivity : AppCompatActivity() {
                        passwordView.error = getString(R.string.wrong_infos)
                        httpLoginView.error = getString(R.string.wrong_infos)
                        httpPasswordView.error = getString(R.string.wrong_infos)
-                    if (logErrors) {
-                        ACRA.getErrorReporter().maybeHandleSilentException(t, this@LoginActivity)
-                        Toast.makeText(
-                            this@LoginActivity,
-                            t.message,
-                            Toast.LENGTH_LONG
-                        ).show()
-                    }
                        showProgress(false)
                    }

@@ -235,6 +239,9 @@ class LoginActivity : AppCompatActivity() {
                        preferenceError(t)
                    }
                })
+            } else {
+                showProgress(false)
+            }
        }
    }

@@ -270,29 +277,19 @@ class LoginActivity : AppCompatActivity() {

    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        menuInflater.inflate(R.menu.login_menu, menu)
-        menu.findItem(R.id.login_debug).isChecked = logErrors
        return true
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
+        return when (item.itemId) {
            R.id.about -> {
                LibsBuilder()
-                    .withActivityStyle(Libs.ActivityStyle.LIGHT_DARK_TOOLBAR)
                    .withAboutIconShown(true)
                    .withAboutVersionShown(true)
                    .start(this)
-                return true
+                true
            }
-            R.id.login_debug -> {
-                val newState = !item.isChecked
-                item.isChecked = newState
-                logErrors = newState
-                editor.putBoolean("login_debug", newState)
-                editor.apply()
-                return true
-            }
-            else -> return super.onOptionsItemSelected(item)
+            else -> super.onOptionsItemSelected(item)
        }
    }
 }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
@@ -1,54 +1,32 @@
 package apps.amine.bou.readerforselfoss

+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.preference.PreferenceManager
-import androidx.multidex.MultiDexApplication
 import android.widget.ImageView
+import androidx.multidex.MultiDexApplication
 import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.ftinc.scoop.Scoop
-import com.github.stkent.amplify.feedback.DefaultEmailFeedbackCollector
-import com.github.stkent.amplify.feedback.GooglePlayStoreFeedbackCollector
-import com.github.stkent.amplify.tracking.Amplify
 import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
 import com.mikepenz.materialdrawer.util.DrawerImageLoader
-import org.acra.ACRA
-import org.acra.ReportField
-import org.acra.annotation.AcraCore
-import org.acra.annotation.AcraDialog
-import org.acra.annotation.AcraHttpSender
-import org.acra.sender.HttpSender
-import java.io.IOException
 import java.util.UUID.randomUUID

-
-@AcraHttpSender(uri = "http://amine-bou.fr:5984/acra-selfoss/_design/acra-storage/_update/report",
-                basicAuthLogin = "selfoss",
-                basicAuthPassword = "selfoss",
-                httpMethod = HttpSender.Method.PUT)
-@AcraDialog(resText = R.string.crash_dialog_text,
-            resCommentPrompt = R.string.crash_dialog_comment,
-            resTheme = android.R.style.Theme_DeviceDefault_Dialog)
-@AcraCore(reportContent = [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],
-          buildConfigClass = BuildConfig::class)
 class MyApp : MultiDexApplication() {
+    private lateinit var config: Config

    override fun onCreate() {
        super.onCreate()
-
-        initAmplify()
+        config = Config(baseContext)

        val prefs = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-        if (prefs.getString("unique_id", "").isEmpty()) {
+        if (prefs.getString("unique_id", "")!!.isEmpty()) {
            val editor = prefs.edit()
            editor.putString("unique_id", randomUUID().toString())
            editor.apply()
@@ -59,21 +37,25 @@ class MyApp : MultiDexApplication() {
        initTheme()

        tryToHandleBug()
+
+        handleNotificationChannels()
    }

-    override fun attachBaseContext(base: Context?) {
-        super.attachBaseContext(base)
-        val prefs = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-        ACRA.init(this)
-        ACRA.getErrorReporter().putCustomData("unique_id", prefs.getString("unique_id", ""))
+    private fun handleNotificationChannels() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager

+            val name = getString(R.string.notification_channel_sync)
+            val importance = NotificationManager.IMPORTANCE_LOW
+            val mChannel = NotificationChannel(Config.syncChannelId, name, importance)
+
+            val newItemsChannelname = getString(R.string.new_items_channel_sync)
+            val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT
+            val newItemsChannelmChannel = NotificationChannel(Config.newItemsChannelId, newItemsChannelname, newItemsChannelimportance)
+
+            notificationManager.createNotificationChannel(mChannel)
+            notificationManager.createNotificationChannel(newItemsChannelmChannel)
        }
-
-    private fun initAmplify() {
-        Amplify.initSharedInstance(this)
-            .setPositiveFeedbackCollectors(GooglePlayStoreFeedbackCollector())
-            .setCriticalFeedbackCollectors(DefaultEmailFeedbackCollector(Config.feedbackEmail))
-            .applyAllDefaultRules()
    }

    private fun initDrawerImageLoader() {
@@ -85,7 +67,7 @@ class MyApp : MultiDexApplication() {
                tag: String?
            ) {
                Glide.with(imageView?.context)
-                    .load(uri)
+                    .loadMaybeBasicAuth(config, uri.toString())
                    .apply(RequestOptions.fitCenterTransform().placeholder(placeholder))
                    .into(imageView)
            }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
@@ -1,5 +1,7 @@
 package apps.amine.bou.readerforselfoss

+import android.content.Context
+import android.content.SharedPreferences
 import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.os.Bundle
@@ -13,28 +15,36 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.room.Room
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.fragments.ArticleFragment
+import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
 import apps.amine.bou.readerforselfoss.transformers.DepthPageTransformer
-import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
+import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
+import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
 import apps.amine.bou.readerforselfoss.utils.succeeded
 import apps.amine.bou.readerforselfoss.utils.toggleStar
 import com.ftinc.scoop.Scoop
 import kotlinx.android.synthetic.main.activity_reader.*
 import me.relex.circleindicator.CircleIndicator
-import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import kotlin.concurrent.thread

 class ReaderActivity : AppCompatActivity() {

    private var markOnScroll: Boolean = false
-    private var debugReadingItems: Boolean = false
    private var currentItem: Int = 0
    private lateinit var userIdentifier: String

@@ -42,6 +52,13 @@ class ReaderActivity : AppCompatActivity() {

    private lateinit var toolbarMenu: Menu

+    private lateinit var db: AppDatabase
+    private lateinit var prefs: SharedPreferences
+
+    private var activeAlignment: Int = 1
+    val JUSTIFY = 1
+    val ALIGN_LEFT = 2
+
    private fun showMenuItem(willAddToFavorite: Boolean) {
        toolbarMenu.findItem(R.id.save).isVisible = willAddToFavorite
        toolbarMenu.findItem(R.id.unsave).isVisible = !willAddToFavorite
@@ -55,11 +72,18 @@ class ReaderActivity : AppCompatActivity() {
        showMenuItem(false)
    }

+    private lateinit var editor: SharedPreferences.Editor
+
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

        setContentView(R.layout.activity_reader)

+        db = Room.databaseBuilder(
+            applicationContext,
+            AppDatabase::class.java, "selfoss-database"
+        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
+
        val scoop = Scoop.getInstance()
        scoop.bind(this, Toppings.PRIMARY.value, toolBar)
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -70,17 +94,21 @@ class ReaderActivity : AppCompatActivity() {
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        supportActionBar?.setDisplayShowHomeEnabled(true)

-        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
+        val settings =
+            getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)

-        debugReadingItems = prefs.getBoolean("read_debug", false)
-        userIdentifier = prefs.getString("unique_id", "")
+        prefs = PreferenceManager.getDefaultSharedPreferences(this)
+        editor = prefs.edit()
+
+        userIdentifier = prefs.getString("unique_id", "")!!
        markOnScroll = prefs.getBoolean("mark_on_scroll", false)
+        activeAlignment = prefs.getInt("text_align", JUSTIFY)

        api = SelfossApi(
            this,
            this@ReaderActivity,
-            prefs.getBoolean("isSelfSignedCert", false),
-            prefs.getBoolean("should_log_everything", false)
+            settings.getBoolean("isSelfSignedCert", false),
+            prefs.getString("api_timeout", "-1")!!.toLong()
        )

        if (allItems.isEmpty()) {
@@ -89,9 +117,10 @@ class ReaderActivity : AppCompatActivity() {

        currentItem = intent.getIntExtra("currentItem", 0)

-        readItem(allItems[currentItem].id)
+        readItem(allItems[currentItem])

-        pager.adapter = ScreenSlidePagerAdapter(supportFragmentManager, AppColors(this@ReaderActivity))
+        pager.adapter =
+                ScreenSlidePagerAdapter(supportFragmentManager, AppColors(this@ReaderActivity))
        pager.currentItem = currentItem
    }

@@ -113,44 +142,41 @@ class ReaderActivity : AppCompatActivity() {
                    } else {
                        canFavorite()
                    }
-                    readItem(allItems[pager.currentItem].id)
+                    readItem(allItems[pager.currentItem])
                }
            }
        )
    }

-    fun readItem(id: String) {
+    fun readItem(item: Item) {
        if (markOnScroll) {
-            api.markItem(id).enqueue(
+            thread {
+                db.itemsDao().delete(item.toEntity())
+            }
+            if (this@ReaderActivity.isNetworkAccessible(this@ReaderActivity.findViewById(R.id.reader_activity_view))) {
+                api.markItem(item.id).enqueue(
                    object : Callback<SuccessResponse> {
                        override fun onResponse(
                            call: Call<SuccessResponse>,
                            response: Response<SuccessResponse>
                        ) {
-                        if (!response.succeeded() && debugReadingItems) {
-                            val message =
-                                "message: ${response.message()} " +
-                                        "response isSuccess: ${response.isSuccessful} " +
-                                        "response code: ${response.code()} " +
-                                        "response message: ${response.message()} " +
-                                        "response errorBody: ${response.errorBody()?.string()} " +
-                                        "body success: ${response.body()?.success} " +
-                                        "body isSuccess: ${response.body()?.isSuccess}"
-                            ACRA.getErrorReporter()
-                                .maybeHandleSilentException(Exception(message), this@ReaderActivity)
-                        }
                        }

                        override fun onFailure(
                            call: Call<SuccessResponse>,
                            t: Throwable
                        ) {
-                        if (debugReadingItems) {
-                            ACRA.getErrorReporter().maybeHandleSilentException(t, this@ReaderActivity)
+                            thread {
+                                db.itemsDao().insertAllItems(item.toEntity())
                            }
                        }
                    }
                )
+            } else {
+                thread {
+                    db.actionsDao().insertAllActions(ActionEntity(item.id, true, false, false, false))
+                }
+            }
        }
    }

@@ -165,7 +191,7 @@ class ReaderActivity : AppCompatActivity() {
        }
    }

-    override fun onSaveInstanceState(oldInstanceState: Bundle?) {
+    override fun onSaveInstanceState(oldInstanceState: Bundle) {
        super.onSaveInstanceState(oldInstanceState)
        oldInstanceState!!.clear()
    }
@@ -173,7 +199,6 @@ class ReaderActivity : AppCompatActivity() {
    private inner class ScreenSlidePagerAdapter(fm: FragmentManager, val appColors: AppColors) :
        FragmentStatePagerAdapter(fm) {

-
        override fun getCount(): Int {
            return allItems.size
        }
@@ -185,10 +210,20 @@ class ReaderActivity : AppCompatActivity() {
        override fun startUpdate(container: ViewGroup) {
            super.startUpdate(container)

-            container.background = ColorDrawable(ContextCompat.getColor(this@ReaderActivity, appColors.colorBackground))
+            container.background = ColorDrawable(
+                ContextCompat.getColor(
+                    this@ReaderActivity,
+                    appColors.colorBackground
+                )
+            )
        }
    }

+    fun alignmentMenu(showJustify: Boolean) {
+        toolbarMenu.findItem(R.id.align_left).isVisible = !showJustify
+        toolbarMenu.findItem(R.id.align_justify).isVisible = showJustify
+    }
+
    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        val inflater = menuInflater
        inflater.inflate(R.menu.reader_menu, menu)
@@ -199,26 +234,43 @@ class ReaderActivity : AppCompatActivity() {
        } else {
            canFavorite()
        }
+        if (activeAlignment == JUSTIFY) {
+            alignmentMenu(false)
+        } else {
+            alignmentMenu(true)
+        }

        return true
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        fun afterSave() {
+            allItems[pager.currentItem] =
+                    allItems[pager.currentItem].toggleStar()
+            notifyAdapter()
+            canRemoveFromFavorite()
+        }
+
+        fun afterUnsave() {
+            allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
+            notifyAdapter()
+            canFavorite()
+        }
+
        when (item.itemId) {
            android.R.id.home -> {
                onBackPressed()
                return true
            }
            R.id.save -> {
+                if (this@ReaderActivity.isNetworkAccessible(null)) {
                    api.starrItem(allItems[pager.currentItem].id)
                        .enqueue(object : Callback<SuccessResponse> {
                            override fun onResponse(
                                call: Call<SuccessResponse>,
                                response: Response<SuccessResponse>
                            ) {
-                            allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
-                            notifyAdapter()
-                            canRemoveFromFavorite()
+                                afterSave()
                            }

                            override fun onFailure(
@@ -232,17 +284,22 @@ class ReaderActivity : AppCompatActivity() {
                                ).show()
                            }
                        })
+                } else {
+                    thread {
+                        db.actionsDao().insertAllActions(ActionEntity(allItems[pager.currentItem].id, false, false, true, false))
+                        afterSave()
+                    }
+                }
            }
            R.id.unsave -> {
+                if (this@ReaderActivity.isNetworkAccessible(null)) {
                    api.unstarrItem(allItems[pager.currentItem].id)
                        .enqueue(object : Callback<SuccessResponse> {
                            override fun onResponse(
                                call: Call<SuccessResponse>,
                                response: Response<SuccessResponse>
                            ) {
-                            allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
-                            notifyAdapter()
-                            canFavorite()
+                                afterUnsave()
                            }

                            override fun onFailure(
@@ -256,11 +313,36 @@ class ReaderActivity : AppCompatActivity() {
                                ).show()
                            }
                        })
+                } else {
+                    thread {
+                        db.actionsDao().insertAllActions(ActionEntity(allItems[pager.currentItem].id, false, false, false, true))
+                        afterUnsave()
+                    }
+                }
+            }
+            R.id.align_left -> {
+                editor.putInt("text_align", ALIGN_LEFT)
+                editor.apply()
+                alignmentMenu(true)
+                refreshFragment()
+            }
+            R.id.align_justify -> {
+                editor.putInt("text_align", JUSTIFY)
+                editor.apply()
+                alignmentMenu(false)
+                refreshFragment()
            }
        }
        return super.onOptionsItemSelected(item)
    }

+    private fun refreshFragment() {
+        finish()
+        overridePendingTransition(0, 0)
+        startActivity(intent)
+        overridePendingTransition(0, 0)
+    }
+
    companion object {
        var allItems: ArrayList<Item> = ArrayList()
    }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
@@ -1,5 +1,6 @@
 package apps.amine.bou.readerforselfoss

+import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.os.Build
@@ -13,6 +14,8 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.Source
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
+import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import com.ftinc.scoop.Scoop
 import kotlinx.android.synthetic.main.activity_sources.*
 import retrofit2.Call
@@ -53,19 +56,22 @@ class SourcesActivity : AppCompatActivity() {
        super.onResume()
        val mLayoutManager = LinearLayoutManager(this)

+        val settings =
+            getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
        val prefs = PreferenceManager.getDefaultSharedPreferences(this)

        val api = SelfossApi(
            this,
            this@SourcesActivity,
-            prefs.getBoolean("isSelfSignedCert", false),
-            prefs.getBoolean("should_log_everything", false)
+            settings.getBoolean("isSelfSignedCert", false),
+            prefs.getString("api_timeout", "-1")!!.toLong()
        )
        var items: ArrayList<Source> = ArrayList()

        recyclerView.setHasFixedSize(true)
        recyclerView.layoutManager = mLayoutManager

+        if (this@SourcesActivity.isNetworkAccessible(this@SourcesActivity.findViewById(R.id.recyclerView))) {
            api.sources.enqueue(object : Callback<List<Source>> {
                override fun onResponse(
                    call: Call<List<Source>>,
@@ -94,6 +100,7 @@ class SourcesActivity : AppCompatActivity() {
                    ).show()
                }
            })
+        }

        fab.setOnClickListener {
            startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt
@@ -4,21 +4,26 @@ import android.app.Activity
 import android.content.Context
 import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
-import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView.ScaleType
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.themes.AppColors
+import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.LinkOnTouchListener
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.bitmapCenterCrop
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.openInBrowserAsNewTask
 import apps.amine.bou.readerforselfoss.utils.openItemUrl
 import apps.amine.bou.readerforselfoss.utils.shareLink
@@ -30,21 +35,27 @@ import com.bumptech.glide.Glide
 import com.like.LikeButton
 import com.like.OnLikeListener
 import kotlinx.android.synthetic.main.card_item.view.*
+import kotlinx.android.synthetic.main.card_item.view.itemImage
+import kotlinx.android.synthetic.main.card_item.view.sourceTitleAndDate
+import kotlinx.android.synthetic.main.card_item.view.title
+import kotlinx.android.synthetic.main.list_item.view.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import kotlin.concurrent.thread

 class ItemCardAdapter(
    override val app: Activity,
    override var items: ArrayList<Item>,
    override val api: SelfossApi,
+    override val db: AppDatabase,
    private val helper: CustomTabActivityHelper,
    private val internalBrowser: Boolean,
    private val articleViewer: Boolean,
    private val fullHeightCards: Boolean,
    override val appColors: AppColors,
-    override val debugReadingItems: Boolean,
    override val userIdentifier: String,
+    override val config: Config,
    override val updateItems: (ArrayList<Item>) -> Unit
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
    private val c: Context = app.baseContext
@@ -62,12 +73,22 @@ class ItemCardAdapter(


        holder.mView.favButton.isLiked = itm.starred
-        holder.mView.title.text = Html.fromHtml(itm.title)
+        holder.mView.title.text = itm.getTitleDecoded()
+        holder.mView.title.setTextColor(ContextCompat.getColor(
+                c,
+                appColors.textColor
+        ))
+        holder.mView.title.setOnTouchListener(LinkOnTouchListener())

        holder.mView.title.setLinkTextColor(appColors.colorAccent)

        holder.mView.sourceTitleAndDate.text = itm.sourceAndDateText()

+        holder.mView.sourceTitleAndDate.setTextColor(ContextCompat.getColor(
+                c,
+                appColors.textColor
+        ))
+
        if (!fullHeightCards) {
            holder.mView.itemImage.maxHeight = imageMaxHeight
            holder.mView.itemImage.scaleType = ScaleType.CENTER_CROP
@@ -79,20 +100,20 @@ class ItemCardAdapter(
            holder.mView.itemImage.setImageDrawable(null)
        } else {
            holder.mView.itemImage.visibility = View.VISIBLE
-            c.bitmapCenterCrop(itm.getThumbnail(c), holder.mView.itemImage)
+            c.bitmapCenterCrop(config, itm.getThumbnail(c), holder.mView.itemImage)
        }

        if (itm.getIcon(c).isEmpty()) {
-            val color = generator.getColor(itm.sourcetitle)
+            val color = generator.getColor(itm.getSourceTitle())

            val drawable =
                TextDrawable
                    .builder()
                    .round()
-                    .build(itm.sourcetitle.toTextDrawableString(c), color)
+                    .build(itm.getSourceTitle().toTextDrawableString(c), color)
            holder.mView.sourceImage.setImageDrawable(drawable)
        } else {
-            c.circularBitmapDrawable(itm.getIcon(c), holder.mView.sourceImage)
+            c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.sourceImage)
        }

        holder.mView.favButton.isLiked = itm.starred
@@ -114,6 +135,7 @@ class ItemCardAdapter(
            mView.favButton.setOnLikeListener(object : OnLikeListener {
                override fun liked(likeButton: LikeButton) {
                    val (id) = items[adapterPosition]
+                    if (c.isNetworkAccessible(null)) {
                        api.starrItem(id).enqueue(object : Callback<SuccessResponse> {
                            override fun onResponse(
                                call: Call<SuccessResponse>,
@@ -133,10 +155,16 @@ class ItemCardAdapter(
                                ).show()
                            }
                        })
+                    } else {
+                        thread {
+                            db.actionsDao().insertAllActions(ActionEntity(id, false, false, true, false))
+                        }
+                    }
                }

                override fun unLiked(likeButton: LikeButton) {
                    val (id) = items[adapterPosition]
+                    if (c.isNetworkAccessible(null)) {
                        api.unstarrItem(id).enqueue(object : Callback<SuccessResponse> {
                            override fun onResponse(
                                call: Call<SuccessResponse>,
@@ -156,11 +184,17 @@ class ItemCardAdapter(
                                ).show()
                            }
                        })
+                    } else {
+                        thread {
+                            db.actionsDao().insertAllActions(ActionEntity(id, false, false, false, true))
+                        }
+                    }
                }
            })

            mView.shareBtn.setOnClickListener {
-                c.shareLink(items[adapterPosition].getLinkDecoded())
+                val item = items[adapterPosition]
+                c.shareLink(item.getLinkDecoded(), item.getTitleDecoded())
            }

            mView.browserBtn.setOnClickListener {
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt
@@ -4,17 +4,24 @@ import android.app.Activity
 import android.content.Context
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
-import android.text.Html
+import android.text.Spannable
+import android.text.style.ClickableSpan
 import android.util.TypedValue
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.themes.AppColors
+import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.LinkOnTouchListener
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.bitmapCenterCrop
@@ -39,17 +46,17 @@ class ItemListAdapter(
    override val app: Activity,
    override var items: ArrayList<Item>,
    override val api: SelfossApi,
+    override val db: AppDatabase,
    private val helper: CustomTabActivityHelper,
    private val internalBrowser: Boolean,
    private val articleViewer: Boolean,
-    override val debugReadingItems: Boolean,
    override val userIdentifier: String,
    override val appColors: AppColors,
+    override val config: Config,
    override val updateItems: (ArrayList<Item>) -> Unit
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
    private val generator: ColorGenerator = ColorGenerator.MATERIAL
    private val c: Context = app.baseContext
-    private val bars: ArrayList<Boolean> = ArrayList(Collections.nCopies(items.size + 1, false))

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
        val v = LayoutInflater.from(c).inflate(
@@ -64,60 +71,42 @@ class ItemListAdapter(
        val itm = items[position]


-        holder.mView.title.text = Html.fromHtml(itm.title)
+        holder.mView.title.text = itm.getTitleDecoded()
+
+        holder.mView.title.setTextColor(ContextCompat.getColor(
+                c,
+                appColors.textColor
+        ))
+
+        holder.mView.title.setOnTouchListener(LinkOnTouchListener())

        holder.mView.title.setLinkTextColor(appColors.colorAccent)

        holder.mView.sourceTitleAndDate.text = itm.sourceAndDateText()

+        holder.mView.sourceTitleAndDate.setTextColor(ContextCompat.getColor(
+                c,
+                appColors.textColor
+        ))
+
        if (itm.getThumbnail(c).isEmpty()) {
-            val sizeInInt = 46
-            val sizeInDp = TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_DIP, sizeInInt.toFloat(), c.resources
-                    .displayMetrics
-            ).toInt()
-
-            val marginInInt = 16
-            val marginInDp = TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_DIP, marginInInt.toFloat(), c.resources
-                    .displayMetrics
-            ).toInt()
-
-            val params = holder.mView.itemImage.layoutParams as ViewGroup.MarginLayoutParams
-            params.height = sizeInDp
-            params.width = sizeInDp
-            params.setMargins(marginInDp, 0, 0, 0)
-            holder.mView.itemImage.layoutParams = params

            if (itm.getIcon(c).isEmpty()) {
-                val color = generator.getColor(itm.sourcetitle)
+                val color = generator.getColor(itm.getSourceTitle())

                val drawable =
                    TextDrawable
                        .builder()
                        .round()
-                        .build(itm.sourcetitle.toTextDrawableString(c), color)
+                        .build(itm.getSourceTitle().toTextDrawableString(c), color)

                holder.mView.itemImage.setImageDrawable(drawable)
            } else {
-                c.circularBitmapDrawable(itm.getIcon(c), holder.mView.itemImage)
+                c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.itemImage)
            }
        } else {
-            c.bitmapCenterCrop(itm.getThumbnail(c), holder.mView.itemImage)
+            c.bitmapCenterCrop(config, itm.getThumbnail(c), holder.mView.itemImage)
        }
-
-        // TODO: maybe handle this differently. It crashes when changing tab
-        try {
-            if (bars[position]) {
-                holder.mView.actionBar.visibility = View.VISIBLE
-            } else {
-                holder.mView.actionBar.visibility = View.GONE
-            }
-        } catch (e: IndexOutOfBoundsException) {
-            holder.mView.actionBar.visibility = View.GONE
-        }
-
-        holder.mView.favButton.isLiked = itm.starred
    }

    override fun getItemCount(): Int = items.size
@@ -125,76 +114,14 @@ class ItemListAdapter(
    inner class ViewHolder(val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {

        init {
-            handleClickListeners()
            handleCustomTabActions()
        }

-        private fun handleClickListeners() {
-
-            mView.favButton.setOnLikeListener(object : OnLikeListener {
-                override fun liked(likeButton: LikeButton) {
-                    val (id) = items[adapterPosition]
-                    api.starrItem(id).enqueue(object : Callback<SuccessResponse> {
-                        override fun onResponse(
-                            call: Call<SuccessResponse>,
-                            response: Response<SuccessResponse>
-                        ) {
-                        }
-
-                        override fun onFailure(
-                            call: Call<SuccessResponse>,
-                            t: Throwable
-                        ) {
-                            mView.favButton.isLiked = false
-                            Toast.makeText(
-                                c,
-                                R.string.cant_mark_favortie,
-                                Toast.LENGTH_SHORT
-                            ).show()
-                        }
-                    })
-                }
-
-                override fun unLiked(likeButton: LikeButton) {
-                    val (id) = items[adapterPosition]
-                    api.unstarrItem(id).enqueue(object : Callback<SuccessResponse> {
-                        override fun onResponse(
-                            call: Call<SuccessResponse>,
-                            response: Response<SuccessResponse>
-                        ) {
-                        }
-
-                        override fun onFailure(
-                            call: Call<SuccessResponse>,
-                            t: Throwable
-                        ) {
-                            mView.favButton.isLiked = true
-                            Toast.makeText(
-                                c,
-                                R.string.cant_unmark_favortie,
-                                Toast.LENGTH_SHORT
-                            ).show()
-                        }
-                    })
-                }
-            })
-
-            mView.shareBtn.setOnClickListener {
-                c.shareLink(items[adapterPosition].getLinkDecoded())
-            }
-
-            mView.browserBtn.setOnClickListener {
-                c.openInBrowserAsNewTask(items[adapterPosition])
-
-            }
-        }
-
        private fun handleCustomTabActions() {
            val customTabsIntent = c.buildCustomTabsIntent()
            helper.bindCustomTabsService(app)

-            mView.setOnClickListener { actionBarShowHide() }
-            mView.setOnLongClickListener {
+            mView.setOnClickListener {
                c.openItemUrl(
                    items,
                    adapterPosition,
@@ -204,16 +131,6 @@ class ItemListAdapter(
                    articleViewer,
                    app
                )
-                true
-            }
-        }
-
-        private fun actionBarShowHide() {
-            bars[adapterPosition] = true
-            if (mView.actionBar.visibility == View.GONE) {
-                mView.actionBar.visibility = View.VISIBLE
-            } else {
-                mView.actionBar.visibility = View.GONE
            }
        }
    }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt
@@ -10,21 +10,26 @@ import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.themes.AppColors
-import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
+import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
+import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
 import apps.amine.bou.readerforselfoss.utils.succeeded
-import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import kotlin.concurrent.thread

 abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapter<VH>() {
    abstract var items: ArrayList<Item>
    abstract val api: SelfossApi
-    abstract val debugReadingItems: Boolean
+    abstract val db: AppDatabase
    abstract val userIdentifier: String
    abstract val app: Activity
    abstract val appColors: AppColors
+    abstract val config: Config
    abstract val updateItems: (ArrayList<Item>) -> Unit

    fun updateAllItems(newItems: ArrayList<Item>) {
@@ -33,7 +38,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
        updateItems(items)
    }

-    private fun doUnmark(i: Item, position: Int) {
+    private fun unmarkSnackbar(i: Item, position: Int) {
        val s = Snackbar
            .make(
                app.findViewById(R.id.coordLayout),
@@ -42,9 +47,13 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
            )
            .setAction(R.string.undo_string) {
                items.add(position, i)
+                thread {
+                    db.itemsDao().insertAllItems(i.toEntity())
+                }
                notifyItemInserted(position)
                updateItems(items)

+                if (app.isNetworkAccessible(null)) {
                    api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
                        override fun onResponse(
                            call: Call<SuccessResponse>,
@@ -54,11 +63,18 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte

                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
                            items.remove(i)
+                            thread {
+                                db.itemsDao().delete(i.toEntity())
+                            }
                            notifyItemRemoved(position)
                            updateItems(items)
-                        doUnmark(i, position)
                        }
                    })
+                } else {
+                    thread {
+                        db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
+                    }
+                }
            }

        val view = s.view
@@ -67,51 +83,145 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
        s.show()
    }

-    fun removeItemAtIndex(position: Int) {
-
-        val i = items[position]
-
-        items.remove(i)
-        notifyItemRemoved(position)
+    private fun markSnackbar(i: Item, position: Int) {
+        val s = Snackbar
+            .make(
+                app.findViewById(R.id.coordLayout),
+                R.string.marked_as_unread,
+                Snackbar.LENGTH_LONG
+            )
+            .setAction(R.string.undo_string) {
+                items.add(position, i)
+                thread {
+                    db.itemsDao().delete(i.toEntity())
+                }
+                notifyItemInserted(position)
                updateItems(items)

-
+                if (app.isNetworkAccessible(null)) {
                    api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
                        override fun onResponse(
                            call: Call<SuccessResponse>,
                            response: Response<SuccessResponse>
                        ) {
-                if (!response.succeeded() && debugReadingItems) {
-                    val message =
-                        "message: ${response.message()} " +
-                                "response isSuccess: ${response.isSuccessful} " +
-                                "response code: ${response.code()} " +
-                                "response message: ${response.message()} " +
-                                "response errorBody: ${response.errorBody()?.string()} " +
-                                "body success: ${response.body()?.success} " +
-                                "body isSuccess: ${response.body()?.isSuccess}"
-                    ACRA.getErrorReporter().maybeHandleSilentException(Exception(message), app)
-                    Toast.makeText(app.baseContext, message, Toast.LENGTH_LONG).show()
-                }
-                doUnmark(i, position)
                        }

                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                if (debugReadingItems) {
-                    ACRA.getErrorReporter().maybeHandleSilentException(t, app)
-                    Toast.makeText(app.baseContext, t.message, Toast.LENGTH_LONG).show()
+                            items.remove(i)
+                            thread {
+                                db.itemsDao().insertAllItems(i.toEntity())
                            }
+                            notifyItemRemoved(position)
+                            updateItems(items)
+                        }
+                    })
+                } else {
+                    thread {
+                        db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
+                    }
+                }
+            }
+
+        val view = s.view
+        val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
+        tv.setTextColor(Color.WHITE)
+        s.show()
+    }
+
+    fun handleItemAtIndex(position: Int) {
+        if (unreadItemStatusAtIndex(position)) {
+            readItemAtIndex(position)
+        } else {
+            unreadItemAtIndex(position)
+        }
+    }
+
+    fun unreadItemStatusAtIndex(position: Int): Boolean {
+        return items[position].unread
+    }
+
+    private fun readItemAtIndex(position: Int) {
+        val i = items[position]
+        items.remove(i)
+        notifyItemRemoved(position)
+        updateItems(items)
+
+        thread {
+            db.itemsDao().delete(i.toEntity())
+        }
+
+        if (app.isNetworkAccessible(null)) {
+            api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
+                override fun onResponse(
+                    call: Call<SuccessResponse>,
+                    response: Response<SuccessResponse>
+                ) {
+
+                    unmarkSnackbar(i, position)
+                }
+
+                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
                    Toast.makeText(
                        app,
                        app.getString(R.string.cant_mark_read),
                        Toast.LENGTH_SHORT
                    ).show()
+                    items.add(position, i)
+                    notifyItemInserted(position)
+                    updateItems(items)
+
+                    thread {
+                        db.itemsDao().insertAllItems(i.toEntity())
+                    }
+                }
+            })
+        } else {
+            thread {
+                db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
+            }
+        }
+    }
+
+    private fun unreadItemAtIndex(position: Int) {
+        val i = items[position]
+        items.remove(i)
+        notifyItemRemoved(position)
+        updateItems(items)
+
+        thread {
+            db.itemsDao().insertAllItems(i.toEntity())
+        }
+
+        if (app.isNetworkAccessible(null)) {
+            api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
+                override fun onResponse(
+                    call: Call<SuccessResponse>,
+                    response: Response<SuccessResponse>
+                ) {
+
+                    markSnackbar(i, position)
+                }
+
+                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                    Toast.makeText(
+                        app,
+                        app.getString(R.string.cant_mark_unread),
+                        Toast.LENGTH_SHORT
+                    ).show()
                    items.add(i)
                    notifyItemInserted(position)
                    updateItems(items)

+                    thread {
+                        db.itemsDao().delete(i.toEntity())
+                    }
                }
            })
+        } else {
+            thread {
+                db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
+            }
+        }
    }

    fun addItemAtIndex(item: Item, position: Int) {
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt
@@ -12,7 +12,9 @@ import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.Source
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.toTextDrawableString
 import com.amulyakhare.textdrawable.TextDrawable
 import com.amulyakhare.textdrawable.util.ColorGenerator
@@ -28,6 +30,7 @@ class SourcesListAdapter(
 ) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>() {
    private val c: Context = app.baseContext
    private val generator: ColorGenerator = ColorGenerator.MATERIAL
+    private lateinit var config: Config

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
        val v = LayoutInflater.from(c).inflate(
@@ -40,21 +43,22 @@ class SourcesListAdapter(

    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
        val itm = items[position]
+        config = Config(c)

        if (itm.getIcon(c).isEmpty()) {
-            val color = generator.getColor(itm.title)
+            val color = generator.getColor(itm.getTitleDecoded())

            val drawable =
                TextDrawable
                    .builder()
                    .round()
-                    .build(itm.title.toTextDrawableString(c), color)
+                    .build(itm.getTitleDecoded().toTextDrawableString(c), color)
            holder.mView.itemImage.setImageDrawable(drawable)
        } else {
-            c.circularBitmapDrawable(itm.getIcon(c), holder.mView.itemImage)
+            c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.itemImage)
        }

-        holder.mView.sourceTitle.text = itm.title
+        holder.mView.sourceTitle.text = itm.getTitleDecoded()
    }

    override fun getItemCount(): Int = items.size
@@ -70,6 +74,7 @@ class SourcesListAdapter(
            val deleteBtn: Button = mView.findViewById(R.id.deleteBtn)

            deleteBtn.setOnClickListener {
+                if (c.isNetworkAccessible(null)) {
                    val (id) = items[adapterPosition]
                    api.deleteSource(id).enqueue(object : Callback<SuccessResponse> {
                        override fun onResponse(
@@ -101,3 +106,4 @@ class SourcesListAdapter(
            }
        }
    }
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/api/mercury/MercuryApi.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/mercury/MercuryApi.kt
@@ -7,17 +7,13 @@ import retrofit2.Call
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory

-class MercuryApi(shouldLog: Boolean) {
+class MercuryApi() {
    private val service: MercuryService

    init {

        val interceptor = HttpLoggingInterceptor()
-        interceptor.level = if (shouldLog) {
-            HttpLoggingInterceptor.Level.BODY
-        } else {
-            HttpLoggingInterceptor.Level.NONE
-        }
+        interceptor.level = HttpLoggingInterceptor.Level.NONE
        val client = OkHttpClient.Builder().addInterceptor(interceptor).build()

        val gson = GsonBuilder()
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/api/mercury/MercuryModels.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/mercury/MercuryModels.kt
@@ -28,17 +28,17 @@ class ParsedContent(
    }

    constructor(source: Parcel) : this(
-        title = source.readString(),
+        title = source.readString().orEmpty(),
        content = source.readString(),
-        date_published = source.readString(),
+        date_published = source.readString().orEmpty(),
        lead_image_url = source.readString(),
-        dek = source.readString(),
-        url = source.readString(),
-        domain = source.readString(),
-        excerpt = 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()
+        next_page_url = source.readString().orEmpty()
    )

    override fun describeContents() = 0
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossApi.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossApi.kt
@@ -12,18 +12,20 @@ import com.burgstaller.okhttp.digest.CachingAuthenticator
 import com.burgstaller.okhttp.digest.Credentials
 import com.burgstaller.okhttp.digest.DigestAuthenticator
 import com.google.gson.GsonBuilder
-import okhttp3.OkHttpClient
+import okhttp3.*
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Call
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import java.net.SocketTimeoutException
 import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.TimeUnit

 class SelfossApi(
    c: Context,
-    callingActivity: Activity,
+    callingActivity: Activity?,
    isWithSelfSignedCert: Boolean,
-    shouldLog: Boolean
+    timeout: Long
 ) {

    private lateinit var service: SelfossService
@@ -38,19 +40,39 @@ class SelfossApi(
            this
        }

+    fun OkHttpClient.Builder.maybeWithSettingsTimeout(timeout: Long): OkHttpClient.Builder =
+        if (timeout != -1L) {
+            this.readTimeout(timeout, TimeUnit.SECONDS)
+                .connectTimeout(timeout, TimeUnit.SECONDS)
+        } else {
+            this
+        }
+
    fun Credentials.createAuthenticator(): DispatchingAuthenticator =
        DispatchingAuthenticator.Builder()
            .with("digest", DigestAuthenticator(this))
            .with("basic", BasicAuthenticator(this))
            .build()

-    fun DispatchingAuthenticator.getHttpClien(isWithSelfSignedCert: Boolean): OkHttpClient.Builder {
+    fun DispatchingAuthenticator.getHttpClien(isWithSelfSignedCert: Boolean, timeout: Long): OkHttpClient.Builder {
        val authCache = ConcurrentHashMap<String, CachingAuthenticator>()
        return OkHttpClient
            .Builder()
+            .maybeWithSettingsTimeout(timeout)
            .maybeWithSelfSigned(isWithSelfSignedCert)
            .authenticator(CachingAuthenticatorDecorator(this, authCache))
            .addInterceptor(AuthenticationCacheInterceptor(authCache))
+            .addInterceptor(object: Interceptor {
+                override fun intercept(chain: Interceptor.Chain): Response {
+                    val request: Request = chain.request()
+                    val response: Response = chain.proceed(request)
+
+                    if (response.code() == 408) {
+                        return response
+                    }
+                    return response
+                }
+            })
    }

    init {
@@ -66,20 +88,40 @@ class SelfossApi(
        val gson =
            GsonBuilder()
                .registerTypeAdapter(Boolean::class.javaPrimitiveType, BooleanTypeAdapter())
+                .registerTypeAdapter(SelfossTagType::class.java, SelfossTagTypeTypeAdapter())
                .setLenient()
                .create()

        val logging = HttpLoggingInterceptor()

-        logging.level = if (shouldLog) {
-            HttpLoggingInterceptor.Level.BODY
-        } else {
-            HttpLoggingInterceptor.Level.NONE
+
+        logging.level = HttpLoggingInterceptor.Level.NONE
+        val httpClient = authenticator.getHttpClien(isWithSelfSignedCert, timeout)
+
+        val timeoutCode = 504
+        httpClient
+                .addInterceptor { chain ->
+                    val res = chain.proceed(chain.request())
+                    if (res.code() == timeoutCode) {
+                        throw SocketTimeoutException("timeout")
+                    }
+                    res
+                }
+                .addInterceptor(logging)
+                .addInterceptor { chain ->
+                    val request = chain.request()
+                    try {
+                        chain.proceed(request)
+                    } catch (e: SocketTimeoutException) {
+                        Response.Builder()
+                                .code(timeoutCode)
+                                .protocol(Protocol.HTTP_2)
+                                .body(ResponseBody.create(MediaType.parse("text/plain"), ""))
+                                .message("")
+                                .request(request)
+                                .build()
+                    }
                }
-
-        val httpClient = authenticator.getHttpClien(isWithSelfSignedCert)
-
-        httpClient.addInterceptor(logging)

        try {
            val retrofit =
@@ -91,9 +133,11 @@ class SelfossApi(
                    .build()
            service = retrofit.create(SelfossService::class.java)
        } catch (e: IllegalArgumentException) {
+            if (callingActivity != null) {
                Config.logoutAndRedirect(c, callingActivity, config.settings.edit(), baseUrlFail = true)
            }
        }
+    }

    fun login(): Call<SuccessResponse> =
        service.loginToSelfoss(config.userLogin, config.userPassword)
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
@@ -4,9 +4,15 @@ import android.content.Context
 import android.net.Uri
 import android.os.Parcel
 import android.os.Parcelable
+import android.text.Html
+import android.webkit.URLUtil
+import org.jsoup.Jsoup

 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.request.RequestOptions
 import com.google.gson.annotations.SerializedName

 private fun constructUrl(config: Config?, path: String, file: String?): String {
@@ -45,7 +51,7 @@ data class Spout(
 data class Source(
    @SerializedName("id") val id: String,
    @SerializedName("title") val title: String,
-    @SerializedName("tags") val tags: String,
+    @SerializedName("tags") val tags: SelfossTagType,
    @SerializedName("spout") val spout: String,
    @SerializedName("error") val error: String,
    @SerializedName("icon") val icon: String
@@ -58,6 +64,10 @@ data class Source(
        }
        return constructUrl(config, "favicons", icon)
    }
+
+    fun getTitleDecoded(): String {
+        return Html.fromHtml(title).toString()
+    }
 }

 data class Item(
@@ -67,11 +77,11 @@ data class Item(
    @SerializedName("content") val content: String,
    @SerializedName("unread") val unread: Boolean,
    @SerializedName("starred") var starred: Boolean,
-    @SerializedName("thumbnail") val thumbnail: String,
-    @SerializedName("icon") val icon: String,
+    @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
+    @SerializedName("tags") val tags: SelfossTagType
 ) : Parcelable {

    var config: Config? = null
@@ -84,17 +94,17 @@ data class Item(
    }

    constructor(source: Parcel) : this(
-        id = source.readString(),
-        datetime = source.readString(),
-        title = source.readString(),
-        content = source.readString(),
+        id = source.readString().orEmpty(),
+        datetime = source.readString().orEmpty(),
+        title = source.readString().orEmpty(),
+        content = source.readString().orEmpty(),
        unread = 0.toByte() != source.readByte(),
        starred = 0.toByte() != source.readByte(),
        thumbnail = source.readString(),
        icon = source.readString(),
-        link = source.readString(),
-        sourcetitle = source.readString(),
-        tags = source.readString()
+        link = source.readString().orEmpty(),
+        sourcetitle = source.readString().orEmpty(),
+        tags = if (source.readParcelable<SelfossTagType>(ClassLoader.getSystemClassLoader()) != null) source.readParcelable(ClassLoader.getSystemClassLoader())!! else SelfossTagType("")
    )

    override fun describeContents() = 0
@@ -110,7 +120,7 @@ data class Item(
        dest.writeString(icon)
        dest.writeString(link)
        dest.writeString(sourcetitle)
-        dest.writeString(tags)
+        dest.writeParcelable(tags, flags)
    }

    fun getIcon(app: Context): String {
@@ -127,6 +137,51 @@ data class Item(
        return constructUrl(config, "thumbnails", thumbnail)
    }

+    fun getImages() : ArrayList<String> {
+        var allImages = ArrayList<String>()
+
+        for ( image in Jsoup.parse(content).getElementsByTag("img")) {
+            val url = image.attr("src")
+            if (url.toLowerCase().contains(".jpg") ||
+                    url.toLowerCase().contains(".jpeg") ||
+                    url.toLowerCase().contains(".png") ||
+                    url.toLowerCase().contains(".webp"))
+            {
+                allImages.add(url)
+            }
+        }
+        return allImages
+    }
+
+    fun preloadImages(context: Context) : Boolean {
+        val imageUrls = this.getImages()
+
+        val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL).timeout(10000)
+
+
+        try {
+            for (url in imageUrls) {
+                if ( URLUtil.isValidUrl(url)) {
+                    val image = Glide.with(context).asBitmap()
+                            .apply(glideOptions)
+                            .load(url).submit()
+                }
+            }
+        } catch (e : Error) {
+            return false
+        }
+
+        return true
+    }
+
+    fun getTitleDecoded(): String {
+        return Html.fromHtml(title).toString()
+    }
+
+    fun getSourceTitle(): String {
+        return Html.fromHtml(sourcetitle).toString()
+    }
+
    // TODO: maybe find a better way to handle these kind of urls
    fun getLinkDecoded(): String {
        var stringUrl: String
@@ -154,3 +209,26 @@ data class Item(
        return stringUrl
    }
 }
+
+data class SelfossTagType(val tags: String) : Parcelable {
+
+    companion object {
+        @JvmField val CREATOR: Parcelable.Creator<SelfossTagType> =
+            object : Parcelable.Creator<SelfossTagType> {
+                override fun createFromParcel(source: Parcel): SelfossTagType =
+                    SelfossTagType(source)
+
+                override fun newArray(size: Int): Array<SelfossTagType?> = arrayOfNulls(size)
+            }
+    }
+
+    constructor(source: Parcel) : this(
+        tags = source.readString().orEmpty()
+    )
+
+    override fun describeContents() = 0
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(tags)
+    }
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossTagTypeTypeAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossTagTypeTypeAdapter.kt
@@ -0,0 +1,22 @@
+package apps.amine.bou.readerforselfoss.api.selfoss
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import java.lang.reflect.Type
+
+internal class SelfossTagTypeTypeAdapter : JsonDeserializer<SelfossTagType> {
+
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): SelfossTagType? =
+        if (json.isJsonArray) {
+            SelfossTagType(json.asJsonArray.joinToString(",") { it.toString() })
+        } else {
+            SelfossTagType(json.toString())
+        }
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/background/background.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/background/background.kt
@@ -0,0 +1,150 @@
+package apps.amine.bou.readerforselfoss.background
+
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.preference.PreferenceManager
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
+import androidx.core.app.NotificationCompat.PRIORITY_LOW
+import androidx.room.Room
+import androidx.work.Worker
+import androidx.work.WorkerParameters
+import apps.amine.bou.readerforselfoss.MainActivity
+import apps.amine.bou.readerforselfoss.R
+import apps.amine.bou.readerforselfoss.api.selfoss.Item
+import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
+import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
+import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
+import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.util.*
+import kotlin.concurrent.schedule
+import kotlin.concurrent.thread
+
+class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params) {
+    lateinit var db: AppDatabase
+
+    override fun doWork(): Result {
+        if (context.isNetworkAccessible(null)) {
+
+            val notificationManager =
+                applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+            val notification = NotificationCompat.Builder(applicationContext, Config.syncChannelId)
+                .setContentTitle(context.getString(R.string.loading_notification_title))
+                .setContentText(context.getString(R.string.loading_notification_text))
+                .setOngoing(true)
+                .setPriority(PRIORITY_LOW)
+                .setChannelId(Config.syncChannelId)
+                .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
+
+            notificationManager.notify(1, notification.build())
+
+            val settings =
+                this.context.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+            val sharedPref = PreferenceManager.getDefaultSharedPreferences(this.context)
+            val notifyNewItems = sharedPref.getBoolean("notify_new_items", false)
+
+            db = Room.databaseBuilder(
+                applicationContext,
+                AppDatabase::class.java, "selfoss-database"
+            ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
+
+            val api = SelfossApi(
+                this.context,
+                null,
+                settings.getBoolean("isSelfSignedCert", false),
+                sharedPref.getString("api_timeout", "-1")!!.toLong()
+            )
+
+            api.allItems().enqueue(object : Callback<List<Item>> {
+                override fun onFailure(call: Call<List<Item>>, t: Throwable) {
+                    Timer("", false).schedule(4000) {
+                        notificationManager.cancel(1)
+                    }
+                }
+
+                override fun onResponse(
+                    call: Call<List<Item>>,
+                    response: Response<List<Item>>
+                ) {
+                    thread {
+                        if (response.body() != null) {
+                            val apiItems = (response.body() as ArrayList<Item>)
+                            db.itemsDao().deleteAllItems()
+                            db.itemsDao()
+                                .insertAllItems(*(apiItems.map { it.toEntity() }).toTypedArray())
+
+                            val newSize = apiItems.filter { it.unread }.size
+                            if (notifyNewItems && newSize > 0) {
+
+                                val intent = Intent(context, MainActivity::class.java).apply {
+                                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                                }
+                                val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
+
+                                val newItemsNotification = NotificationCompat.Builder(applicationContext, Config.newItemsChannelId)
+                                    .setContentTitle(context.getString(R.string.new_items_notification_title))
+                                    .setContentText(context.getString(R.string.new_items_notification_text, newSize))
+                                    .setPriority(PRIORITY_DEFAULT)
+                                    .setChannelId(Config.newItemsChannelId)
+                                    .setContentIntent(pendingIntent)
+                                    .setAutoCancel(true)
+                                    .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
+
+                                Timer("", false).schedule(4000) {
+                                    notificationManager.notify(2, newItemsNotification.build())
+                                }
+                            }
+                            apiItems.map {it.preloadImages(context)}
+                        }
+                        Timer("", false).schedule(4000) {
+                            notificationManager.cancel(1)
+                        }
+                    }
+                }
+            })
+            thread {
+                val actions = db.actionsDao().actions()
+
+                actions.forEach { action ->
+                    when {
+                        action.read -> doAndReportOnFail(api.markItem(action.articleId), action)
+                        action.unread -> doAndReportOnFail(api.unmarkItem(action.articleId), action)
+                        action.starred -> doAndReportOnFail(api.starrItem(action.articleId), action)
+                        action.unstarred -> doAndReportOnFail(
+                            api.unstarrItem(action.articleId),
+                            action
+                        )
+                    }
+                }
+            }
+        }
+        return Result.success()
+    }
+
+    private fun <T> doAndReportOnFail(call: Call<T>, action: ActionEntity) {
+        call.enqueue(object : Callback<T> {
+            override fun onResponse(
+                call: Call<T>,
+                response: Response<T>
+            ) {
+                thread {
+                    db.actionsDao().delete(action)
+                }
+            }
+
+            override fun onFailure(call: Call<T>, t: Throwable) {
+            }
+        })
+    }
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt
@@ -1,123 +1,170 @@
 package apps.amine.bou.readerforselfoss.fragments

 import android.content.Context
+import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
+import android.content.res.TypedArray
+import android.graphics.Bitmap
+import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
+import android.view.*
+import android.webkit.*
 import androidx.browser.customtabs.CustomTabsIntent
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import androidx.fragment.app.Fragment
 import androidx.core.content.ContextCompat
 import androidx.core.widget.NestedScrollView
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.webkit.WebSettings
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.res.ResourcesCompat
+import androidx.room.Room
+import apps.amine.bou.readerforselfoss.ImageActivity
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi
 import apps.amine.bou.readerforselfoss.api.mercury.ParsedContent
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
+import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
+import apps.amine.bou.readerforselfoss.utils.glide.getBitmapInputStream
 import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
-import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.openItemUrl
 import apps.amine.bou.readerforselfoss.utils.shareLink
 import apps.amine.bou.readerforselfoss.utils.sourceAndDateText
 import apps.amine.bou.readerforselfoss.utils.succeeded
-import apps.amine.bou.readerforselfoss.utils.toPx
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
 import com.github.rubensousa.floatingtoolbar.FloatingToolbar
 import kotlinx.android.synthetic.main.fragment_article.view.*
-import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 import java.net.MalformedURLException
 import java.net.URL
+import java.util.concurrent.ExecutionException
+import kotlin.collections.ArrayList
+import kotlin.concurrent.thread

 class ArticleFragment : Fragment() {
    private lateinit var pageNumber: Number
-    private var fontSize: Int = 14
+    private var fontSize: Int = 16
    private lateinit var allItems: ArrayList<Item>
-    private lateinit var mCustomTabActivityHelper: CustomTabActivityHelper
+    private var mCustomTabActivityHelper: CustomTabActivityHelper? = null;
    private lateinit var url: String
    private lateinit var contentText: String
    private lateinit var contentSource: String
    private lateinit var contentImage: String
    private lateinit var contentTitle: String
+    private lateinit var allImages : ArrayList<String>
    private lateinit var editor: SharedPreferences.Editor
    private lateinit var fab: FloatingActionButton
    private lateinit var appColors: AppColors
+    private lateinit var db: AppDatabase
+    private lateinit var textAlignment: String
+    private lateinit var config: Config
+
+    private var rootView: ViewGroup? = null
+
+    private lateinit var prefs: SharedPreferences
+
+    private var typeface: Typeface? = null
+    private var resId: Int = 0
+    private var font = ""

    override fun onStop() {
        super.onStop()
-        mCustomTabActivityHelper.unbindCustomTabsService(activity)
+        if (mCustomTabActivityHelper != null) {
+            mCustomTabActivityHelper!!.unbindCustomTabsService(activity)
+        }
    }

    override fun onCreate(savedInstanceState: Bundle?) {
        appColors = AppColors(activity!!)
+        config = Config(activity!!)

        super.onCreate(savedInstanceState)

        pageNumber = arguments!!.getInt(ARG_POSITION)
-        allItems = arguments!!.getParcelableArrayList(ARG_ITEMS)
+        allItems = arguments!!.getParcelableArrayList<Item>(ARG_ITEMS) as ArrayList<Item>
+
+        db = Room.databaseBuilder(
+            context!!,
+            AppDatabase::class.java, "selfoss-database"
+        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
    }

-    private lateinit var rootView: ViewGroup
-
-
    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View? {
+        try {
            rootView = inflater
                .inflate(R.layout.fragment_article, container, false) as ViewGroup

            url = allItems[pageNumber.toInt()].getLinkDecoded()
            contentText = allItems[pageNumber.toInt()].content
-        contentTitle = allItems[pageNumber.toInt()].title
+            contentTitle = allItems[pageNumber.toInt()].getTitleDecoded()
            contentImage = allItems[pageNumber.toInt()].getThumbnail(activity!!)
            contentSource = allItems[pageNumber.toInt()].sourceAndDateText()
+            allImages = allItems[pageNumber.toInt()].getImages()

-        val prefs = PreferenceManager.getDefaultSharedPreferences(activity)
+            prefs = PreferenceManager.getDefaultSharedPreferences(activity)
            editor = prefs.edit()
-        fontSize = prefs.getString("reader_font_size", "14").toInt()
+            fontSize = prefs.getString("reader_font_size", "16")!!.toInt()
+
+            font = prefs.getString("reader_font", "")!!
+            if (font.isNotEmpty()) {
+                resId = context!!.resources.getIdentifier(font, "font", context!!.packageName)
+                typeface = try {
+                    ResourcesCompat.getFont(context!!, resId)!!
+                } catch (e: java.lang.Exception) {
+                    // ACRA.getErrorReporter().maybeHandleSilentException(Throwable("Font loading issue: ${e.message}"), context!!)
+                    // Just to be sure
+                    null
+                }
+            }
+
+            refreshAlignment()

            val settings = activity!!.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-        val debugReadingItems = prefs.getBoolean("read_debug", false)

            val api = SelfossApi(
                context!!,
                activity!!,
                settings.getBoolean("isSelfSignedCert", false),
-            prefs.getBoolean("should_log_everything", false)
+                prefs.getString("api_timeout", "-1")!!.toLong()
            )

-        fab = rootView.fab
+            fab = rootView!!.fab

            fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)

            fab.rippleColor = appColors.colorAccentDark

-        val floatingToolbar: FloatingToolbar = rootView.floatingToolbar
+            val floatingToolbar: FloatingToolbar = rootView!!.floatingToolbar
            floatingToolbar.attachFab(fab)

            floatingToolbar.background = ColorDrawable(appColors.colorAccent)

            val customTabsIntent = activity!!.buildCustomTabsIntent()
            mCustomTabActivityHelper = CustomTabActivityHelper()
-        mCustomTabActivityHelper.bindCustomTabsService(activity)
+            mCustomTabActivityHelper!!.bindCustomTabsService(activity)


            floatingToolbar.setClickListener(
@@ -125,7 +172,7 @@ class ArticleFragment : Fragment() {
                    override fun onItemClick(item: MenuItem) {
                        when (item.itemId) {
                            R.id.more_action -> getContentFromMercury(customTabsIntent, prefs)
-                        R.id.share_action -> activity!!.shareLink(url)
+                            R.id.share_action -> activity!!.shareLink(url, contentTitle)
                            R.id.open_action -> activity!!.openItemUrl(
                                allItems,
                                pageNumber.toInt(),
@@ -135,35 +182,27 @@ class ArticleFragment : Fragment() {
                                false,
                                activity!!
                            )
-                        R.id.unread_action -> api.unmarkItem(allItems[pageNumber.toInt()].id).enqueue(
+                            R.id.unread_action -> if ((context != null && context!!.isNetworkAccessible(null)) || context == null) {
+                                api.unmarkItem(allItems[pageNumber.toInt()].id).enqueue(
                                    object : Callback<SuccessResponse> {
                                        override fun onResponse(
                                            call: Call<SuccessResponse>,
                                            response: Response<SuccessResponse>
                                        ) {
-                                    if (!response.succeeded() && debugReadingItems) {
-                                        val message =
-                                            "message: ${response.message()} " +
-                                                    "response isSuccess: ${response.isSuccessful} " +
-                                                    "response code: ${response.code()} " +
-                                                    "response message: ${response.message()} " +
-                                                    "response errorBody: ${response.errorBody()?.string()} " +
-                                                    "body success: ${response.body()?.success} " +
-                                                    "body isSuccess: ${response.body()?.isSuccess}"
-                                        ACRA.getErrorReporter().maybeHandleSilentException(Exception(message), activity!!)
-                                    }
                                        }

                                        override fun onFailure(
                                            call: Call<SuccessResponse>,
                                            t: Throwable
                                        ) {
-                                    if (debugReadingItems) {
-                                        ACRA.getErrorReporter().maybeHandleSilentException(t, activity!!)
-                                    }
                                        }
                                    }
                                )
+                            } else {
+                                thread {
+                                    db.actionsDao().insertAllActions(ActionEntity(allItems[pageNumber.toInt()].id, false, true, false, false))
+                                }
+                            }
                            else -> Unit
                        }
                    }
@@ -173,29 +212,35 @@ class ArticleFragment : Fragment() {
                }
            )

-        rootView.source.text = contentSource
+            rootView!!.source.text = contentSource
+            if (typeface != null) {
+                rootView!!.source.typeface = typeface
+            }

            if (contentText.isEmptyOrNullOrNullString()) {
                getContentFromMercury(customTabsIntent, prefs)
            } else {
-            rootView.titleView.text = contentTitle
+                rootView!!.titleView.text = contentTitle
+                if (typeface != null) {
+                    rootView!!.titleView.typeface = typeface
+                }

-            htmlToWebview(contentText, prefs)
+                htmlToWebview()

                if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
-                rootView.imageView.visibility = View.VISIBLE
+                    rootView!!.imageView.visibility = View.VISIBLE
                    Glide
                        .with(context!!)
                        .asBitmap()
-                    .load(contentImage)
+                        .loadMaybeBasicAuth(config, contentImage)
                        .apply(RequestOptions.fitCenterTransform())
-                    .into(rootView.imageView)
+                        .into(rootView!!.imageView)
                } else {
-                rootView.imageView.visibility = View.GONE
+                    rootView!!.imageView.visibility = View.GONE
                }
            }

-        rootView.nestedScrollView.setOnScrollChangeListener(
+            rootView!!.nestedScrollView.setOnScrollChangeListener(
                NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                    if (scrollY > oldScrollY) {
                        fab.hide()
@@ -205,17 +250,40 @@ class ArticleFragment : Fragment() {
                }
            )

+        } catch (e: InflateException) {
+            AlertDialog.Builder(context!!)
+                .setMessage(context!!.getString(R.string.webview_dialog_issue_message))
+                .setTitle(context!!.getString(R.string.webview_dialog_issue_title))
+                .setPositiveButton(android.R.string.ok
+                ) { dialog, which ->
+                    val sharedPref = PreferenceManager.getDefaultSharedPreferences(context!!)
+                    val editor = sharedPref.edit()
+                    editor.putBoolean("prefer_article_viewer", false)
+                    editor.commit()
+                    activity!!.finish()
+                }
+                .create()
+                .show()
+        }
+
        return rootView
    }

+    private fun refreshAlignment() {
+        textAlignment = when (prefs.getInt("text_align", 1)) {
+            1 -> "justify"
+            2 -> "left"
+            else -> "justify"
+        }
+    }
+
    private fun getContentFromMercury(
        customTabsIntent: CustomTabsIntent,
        prefs: SharedPreferences
    ) {
-        rootView.progressBar.visibility = View.VISIBLE
-        val parser = MercuryApi(
-            prefs.getBoolean("should_log_everything", false)
-        )
+        if ((context != null && context!!.isNetworkAccessible(null)) || context == null) {
+            rootView!!.progressBar.visibility = View.VISIBLE
+            val parser = MercuryApi()

            parser.parseUrl(url).enqueue(
                object : Callback<ParsedContent> {
@@ -227,57 +295,52 @@ class ArticleFragment : Fragment() {
                        try {
                            if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) {
                                try {
-                                rootView.titleView.text = response.body()!!.title
+                                    rootView!!.titleView.text = response.body()!!.title
+                                    if (typeface != null) {
+                                        rootView!!.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) {
-                                    ACRA.getErrorReporter().maybeHandleSilentException(e, activity!!)
+                                        // Mercury returned a relative url. We do nothing.
                                    }
                                } catch (e: Exception) {
-                                if (context != null) {
-                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
-                                }
                                }

                                try {
-                                htmlToWebview(response.body()!!.content.orEmpty(), prefs)
+                                    contentText = response.body()!!.content.orEmpty()
+                                    htmlToWebview()
                                } catch (e: Exception) {
-                                if (context != null) {
-                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
-                                }
                                }

                                try {
                                    if (response.body()!!.lead_image_url != null && !response.body()!!.lead_image_url.isNullOrEmpty() && context != null) {
-                                    rootView.imageView.visibility = View.VISIBLE
+                                        rootView!!.imageView.visibility = View.VISIBLE
                                        try {
                                            Glide
                                                .with(context!!)
                                                .asBitmap()
-                                            .load(response.body()!!.lead_image_url)
+                                                .loadMaybeBasicAuth(config, response.body()!!.lead_image_url.orEmpty())
                                                .apply(RequestOptions.fitCenterTransform())
-                                            .into(rootView.imageView)
+                                                .into(rootView!!.imageView)
                                        } catch (e: Exception) {
-                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
                                        }
                                    } else {
-                                    rootView.imageView.visibility = View.GONE
+                                        rootView!!.imageView.visibility = View.GONE
                                    }
                                } catch (e: Exception) {
                                    if (context != null) {
-                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
                                    }
                                }

                                try {
-                                rootView.nestedScrollView.scrollTo(0, 0)
+                                    rootView!!.nestedScrollView.scrollTo(0, 0)

-                                rootView.progressBar.visibility = View.GONE
+                                    rootView!!.progressBar.visibility = View.GONE
                                } catch (e: Exception) {
                                    if (context != null) {
-                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
                                    }
                                }
                            } else {
@@ -285,13 +348,11 @@ class ArticleFragment : Fragment() {
                                    openInBrowserAfterFailing(customTabsIntent)
                                } catch (e: Exception) {
                                    if (context != null) {
-                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
                                    }
                                }
                            }
                        } catch (e: Exception) {
                            if (context != null) {
-                            ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
                            }
                        }
                    }
@@ -303,32 +364,38 @@ class ArticleFragment : Fragment() {
                }
            )
        }
+    }

-    private fun htmlToWebview(c: String, prefs: SharedPreferences) {
+    private fun htmlToWebview() {
        val stringColor = String.format("#%06X", 0xFFFFFF and appColors.colorAccent)

-        rootView.webcontent.visibility = View.VISIBLE
+        val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
+        val a: TypedArray = context!!.obtainStyledAttributes(resId, attrs)
+
+
+        rootView!!.webcontent.settings.standardFontFamily = a.getString(0)
+        rootView!!.webcontent.visibility = View.VISIBLE
        val (textColor, backgroundColor) = if (appColors.isDarkTheme) {
            if (context != null) {
-                rootView.webcontent.setBackgroundColor(
+                rootView!!.webcontent.setBackgroundColor(
                    ContextCompat.getColor(
                        context!!,
                        R.color.dark_webview
                    )
                )
-                Pair(ContextCompat.getColor(context!!, R.color.dark_webview_text), ContextCompat.getColor(context!!, R.color.light_webview_text))
+                Pair(ContextCompat.getColor(context!!, R.color.dark_webview_text), ContextCompat.getColor(context!!, R.color.dark_webview))
            } else {
                Pair(null, null)
            }
        } else {
            if (context != null) {
-                rootView.webcontent.setBackgroundColor(
+                rootView!!.webcontent.setBackgroundColor(
                    ContextCompat.getColor(
                        context!!,
                        R.color.light_webview
                    )
                )
-                Pair(ContextCompat.getColor(context!!, R.color.light_webview_text), ContextCompat.getColor(context!!, R.color.dark_webview_text))
+                Pair(ContextCompat.getColor(context!!, R.color.light_webview_text), ContextCompat.getColor(context!!, R.color.light_webview))
            } else {
                Pair(null, null)
            }
@@ -346,15 +413,56 @@ class ArticleFragment : Fragment() {
            "#FFFFFF"
        }

-        rootView.webcontent.settings.useWideViewPort = true
-        rootView.webcontent.settings.loadWithOverviewMode = true
-        rootView.webcontent.settings.javaScriptEnabled = false
+        rootView!!.webcontent.settings.useWideViewPort = true
+        rootView!!.webcontent.settings.loadWithOverviewMode = true
+        rootView!!.webcontent.settings.javaScriptEnabled = false
+
+        rootView!!.webcontent.webViewClient = object : WebViewClient() {
+            override fun shouldOverrideUrlLoading(view: WebView?, url : String): Boolean {
+                if (rootView!!.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+                    rootView!!.context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+                }
+                return true
+            }
+
+            override fun shouldInterceptRequest(view: WebView?, url: String): WebResourceResponse? {
+                val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
+                if (url.toLowerCase().contains(".jpg") || url.toLowerCase().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.toLowerCase().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.toLowerCase().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) {}
+                }
+
+                return super.shouldInterceptRequest(view, url)
+            }
+        }
+
+        val gestureDetector = GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
+            override fun onSingleTapUp(e: MotionEvent?): Boolean {
+                return performClick()
+            }
+        })
+
+        rootView!!.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            rootView.webcontent.settings.layoutAlgorithm =
+            rootView!!.webcontent.settings.layoutAlgorithm =
                    WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
        } else {
-            rootView.webcontent.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
+            rootView!!.webcontent.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
        }

        var baseUrl: String? = null
@@ -363,13 +471,31 @@ class ArticleFragment : Fragment() {
            val itemUrl = URL(url)
            baseUrl = itemUrl.protocol + "://" + itemUrl.host
        } catch (e: MalformedURLException) {
-            ACRA.getErrorReporter().maybeHandleSilentException(e, activity!!)
        }

-        rootView.webcontent.loadDataWithBaseURL(
+        val fontName =  when (font) {
+            getString(R.string.open_sans_font_id) -> "Open Sans"
+            getString(R.string.roboto_font_id) -> "Roboto"
+            else -> ""
+        }
+
+        val fontLinkAndStyle = if (font.isNotEmpty()) {
+            """<link href="https://fonts.googleapis.com/css?family=${fontName.replace(" ", "+")}" rel="stylesheet">
+                |<style>
+                |   * {
+                |       font-family: '$fontName';
+                |   }
+                |</style>
+            """.trimMargin()
+        } else {
+            ""
+        }
+
+        rootView!!.webcontent.loadDataWithBaseURL(
            baseUrl,
            """<html>
                |<head>
+                |   <meta name="viewport" content="width=device-width, initial-scale=1">
                |   <style>
                |      img {
                |        display: inline-block;
@@ -384,13 +510,21 @@ class ArticleFragment : Fragment() {
                |        color: $stringTextColor;
                |      }
                |      * {
-                |        font-size: ${fontSize.toPx}px;
-                |        text-align: justify;
+                |        font-size: ${fontSize}px;
+                |        text-align: $textAlignment;
                |        word-break: break-word;
                |        overflow:hidden;
+                |        line-height: 1.5em;
+                |        background-color: $stringBackgroundColor;
+                |      }
+                |      body, html {
+                |        background-color: $stringBackgroundColor !important;
+                |        border-color: $stringBackgroundColor  !important;
+                |        padding: 0 !important;
+                |        margin: 0 !important;
                |      }
                |      a, pre, code {
-                |        text-align: left;
+                |        text-align: $textAlignment;
                |      }
                |      pre, code {
                |        white-space: pre-wrap;
@@ -398,9 +532,10 @@ class ArticleFragment : Fragment() {
                |        background-color: $stringBackgroundColor;
                |      }
                |   </style>
+                |   $fontLinkAndStyle
                |</head>
                |<body>
-                |   $c
+                |   $contentText
                |</body>""".trimMargin(),
            "text/html",
            "utf-8",
@@ -409,7 +544,7 @@ class ArticleFragment : Fragment() {
    }

    private fun openInBrowserAfterFailing(customTabsIntent: CustomTabsIntent) {
-        rootView.progressBar.visibility = View.GONE
+        rootView!!.progressBar.visibility = View.GONE
        activity!!.openItemUrl(
            allItems,
            pageNumber.toInt(),
@@ -438,5 +573,20 @@ class ArticleFragment : Fragment() {
        }
    }

+    fun performClick(): Boolean {
+        if (rootView!!.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
+                rootView!!.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+
+            val position : Int = allImages.indexOf(rootView!!.webcontent.hitTestResult.extra)
+
+            val intent = Intent(activity, ImageActivity::class.java)
+            intent.putExtra("allImages", allImages)
+            intent.putExtra("position", position)
+            startActivity(intent)
+            return false
+        }
+        return false
+    }
+

 }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ImageFragment.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ImageFragment.kt
@@ -0,0 +1,49 @@
+package apps.amine.bou.readerforselfoss.fragments
+
+import android.os.Bundle
+import android.view.*
+import androidx.fragment.app.Fragment
+import apps.amine.bou.readerforselfoss.R
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.request.RequestOptions
+import kotlinx.android.synthetic.main.fragment_image.view.*
+
+class ImageFragment : Fragment() {
+
+    private lateinit var imageUrl : String
+    private val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        imageUrl = requireArguments().getString("imageUrl")!!
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val view : View = inflater.inflate(R.layout.fragment_image, container, false)
+
+        view.photoView.visibility = View.VISIBLE
+        Glide.with(activity)
+                .asBitmap()
+                .apply(glideOptions)
+                .load(imageUrl)
+                .into(view.photoView)
+
+        return view
+    }
+
+    companion object {
+        private const val ARG_IMAGE = "imageUrl"
+
+        fun newInstance(
+                imageUrl : String
+        ): ImageFragment {
+            val fragment = ImageFragment()
+            val args = Bundle()
+            args.putString(ARG_IMAGE, imageUrl)
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/dao/ActionsDao.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/dao/ActionsDao.kt
@@ -0,0 +1,23 @@
+package apps.amine.bou.readerforselfoss.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
+
+@Dao
+interface ActionsDao {
+    @Query("SELECT * FROM actions order by id asc")
+    fun actions(): List<ActionEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertAllActions(vararg actions: ActionEntity)
+
+    @Query("DELETE FROM actions WHERE articleid = :article_id AND read = 1")
+    fun deleteReadActionForArticle(article_id: String)
+
+    @Delete
+    fun delete(action: ActionEntity)
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/dao/ItemsDao.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/dao/ItemsDao.kt
@@ -1,6 +1,7 @@
 package apps.amine.bou.readerforselfoss.persistence.dao

 import androidx.room.Dao
+import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
@@ -11,15 +12,18 @@ import androidx.room.Update

@Dao
 interface ItemsDao {
-    @Query("SELECT * FROM items")
+    @Query("SELECT * FROM items order by id desc")
    fun items(): List<ItemEntity>

    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertAllItems(vararg tags: ItemEntity)
+    fun insertAllItems(vararg items: ItemEntity)

    @Query("DELETE FROM items")
    fun deleteAllItems()

+    @Delete
+    fun delete(item: ItemEntity)
+
    @Update
    fun updateItem(item: ItemEntity)
 }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/database/AppDatabase.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/database/AppDatabase.kt
@@ -2,15 +2,19 @@ package apps.amine.bou.readerforselfoss.persistence.database

 import androidx.room.RoomDatabase
 import androidx.room.Database
+import apps.amine.bou.readerforselfoss.persistence.dao.ActionsDao
 import apps.amine.bou.readerforselfoss.persistence.dao.DrawerDataDao
 import apps.amine.bou.readerforselfoss.persistence.dao.ItemsDao
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.entities.ItemEntity
 import apps.amine.bou.readerforselfoss.persistence.entities.SourceEntity
 import apps.amine.bou.readerforselfoss.persistence.entities.TagEntity

-@Database(entities = [TagEntity::class, SourceEntity::class, ItemEntity::class], version = 2)
+@Database(entities = [TagEntity::class, SourceEntity::class, ItemEntity::class, ActionEntity::class], version = 4)
 abstract class AppDatabase : RoomDatabase() {
    abstract fun drawerDataDao(): DrawerDataDao

    abstract fun itemsDao(): ItemsDao
+
+    abstract fun actionsDao(): ActionsDao
 }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/entities/ActionEntity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/entities/ActionEntity.kt
@@ -0,0 +1,22 @@
+package apps.amine.bou.readerforselfoss.persistence.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "actions")
+data class ActionEntity(
+    @ColumnInfo(name = "articleid")
+    val articleId: String,
+    @ColumnInfo(name = "read")
+    val read: Boolean,
+    @ColumnInfo(name = "unread")
+    val unread: Boolean,
+    @ColumnInfo(name = "starred")
+    var starred: Boolean,
+    @ColumnInfo(name = "unstarred")
+    var unstarred: Boolean
+) {
+    @PrimaryKey(autoGenerate = true)
+    var id: Int = 0
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/entities/ItemEntity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/entities/ItemEntity.kt
@@ -20,9 +20,9 @@ data class ItemEntity(
    @ColumnInfo(name = "starred")
    var starred: Boolean,
    @ColumnInfo(name = "thumbnail")
-    val thumbnail: String,
+    val thumbnail: String?,
    @ColumnInfo(name = "icon")
-    val icon: String,
+    val icon: String?,
    @ColumnInfo(name = "link")
    val link: String,
    @ColumnInfo(name = "sourcetitle")
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/migrations/migrations.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/migrations/migrations.kt
@@ -8,3 +8,27 @@ val MIGRATION_1_2: Migration = object : Migration(1, 2) {
        database.execSQL("CREATE TABLE IF NOT EXISTS `items` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT NOT NULL, `icon` TEXT NOT NULL, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))")
    }
 }
+
+val MIGRATION_2_3: Migration = object : Migration(2, 3) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE TABLE IF NOT EXISTS `actions` (`id` INTEGER NOT NULL, `articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL, PRIMARY KEY(`id`))")
+    }
+}
+
+val MIGRATION_3_4: Migration = object : Migration(3, 4) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        // @see https://stackoverflow.com/questions/57392015/how-to-migrate-not-null-table-column-into-null-in-android-room-database
+        // Create the new table
+        database.execSQL("CREATE TABLE IF NOT EXISTS `itemstmp` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT, `icon` TEXT, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))")
+
+        // Copy the data
+        database.execSQL(
+                "INSERT INTO itemstmp (`id`, `datetime`, `title`, `content`, `unread`, `starred`, `thumbnail`, `icon`, `link`, `sourcetitle`, `tags`) SELECT `id`, `datetime`, `title`, `content`, `unread`, `starred`, `thumbnail`, `icon`, `link`, `sourcetitle`, `tags` FROM items")
+
+        // Remove the old table
+        database.execSQL("DROP TABLE items")
+
+        // Change the table name to the correct one
+        database.execSQL("ALTER TABLE itemstmp RENAME TO items")
+    }
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java
@@ -8,6 +8,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -24,6 +25,7 @@ import android.text.Editable;
 import android.text.InputFilter;
 import android.text.Spanned;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -124,6 +126,27 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
    public void onBuildHeaders(List<Header> target) {
        loadHeadersFromResource(R.xml.pref_headers, target);
+
+        AppColors appColors = new AppColors(this);
+        if (appColors != null && appColors.isDarkTheme()) {
+            for (Header header : target) {
+                tryLoadIconDark(header);
+            }
+        }
+    }
+
+    private void tryLoadIconDark(Header header){
+        try{
+            if (header.fragmentArguments != null) {
+                String iconDark = header.fragmentArguments.getString("iconDark");
+                int iconDarkId = getResources().getIdentifier(iconDark, "drawable", getPackageName());
+                if (iconDarkId != 0) {
+                    header.iconRes = iconDarkId;
+                }
+            }
+        } catch (Exception e) {
+            Log.e("SettingsActivity", "Can not load dark icon", e);
+        }
    }

    /**
@@ -136,7 +159,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                || GeneralPreferenceFragment.class.getName().equals(fragmentName)
                || ArticleViewerPreferenceFragment.class.getName().equals(fragmentName)
                || OfflinePreferenceFragment.class.getName().equals(fragmentName)
-                || DebugPreferenceFragment.class.getName().equals(fragmentName)
+                || ExperimentalPreferenceFragment.class.getName().equals(fragmentName)
                || LinksPreferenceFragment.class.getName().equals(fragmentName)
                || ThemePreferenceFragment.class.getName().equals(fragmentName);
    }
@@ -172,16 +195,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
            });

        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                getActivity().finish();
-                return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
    }

    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
@@ -222,58 +235,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                    }
            });
        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                getActivity().finish();
-                return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public static class DebugPreferenceFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_debug);
-            setHasOptionsMenu(true);
-
-            SharedPreferences pref = getActivity().getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE);
-            final String id = pref.getString("unique_id", "...");
-
-            final Preference identifier = findPreference("debug_identifier");
-            final ClipboardManager clipboard = (ClipboardManager)
-                    getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
-
-            identifier.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    if (clipboard != null) {
-                        ClipData clip = ClipData.newPlainText("Selfoss unique id", id);
-                        clipboard.setPrimaryClip(clip);
-
-                        Toast.makeText(getActivity(), R.string.unique_id_to_clipboard, Toast.LENGTH_LONG).show();
-                        return true;
-                    }
-                    return false;
-                }
-            });
-            identifier.setTitle(id);
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                getActivity().finish();
-                return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
    }

    /**
@@ -317,16 +278,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                }
            });
        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                getActivity().finish();
-                return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
    }

    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
@@ -341,10 +292,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
        @Override
        public boolean onOptionsItemSelected(MenuItem item) {
            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                getActivity().finish();
-                return true;
-            } else if (id == R.id.clear) {
+            if (id == R.id.clear) {
                SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(getActivity());
                SharedPreferences.Editor editor = pref.edit();
                editor.remove("color_primary");
@@ -353,7 +301,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                editor.remove("color_accent_dark");
                editor.remove("dark_theme");
                editor.apply();
-                getActivity().finish();
+                getActivity().recreate();
            }
            return super.onOptionsItemSelected(item);
        }
@@ -372,15 +320,15 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
            addPreferencesFromResource(R.xml.pref_offline);
            setHasOptionsMenu(true);
        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                getActivity().finish();
-                return true;
    }
-            return super.onOptionsItemSelected(item);
+
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    public static class ExperimentalPreferenceFragment extends PreferenceFragment {
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            addPreferencesFromResource(R.xml.pref_experimental);
+            setHasOptionsMenu(true);
        }
    }

@@ -389,7 +337,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
    public boolean onOptionsItemSelected(MenuItem item) {
        int id = item.getItemId();
        if (id == android.R.id.home) {
-            finish();
+            super.onBackPressed();
            return true;
        }
        return super.onOptionsItemSelected(item);
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt
@@ -18,6 +18,7 @@ class AppColors(a: Activity) {
    @ColorInt val colorAccentDark: Int
    @ColorInt val cardBackgroundColor: Int
    @ColorInt val colorBackground: Int
+    @ColorInt val textColor: Int
    val isDarkTheme: Boolean

    init {
@@ -57,6 +58,12 @@ class AppColors(a: Activity) {
            android.R.color.background_light
        }

+        textColor = if (isDarkTheme) {
+            R.color.md_white_1000
+        } else {
+            R.color.md_grey_900
+        }
+
        val wrapper = Context::class.java
        val method = wrapper!!.getMethod("getThemeResId")
        method.isAccessible = true
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/Acra.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/Acra.kt
@@ -1,12 +0,0 @@
-package apps.amine.bou.readerforselfoss.utils
-
-import android.content.Context
-import android.preference.PreferenceManager
-import org.acra.ErrorReporter
-
-fun ErrorReporter.maybeHandleSilentException(throwable: Throwable, ctx: Context) {
-    val sharedPref = PreferenceManager.getDefaultSharedPreferences(ctx)
-    if (sharedPref.getBoolean("acra_should_log", false)) {
-        this.handleSilentException(throwable)
-    }
-}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/AppUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/AppUtils.kt
@@ -25,11 +25,12 @@ fun String.toStringUriWithHttp(): String =
        this
    }

-fun Context.shareLink(itemUrl: String) {
+fun Context.shareLink(itemUrl: String, itemTitle: String) {
    val sendIntent = Intent()
    sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
    sendIntent.action = Intent.ACTION_SEND
    sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl.toStringUriWithHttp())
+    sendIntent.putExtra(Intent.EXTRA_SUBJECT, itemTitle)
    sendIntent.type = "text/plain"
    startActivity(
        Intent.createChooser(
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt
@@ -11,19 +11,19 @@ class Config(c: Context) {
    val settings: SharedPreferences = c.getSharedPreferences(settingsName, Context.MODE_PRIVATE)

    val baseUrl: String
-        get() = settings.getString("url", "")
+        get() = settings.getString("url", "")!!

    val userLogin: String
-        get() = settings.getString("login", "")
+        get() = settings.getString("login", "")!!

    val userPassword: String
-        get() = settings.getString("password", "")
+        get() = settings.getString("password", "")!!

    val httpUserLogin: String
-        get() = settings.getString("httpUserName", "")
+        get() = settings.getString("httpUserName", "")!!

    val httpUserPassword: String
-        get() = settings.getString("httpPassword", "")
+        get() = settings.getString("httpPassword", "")!!

    companion object {
        const val settingsName = "paramsselfoss"
@@ -36,6 +36,10 @@ class Config(c: Context) {

        const val trackerUrl = "https://github.com/aminecmi/ReaderforSelfoss/issues"

+        const val syncChannelId = "sync-channel-id"
+
+        const val newItemsChannelId = "new-items-channel-id"
+
        fun logoutAndRedirect(
            c: Context,
            callingActivity: Activity,
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt
@@ -3,7 +3,7 @@ package apps.amine.bou.readerforselfoss.utils
 import android.content.Context
 import android.text.format.DateUtils
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
-import org.acra.ACRA
+import apps.amine.bou.readerforselfoss.api.selfoss.SelfossTagType
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
@@ -14,7 +14,6 @@ fun String.toTextDrawableString(c: Context): String {
        try {
            textDrawable.append(s[0])
        } catch (e: StringIndexOutOfBoundsException) {
-            ACRA.getErrorReporter().maybeHandleSilentException(e, c)
        }
    }
    return textDrawable.toString()
@@ -33,7 +32,7 @@ fun Item.sourceAndDateText(): String {
        ""
    }

-    return this.sourcetitle + formattedDate
+    return this.getSourceTitle() + formattedDate
 }

 fun Item.toggleStar(): Item {
@@ -44,8 +43,8 @@ fun Item.toggleStar(): Item {
 fun List<Item>.flattenTags(): List<Item> =
    this.flatMap {
        val item = it
-        val tags: List<String> = it.tags.split(",")
-        tags.map {
-            item.copy(tags = it.trim())
+        val tags: List<String> = it.tags.tags.split(",")
+        tags.map { t ->
+            item.copy(tags = SelfossTagType(t.trim()))
        }
    }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt
@@ -2,12 +2,18 @@ package apps.amine.bou.readerforselfoss.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.text.Spannable
+import android.text.style.ClickableSpan
 import androidx.browser.customtabs.CustomTabsIntent
 import android.util.Patterns
+import android.view.MotionEvent
+import android.view.View
+import android.widget.TextView
 import android.widget.Toast
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.ReaderActivity
@@ -123,13 +129,17 @@ fun Context.openItemUrl(
 private fun openInBrowser(linkDecoded: String, app: Activity) {
    val intent = Intent(Intent.ACTION_VIEW)
    intent.data = Uri.parse(linkDecoded)
+    try {
        app.startActivity(intent)
+    } catch (e: ActivityNotFoundException) {
+        Toast.makeText(app.baseContext, e.message, Toast.LENGTH_LONG).show()
+    }
 }

 fun String.isUrlValid(): Boolean =
    HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()

-fun String.isBaseUrlValid(): Boolean {
+fun String.isBaseUrlValid(ctx: Context): Boolean {
    val baseUrl = HttpUrl.parse(this)
    var existsAndEndsWithSlash = false
    if (baseUrl != null) {
@@ -146,3 +156,40 @@ fun Context.openInBrowserAsNewTask(i: Item) {
    intent.data = Uri.parse(i.getLinkDecoded().toStringUriWithHttp())
    startActivity(intent)
 }
+
+class LinkOnTouchListener: View.OnTouchListener {
+    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
+        var ret = false
+        val widget: TextView = v as TextView
+        val text: CharSequence = widget.text
+        val stext = Spannable.Factory.getInstance().newSpannable(text)
+
+        val action = event!!.action
+
+        if (action == MotionEvent.ACTION_UP ||
+            action == MotionEvent.ACTION_DOWN) {
+            var x: Float = event.x
+            var y: Float = event.y
+
+            x -= widget.totalPaddingLeft
+            y -= widget.totalPaddingTop
+
+            x += widget.scrollX
+            y += widget.scrollY
+
+            val layout = widget.layout
+            val line = layout.getLineForVertical(y.toInt())
+            val off = layout.getOffsetForHorizontal(line, x)
+
+            val link = stext.getSpans(off, off, ClickableSpan::class.java)
+
+            if (link.isNotEmpty()) {
+                if (action == MotionEvent.ACTION_UP) {
+                    link[0].onClick(widget)
+                }
+                ret = true
+            }
+        }
+        return ret
+    }
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlBasePrimaryDrawerItem.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlBasePrimaryDrawerItem.kt
@@ -1,112 +0,0 @@
-/* From https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/CustomUrlBasePrimaryDrawerItem.java */
-package apps.amine.bou.readerforselfoss.utils.drawer
-
-import android.net.Uri
-import androidx.annotation.ColorInt
-import androidx.annotation.ColorRes
-import androidx.annotation.StringRes
-import androidx.recyclerview.widget.RecyclerView
-
-import com.mikepenz.materialdrawer.holder.ColorHolder
-import com.mikepenz.materialdrawer.holder.ImageHolder
-import com.mikepenz.materialdrawer.holder.StringHolder
-import com.mikepenz.materialdrawer.model.BaseDrawerItem
-import com.mikepenz.materialdrawer.util.DrawerImageLoader
-import com.mikepenz.materialdrawer.util.DrawerUIUtils
-import com.mikepenz.materialize.util.UIUtils
-
-abstract class CustomUrlBasePrimaryDrawerItem<T, VH : RecyclerView.ViewHolder> :
-    BaseDrawerItem<T, VH>() {
-    fun withIcon(url: String): T {
-        this.icon = ImageHolder(url)
-        return this as T
-    }
-
-    fun withIcon(uri: Uri): T {
-        this.icon = ImageHolder(uri)
-        return this as T
-    }
-
-    var description: StringHolder? = null
-        private set
-    var descriptionTextColor: ColorHolder? = null
-        private set
-
-    fun withDescription(description: String): T {
-        this.description = StringHolder(description)
-        return this as T
-    }
-
-    fun withDescription(@StringRes descriptionRes: Int): T {
-        this.description = StringHolder(descriptionRes)
-        return this as T
-    }
-
-    fun withDescriptionTextColor(@ColorInt color: Int): T {
-        this.descriptionTextColor = ColorHolder.fromColor(color)
-        return this as T
-    }
-
-    fun withDescriptionTextColorRes(@ColorRes colorRes: Int): T {
-        this.descriptionTextColor = ColorHolder.fromColorRes(colorRes)
-        return this as T
-    }
-
-    /**
-     * a helper method to have the logic for all secondaryDrawerItems only once
-
-     * @param viewHolder
-     */
-    protected fun bindViewHelper(viewHolder: CustomBaseViewHolder) {
-        val ctx = viewHolder.itemView.context
-
-        //set the identifier from the drawerItem here. It can be used to run tests
-        viewHolder.itemView.id = hashCode()
-
-        //set the item selected if it is
-        viewHolder.itemView.isSelected = isSelected
-
-        //get the correct color for the background
-        val selectedColor = getSelectedColor(ctx)
-        //get the correct color for the text
-        val color = getColor(ctx)
-        val selectedTextColor = getSelectedTextColor(ctx)
-        //get the correct color for the icon
-        val iconColor = getIconColor(ctx)
-        val selectedIconColor = getSelectedIconColor(ctx)
-
-        //set the background for the item
-        UIUtils.setBackground(
-            viewHolder.view,
-            UIUtils.getSelectableBackground(ctx, selectedColor, true)
-        )
-        //set the text for the name
-        StringHolder.applyTo(this.getName(), viewHolder.name)
-        //set the text for the description or hide
-        StringHolder.applyToOrHide(this.description, viewHolder.description)
-
-        //set the colors for textViews
-        viewHolder.name.setTextColor(getTextColorStateList(color, selectedTextColor))
-        //set the description text color
-        ColorHolder.applyToOr(
-            descriptionTextColor,
-            viewHolder.description,
-            getTextColorStateList(color, selectedTextColor)
-        )
-
-        //define the typeface for our textViews
-        if (getTypeface() != null) {
-            viewHolder.name.typeface = getTypeface()
-            viewHolder.description.typeface = getTypeface()
-        }
-
-        //we make sure we reset the image first before setting the new one in case there is an empty one
-        DrawerImageLoader.getInstance().cancelImage(viewHolder.icon)
-        viewHolder.icon.setImageBitmap(null)
-        //get the drawables for our icon and set it
-        ImageHolder.applyTo(icon, viewHolder.icon, "customUrlItem")
-
-        //for android API 17 --> Padding not applied via xml
-        DrawerUIUtils.setDrawerVerticalPadding(viewHolder.view)
-    }
-}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlPrimaryDrawerItem.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlPrimaryDrawerItem.kt
@@ -1,94 +0,0 @@
-/* From https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/CustomUrlPrimaryDrawerItem.java */
-package apps.amine.bou.readerforselfoss.utils.drawer
-
-import androidx.annotation.LayoutRes
-import androidx.annotation.StringRes
-import android.view.View
-import android.widget.TextView
-import apps.amine.bou.readerforselfoss.R
-import com.mikepenz.materialdrawer.holder.BadgeStyle
-import com.mikepenz.materialdrawer.holder.StringHolder
-import com.mikepenz.materialdrawer.model.interfaces.ColorfulBadgeable
-
-class CustomUrlPrimaryDrawerItem :
-    CustomUrlBasePrimaryDrawerItem<CustomUrlPrimaryDrawerItem, CustomUrlPrimaryDrawerItem.ViewHolder>(),
-    ColorfulBadgeable<CustomUrlPrimaryDrawerItem> {
-    protected var mBadge: StringHolder = StringHolder("")
-    protected var mBadgeStyle = BadgeStyle()
-
-    override fun withBadge(badge: StringHolder): CustomUrlPrimaryDrawerItem {
-        this.mBadge = badge
-        return this
-    }
-
-    override fun withBadge(badge: String): CustomUrlPrimaryDrawerItem {
-        this.mBadge = StringHolder(badge)
-        return this
-    }
-
-    override fun withBadge(@StringRes badgeRes: Int): CustomUrlPrimaryDrawerItem {
-        this.mBadge = StringHolder(badgeRes)
-        return this
-    }
-
-    override fun withBadgeStyle(badgeStyle: BadgeStyle): CustomUrlPrimaryDrawerItem {
-        this.mBadgeStyle = badgeStyle
-        return this
-    }
-
-    override fun getBadge(): StringHolder {
-        return mBadge
-    }
-
-    override fun getBadgeStyle(): BadgeStyle {
-        return mBadgeStyle
-    }
-
-    override fun getType(): Int {
-        return R.id.material_drawer_item_custom_url_item
-    }
-
-    @LayoutRes
-    override fun getLayoutRes(): Int {
-        return R.layout.material_drawer_item_primary
-    }
-
-    override fun bindView(viewHolder: ViewHolder, payloads: List<*>?) {
-        super.bindView(viewHolder, payloads)
-
-        val ctx = viewHolder.itemView.context
-
-        //bind the basic view parts
-        bindViewHelper(viewHolder)
-
-        //set the text for the badge or hide
-        val badgeVisible = StringHolder.applyToOrHide(mBadge, viewHolder.badge)
-        //style the badge if it is visible
-        if (badgeVisible) {
-            mBadgeStyle.style(
-                viewHolder.badge,
-                getTextColorStateList(getColor(ctx), getSelectedTextColor(ctx))
-            )
-            viewHolder.badgeContainer.visibility = View.VISIBLE
-        } else {
-            viewHolder.badgeContainer.visibility = View.GONE
-        }
-
-        //define the typeface for our textViews
-        if (getTypeface() != null) {
-            viewHolder.badge.typeface = getTypeface()
-        }
-
-        //call the onPostBindView method to trigger post bind view actions (like the listener to modify the item if required)
-        onPostBindView(this, viewHolder.itemView)
-    }
-
-    override fun getViewHolder(v: View): ViewHolder {
-        return ViewHolder(v)
-    }
-
-    class ViewHolder(view: View) : CustomBaseViewHolder(view) {
-        val badgeContainer: View = view.findViewById(R.id.material_drawer_badge_container)
-        val badge: TextView = view.findViewById(R.id.material_drawer_badge)
-    }
-}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/GlideUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/GlideUtils.kt
@@ -2,30 +2,33 @@ package apps.amine.bou.readerforselfoss.utils.glide

 import android.content.Context
 import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.util.Base64
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 import android.widget.ImageView
+import apps.amine.bou.readerforselfoss.utils.Config
 import com.bumptech.glide.Glide
+import com.bumptech.glide.RequestBuilder
+import com.bumptech.glide.RequestManager
+import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.load.model.LazyHeaders
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.BitmapImageViewTarget
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.io.InputStream

-fun Context.bitmapCenterCrop(url: String, iv: ImageView) =
+fun Context.bitmapCenterCrop(config: Config, url: String, iv: ImageView) =
    Glide.with(this)
        .asBitmap()
-        .load(url)
+        .loadMaybeBasicAuth(config, url)
        .apply(RequestOptions.centerCropTransform())
        .into(iv)

-fun Context.bitmapFitCenter(url: String, iv: ImageView) =
+fun Context.circularBitmapDrawable(config: Config, url: String, iv: ImageView) =
    Glide.with(this)
        .asBitmap()
-        .load(url)
-        .apply(RequestOptions.fitCenterTransform())
-        .into(iv)
-
-fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
-    Glide.with(this)
-        .asBitmap()
-        .load(url)
+        .loadMaybeBasicAuth(config, url)
        .apply(RequestOptions.centerCropTransform())
        .into(object : BitmapImageViewTarget(iv) {
            override fun setResource(resource: Bitmap?) {
@@ -37,3 +40,30 @@ fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
                iv.setImageDrawable(circularBitmapDrawable)
            }
        })
+
+fun RequestBuilder<Bitmap>.loadMaybeBasicAuth(config: Config, url: String): RequestBuilder<Bitmap> {
+    val builder: LazyHeaders.Builder = LazyHeaders.Builder()
+    if (config.httpUserLogin.isNotEmpty() || config.httpUserPassword.isNotEmpty()) {
+        val basicAuth = "Basic " + Base64.encodeToString("${config.httpUserLogin}:${config.httpUserPassword}".toByteArray(), Base64.NO_WRAP)
+        builder.addHeader("Authorization", basicAuth)
+    }
+    val glideUrl = GlideUrl(url, builder.build())
+    return this.load(glideUrl)
+}
+
+fun RequestManager.loadMaybeBasicAuth(config: Config, url: String): RequestBuilder<Drawable> {
+    val builder: LazyHeaders.Builder = LazyHeaders.Builder()
+    if (config.httpUserLogin.isNotEmpty() || config.httpUserPassword.isNotEmpty()) {
+        val basicAuth = "Basic " + Base64.encodeToString("${config.httpUserLogin}:${config.httpUserPassword}".toByteArray(), Base64.NO_WRAP)
+        builder.addHeader("Authorization", basicAuth)
+    }
+    val glideUrl = GlideUrl(url, builder.build())
+    return this.load(glideUrl)
+}
+
+fun getBitmapInputStream(bitmap:Bitmap,compressFormat: Bitmap.CompressFormat): InputStream {
+    val byteArrayOutputStream = ByteArrayOutputStream()
+    bitmap.compress(compressFormat, 80, byteArrayOutputStream)
+    val bitmapData: ByteArray = byteArrayOutputStream.toByteArray()
+    return ByteArrayInputStream(bitmapData)
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/network/NetworkUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/network/NetworkUtils.kt
@@ -0,0 +1,45 @@
+package apps.amine.bou.readerforselfoss.utils.network
+
+import android.content.Context
+import android.graphics.Color
+import android.net.ConnectivityManager
+import android.net.NetworkInfo
+import android.view.View
+import android.widget.TextView
+import apps.amine.bou.readerforselfoss.R
+import com.google.android.material.snackbar.Snackbar
+
+var snackBarShown = false
+var view: View? = null
+lateinit var s: Snackbar
+
+fun Context.isNetworkAccessible(v: View?, overrideOffline: Boolean = false): Boolean {
+    val cm = this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+    val activeNetwork: NetworkInfo? = cm.activeNetworkInfo
+    val networkIsAccessible = activeNetwork != null && activeNetwork.isConnectedOrConnecting
+
+    if (v != null && (!networkIsAccessible || overrideOffline) && (!snackBarShown || v != view)) {
+        view = v
+        s = Snackbar
+            .make(
+                v,
+                R.string.no_network_connectivity,
+                Snackbar.LENGTH_INDEFINITE
+            )
+
+        s.setAction(android.R.string.ok) {
+            snackBarShown = false
+            s.dismiss()
+        }
+
+        val view = s.view
+        val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
+        tv.setTextColor(Color.WHITE)
+        s.show()
+        snackBarShown = true
+    }
+    if (snackBarShown && networkIsAccessible && !overrideOffline) {
+        s.dismiss()
+    }
+    return if(overrideOffline) overrideOffline else networkIsAccessible
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/persistence/EntitiesUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/persistence/EntitiesUtils.kt
@@ -1,6 +1,7 @@
 package apps.amine.bou.readerforselfoss.utils.persistence

 import apps.amine.bou.readerforselfoss.api.selfoss.Item
+import apps.amine.bou.readerforselfoss.api.selfoss.SelfossTagType
 import apps.amine.bou.readerforselfoss.api.selfoss.Source
 import apps.amine.bou.readerforselfoss.api.selfoss.Tag
 import apps.amine.bou.readerforselfoss.persistence.entities.ItemEntity
@@ -18,7 +19,7 @@ fun SourceEntity.toView(): Source =
        Source(
            this.id,
            this.title,
-            this.tags,
+            SelfossTagType(this.tags),
            this.spout,
            this.error,
            this.icon
@@ -27,8 +28,8 @@ fun SourceEntity.toView(): Source =
 fun Source.toEntity(): SourceEntity =
        SourceEntity(
            this.id,
-            this.title,
-            this.tags,
+            this.getTitleDecoded(),
+            this.tags.tags,
            this.spout,
            this.error,
            this.icon.orEmpty()
@@ -53,20 +54,20 @@ fun ItemEntity.toView(): Item =
            this.icon,
            this.link,
            this.sourcetitle,
-            this.tags
+            SelfossTagType(this.tags)
        )

 fun Item.toEntity(): ItemEntity =
    ItemEntity(
        this.id,
        this.datetime,
-        this.title,
+        this.getTitleDecoded(),
        this.content,
        this.unread,
        this.starred,
        this.thumbnail,
        this.icon,
        this.link,
-        this.sourcetitle,
-        this.tags
+        this.getSourceTitle(),
+        this.tags.tags
    )
--- a/app/src/main/res/drawable-anydpi/ic_format_align_justify.xml
+++ b/app/src/main/res/drawable-anydpi/ic_format_align_justify.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M3,21h18v-2L3,19v2zM3,17h18v-2L3,15v2zM3,13h18v-2L3,11v2zM3,9h18L21,7L3,7v2zM3,3v2h18L21,3L3,3z"/>
+</vector>
--- a/app/src/main/res/drawable-anydpi/ic_format_align_left.xml
+++ b/app/src/main/res/drawable-anydpi/ic_format_align_left.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M15,15L3,15v2h12v-2zM15,7L3,7v2h12L15,7zM3,13h18v-2L3,11v2zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3z"/>
+</vector>
--- a/app/src/main/res/drawable-hdpi/ic_action_search.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_search.png
--- a/app/src/main/res/drawable-hdpi/ic_add.png
+++ b/app/src/main/res/drawable-hdpi/ic_add.png
--- a/app/src/main/res/drawable-hdpi/ic_archive_black_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_archive_black_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_bug_report.png
+++ b/app/src/main/res/drawable-hdpi/ic_bug_report.png
--- a/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode.png
+++ b/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode.png
--- a/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode_black_24.png
+++ b/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode_black_24.png
--- a/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_color_lens_black_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_color_lens_black_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_done_all_white_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_done_all_white_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_favorite_black_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_favorite_black_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_fiber_new.png
+++ b/app/src/main/res/drawable-hdpi/ic_fiber_new.png
--- a/app/src/main/res/drawable-hdpi/ic_fiber_new_black_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_fiber_new_black_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_history.png
+++ b/app/src/main/res/drawable-hdpi/ic_history.png
--- a/app/src/main/res/drawable-hdpi/ic_info_black_24.png
+++ b/app/src/main/res/drawable-hdpi/ic_info_black_24.png
--- a/app/src/main/res/drawable-hdpi/ic_info_outline.png
+++ b/app/src/main/res/drawable-hdpi/ic_info_outline.png
--- a/app/src/main/res/drawable-hdpi/ic_open_in_browser.png
+++ b/app/src/main/res/drawable-hdpi/ic_open_in_browser.png
--- a/app/src/main/res/drawable-hdpi/ic_open_in_browser_black_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_open_in_browser_black_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_refresh.png
+++ b/app/src/main/res/drawable-hdpi/ic_refresh.png
--- a/app/src/main/res/drawable-hdpi/ic_remove_circle_outline_black_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_remove_circle_outline_black_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_settings.png
+++ b/app/src/main/res/drawable-hdpi/ic_settings.png
--- a/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_share_black_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_share_black_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_signal_wifi_statusbar_not_connected.png
+++ b/app/src/main/res/drawable-hdpi/ic_signal_wifi_statusbar_not_connected.png
--- a/app/src/main/res/drawable-mdpi/ic_action_search.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_search.png
--- a/app/src/main/res/drawable-mdpi/ic_add.png
+++ b/app/src/main/res/drawable-mdpi/ic_add.png
--- a/app/src/main/res/drawable-mdpi/ic_archive_black_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_archive_black_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_bug_report.png
+++ b/app/src/main/res/drawable-mdpi/ic_bug_report.png
--- a/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode.png
+++ b/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode.png
--- a/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode_black_24.png
+++ b/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode_black_24.png
--- a/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_color_lens_black_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_color_lens_black_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_done_all_white_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_done_all_white_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_favorite_black_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_favorite_black_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_fiber_new.png
+++ b/app/src/main/res/drawable-mdpi/ic_fiber_new.png
--- a/app/src/main/res/drawable-mdpi/ic_fiber_new_black_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_fiber_new_black_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_history.png
+++ b/app/src/main/res/drawable-mdpi/ic_history.png
--- a/app/src/main/res/drawable-mdpi/ic_info_black_24.png
+++ b/app/src/main/res/drawable-mdpi/ic_info_black_24.png
--- a/app/src/main/res/drawable-mdpi/ic_info_outline.png
+++ b/app/src/main/res/drawable-mdpi/ic_info_outline.png
--- a/app/src/main/res/drawable-mdpi/ic_open_in_browser.png
+++ b/app/src/main/res/drawable-mdpi/ic_open_in_browser.png
--- a/app/src/main/res/drawable-mdpi/ic_open_in_browser_black_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_open_in_browser_black_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_refresh.png
+++ b/app/src/main/res/drawable-mdpi/ic_refresh.png
--- a/app/src/main/res/drawable-mdpi/ic_remove_circle_outline_black_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_remove_circle_outline_black_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_settings.png
+++ b/app/src/main/res/drawable-mdpi/ic_settings.png
--- a/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_share_black_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_share_black_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_signal_wifi_statusbar_not_connected.png
+++ b/app/src/main/res/drawable-mdpi/ic_signal_wifi_statusbar_not_connected.png
--- a/app/src/main/res/drawable-xhdpi/ic_action_search.png
+++ b/app/src/main/res/drawable-xhdpi/ic_action_search.png
--- a/app/src/main/res/drawable-xhdpi/ic_add.png
+++ b/app/src/main/res/drawable-xhdpi/ic_add.png
--- a/app/src/main/res/drawable-xhdpi/ic_archive_black_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_archive_black_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_bug_report.png
+++ b/app/src/main/res/drawable-xhdpi/ic_bug_report.png
--- a/app/src/main/res/drawable-xhdpi/ic_chrome_reader_mode.png
+++ b/app/src/main/res/drawable-xhdpi/ic_chrome_reader_mode.png
--- a/Show More
+++ b/Show More