Closes #322.

* Update to support rebase

* Prevent Glide from opening svg images

.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.

CHANGELOG.md

@@ -1,5 +1,13 @@
 **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.
@@ -18,6 +26,22 @@
 
 - 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.

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).
+<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>
-- 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.
+## 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)

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()
+    def process
-    return process.text.substring(1).replaceAll("\\.", "").trim()
+    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
+    compileSdkVersion 30
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '30.0.3'
     defaultConfig {
         applicationId "apps.amine.bou.readerforselfoss"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode versionCodeFromGit()
         versionName versionNameFromGit()
 
@@ -67,14 +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
         }
     }
     flavorDimensions "build"
@@ -83,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.espresso:espresso-core:3.4.0-alpha02'
-    androidTestImplementation 'androidx.test:runner:1.1.0-beta02'
+    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 "androidx.appcompat:appcompat:1.3.0-alpha02"
-    implementation "com.google.android.material:material:$android_version"
+    implementation 'com.google.android.material:material:1.3.0-beta01'
-    implementation "androidx.recyclerview:recyclerview:$android_version"
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-beta01'
     implementation "androidx.legacy:legacy-support-v4:$android_version"
-    implementation "androidx.vectordrawable:vectordrawable:$android_version"
+    implementation 'androidx.vectordrawable:vectordrawable:1.2.0-alpha02'
-    implementation "androidx.browser:browser:$android_version"
+    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') {
@@ -126,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'
 
@@ -134,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'
@@ -148,34 +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 'androidx.core:core-ktx:1.5.0-alpha05'
-    implementation 'ch.acra:acra-http:5.2.1'
-    implementation 'ch.acra:acra-dialog:5.2.1'
 
-    implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata:2.3.0-rc01"
-    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.3.0-rc01"
 
-    implementation "androidx.room:room-runtime:$room_version"
+    implementation "androidx.room:room-runtime:2.3.0-alpha04"
-    kapt "androidx.room:room-compiler:$room_version"
+    kapt "androidx.room:room-compiler:2.3.0-alpha04"
 
     implementation "android.arch.work:work-runtime-ktx:$work_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"))
-        }
-    }
-}

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\")"
+    ]
+  }
+}

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="apps.amine.bou.readerforselfoss"
+    package="apps.amine.bou.readerforselfoss">
-    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -12,17 +11,18 @@
         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"
+            <meta-data
+                android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
         <activity
@@ -37,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"
@@ -55,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"
@@ -76,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>

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,12 +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),
+                settings.getBoolean("isSelfSignedCert", false),
-                prefs.getString("api_timeout", "-1").toLong(),
+                prefs.getString("api_timeout", "-1")!!.toLong()
-                prefs.getBoolean("should_log_everything", false)
             )
         } catch (e: IllegalArgumentException) {
             mustLoginToAddSource()
@@ -109,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)

app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt

@@ -4,47 +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.NetworkType
-import androidx.work.OneTimeWorkRequestBuilder
 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.*
-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.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
@@ -52,10 +41,8 @@ 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
@@ -67,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
@@ -79,8 +65,6 @@ 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
@@ -101,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
@@ -152,6 +134,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
     private lateinit var db: AppDatabase
 
+    private lateinit var config: Config
+
     data class DrawerData(val tags: List<Tag>?, val sources: List<Source>?)
 
     override fun onStart() {
@@ -161,6 +145,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         appColors = AppColors(this@HomeActivity)
+        config = Config(this@HomeActivity)
 
         super.onCreate(savedInstanceState)
 
@@ -176,14 +161,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         handleThemeBinding()
 
         setSupportActionBar(toolBar)
-        if (savedInstanceState == null) {
-            Amplify.getSharedInstance().promptIfReady(promptView)
-        }
 
         db = Room.databaseBuilder(
             applicationContext,
             AppDatabase::class.java, "selfoss-database"
-        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()
+        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
 
 
         customTabActivityHelper = CustomTabActivityHelper()
@@ -195,8 +177,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             this,
             this@HomeActivity,
             settings.getBoolean("isSelfSignedCert", false),
-            sharedPref.getString("api_timeout", "-1").toLong(),
+            sharedPref.getString("api_timeout", "-1")!!.toLong()
-            shouldLogEverything
         )
         items = ArrayList()
         allItems = ArrayList()
@@ -230,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(
@@ -250,14 +231,18 @@ 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) {
+                        val wasItemUnread = adapter.unreadItemStatusAtIndex(position)
-                            is ItemCardAdapter -> adapter.removeItemAtIndex(position)
+
-                            is ItemListAdapter -> adapter.removeItemAtIndex(position)
+                        adapter.handleItemAtIndex(position)
+
+                        if (wasItemUnread) {
+                            badgeNew--
+                        } else {
+                            badgeNew++
                         }
 
-                        badgeNew--
                         reloadBadgeContent()
 
                         val tagHashes = i.tags.tags.split(",").map { it.longHash() }
@@ -304,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)
@@ -364,8 +349,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
         getElementsAccordingToTab()
 
-        handleGDPRDialog(sharedPref.getBoolean("GDPR_shown", false))
-
         handleRecurringTask()
 
         handleOfflineActions()
@@ -400,27 +383,25 @@ 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()
+        itemsNumber = sharedPref.getString("prefer_api_items_number", "200")!!.toInt()
-        userIdentifier = sharedPref.getString("unique_id", "")
+        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()) {
+        hiddenTags = if (sharedPref.getString("hidden_tags", "")!!.isNotEmpty()) {
-            sharedPref.getString("hidden_tags", "").replace("\\s".toRegex(), "").split(",")
+            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()
+        refreshMinutes = sharedPref.getString("periodic_refresh_minutes", "360")!!.toLong()
 
         if (refreshMinutes <= 15) {
             refreshMinutes = 15
@@ -469,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
@@ -478,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))
@@ -488,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(
@@ -518,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 {
@@ -531,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)
@@ -547,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)
@@ -578,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)
@@ -594,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)
@@ -612,18 +603,27 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     }
                 } else {
                     for (tag in maybeSources) {
-                        drawer.addItem(
+                        val item = PrimaryDrawerItem()
-                            CustomUrlPrimaryDrawerItem()
+                                .withName(tag.getTitleDecoded())
-                                .withName(tag.title)
                                 .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)
+
                     }
                 }
             }
@@ -680,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)
@@ -1135,8 +1128,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                             articleViewer,
                             fullHeightCards,
                             appColors,
-                            debugReadingItems,
+                            userIdentifier,
-                            userIdentifier
+                            config
                         ) {
                             updateItems(it)
                         }
@@ -1150,9 +1143,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                             customTabActivityHelper,
                             internalBrowser,
                             articleViewer,
-                            debugReadingItems,
                             userIdentifier,
-                            appColors
+                            appColors,
+                            config
                         ) {
                             updateItems(it)
                         }
@@ -1323,10 +1316,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                 .map { it.key to it.value.size }
                                 .toMap()
 
-                        fun readAllDebug(e: Throwable) {
-                            ACRA.getErrorReporter().maybeHandleSilentException(e, this@HomeActivity)
-                        }
-
                         if (ids.isNotEmpty() && this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
                             api.readAll(ids).enqueue(object : Callback<SuccessResponse> {
                                 override fun onResponse(
@@ -1341,12 +1330,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                         ).show()
                                         tabNewBadge.removeBadge()
 
-
+                                        handleDrawerItems()
-                                        tagsBadge = itemsByTag.map {
-                                            (it.key to ((tagsBadge[it.key] ?: it.value) - it.value))
-                                        }.toMap()
-
-                                        reloadTagsBadges()
 
                                         getElementsAccordingToTab()
                                     } else {
@@ -1356,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
@@ -1376,10 +1353,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                         Toast.LENGTH_SHORT
                                     ).show()
                                     swipeRefreshLayout.isRefreshing = false
-
-                                    if (debugReadingItems) {
-                                        readAllDebug(t)
-                                    }
                                 }
                             })
                             items = ArrayList()
@@ -1416,24 +1389,6 @@ 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()
-            }
-            alertDialog.show()
-        }
-    }
-
     private fun handleRecurringTask() {
         if (periodicRefresh) {
             val myConstraints = Constraints.Builder()
@@ -1466,7 +1421,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                }
 
                override fun onFailure(call: Call<T>, t: Throwable) {
-                   ACRA.getErrorReporter().maybeHandleSilentException(t, this@HomeActivity)
                }
            })
         }

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])
+        }
+    }
+}

app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt

@@ -20,12 +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
@@ -40,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?) {
@@ -54,14 +51,12 @@ class LoginActivity : AppCompatActivity() {
 
         handleBaseUrlFail()
 
-
         settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-        userIdentifier = settings.getString("unique_id", "")
+        userIdentifier = settings.getString("unique_id", "")!!
-        logErrors = settings.getBoolean("login_debug", false)
 
         editor = settings.edit()
 
-        if (settings.getString("url", "").isNotEmpty()) {
+        if (settings.getString("url", "")!!.isNotEmpty()) {
             goToMain()
         }
 
@@ -145,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
@@ -164,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
@@ -178,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 {
@@ -195,8 +204,7 @@ class LoginActivity : AppCompatActivity() {
                 this,
                 this@LoginActivity,
                 isWithSelfSignedCert,
-                -1L,
+                -1L
-                isWithSelfSignedCert
             )
 
             if (this@LoginActivity.isNetworkAccessible(this@LoginActivity.findViewById(R.id.loginForm))) {
@@ -213,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)
                     }
 
@@ -277,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 -> {
+            else -> super.onOptionsItemSelected(item)
-                val newState = !item.isChecked
-                item.isChecked = newState
-                logErrors = newState
-                editor.putBoolean("login_debug", newState)
-                editor.apply()
-                return true
-            }
-            else -> return super.onOptionsItemSelected(item)
         }
     }
 }

app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt

@@ -7,51 +7,26 @@ 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()
-
+        config = Config(baseContext)
-        initAmplify()
 
         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()
@@ -83,21 +58,6 @@ class MyApp : MultiDexApplication() {
         }
     }
 
-    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 initAmplify() {
-        Amplify.initSharedInstance(this)
-            .setPositiveFeedbackCollectors(GooglePlayStoreFeedbackCollector())
-            .setCriticalFeedbackCollectors(DefaultEmailFeedbackCollector(Config.feedbackEmail))
-            .applyAllDefaultRules()
-    }
-
     private fun initDrawerImageLoader() {
         DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
             override fun set(
@@ -107,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)
             }

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,6 +15,7 @@ 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
@@ -22,10 +25,11 @@ 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
@@ -33,7 +37,6 @@ 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
@@ -42,7 +45,6 @@ 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
 
@@ -51,6 +53,11 @@ 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
@@ -65,6 +72,8 @@ class ReaderActivity : AppCompatActivity() {
         showMenuItem(false)
     }
 
+    private lateinit var editor: SharedPreferences.Editor
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -73,7 +82,7 @@ class ReaderActivity : AppCompatActivity() {
         db = Room.databaseBuilder(
             applicationContext,
             AppDatabase::class.java, "selfoss-database"
-        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()
+        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
 
         val scoop = Scoop.getInstance()
         scoop.bind(this, Toppings.PRIMARY.value, toolBar)
@@ -85,18 +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)
+        prefs = PreferenceManager.getDefaultSharedPreferences(this)
-        userIdentifier = prefs.getString("unique_id", "")
+        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),
+            settings.getBoolean("isSelfSignedCert", false),
-            prefs.getString("api_timeout", "-1").toLong(),
+            prefs.getString("api_timeout", "-1")!!.toLong()
-            prefs.getBoolean("should_log_everything", false)
         )
 
         if (allItems.isEmpty()) {
@@ -148,18 +160,6 @@ class ReaderActivity : AppCompatActivity() {
                             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(
@@ -169,10 +169,6 @@ class ReaderActivity : AppCompatActivity() {
                             thread {
                                 db.itemsDao().insertAllItems(item.toEntity())
                             }
-                            if (debugReadingItems) {
-                                ACRA.getErrorReporter()
-                                    .maybeHandleSilentException(t, this@ReaderActivity)
-                            }
                         }
                     }
                 )
@@ -195,7 +191,7 @@ class ReaderActivity : AppCompatActivity() {
         }
     }
 
-    override fun onSaveInstanceState(oldInstanceState: Bundle?) {
+    override fun onSaveInstanceState(oldInstanceState: Bundle) {
         super.onSaveInstanceState(oldInstanceState)
         oldInstanceState!!.clear()
     }
@@ -223,6 +219,11 @@ class ReaderActivity : AppCompatActivity() {
         }
     }
 
+    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)
@@ -233,6 +234,11 @@ class ReaderActivity : AppCompatActivity() {
         } else {
             canFavorite()
         }
+        if (activeAlignment == JUSTIFY) {
+            alignmentMenu(false)
+        } else {
+            alignmentMenu(true)
+        }
 
         return true
     }
@@ -314,10 +320,29 @@ class ReaderActivity : AppCompatActivity() {
                     }
                 }
             }
+            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()
     }

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,7 @@ 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.*
@@ -54,14 +56,15 @@ 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),
+            settings.getBoolean("isSelfSignedCert", false),
-            prefs.getString("api_timeout", "-1").toLong(),
+            prefs.getString("api_timeout", "-1")!!.toLong()
-            prefs.getBoolean("should_log_everything", false)
         )
         var items: ArrayList<Source> = ArrayList()
 

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt

@@ -4,12 +4,12 @@ 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
@@ -17,6 +17,7 @@ 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
@@ -34,6 +35,10 @@ 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
@@ -49,8 +54,8 @@ class ItemCardAdapter(
     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
@@ -68,13 +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
@@ -86,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
@@ -179,7 +193,8 @@ class ItemCardAdapter(
             })
 
             mView.shareBtn.setOnClickListener {
-                c.shareLink(items[adapterPosition].getLinkDecoded())
+                val item = items[adapterPosition]
+                c.shareLink(item.getLinkDecoded(), item.getTitleDecoded())
             }
 
             mView.browserBtn.setOnClickListener {

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt

@@ -4,7 +4,6 @@ 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
@@ -14,12 +13,14 @@ 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
@@ -49,9 +50,9 @@ class ItemListAdapter(
     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
@@ -70,7 +71,12 @@ 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())
 
@@ -78,40 +84,28 @@ class ItemListAdapter(
 
         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)
         }
     }
 

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt

@@ -13,11 +13,10 @@ 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
@@ -27,10 +26,10 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
     abstract var items: ArrayList<Item>
     abstract val api: SelfossApi
     abstract val db: AppDatabase
-    abstract val debugReadingItems: Boolean
     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>) {
@@ -39,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),
@@ -69,12 +68,11 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                             }
                             notifyItemRemoved(position)
                             updateItems(items)
-                            doUnmark(i, position)
                         }
                     })
                 } else {
                     thread {
-                        db.actionsDao().deleteReadActionForArticle(i.id)
+                        db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
                     }
                 }
             }
@@ -85,7 +83,64 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         s.show()
     }
 
-    fun removeItemAtIndex(position: Int) {
+    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>
+                        ) {
+                        }
+
+                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                            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)
@@ -101,33 +156,17 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                     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)
+                    unmarkSnackbar(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()
-                    }
                     Toast.makeText(
                         app,
                         app.getString(R.string.cant_mark_read),
                         Toast.LENGTH_SHORT
                     ).show()
-                    items.add(i)
+                    items.add(position, i)
                     notifyItemInserted(position)
                     updateItems(items)
 
@@ -139,7 +178,48 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         } else {
             thread {
                 db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
-                doUnmark(i, position)
+            }
+        }
+    }
+
+    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))
             }
         }
     }

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt

@@ -12,6 +12,7 @@ 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
@@ -29,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(
@@ -41,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

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) {
+        interceptor.level = HttpLoggingInterceptor.Level.NONE
-            HttpLoggingInterceptor.Level.BODY
-        } else {
-            HttpLoggingInterceptor.Level.NONE
-        }
         val client = OkHttpClient.Builder().addInterceptor(interceptor).build()
 
         val gson = GsonBuilder()

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(),
+        dek = source.readString().orEmpty(),
-        url = source.readString(),
+        url = source.readString().orEmpty(),
-        domain = source.readString(),
+        domain = source.readString().orEmpty(),
-        excerpt = source.readString(),
+        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

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossApi.kt

@@ -12,11 +12,12 @@ 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
 
@@ -24,8 +25,7 @@ class SelfossApi(
     c: Context,
     callingActivity: Activity?,
     isWithSelfSignedCert: Boolean,
-    timeout: Long,
+    timeout: Long
-    shouldLog: Boolean
 ) {
 
     private lateinit var service: SelfossService
@@ -62,6 +62,17 @@ class SelfossApi(
             .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 {
@@ -83,15 +94,34 @@ class SelfossApi(
 
         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)
 
-        httpClient.addInterceptor(logging)
+        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()
+                    }
+                }
 
         try {
             val retrofit =

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 {
@@ -58,6 +64,10 @@ data class Source(
         }
         return constructUrl(config, "favicons", icon)
     }
+
+    fun getTitleDecoded(): String {
+        return Html.fromHtml(title).toString()
+    }
 }
 
 data class Item(
@@ -67,8 +77,8 @@ data class Item(
     @SerializedName("content") val content: String,
     @SerializedName("unread") val unread: Boolean,
     @SerializedName("starred") var starred: Boolean,
-    @SerializedName("thumbnail") val thumbnail: String,
+    @SerializedName("thumbnail") val thumbnail: String?,
-    @SerializedName("icon") val icon: String,
+    @SerializedName("icon") val icon: String?,
     @SerializedName("link") val link: String,
     @SerializedName("sourcetitle") val sourcetitle: String,
     @SerializedName("tags") val tags: SelfossTagType
@@ -84,17 +94,17 @@ data class Item(
     }
 
     constructor(source: Parcel) : this(
-        id = source.readString(),
+        id = source.readString().orEmpty(),
-        datetime = source.readString(),
+        datetime = source.readString().orEmpty(),
-        title = source.readString(),
+        title = source.readString().orEmpty(),
-        content = source.readString(),
+        content = source.readString().orEmpty(),
         unread = 0.toByte() != source.readByte(),
         starred = 0.toByte() != source.readByte(),
         thumbnail = source.readString(),
         icon = source.readString(),
-        link = source.readString(),
+        link = source.readString().orEmpty(),
-        sourcetitle = source.readString(),
+        sourcetitle = source.readString().orEmpty(),
-        tags = source.readParcelable(ClassLoader.getSystemClassLoader())
+        tags = if (source.readParcelable<SelfossTagType>(ClassLoader.getSystemClassLoader()) != null) source.readParcelable(ClassLoader.getSystemClassLoader())!! else SelfossTagType("")
     )
 
     override fun describeContents() = 0
@@ -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)
+
+
+        try {
+            for (url in imageUrls) {
+                if ( URLUtil.isValidUrl(url)) {
+                    val image = Glide.with(context).asBitmap()
+                            .apply(glideOptions)
+                            .load(url).submit().get()
+                }
+            }
+        } 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
@@ -168,7 +223,7 @@ data class SelfossTagType(val tags: String) : Parcelable {
     }
 
     constructor(source: Parcel) : this(
-        tags = source.readString()
+        tags = source.readString().orEmpty()
     )
 
     override fun describeContents() = 0

app/src/main/java/apps/amine/bou/readerforselfoss/background/background.kt

@@ -19,11 +19,10 @@ 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.maybeHandleSilentException
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
-import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -46,7 +45,7 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
                 .setOngoing(true)
                 .setPriority(PRIORITY_LOW)
                 .setChannelId(Config.syncChannelId)
-                .setSmallIcon(R.drawable.ic_cloud_download)
+                .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
 
             notificationManager.notify(1, notification.build())
 
@@ -58,14 +57,13 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
             db = Room.databaseBuilder(
                 applicationContext,
                 AppDatabase::class.java, "selfoss-database"
-            ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()
+            ).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(),
+                sharedPref.getString("api_timeout", "-1")!!.toLong()
-                sharedPref.getBoolean("should_log_everything", false)
             )
 
             api.allItems().enqueue(object : Callback<List<Item>> {
@@ -101,12 +99,13 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
                                     .setChannelId(Config.newItemsChannelId)
                                     .setContentIntent(pendingIntent)
                                     .setAutoCancel(true)
-                                    .setSmallIcon(R.drawable.ic_fiber_new_black_24dp)
+                                    .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)
@@ -130,7 +129,7 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
                 }
             }
         }
-        return Result.SUCCESS
+        return Result.success()
     }
 
     private fun <T> doAndReportOnFail(call: Call<T>, action: ActionEntity) {
@@ -145,7 +144,6 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
             }
 
             override fun onFailure(call: Call<T>, t: Throwable) {
-                ACRA.getErrorReporter().maybeHandleSilentException(t, context)
             }
         })
     }

app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt

@@ -1,23 +1,28 @@
 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 androidx.appcompat.app.AlertDialog
-import android.view.MenuItem
+import androidx.core.content.res.ResourcesCompat
-import android.view.View
-import android.view.ViewGroup
-import android.webkit.WebSettings
 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
@@ -28,215 +33,257 @@ 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).build()
+        ).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? {
-        rootView = inflater
+        try {
-            .inflate(R.layout.fragment_article, container, false) as ViewGroup
+            rootView = inflater
+                .inflate(R.layout.fragment_article, container, false) as ViewGroup
 
-        url = allItems[pageNumber.toInt()].getLinkDecoded()
+            url = allItems[pageNumber.toInt()].getLinkDecoded()
-        contentText = allItems[pageNumber.toInt()].content
+            contentText = allItems[pageNumber.toInt()].content
-        contentTitle = allItems[pageNumber.toInt()].title
+            contentTitle = allItems[pageNumber.toInt()].getTitleDecoded()
-        contentImage = allItems[pageNumber.toInt()].getThumbnail(activity!!)
+            contentImage = allItems[pageNumber.toInt()].getThumbnail(activity!!)
-        contentSource = allItems[pageNumber.toInt()].sourceAndDateText()
+            contentSource = allItems[pageNumber.toInt()].sourceAndDateText()
+            allImages = allItems[pageNumber.toInt()].getImages()
 
-        val prefs = PreferenceManager.getDefaultSharedPreferences(activity)
+            prefs = PreferenceManager.getDefaultSharedPreferences(activity)
-        editor = prefs.edit()
+            editor = prefs.edit()
-        fontSize = prefs.getString("reader_font_size", "14").toInt()
+            fontSize = prefs.getString("reader_font_size", "16")!!.toInt()
 
-        val settings = activity!!.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+            font = prefs.getString("reader_font", "")!!
-        val debugReadingItems = prefs.getBoolean("read_debug", false)
+            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
+                }
+            }
 
-        val api = SelfossApi(
+            refreshAlignment()
-            context!!,
-            activity!!,
-            settings.getBoolean("isSelfSignedCert", false),
-            prefs.getString("api_timeout", "-1").toLong(),
-            prefs.getBoolean("should_log_everything", false)
-        )
 
-        fab = rootView.fab
+            val settings = activity!!.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
 
-        fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
+            val api = SelfossApi(
+                context!!,
+                activity!!,
+                settings.getBoolean("isSelfSignedCert", false),
+                prefs.getString("api_timeout", "-1")!!.toLong()
+            )
 
-        fab.rippleColor = appColors.colorAccentDark
+            fab = rootView!!.fab
 
-        val floatingToolbar: FloatingToolbar = rootView.floatingToolbar
+            fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
-        floatingToolbar.attachFab(fab)
 
-        floatingToolbar.background = ColorDrawable(appColors.colorAccent)
+            fab.rippleColor = appColors.colorAccentDark
 
-        val customTabsIntent = activity!!.buildCustomTabsIntent()
+            val floatingToolbar: FloatingToolbar = rootView!!.floatingToolbar
-        mCustomTabActivityHelper = CustomTabActivityHelper()
+            floatingToolbar.attachFab(fab)
-        mCustomTabActivityHelper.bindCustomTabsService(activity)
+
+            floatingToolbar.background = ColorDrawable(appColors.colorAccent)
+
+            val customTabsIntent = activity!!.buildCustomTabsIntent()
+            mCustomTabActivityHelper = CustomTabActivityHelper()
+            mCustomTabActivityHelper!!.bindCustomTabsService(activity)
 
 
-        floatingToolbar.setClickListener(
+            floatingToolbar.setClickListener(
-            object : FloatingToolbar.ItemClickListener {
+                object : FloatingToolbar.ItemClickListener {
-                override fun onItemClick(item: MenuItem) {
+                    override fun onItemClick(item: MenuItem) {
-                    when (item.itemId) {
+                        when (item.itemId) {
-                        R.id.more_action -> getContentFromMercury(customTabsIntent, prefs)
+                            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(
+                            R.id.open_action -> activity!!.openItemUrl(
-                            allItems,
+                                allItems,
-                            pageNumber.toInt(),
+                                pageNumber.toInt(),
-                            url,
+                                url,
-                            customTabsIntent,
+                                customTabsIntent,
-                            false,
+                                false,
-                            false,
+                                false,
-                            activity!!
+                                activity!!
-                        )
-                        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 {
+                            R.id.unread_action -> if ((context != null && context!!.isNetworkAccessible(null)) || context == null) {
-                            thread {
+                                api.unmarkItem(allItems[pageNumber.toInt()].id).enqueue(
-                                db.actionsDao().insertAllActions(ActionEntity(allItems[pageNumber.toInt()].id, false, true, false, false))
+                                    object : Callback<SuccessResponse> {
+                                        override fun onResponse(
+                                            call: Call<SuccessResponse>,
+                                            response: Response<SuccessResponse>
+                                        ) {
+                                        }
+
+                                        override fun onFailure(
+                                            call: Call<SuccessResponse>,
+                                            t: Throwable
+                                        ) {
+                                        }
+                                    }
+                                )
+                            } else {
+                                thread {
+                                    db.actionsDao().insertAllActions(ActionEntity(allItems[pageNumber.toInt()].id, false, true, false, false))
+                                }
                             }
+                            else -> Unit
                         }
-                        else -> Unit
+                    }
+
+                    override fun onItemLongClick(item: MenuItem?) {
                     }
                 }
+            )
 
-                override fun onItemLongClick(item: MenuItem?) {
+            rootView!!.source.text = contentSource
+            if (typeface != null) {
+                rootView!!.source.typeface = typeface
+            }
+
+            if (contentText.isEmptyOrNullOrNullString()) {
+                getContentFromMercury(customTabsIntent, prefs)
+            } else {
+                rootView!!.titleView.text = contentTitle
+                if (typeface != null) {
+                    rootView!!.titleView.typeface = typeface
+                }
+
+                htmlToWebview()
+
+                if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
+                    rootView!!.imageView.visibility = View.VISIBLE
+                    Glide
+                        .with(context!!)
+                        .asBitmap()
+                        .loadMaybeBasicAuth(config, contentImage)
+                        .apply(RequestOptions.fitCenterTransform())
+                        .into(rootView!!.imageView)
+                } else {
+                    rootView!!.imageView.visibility = View.GONE
                 }
             }
-        )
 
-        rootView.source.text = contentSource
+            rootView!!.nestedScrollView.setOnScrollChangeListener(
+                NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+                    if (scrollY > oldScrollY) {
+                        fab.hide()
+                    } else {
+                        if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
+                    }
+                }
+            )
 
-        if (contentText.isEmptyOrNullOrNullString()) {
+        } catch (e: InflateException) {
-            getContentFromMercury(customTabsIntent, prefs)
+            AlertDialog.Builder(context!!)
-        } else {
+                .setMessage(context!!.getString(R.string.webview_dialog_issue_message))
-            rootView.titleView.text = contentTitle
+                .setTitle(context!!.getString(R.string.webview_dialog_issue_title))
-
+                .setPositiveButton(android.R.string.ok
-            htmlToWebview(contentText, prefs)
+                ) { dialog, which ->
-
+                    val sharedPref = PreferenceManager.getDefaultSharedPreferences(context!!)
-            if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
+                    val editor = sharedPref.edit()
-                rootView.imageView.visibility = View.VISIBLE
+                    editor.putBoolean("prefer_article_viewer", false)
-                Glide
+                    editor.commit()
-                    .with(context!!)
+                    activity!!.finish()
-                    .asBitmap()
+                }
-                    .load(contentImage)
+                .create()
-                    .apply(RequestOptions.fitCenterTransform())
+                .show()
-                    .into(rootView.imageView)
-            } else {
-                rootView.imageView.visibility = View.GONE
-            }
         }
 
-        rootView.nestedScrollView.setOnScrollChangeListener(
-            NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
-                if (scrollY > oldScrollY) {
-                    fab.hide()
-                } else {
-                    if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.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
     ) {
         if ((context != null && context!!.isNetworkAccessible(null)) || context == null) {
-            rootView.progressBar.visibility = View.VISIBLE
+            rootView!!.progressBar.visibility = View.VISIBLE
-            val parser = MercuryApi(
+            val parser = MercuryApi()
-                prefs.getBoolean("should_log_everything", false)
-            )
 
             parser.parseUrl(url).enqueue(
                 object : Callback<ParsedContent> {
@@ -248,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 {
@@ -306,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!!)
                             }
                         }
                     }
@@ -326,31 +366,36 @@ 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)
             }
@@ -368,15 +413,56 @@ class ArticleFragment : Fragment() {
             "#FFFFFF"
         }
 
-        rootView.webcontent.settings.useWideViewPort = true
+        rootView!!.webcontent.settings.useWideViewPort = true
-        rootView.webcontent.settings.loadWithOverviewMode = true
+        rootView!!.webcontent.settings.loadWithOverviewMode = true
-        rootView.webcontent.settings.javaScriptEnabled = false
+        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
@@ -385,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;
@@ -406,13 +510,21 @@ class ArticleFragment : Fragment() {
                 |        color: $stringTextColor;
                 |      }
                 |      * {
-                |        font-size: ${fontSize.toPx}px;
+                |        font-size: ${fontSize}px;
-                |        text-align: justify;
+                |        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;
@@ -420,9 +532,10 @@ class ArticleFragment : Fragment() {
                 |        background-color: $stringBackgroundColor;
                 |      }
                 |   </style>
+                |   $fontLinkAndStyle
                 |</head>
                 |<body>
-                |   $c
+                |   $contentText
                 |</body>""".trimMargin(),
             "text/html",
             "utf-8",
@@ -431,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(),
@@ -460,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
+    }
+
 
 }

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
+        }
+    }
+}

app/src/main/java/apps/amine/bou/readerforselfoss/persistence/database/AppDatabase.kt

@@ -10,7 +10,7 @@ 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, ActionEntity::class], version = 3)
+@Database(entities = [TagEntity::class, SourceEntity::class, ItemEntity::class, ActionEntity::class], version = 4)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun drawerDataDao(): DrawerDataDao
 

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")

app/src/main/java/apps/amine/bou/readerforselfoss/persistence/migrations/migrations.kt

@@ -14,3 +14,21 @@ val MIGRATION_2_3: Migration = object : Migration(2, 3) {
         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")
+    }
+}

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);
+        }
     }
 
     /**
@@ -137,7 +160,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                 || ArticleViewerPreferenceFragment.class.getName().equals(fragmentName)
                 || OfflinePreferenceFragment.class.getName().equals(fragmentName)
                 || ExperimentalPreferenceFragment.class.getName().equals(fragmentName)
-                || DebugPreferenceFragment.class.getName().equals(fragmentName)
                 || LinksPreferenceFragment.class.getName().equals(fragmentName)
                 || ThemePreferenceFragment.class.getName().equals(fragmentName);
     }
@@ -173,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)
@@ -223,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);
-        }
     }
 
     /**
@@ -318,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)
@@ -342,10 +292,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
         @Override
         public boolean onOptionsItemSelected(MenuItem item) {
             int id = item.getItemId();
-            if (id == android.R.id.home) {
+            if (id == R.id.clear) {
-                getActivity().finish();
-                return true;
-            } else if (id == R.id.clear) {
                 SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(getActivity());
                 SharedPreferences.Editor editor = pref.edit();
                 editor.remove("color_primary");
@@ -354,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);
         }
@@ -373,16 +320,6 @@ 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)
@@ -393,16 +330,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             addPreferencesFromResource(R.xml.pref_experimental);
             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);
-        }
     }
 
 
@@ -410,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);

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

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)
-    }
-}

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(

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"

app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.text.format.DateUtils
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossTagType
-import org.acra.ACRA
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
@@ -15,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()
@@ -34,7 +32,7 @@ fun Item.sourceAndDateText(): String {
         ""
     }
 
-    return this.sourcetitle + formattedDate
+    return this.getSourceTitle() + formattedDate
 }
 
 fun Item.toggleStar(): Item {

app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt

@@ -2,6 +2,7 @@ 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
@@ -128,13 +129,17 @@ fun Context.openItemUrl(
 private fun openInBrowser(linkDecoded: String, app: Activity) {
     val intent = Intent(Intent.ACTION_VIEW)
     intent.data = Uri.parse(linkDecoded)
-    app.startActivity(intent)
+    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) {

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)
-    }
-}

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)
-    }
-}

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)
+        .loadMaybeBasicAuth(config, url)
-        .apply(RequestOptions.fitCenterTransform())
-        .into(iv)
-
-fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
-    Glide.with(this)
-        .asBitmap()
-        .load(url)
         .apply(RequestOptions.centerCropTransform())
         .into(object : BitmapImageViewTarget(iv) {
             override fun setResource(resource: Bitmap?) {
@@ -36,4 +39,31 @@ fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
                 circularBitmapDrawable.isCircular = true
                 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)
+}

app/src/main/java/apps/amine/bou/readerforselfoss/utils/persistence/EntitiesUtils.kt

@@ -28,7 +28,7 @@ fun SourceEntity.toView(): Source =
 fun Source.toEntity(): SourceEntity =
         SourceEntity(
             this.id,
-            this.title,
+            this.getTitleDecoded(),
             this.tags.tags,
             this.spout,
             this.error,
@@ -61,13 +61,13 @@ 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.getSourceTitle(),
         this.tags.tags
     )

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>

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>