Updated to androidx.

.github/CONTRIBUTING.md

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

.gitignore

@@ -216,4 +216,6 @@ gradle-app.setting
 
 release/
 
-crowdin.properties
+crowdin.properties
+
+publish-version.sh

CHANGELOG.md

@@ -1,31 +1,3 @@
-**1.7.x**
-
-- Hiding tags with 0 articles
-
-- Fixed issue with basic auth and images loading
-
-- Added the ability to justify or left align the reader text
-
-- Fixed #251
-
-- Added experimental issue to set a default timeout. Should work for #238.
-
-- Closing #220.
-
-- Start of #238. "Add a quick shortcut to open the app on offline mode ?"
-
-- Closes #216. Issue with selfoss version 2.19.
-
-- Closes #179. Sync of read/unread/star/unstar items on background task or on app reload with network available.
-
-- Closes #33. Background sync with settings.
-
-- Closing #1. Initial article caching.
-
-- Closing #228 by removing the list action bar. Action buttons are exclusively on the card view from now on.
-
-- Closing #38. Only doing api calls on network available.
-
 **1.6.x**
 
 - Handling hidden tags.

README.md

@@ -18,11 +18,7 @@ Also, the last APK built from source is available [here](https://jenkins.amine-b
 
 ## Want to help ?
 
-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)
+Check the [Contribution guide](https://github.com/aminecmi/ReaderforSelfoss/blob/master/.github/CONTRIBUTING.md)
 
 ## Useful links
 

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
-    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 process = "git describe --abbrev=0 --tags".execute()
+    return process.text.substring(1).replaceAll("\\.", "").trim()
 }
 
 def versionCodeFromGit() {
@@ -24,8 +24,6 @@ def versionNameFromGit() {
     return gitVersion()
 }
 
-apply plugin: 'kotlin-kapt'
-
 apply plugin: 'com.android.application'
 
 apply plugin: 'kotlin-android'
@@ -38,7 +36,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '28.0.2'
     defaultConfig {
         applicationId "apps.amine.bou.readerforselfoss"
         minSdkVersion 16
@@ -56,18 +54,11 @@ android {
 
         // tests
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation":
-                                     "$projectDir/schemas".toString()]
-            }
-        }
     }
     buildTypes {
         release {
             minifyEnabled true
-            shrinkResources false
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard-rules.pro'
         }
@@ -75,6 +66,7 @@ android {
             buildConfigField "String", "LOGIN_URL", appLoginUrl
             buildConfigField "String", "LOGIN_USERNAME", appLoginUsername
             buildConfigField "String", "LOGIN_PASSWORD", appLoginPassword
+            applicationIdSuffix ".dev"
         }
     }
     flavorDimensions "build"
@@ -93,29 +85,32 @@ android {
 
 dependencies {
     // Testing
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-beta02'
-    androidTestImplementation 'androidx.test:runner:1.1.0-beta02'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
+    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
     // 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.1.0-alpha4'
     // 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.1.0-alpha4'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     // Android Support
-    implementation "androidx.appcompat:appcompat:$android_version"
-    implementation "com.google.android.material:material:$android_version"
-    implementation "androidx.recyclerview:recyclerview:$android_version"
-    implementation "androidx.legacy:legacy-support-v4:$android_version"
-    implementation "androidx.vectordrawable:vectordrawable:$android_version"
-    implementation "androidx.browser:browser:$android_version"
-    implementation "androidx.cardview:cardview:$android_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.0.0'
+    implementation 'androidx.browser:browser:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
 
     //multidex
-    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.multidex:multidex:2.0.0'
+
+    // Intro
+    implementation 'agency.tango.android:material-intro-screen:0.0.5'
 
     // About
-    implementation('com.mikepenz:aboutlibraries:6.2.0@aar') {
+    implementation('com.mikepenz:aboutlibraries:6.0.0@aar') {
         transitive = true
     }
 
@@ -126,8 +121,8 @@ dependencies {
     implementation 'com.burgstaller:okhttp-digest:1.12'
 
     // Material-ish things
-    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.0.5'
-    implementation 'com.github.jd-alexander:LikeButton:0.2.3'
+    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.0.3'
+    implementation 'com.github.jd-alexander:LikeButton:0.2.1'
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
 
     // glide
@@ -135,32 +130,25 @@ dependencies {
     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'
+    implementation 'com.github.stkent:amplify:2.1.0'
 
     // Drawer
-    implementation 'co.zsmb:materialdrawer-kt:2.0.1'
+    implementation 'co.zsmb:materialdrawer-kt:2.0.0'
+    implementation 'com.anupcowkur:reservoir:3.1.0'
 
     // Themes
     implementation 'com.52inc:scoops:1.0.0'
-    implementation 'com.jaredrummler:colorpicker:1.0.2'
+    implementation 'com.jrummyapps:colorpicker:2.1.7'
     implementation 'com.github.rubensousa:floatingtoolbar:1.5.1'
 
     // Pager
-    implementation 'me.relex:circleindicator:2.0.0@aar'
+    implementation 'me.relex:circleindicator:1.2.2@aar'
 
     implementation 'androidx.core:core-ktx:1.0.0'
 
     // Crash
-    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-common-java8:$lifecycle_version"
-
-    implementation "androidx.room:room-runtime:$room_version"
-    kapt "androidx.room:room-compiler:$room_version"
-
-    implementation "android.arch.work:work-runtime-ktx:$work_version"
+    implementation 'ch.acra:acra-http:5.2.0'
+    implementation 'ch.acra:acra-dialog:5.2.0'
 }
 
 
@@ -178,4 +166,4 @@ def initAppLoginPropertiesIfNeeded() {
             entry(key: "appLoginPassword", value: System.getProperty("appLoginPassword"))
         }
     }
-}
+}

app/proguard-rules.pro

@@ -30,6 +30,22 @@
     <fields>;
 }
 
+
+##Retrofit
+#-keep class com.google.gson.** { *; }
+#-keep class com.google.inject.** { *; }
+#-keep class org.apache.http.** { *; }
+#-keep class org.apache.james.mime4j.** { *; }
+#-keep class javax.inject.** { *; }
+#-keep class retrofit.** { *; }
+#-keepclassmembernames interface * {
+#    @retrofit.http.* <methods>;
+#}
+#-keep class retrofit.** { *; }
+#-keep class apps.amine.bou.readerforselfoss.api.selfoss.model.** { *; }
+#-keepclassmembernames interface * {
+#    @retrofit.http.* <methods>;
+#}
 -dontwarn okio.**
 -dontwarn retrofit2.Platform$Java8
 -keep class retrofit.** { *; }
@@ -59,7 +75,4 @@
 
 -dontwarn javax.annotation.**
 
--keep class android.support.v7.widget.SearchView { *; }
-
-# maybe remove later ?
--keep class * extends androidx.fragment.app.Fragment
+-keep class androidx.appcompat.widget.SearchView { *; }

app/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/1.json

@@ -1,96 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 1,
-    "identityHash": "08ca537d7ac9d4dd216e8e395d70801a",
-    "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": []
-      }
-    ],
-    "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, \"08ca537d7ac9d4dd216e8e395d70801a\")"
-    ]
-  }
-}

app/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/2.json

@@ -1,176 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 2,
-    "identityHash": "6fa6944b04100d68eab61039876a8804",
-    "entities": [
-      {
-        "tableName": "tags",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
-        "fields": [
-          {
-            "fieldPath": "tag",
-            "columnName": "tag",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "tag"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "sources",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tags",
-            "columnName": "tags",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "spout",
-            "columnName": "spout",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "error",
-            "columnName": "error",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "icon",
-            "columnName": "icon",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "items",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT NOT NULL, `icon` TEXT NOT NULL, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "datetime",
-            "columnName": "datetime",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "starred",
-            "columnName": "starred",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "thumbnail",
-            "columnName": "thumbnail",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "icon",
-            "columnName": "icon",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "link",
-            "columnName": "link",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sourcetitle",
-            "columnName": "sourcetitle",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tags",
-            "columnName": "tags",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "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, \"6fa6944b04100d68eab61039876a8804\")"
-    ]
-  }
-}

app/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/3.json

@@ -1,226 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 3,
-    "identityHash": "7ad9c4961992c13b670128485ebb3efc",
-    "entities": [
-      {
-        "tableName": "tags",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
-        "fields": [
-          {
-            "fieldPath": "tag",
-            "columnName": "tag",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "tag"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "sources",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tags",
-            "columnName": "tags",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "spout",
-            "columnName": "spout",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "error",
-            "columnName": "error",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "icon",
-            "columnName": "icon",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "items",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT NOT NULL, `icon` TEXT NOT NULL, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "datetime",
-            "columnName": "datetime",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "starred",
-            "columnName": "starred",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "thumbnail",
-            "columnName": "thumbnail",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "icon",
-            "columnName": "icon",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "link",
-            "columnName": "link",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sourcetitle",
-            "columnName": "sourcetitle",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tags",
-            "columnName": "tags",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "actions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "articleId",
-            "columnName": "articleid",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "read",
-            "columnName": "read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "starred",
-            "columnName": "starred",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unstarred",
-            "columnName": "unstarred",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"7ad9c4961992c13b670128485ebb3efc\")"
-    ]
-  }
-}

app/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt

@@ -7,17 +7,14 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
-import androidx.test.espresso.action.ViewActions.pressBack
 import androidx.test.espresso.action.ViewActions.pressKey
 import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.contrib.DrawerActions
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.Intents.intended
 import androidx.test.espresso.intent.Intents.times
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText

app/src/androidTest/java/apps/amine/bou/readerforselfoss/IntroActivityEspressoTest.kt

@@ -0,0 +1,91 @@
+package apps.amine.bou.readerforselfoss
+
+import android.content.Context
+import android.content.Intent
+import androidx.test.InstrumentationRegistry.getInstrumentation
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.Intents.times
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import apps.amine.bou.readerforselfoss.utils.Config
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.*
+
+@RunWith(AndroidJUnit4::class)
+class IntroActivityEspressoTest {
+
+    @Rule @JvmField
+    val rule = ActivityTestRule(IntroActivity::class.java, true, false)
+
+    @Before
+    fun clearData() {
+        val editor =
+                getInstrumentation().targetContext
+                        .getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+                        .edit()
+        editor.clear()
+        editor.commit()
+
+        Intents.init()
+    }
+
+    @Test
+    fun nextEachTimes() {
+
+        rule.launchActivity(Intent())
+
+        onView(withText(R.string.intro_hello_title)).check(matches(isDisplayed()))
+        onView(withId(R.id.button_next)).perform(click())
+        onView(withText(R.string.intro_needs_selfoss_message)).check(matches(isDisplayed()))
+        onView(withId(R.id.button_next)).perform(click())
+        onView(withText(R.string.intro_all_set_message)).check(matches(isDisplayed()))
+        onView(withId(R.id.button_next)).perform(click())
+
+        intended(hasComponent(IntroActivity::class.java.name), times(1))
+        intended(hasComponent(LoginActivity::class.java.name), times(1))
+    }
+
+    @Test
+    fun nextBackRandomTimes() {
+        val max = 5
+        val min = 1
+
+        val random = (Random().nextInt(max + 1 - min)) + min
+
+        rule.launchActivity(Intent())
+
+        onView(withText(R.string.intro_hello_title)).check(matches(isDisplayed()))
+        onView(withId(R.id.button_next)).perform(click())
+
+        repeat(random) { _ ->
+            onView(withText(R.string.intro_needs_selfoss_message)).check(matches(isDisplayed()))
+            onView(withId(R.id.button_next)).perform(click())
+            onView(withText(R.string.intro_all_set_message)).check(matches(isDisplayed()))
+            onView(withId(R.id.button_back)).perform(click())
+        }
+
+        onView(withId(R.id.button_next)).perform(click())
+        onView(withText(R.string.intro_all_set_message)).check(matches(isDisplayed()))
+        onView(withId(R.id.button_next)).perform(click())
+
+        intended(hasComponent(IntroActivity::class.java.name), times(1))
+        intended(hasComponent(LoginActivity::class.java.name), times(1))
+    }
+
+    @After
+    fun releaseIntents() {
+        Intents.release()
+    }
+}

app/src/androidTest/java/apps/amine/bou/readerforselfoss/MainActivityEspressoTest.kt

@@ -45,6 +45,7 @@ class MainActivityEspressoTest {
         rule.launchActivity(intent)
 
         intended(hasComponent(MainActivity::class.java.name))
+        intended(hasComponent(IntroActivity::class.java.name))
         intended(hasComponent(LoginActivity::class.java.name), times(0))
     }
 
@@ -57,6 +58,7 @@ class MainActivityEspressoTest {
 
         intended(hasComponent(MainActivity::class.java.name))
         intended(hasComponent(LoginActivity::class.java.name))
+        intended(hasComponent(IntroActivity::class.java.name), times(0))
     }
 
     @After

app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="apps.amine.bou.readerforselfoss">
+    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" />
 
     <application
@@ -11,19 +11,19 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/NoBar">
         <activity
             android:name=".MainActivity"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
+        </activity>
+        <activity
+            android:name=".IntroActivity"
+            android:theme="@style/Theme.Intro">
         </activity>
         <activity
             android:name=".LoginActivity"
@@ -37,7 +37,7 @@
             android:parentActivityName=".HomeActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".HomeActivity" />
+                android:value="apps.amine.bou.readerforselfoss.HomeActivity" />
         </activity>
         <activity
             android:name=".SourcesActivity"
@@ -55,7 +55,9 @@
 
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="text/plain" />
             </intent-filter>
         </activity>
@@ -74,9 +76,6 @@
             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,6 +1,5 @@
 package apps.amine.bou.readerforselfoss
 
-import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
@@ -23,13 +22,12 @@ import apps.amine.bou.readerforselfoss.themes.Toppings
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid
 import com.ftinc.scoop.Scoop
-import kotlinx.android.synthetic.main.activity_add_source.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 import android.graphics.PorterDuff
-
-
+import androidx.appcompat.widget.Toolbar
+import kotlinx.android.synthetic.main.activity_add_source.*
 
 class AddSourceActivity : AppCompatActivity() {
 
@@ -86,13 +84,10 @@ class AddSourceActivity : AppCompatActivity() {
 
         try {
             val prefs = PreferenceManager.getDefaultSharedPreferences(this)
-            val settings =
-                getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
             api = SelfossApi(
                 this,
                 this@AddSourceActivity,
-                settings.getBoolean("isSelfSignedCert", false),
-                prefs.getString("api_timeout", "-1").toLong(),
+                prefs.getBoolean("isSelfSignedCert", false),
                 prefs.getBoolean("should_log_everything", false)
             )
         } catch (e: IllegalArgumentException) {
@@ -112,7 +107,7 @@ class AddSourceActivity : AppCompatActivity() {
         super.onResume()
         val config = Config(this)
 
-        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid(false, this@AddSourceActivity)) {
+        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid()) {
             mustLoginToAddSource()
         } else {
             handleSpoutsSpinner(spoutsSpinner, api, progress, formContainer)

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

@@ -0,0 +1,70 @@
+package apps.amine.bou.readerforselfoss
+
+import agency.tango.materialintroscreen.MaterialIntroActivity
+import agency.tango.materialintroscreen.MessageButtonBehaviour
+import agency.tango.materialintroscreen.SlideFragmentBuilder
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.preference.PreferenceManager
+import android.view.View
+import androidx.appcompat.app.AppCompatDelegate
+
+class IntroActivity : MaterialIntroActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+
+        addSlide(
+            SlideFragmentBuilder()
+                .backgroundColor(R.color.colorPrimary)
+                .buttonsColor(R.color.colorAccent)
+                .image(R.drawable.web_hi_res_512)
+                .title(getString(R.string.intro_hello_title))
+                .description(getString(R.string.intro_hello_message))
+                .build()
+        )
+
+        addSlide(
+            SlideFragmentBuilder()
+                .backgroundColor(R.color.colorAccent)
+                .buttonsColor(R.color.colorPrimary)
+                .image(R.drawable.ic_info_outline_white_48px)
+                .title(getString(R.string.intro_needs_selfoss_title))
+                .description(getString(R.string.intro_needs_selfoss_message))
+                .build(),
+            MessageButtonBehaviour(
+                View.OnClickListener {
+                    val browserIntent = Intent(
+                        Intent.ACTION_VIEW,
+                        Uri.parse("https://selfoss.aditu.de")
+                    )
+                    startActivity(browserIntent)
+                }, getString(R.string.intro_needs_selfoss_link)
+            )
+        )
+
+        addSlide(
+            SlideFragmentBuilder()
+                .backgroundColor(R.color.colorPrimaryDark)
+                .buttonsColor(R.color.colorAccentDark)
+                .image(R.drawable.ic_thumb_up_white_48px)
+                .title(getString(R.string.intro_all_set_title))
+                .description(getString(R.string.intro_all_set_message))
+                .build()
+        )
+    }
+
+    override fun onFinish() {
+        super.onFinish()
+        val getPrefs = PreferenceManager.getDefaultSharedPreferences(baseContext)
+        val e = getPrefs.edit()
+        e.putBoolean("firstStart", false)
+        e.apply()
+        val intent = Intent(this, LoginActivity::class.java)
+        startActivity(intent)
+        finish()
+    }
+}

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

@@ -21,7 +21,6 @@ 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.*
@@ -54,6 +53,7 @@ class LoginActivity : AppCompatActivity() {
 
         handleBaseUrlFail()
 
+
         settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
         userIdentifier = settings.getString("unique_id", "")
         logErrors = settings.getBoolean("login_debug", false)
@@ -112,9 +112,8 @@ class LoginActivity : AppCompatActivity() {
             alertDialog.setMessage(getString(R.string.base_url_error))
             alertDialog.setButton(
                 AlertDialog.BUTTON_NEUTRAL,
-                "OK",
-                { dialog, _ -> dialog.dismiss() }
-            )
+                "OK"
+            ) { dialog, _ -> dialog.dismiss() }
             alertDialog.show()
         }
     }
@@ -144,7 +143,7 @@ class LoginActivity : AppCompatActivity() {
         var cancel = false
         var focusView: View? = null
 
-        if (!url.isBaseUrlValid(logErrors, this@LoginActivity)) {
+        if (!url.isBaseUrlValid()) {
             urlView.error = getString(R.string.login_url_problem)
             focusView = urlView
             cancel = true
@@ -155,15 +154,14 @@ class LoginActivity : AppCompatActivity() {
                 alertDialog.setMessage(getString(R.string.text_wrong_url))
                 alertDialog.setButton(
                     AlertDialog.BUTTON_NEUTRAL,
-                    "OK",
-                    { dialog, _ -> dialog.dismiss() }
-                )
+                    "OK"
+                ) { dialog, _ -> dialog.dismiss() }
                 alertDialog.show()
                 inValidCount = 0
             }
         }
 
-        if (isWithLogin) {
+        if (isWithLogin || isWithHTTPLogin) {
             if (TextUtils.isEmpty(password)) {
                 passwordView.error = getString(R.string.error_invalid_password)
                 focusView = passwordView
@@ -177,20 +175,6 @@ 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 {
@@ -208,53 +192,47 @@ class LoginActivity : AppCompatActivity() {
                 this,
                 this@LoginActivity,
                 isWithSelfSignedCert,
-                -1L,
                 isWithSelfSignedCert
             )
-
-            if (this@LoginActivity.isNetworkAccessible(this@LoginActivity.findViewById(R.id.loginForm))) {
-                api.login().enqueue(object : Callback<SuccessResponse> {
-                    private fun preferenceError(t: Throwable) {
-                        editor.remove("url")
-                        editor.remove("login")
-                        editor.remove("httpUserName")
-                        editor.remove("password")
-                        editor.remove("httpPassword")
-                        editor.apply()
-                        urlView.error = getString(R.string.wrong_infos)
-                        loginView.error = getString(R.string.wrong_infos)
-                        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)
+            api.login().enqueue(object : Callback<SuccessResponse> {
+                private fun preferenceError(t: Throwable) {
+                    editor.remove("url")
+                    editor.remove("login")
+                    editor.remove("httpUserName")
+                    editor.remove("password")
+                    editor.remove("httpPassword")
+                    editor.apply()
+                    urlView.error = getString(R.string.wrong_infos)
+                    loginView.error = getString(R.string.wrong_infos)
+                    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)
+                }
 
-                    override fun onResponse(
-                        call: Call<SuccessResponse>,
-                        response: Response<SuccessResponse>
-                    ) {
-                        if (response.body() != null && response.body()!!.isSuccess) {
-                            goToMain()
-                        } else {
-                            preferenceError(Exception("No response body..."))
-                        }
+                override fun onResponse(
+                    call: Call<SuccessResponse>,
+                    response: Response<SuccessResponse>
+                ) {
+                    if (response.body() != null && response.body()!!.isSuccess) {
+                        goToMain()
+                    } else {
+                        preferenceError(Exception("No response body..."))
                     }
+                }
 
-                    override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                        preferenceError(t)
-                    }
-                })
-            } else {
-                showProgress(false)
-            }
+                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                    preferenceError(t)
+                }
+            })
         }
     }
 

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

@@ -11,9 +11,17 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        val intent = Intent(this, LoginActivity::class.java)
+        if (PreferenceManager.getDefaultSharedPreferences(baseContext).getBoolean(
+                "firstStart",
+                true
+            )) {
+            val i = Intent(this@MainActivity, IntroActivity::class.java)
+            startActivity(i)
+        } else {
+            val intent = Intent(this, LoginActivity::class.java)
+            startActivity(intent)
+        }
 
-        startActivity(intent)
         finish()
     }
 }

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

@@ -1,16 +1,14 @@
 package apps.amine.bou.readerforselfoss
 
-import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.content.Context
+import android.content.SharedPreferences
 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.anupcowkur.reservoir.Reservoir
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.ftinc.scoop.Scoop
@@ -29,8 +27,10 @@ import java.io.IOException
 import java.util.UUID.randomUUID
 
 
-@AcraHttpSender(uri = "http://37.187.110.167/amine/acra/simplest-acra.php",
-                httpMethod = HttpSender.Method.POST)
+@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)
@@ -43,13 +43,14 @@ import java.util.UUID.randomUUID
     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()
 
+        initCache()
+
         val prefs = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
         if (prefs.getString("unique_id", "").isEmpty()) {
             val editor = prefs.edit()
@@ -62,25 +63,6 @@ class MyApp : MultiDexApplication() {
         initTheme()
 
         tryToHandleBug()
-
-        handleNotificationChannels()
-    }
-
-    private fun handleNotificationChannels() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
-
-            val name = getString(R.string.notification_channel_sync)
-            val importance = NotificationManager.IMPORTANCE_LOW
-            val mChannel = NotificationChannel(Config.syncChannelId, name, importance)
-
-            val newItemsChannelname = getString(R.string.new_items_channel_sync)
-            val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT
-            val newItemsChannelmChannel = NotificationChannel(Config.newItemsChannelId, newItemsChannelname, newItemsChannelimportance)
-
-            notificationManager.createNotificationChannel(mChannel)
-            notificationManager.createNotificationChannel(newItemsChannelmChannel)
-        }
     }
 
     override fun attachBaseContext(base: Context?) {
@@ -98,6 +80,14 @@ class MyApp : MultiDexApplication() {
             .applyAllDefaultRules()
     }
 
+    private fun initCache() {
+        try {
+            Reservoir.init(this, 8192) //in bytes
+        } catch (e: IOException) {
+            //failure
+        }
+    }
+
     private fun initDrawerImageLoader() {
         DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
             override fun set(
@@ -107,7 +97,7 @@ class MyApp : MultiDexApplication() {
                 tag: String?
             ) {
                 Glide.with(imageView?.context)
-                    .loadMaybeBasicAuth(config, uri.toString())
+                    .load(uri)
                     .apply(RequestOptions.fitCenterTransform().placeholder(placeholder))
                     .into(imageView)
             }

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

@@ -1,7 +1,5 @@
 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
@@ -15,23 +13,14 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.room.Room
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.fragments.ArticleFragment
-import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
-import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
-import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
 import apps.amine.bou.readerforselfoss.transformers.DepthPageTransformer
-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 apps.amine.bou.readerforselfoss.utils.succeeded
 import apps.amine.bou.readerforselfoss.utils.toggleStar
 import com.ftinc.scoop.Scoop
@@ -41,7 +30,6 @@ import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import kotlin.concurrent.thread
 
 class ReaderActivity : AppCompatActivity() {
 
@@ -54,13 +42,6 @@ class ReaderActivity : AppCompatActivity() {
 
     private lateinit var toolbarMenu: Menu
 
-    private lateinit var db: AppDatabase
-    private lateinit var prefs: SharedPreferences
-
-    private var activeAlignment: Int = 1
-    val JUSTIFY = 1
-    val ALIGN_LEFT = 2
-
     private fun showMenuItem(willAddToFavorite: Boolean) {
         toolbarMenu.findItem(R.id.save).isVisible = willAddToFavorite
         toolbarMenu.findItem(R.id.unsave).isVisible = !willAddToFavorite
@@ -74,21 +55,14 @@ class ReaderActivity : AppCompatActivity() {
         showMenuItem(false)
     }
 
-    private lateinit var editor: SharedPreferences.Editor
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_reader)
 
-        db = Room.databaseBuilder(
-            applicationContext,
-            AppDatabase::class.java, "selfoss-database"
-        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()
-
         val scoop = Scoop.getInstance()
         scoop.bind(this, Toppings.PRIMARY.value, toolBar)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
         }
 
@@ -96,22 +70,16 @@ class ReaderActivity : AppCompatActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
-        val settings =
-            getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-
-        prefs = PreferenceManager.getDefaultSharedPreferences(this)
-        editor = prefs.edit()
+        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
 
         debugReadingItems = prefs.getBoolean("read_debug", false)
         userIdentifier = prefs.getString("unique_id", "")
         markOnScroll = prefs.getBoolean("mark_on_scroll", false)
-        activeAlignment = prefs.getInt("text_align", JUSTIFY)
 
         api = SelfossApi(
             this,
             this@ReaderActivity,
-            settings.getBoolean("isSelfSignedCert", false),
-            prefs.getString("api_timeout", "-1").toLong(),
+            prefs.getBoolean("isSelfSignedCert", false),
             prefs.getBoolean("should_log_everything", false)
         )
 
@@ -121,10 +89,9 @@ class ReaderActivity : AppCompatActivity() {
 
         currentItem = intent.getIntExtra("currentItem", 0)
 
-        readItem(allItems[currentItem])
+        readItem(allItems[currentItem].id)
 
-        pager.adapter =
-                ScreenSlidePagerAdapter(supportFragmentManager, AppColors(this@ReaderActivity))
+        pager.adapter = ScreenSlidePagerAdapter(supportFragmentManager, AppColors(this@ReaderActivity))
         pager.currentItem = currentItem
     }
 
@@ -134,7 +101,8 @@ class ReaderActivity : AppCompatActivity() {
         notifyAdapter()
 
         pager.setPageTransformer(true, DepthPageTransformer())
-        (indicator as CircleIndicator).setViewPager(pager)
+        // TODO: add back the page indicator
+        // (indicator as CircleIndicator).setViewPager(pager as android.support.v4.view.ViewPager)
 
         pager.addOnPageChangeListener(
             object : ViewPager.SimpleOnPageChangeListener() {
@@ -146,57 +114,44 @@ class ReaderActivity : AppCompatActivity() {
                     } else {
                         canFavorite()
                     }
-                    readItem(allItems[pager.currentItem])
+                    readItem(allItems[pager.currentItem].id)
                 }
             }
         )
     }
 
-    fun readItem(item: Item) {
+    fun readItem(id: String) {
         if (markOnScroll) {
-            thread {
-                db.itemsDao().delete(item.toEntity())
-            }
-            if (this@ReaderActivity.isNetworkAccessible(this@ReaderActivity.findViewById(R.id.reader_activity_view))) {
-                api.markItem(item.id).enqueue(
-                    object : Callback<SuccessResponse> {
-                        override fun onResponse(
-                            call: Call<SuccessResponse>,
-                            response: Response<SuccessResponse>
-                        ) {
-                            if (!response.succeeded() && debugReadingItems) {
-                                val message =
-                                    "message: ${response.message()} " +
-                                            "response isSuccess: ${response.isSuccessful} " +
-                                            "response code: ${response.code()} " +
-                                            "response message: ${response.message()} " +
-                                            "response errorBody: ${response.errorBody()?.string()} " +
-                                            "body success: ${response.body()?.success} " +
-                                            "body isSuccess: ${response.body()?.isSuccess}"
-                                ACRA.getErrorReporter()
-                                    .maybeHandleSilentException(Exception(message), this@ReaderActivity)
-                            }
-                        }
-
-                        override fun onFailure(
-                            call: Call<SuccessResponse>,
-                            t: Throwable
-                        ) {
-                            thread {
-                                db.itemsDao().insertAllItems(item.toEntity())
-                            }
-                            if (debugReadingItems) {
-                                ACRA.getErrorReporter()
-                                    .maybeHandleSilentException(t, this@ReaderActivity)
-                            }
+            api.markItem(id).enqueue(
+                object : Callback<SuccessResponse> {
+                    override fun onResponse(
+                        call: Call<SuccessResponse>,
+                        response: Response<SuccessResponse>
+                    ) {
+                        if (!response.succeeded() && debugReadingItems) {
+                            val message =
+                                "message: ${response.message()} " +
+                                        "response isSuccess: ${response.isSuccessful} " +
+                                        "response code: ${response.code()} " +
+                                        "response message: ${response.message()} " +
+                                        "response errorBody: ${response.errorBody()?.string()} " +
+                                        "body success: ${response.body()?.success} " +
+                                        "body isSuccess: ${response.body()?.isSuccess}"
+                            ACRA.getErrorReporter()
+                                .maybeHandleSilentException(Exception(message), this@ReaderActivity)
+                        }
+                    }
+
+                    override fun onFailure(
+                        call: Call<SuccessResponse>,
+                        t: Throwable
+                    ) {
+                        if (debugReadingItems) {
+                            ACRA.getErrorReporter().maybeHandleSilentException(t, this@ReaderActivity)
                         }
                     }
-                )
-            } else {
-                thread {
-                    db.actionsDao().insertAllActions(ActionEntity(item.id, true, false, false, false))
                 }
-            }
+            )
         }
     }
 
@@ -219,6 +174,7 @@ class ReaderActivity : AppCompatActivity() {
     private inner class ScreenSlidePagerAdapter(fm: FragmentManager, val appColors: AppColors) :
         FragmentStatePagerAdapter(fm) {
 
+
         override fun getCount(): Int {
             return allItems.size
         }
@@ -230,20 +186,10 @@ class ReaderActivity : AppCompatActivity() {
         override fun startUpdate(container: ViewGroup) {
             super.startUpdate(container)
 
-            container.background = ColorDrawable(
-                ContextCompat.getColor(
-                    this@ReaderActivity,
-                    appColors.colorBackground
-                )
-            )
+            container.background = ColorDrawable(ContextCompat.getColor(this@ReaderActivity, appColors.colorBackground))
         }
     }
 
-    fun alignmentMenu(showJustify: Boolean) {
-        toolbarMenu.findItem(R.id.align_left).isVisible = !showJustify
-        toolbarMenu.findItem(R.id.align_justify).isVisible = showJustify
-    }
-
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         val inflater = menuInflater
         inflater.inflate(R.menu.reader_menu, menu)
@@ -254,115 +200,68 @@ class ReaderActivity : AppCompatActivity() {
         } else {
             canFavorite()
         }
-        if (activeAlignment == JUSTIFY) {
-            alignmentMenu(false)
-        } else {
-            alignmentMenu(true)
-        }
 
         return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        fun afterSave() {
-            allItems[pager.currentItem] =
-                    allItems[pager.currentItem].toggleStar()
-            notifyAdapter()
-            canRemoveFromFavorite()
-        }
-
-        fun afterUnsave() {
-            allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
-            notifyAdapter()
-            canFavorite()
-        }
-
         when (item.itemId) {
             android.R.id.home -> {
                 onBackPressed()
                 return true
             }
             R.id.save -> {
-                if (this@ReaderActivity.isNetworkAccessible(null)) {
-                    api.starrItem(allItems[pager.currentItem].id)
-                        .enqueue(object : Callback<SuccessResponse> {
-                            override fun onResponse(
-                                call: Call<SuccessResponse>,
-                                response: Response<SuccessResponse>
-                            ) {
-                                afterSave()
-                            }
+                api.starrItem(allItems[pager.currentItem].id)
+                    .enqueue(object : Callback<SuccessResponse> {
+                        override fun onResponse(
+                            call: Call<SuccessResponse>,
+                            response: Response<SuccessResponse>
+                        ) {
+                            allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
+                            notifyAdapter()
+                            canRemoveFromFavorite()
+                        }
 
-                            override fun onFailure(
-                                call: Call<SuccessResponse>,
-                                t: Throwable
-                            ) {
-                                Toast.makeText(
-                                    baseContext,
-                                    R.string.cant_mark_favortie,
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        })
-                } else {
-                    thread {
-                        db.actionsDao().insertAllActions(ActionEntity(allItems[pager.currentItem].id, false, false, true, false))
-                        afterSave()
-                    }
-                }
+                        override fun onFailure(
+                            call: Call<SuccessResponse>,
+                            t: Throwable
+                        ) {
+                            Toast.makeText(
+                                baseContext,
+                                R.string.cant_mark_favortie,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    })
             }
             R.id.unsave -> {
-                if (this@ReaderActivity.isNetworkAccessible(null)) {
-                    api.unstarrItem(allItems[pager.currentItem].id)
-                        .enqueue(object : Callback<SuccessResponse> {
-                            override fun onResponse(
-                                call: Call<SuccessResponse>,
-                                response: Response<SuccessResponse>
-                            ) {
-                                afterUnsave()
-                            }
+                api.unstarrItem(allItems[pager.currentItem].id)
+                    .enqueue(object : Callback<SuccessResponse> {
+                        override fun onResponse(
+                            call: Call<SuccessResponse>,
+                            response: Response<SuccessResponse>
+                        ) {
+                            allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
+                            notifyAdapter()
+                            canFavorite()
+                        }
 
-                            override fun onFailure(
-                                call: Call<SuccessResponse>,
-                                t: Throwable
-                            ) {
-                                Toast.makeText(
-                                    baseContext,
-                                    R.string.cant_unmark_favortie,
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        })
-                } else {
-                    thread {
-                        db.actionsDao().insertAllActions(ActionEntity(allItems[pager.currentItem].id, false, false, false, true))
-                        afterUnsave()
-                    }
-                }
-            }
-            R.id.align_left -> {
-                editor.putInt("text_align", ALIGN_LEFT)
-                editor.apply()
-                alignmentMenu(true)
-                refreshFragment()
-            }
-            R.id.align_justify -> {
-                editor.putInt("text_align", JUSTIFY)
-                editor.apply()
-                alignmentMenu(false)
-                refreshFragment()
+                        override fun onFailure(
+                            call: Call<SuccessResponse>,
+                            t: Throwable
+                        ) {
+                            Toast.makeText(
+                                baseContext,
+                                R.string.cant_unmark_favortie,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    })
             }
         }
         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,21 +1,18 @@
 package apps.amine.bou.readerforselfoss
 
-import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
 import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.LinearLayoutManager
 import android.widget.Toast
+import androidx.recyclerview.widget.LinearLayoutManager
 import apps.amine.bou.readerforselfoss.adapters.SourcesListAdapter
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.Source
+import apps.amine.bou.readerforselfoss.api.selfoss.Sources
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
-import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import com.ftinc.scoop.Scoop
 import kotlinx.android.synthetic.main.activity_sources.*
 import retrofit2.Call
@@ -56,52 +53,47 @@ 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,
-            settings.getBoolean("isSelfSignedCert", false),
-            prefs.getString("api_timeout", "-1").toLong(),
+            prefs.getBoolean("isSelfSignedCert", false),
             prefs.getBoolean("should_log_everything", false)
         )
-        var items: ArrayList<Source> = ArrayList()
+        var items: ArrayList<Sources> = ArrayList()
 
         recyclerView.setHasFixedSize(true)
         recyclerView.layoutManager = mLayoutManager
 
-        if (this@SourcesActivity.isNetworkAccessible(this@SourcesActivity.findViewById(R.id.recyclerView))) {
-            api.sources.enqueue(object : Callback<List<Source>> {
-                override fun onResponse(
-                    call: Call<List<Source>>,
-                    response: Response<List<Source>>
-                ) {
-                    if (response.body() != null && response.body()!!.isNotEmpty()) {
-                        items = response.body() as ArrayList<Source>
-                    }
-                    val mAdapter = SourcesListAdapter(this@SourcesActivity, items, api)
-                    recyclerView.adapter = mAdapter
-                    mAdapter.notifyDataSetChanged()
-                    if (items.isEmpty()) {
-                        Toast.makeText(
-                            this@SourcesActivity,
-                            R.string.nothing_here,
-                            Toast.LENGTH_SHORT
-                        ).show()
-                    }
+        api.sources.enqueue(object : Callback<List<Sources>> {
+            override fun onResponse(
+                call: Call<List<Sources>>,
+                response: Response<List<Sources>>
+            ) {
+                if (response.body() != null && response.body()!!.isNotEmpty()) {
+                    items = response.body() as ArrayList<Sources>
                 }
-
-                override fun onFailure(call: Call<List<Source>>, t: Throwable) {
+                val mAdapter = SourcesListAdapter(this@SourcesActivity, items, api)
+                recyclerView.adapter = mAdapter
+                mAdapter.notifyDataSetChanged()
+                if (items.isEmpty()) {
                     Toast.makeText(
                         this@SourcesActivity,
-                        R.string.cant_get_sources,
+                        R.string.nothing_here,
                         Toast.LENGTH_SHORT
                     ).show()
                 }
-            })
-        }
+            }
+
+            override fun onFailure(call: Call<List<Sources>>, t: Throwable) {
+                Toast.makeText(
+                    this@SourcesActivity,
+                    R.string.cant_get_sources,
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+        })
 
         fab.setOnClickListener {
             startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))

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

@@ -14,16 +14,11 @@ import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
-import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.themes.AppColors
-import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.LinkOnTouchListener
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.bitmapCenterCrop
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.openInBrowserAsNewTask
 import apps.amine.bou.readerforselfoss.utils.openItemUrl
 import apps.amine.bou.readerforselfoss.utils.shareLink
@@ -38,13 +33,11 @@ import kotlinx.android.synthetic.main.card_item.view.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import kotlin.concurrent.thread
 
 class ItemCardAdapter(
     override val app: Activity,
     override var items: ArrayList<Item>,
     override val api: SelfossApi,
-    override val db: AppDatabase,
     private val helper: CustomTabActivityHelper,
     private val internalBrowser: Boolean,
     private val articleViewer: Boolean,
@@ -52,7 +45,6 @@ class ItemCardAdapter(
     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
@@ -71,7 +63,6 @@ class ItemCardAdapter(
 
         holder.mView.favButton.isLiked = itm.starred
         holder.mView.title.text = Html.fromHtml(itm.title)
-        holder.mView.title.setOnTouchListener(LinkOnTouchListener())
 
         holder.mView.title.setLinkTextColor(appColors.colorAccent)
 
@@ -88,7 +79,7 @@ class ItemCardAdapter(
             holder.mView.itemImage.setImageDrawable(null)
         } else {
             holder.mView.itemImage.visibility = View.VISIBLE
-            c.bitmapCenterCrop(config, itm.getThumbnail(c), holder.mView.itemImage)
+            c.bitmapCenterCrop(itm.getThumbnail(c), holder.mView.itemImage)
         }
 
         if (itm.getIcon(c).isEmpty()) {
@@ -101,7 +92,7 @@ class ItemCardAdapter(
                     .build(itm.sourcetitle.toTextDrawableString(c), color)
             holder.mView.sourceImage.setImageDrawable(drawable)
         } else {
-            c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.sourceImage)
+            c.circularBitmapDrawable(itm.getIcon(c), holder.mView.sourceImage)
         }
 
         holder.mView.favButton.isLiked = itm.starred
@@ -123,66 +114,53 @@ class ItemCardAdapter(
             mView.favButton.setOnLikeListener(object : OnLikeListener {
                 override fun liked(likeButton: LikeButton) {
                     val (id) = items[adapterPosition]
-                    if (c.isNetworkAccessible(null)) {
-                        api.starrItem(id).enqueue(object : Callback<SuccessResponse> {
-                            override fun onResponse(
-                                call: Call<SuccessResponse>,
-                                response: Response<SuccessResponse>
-                            ) {
-                            }
-
-                            override fun onFailure(
-                                call: Call<SuccessResponse>,
-                                t: Throwable
-                            ) {
-                                mView.favButton.isLiked = false
-                                Toast.makeText(
-                                    c,
-                                    R.string.cant_mark_favortie,
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        })
-                    } else {
-                        thread {
-                            db.actionsDao().insertAllActions(ActionEntity(id, false, false, true, false))
+                    api.starrItem(id).enqueue(object : Callback<SuccessResponse> {
+                        override fun onResponse(
+                            call: Call<SuccessResponse>,
+                            response: Response<SuccessResponse>
+                        ) {
                         }
-                    }
+
+                        override fun onFailure(
+                            call: Call<SuccessResponse>,
+                            t: Throwable
+                        ) {
+                            mView.favButton.isLiked = false
+                            Toast.makeText(
+                                c,
+                                R.string.cant_mark_favortie,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    })
                 }
 
                 override fun unLiked(likeButton: LikeButton) {
                     val (id) = items[adapterPosition]
-                    if (c.isNetworkAccessible(null)) {
-                        api.unstarrItem(id).enqueue(object : Callback<SuccessResponse> {
-                            override fun onResponse(
-                                call: Call<SuccessResponse>,
-                                response: Response<SuccessResponse>
-                            ) {
-                            }
-
-                            override fun onFailure(
-                                call: Call<SuccessResponse>,
-                                t: Throwable
-                            ) {
-                                mView.favButton.isLiked = true
-                                Toast.makeText(
-                                    c,
-                                    R.string.cant_unmark_favortie,
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        })
-                    } else {
-                        thread {
-                            db.actionsDao().insertAllActions(ActionEntity(id, false, false, false, true))
+                    api.unstarrItem(id).enqueue(object : Callback<SuccessResponse> {
+                        override fun onResponse(
+                            call: Call<SuccessResponse>,
+                            response: Response<SuccessResponse>
+                        ) {
                         }
-                    }
+
+                        override fun onFailure(
+                            call: Call<SuccessResponse>,
+                            t: Throwable
+                        ) {
+                            mView.favButton.isLiked = true
+                            Toast.makeText(
+                                c,
+                                R.string.cant_unmark_favortie,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    })
                 }
             })
 
             mView.shareBtn.setOnClickListener {
-                val item = items[adapterPosition]
-                c.shareLink(item.getLinkDecoded(), item.title)
+                c.shareLink(items[adapterPosition].getLinkDecoded())
             }
 
             mView.browserBtn.setOnClickListener {

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

@@ -5,23 +5,16 @@ import android.content.Context
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import android.text.Html
-import android.text.Spannable
-import android.text.style.ClickableSpan
 import android.util.TypedValue
 import android.view.LayoutInflater
-import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import android.widget.Toast
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
-import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.themes.AppColors
-import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.LinkOnTouchListener
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.bitmapCenterCrop
@@ -46,18 +39,18 @@ class ItemListAdapter(
     override val app: Activity,
     override var items: ArrayList<Item>,
     override val api: SelfossApi,
-    override val db: AppDatabase,
     private val helper: CustomTabActivityHelper,
+    private val clickBehavior: Boolean,
     private val internalBrowser: Boolean,
     private val articleViewer: Boolean,
     override val debugReadingItems: Boolean,
     override val userIdentifier: String,
     override val appColors: AppColors,
-    override val config: Config,
     override val updateItems: (ArrayList<Item>) -> Unit
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
     private val generator: ColorGenerator = ColorGenerator.MATERIAL
     private val c: Context = app.baseContext
+    private val bars: ArrayList<Boolean> = ArrayList(Collections.nCopies(items.size + 1, false))
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val v = LayoutInflater.from(c).inflate(
@@ -74,8 +67,6 @@ class ItemListAdapter(
 
         holder.mView.title.text = Html.fromHtml(itm.title)
 
-        holder.mView.title.setOnTouchListener(LinkOnTouchListener())
-
         holder.mView.title.setLinkTextColor(appColors.colorAccent)
 
         holder.mView.sourceTitleAndDate.text = itm.sourceAndDateText()
@@ -110,11 +101,24 @@ class ItemListAdapter(
 
                 holder.mView.itemImage.setImageDrawable(drawable)
             } else {
-                c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.itemImage)
+                c.circularBitmapDrawable(itm.getIcon(c), holder.mView.itemImage)
             }
         } else {
-            c.bitmapCenterCrop(config, itm.getThumbnail(c), holder.mView.itemImage)
+            c.bitmapCenterCrop(itm.getThumbnail(c), holder.mView.itemImage)
         }
+
+        // TODO: maybe handle this differently. It crashes when changing tab
+        try {
+            if (bars[position]) {
+                holder.mView.actionBar.visibility = View.VISIBLE
+            } else {
+                holder.mView.actionBar.visibility = View.GONE
+            }
+        } catch (e: IndexOutOfBoundsException) {
+            holder.mView.actionBar.visibility = View.GONE
+        }
+
+        holder.mView.favButton.isLiked = itm.starred
     }
 
     override fun getItemCount(): Int = items.size
@@ -122,23 +126,114 @@ class ItemListAdapter(
     inner class ViewHolder(val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
 
         init {
+            handleClickListeners()
             handleCustomTabActions()
         }
 
+        private fun handleClickListeners() {
+
+            mView.favButton.setOnLikeListener(object : OnLikeListener {
+                override fun liked(likeButton: LikeButton) {
+                    val (id) = items[adapterPosition]
+                    api.starrItem(id).enqueue(object : Callback<SuccessResponse> {
+                        override fun onResponse(
+                            call: Call<SuccessResponse>,
+                            response: Response<SuccessResponse>
+                        ) {
+                        }
+
+                        override fun onFailure(
+                            call: Call<SuccessResponse>,
+                            t: Throwable
+                        ) {
+                            mView.favButton.isLiked = false
+                            Toast.makeText(
+                                c,
+                                R.string.cant_mark_favortie,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    })
+                }
+
+                override fun unLiked(likeButton: LikeButton) {
+                    val (id) = items[adapterPosition]
+                    api.unstarrItem(id).enqueue(object : Callback<SuccessResponse> {
+                        override fun onResponse(
+                            call: Call<SuccessResponse>,
+                            response: Response<SuccessResponse>
+                        ) {
+                        }
+
+                        override fun onFailure(
+                            call: Call<SuccessResponse>,
+                            t: Throwable
+                        ) {
+                            mView.favButton.isLiked = true
+                            Toast.makeText(
+                                c,
+                                R.string.cant_unmark_favortie,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    })
+                }
+            })
+
+            mView.shareBtn.setOnClickListener {
+                c.shareLink(items[adapterPosition].getLinkDecoded())
+            }
+
+            mView.browserBtn.setOnClickListener {
+                c.openInBrowserAsNewTask(items[adapterPosition])
+
+            }
+        }
+
         private fun handleCustomTabActions() {
             val customTabsIntent = c.buildCustomTabsIntent()
             helper.bindCustomTabsService(app)
 
-            mView.setOnClickListener {
-                c.openItemUrl(
-                    items,
-                    adapterPosition,
-                    items[adapterPosition].getLinkDecoded(),
-                    customTabsIntent,
-                    internalBrowser,
-                    articleViewer,
-                    app
-                )
+
+            if (!clickBehavior) {
+                mView.setOnClickListener {
+                    c.openItemUrl(
+                        items,
+                        adapterPosition,
+                        items[adapterPosition].getLinkDecoded(),
+                        customTabsIntent,
+                        internalBrowser,
+                        articleViewer,
+                        app
+                    )
+                }
+                mView.setOnLongClickListener {
+                    actionBarShowHide()
+                    true
+                }
+            } else {
+                mView.setOnClickListener { actionBarShowHide() }
+                mView.setOnLongClickListener {
+                    c.openItemUrl(
+                        items,
+                        adapterPosition,
+                        items[adapterPosition].getLinkDecoded(),
+                        customTabsIntent,
+                        internalBrowser,
+                        articleViewer,
+                        app
+                    )
+                    true
+                }
+            }
+        }
+
+        private fun actionBarShowHide() {
+            bars[adapterPosition] = true
+            if (mView.actionBar.visibility == View.GONE) {
+                mView.actionBar.visibility = View.VISIBLE
+            } else {
+                mView.actionBar.visibility = View.GONE
             }
         }
     }

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

@@ -2,7 +2,6 @@ package apps.amine.bou.readerforselfoss.adapters
 
 import android.app.Activity
 import android.graphics.Color
-import com.google.android.material.snackbar.Snackbar
 import androidx.recyclerview.widget.RecyclerView
 import android.widget.TextView
 import android.widget.Toast
@@ -10,29 +9,22 @@ import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
-import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.themes.AppColors
-import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
-import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
 import apps.amine.bou.readerforselfoss.utils.succeeded
+import com.google.android.material.snackbar.Snackbar
 import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import kotlin.concurrent.thread
 
 abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapter<VH>() {
     abstract var items: ArrayList<Item>
     abstract val api: SelfossApi
-    abstract val 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>) {
@@ -41,7 +33,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         updateItems(items)
     }
 
-    private fun unmarkSnackbar(i: Item, position: Int) {
+    private fun doUnmark(i: Item, position: Int) {
         val s = Snackbar
             .make(
                 app.findViewById(R.id.coordLayout),
@@ -50,34 +42,23 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
             )
             .setAction(R.string.undo_string) {
                 items.add(position, i)
-                thread {
-                    db.itemsDao().insertAllItems(i.toEntity())
-                }
                 notifyItemInserted(position)
                 updateItems(items)
 
-                if (app.isNetworkAccessible(null)) {
-                    api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                        override fun onResponse(
-                            call: Call<SuccessResponse>,
-                            response: Response<SuccessResponse>
-                        ) {
-                        }
-
-                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                            items.remove(i)
-                            thread {
-                                db.itemsDao().delete(i.toEntity())
-                            }
-                            notifyItemRemoved(position)
-                            updateItems(items)
-                        }
-                    })
-                } else {
-                    thread {
-                        db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
+                api.unmarkItem(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)
+                        notifyItemRemoved(position)
+                        updateItems(items)
+                        doUnmark(i, position)
+                    }
+                })
             }
 
         val view = s.view
@@ -86,177 +67,51 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         s.show()
     }
 
-    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())
+    fun removeItemAtIndex(position: Int) {
+
+        val i = items[position]
+
+        items.remove(i)
+        notifyItemRemoved(position)
+        updateItems(items)
+
+
+        api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
+            override fun onResponse(
+                call: Call<SuccessResponse>,
+                response: Response<SuccessResponse>
+            ) {
+                if (!response.succeeded() && debugReadingItems) {
+                    val message =
+                        "message: ${response.message()} " +
+                                "response isSuccess: ${response.isSuccessful} " +
+                                "response code: ${response.code()} " +
+                                "response message: ${response.message()} " +
+                                "response errorBody: ${response.errorBody()?.string()} " +
+                                "body success: ${response.body()?.success} " +
+                                "body isSuccess: ${response.body()?.isSuccess}"
+                    ACRA.getErrorReporter().maybeHandleSilentException(Exception(message), app)
+                    Toast.makeText(app.baseContext, message, Toast.LENGTH_LONG).show()
                 }
+                doUnmark(i, position)
+            }
+
+            override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                if (debugReadingItems) {
+                    ACRA.getErrorReporter().maybeHandleSilentException(t, app)
+                    Toast.makeText(app.baseContext, t.message, Toast.LENGTH_LONG).show()
+                }
+                Toast.makeText(
+                    app,
+                    app.getString(R.string.cant_mark_read),
+                    Toast.LENGTH_SHORT
+                ).show()
+                items.add(i)
                 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)
-        updateItems(items)
-
-        thread {
-            db.itemsDao().delete(i.toEntity())
-        }
-
-        if (app.isNetworkAccessible(null)) {
-            api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                override fun onResponse(
-                    call: Call<SuccessResponse>,
-                    response: Response<SuccessResponse>
-                ) {
-                    if (!response.succeeded() && debugReadingItems) {
-                        val message =
-                            "MARK 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()
-                    }
-
-                    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(position, i)
-                    notifyItemInserted(position)
-                    updateItems(items)
-
-                    thread {
-                        db.itemsDao().insertAllItems(i.toEntity())
-                    }
-                }
-            })
-        } else {
-            thread {
-                db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
-            }
-        }
-    }
-
-    private fun unreadItemAtIndex(position: Int) {
-        val i = items[position]
-        items.remove(i)
-        notifyItemRemoved(position)
-        updateItems(items)
-
-        thread {
-            db.itemsDao().insertAllItems(i.toEntity())
-        }
-
-        if (app.isNetworkAccessible(null)) {
-            api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                override fun onResponse(
-                    call: Call<SuccessResponse>,
-                    response: Response<SuccessResponse>
-                ) {
-                    if (!response.succeeded() && debugReadingItems) {
-                        val message =
-                            "UNMARK 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()
-                    }
-
-                    markSnackbar(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_unread),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                    items.add(i)
-                    notifyItemInserted(position)
-                    updateItems(items)
-
-                    thread {
-                        db.itemsDao().delete(i.toEntity())
-                    }
-                }
-            })
-        } else {
-            thread {
-                db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
-            }
-        }
+        })
     }
 
     fun addItemAtIndex(item: Item, position: Int) {

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

@@ -10,11 +10,9 @@ import android.widget.Button
 import android.widget.Toast
 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.Sources
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
-import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.toTextDrawableString
 import com.amulyakhare.textdrawable.TextDrawable
 import com.amulyakhare.textdrawable.util.ColorGenerator
@@ -25,12 +23,11 @@ import retrofit2.Response
 
 class SourcesListAdapter(
     private val app: Activity,
-    private val items: ArrayList<Source>,
+    private val items: ArrayList<Sources>,
     private val api: SelfossApi
 ) : 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(
@@ -43,7 +40,6 @@ 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)
@@ -55,7 +51,7 @@ class SourcesListAdapter(
                     .build(itm.title.toTextDrawableString(c), color)
             holder.mView.itemImage.setImageDrawable(drawable)
         } else {
-            c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.itemImage)
+            c.circularBitmapDrawable(itm.getIcon(c), holder.mView.itemImage)
         }
 
         holder.mView.sourceTitle.text = itm.title
@@ -74,35 +70,33 @@ class SourcesListAdapter(
             val deleteBtn: Button = mView.findViewById(R.id.deleteBtn)
 
             deleteBtn.setOnClickListener {
-                if (c.isNetworkAccessible(null)) {
-                    val (id) = items[adapterPosition]
-                    api.deleteSource(id).enqueue(object : Callback<SuccessResponse> {
-                        override fun onResponse(
-                            call: Call<SuccessResponse>,
-                            response: Response<SuccessResponse>
-                        ) {
-                            if (response.body() != null && response.body()!!.isSuccess) {
-                                items.removeAt(adapterPosition)
-                                notifyItemRemoved(adapterPosition)
-                                notifyItemRangeChanged(adapterPosition, itemCount)
-                            } else {
-                                Toast.makeText(
-                                    app,
-                                    R.string.can_delete_source,
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        }
-
-                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                val (id) = items[adapterPosition]
+                api.deleteSource(id).enqueue(object : Callback<SuccessResponse> {
+                    override fun onResponse(
+                        call: Call<SuccessResponse>,
+                        response: Response<SuccessResponse>
+                    ) {
+                        if (response.body() != null && response.body()!!.isSuccess) {
+                            items.removeAt(adapterPosition)
+                            notifyItemRemoved(adapterPosition)
+                            notifyItemRangeChanged(adapterPosition, itemCount)
+                        } else {
                             Toast.makeText(
                                 app,
                                 R.string.can_delete_source,
                                 Toast.LENGTH_SHORT
                             ).show()
                         }
-                    })
-                }
+                    }
+
+                    override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                        Toast.makeText(
+                            app,
+                            R.string.can_delete_source,
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                })
             }
         }
     }

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

@@ -12,22 +12,17 @@ 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.Interceptor
 import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Call
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.TimeUnit
 
 class SelfossApi(
     c: Context,
-    callingActivity: Activity?,
+    callingActivity: Activity,
     isWithSelfSignedCert: Boolean,
-    timeout: Long,
     shouldLog: Boolean
 ) {
 
@@ -43,39 +38,19 @@ class SelfossApi(
             this
         }
 
-    fun OkHttpClient.Builder.maybeWithSettingsTimeout(timeout: Long): OkHttpClient.Builder =
-        if (timeout != -1L) {
-            this.readTimeout(timeout, TimeUnit.SECONDS)
-                .connectTimeout(timeout, TimeUnit.SECONDS)
-        } else {
-            this
-        }
-
     fun Credentials.createAuthenticator(): DispatchingAuthenticator =
         DispatchingAuthenticator.Builder()
             .with("digest", DigestAuthenticator(this))
             .with("basic", BasicAuthenticator(this))
             .build()
 
-    fun DispatchingAuthenticator.getHttpClien(isWithSelfSignedCert: Boolean, timeout: Long): OkHttpClient.Builder {
+    fun DispatchingAuthenticator.getHttpClien(isWithSelfSignedCert: Boolean): OkHttpClient.Builder {
         val authCache = ConcurrentHashMap<String, CachingAuthenticator>()
         return OkHttpClient
             .Builder()
-            .maybeWithSettingsTimeout(timeout)
             .maybeWithSelfSigned(isWithSelfSignedCert)
             .authenticator(CachingAuthenticatorDecorator(this, authCache))
             .addInterceptor(AuthenticationCacheInterceptor(authCache))
-            .addInterceptor(object: Interceptor {
-                override fun intercept(chain: Interceptor.Chain): Response {
-                    val request: Request = chain.request()
-                    val response: Response = chain.proceed(request)
-
-                    if (response.code() == 408) {
-                        return response
-                    }
-                    return response
-                }
-            })
     }
 
     init {
@@ -91,7 +66,6 @@ class SelfossApi(
         val gson =
             GsonBuilder()
                 .registerTypeAdapter(Boolean::class.javaPrimitiveType, BooleanTypeAdapter())
-                .registerTypeAdapter(SelfossTagType::class.java, SelfossTagTypeTypeAdapter())
                 .setLenient()
                 .create()
 
@@ -103,7 +77,7 @@ class SelfossApi(
             HttpLoggingInterceptor.Level.NONE
         }
 
-        val httpClient = authenticator.getHttpClien(isWithSelfSignedCert, timeout)
+        val httpClient = authenticator.getHttpClien(isWithSelfSignedCert)
 
         httpClient.addInterceptor(logging)
 
@@ -117,9 +91,7 @@ class SelfossApi(
                     .build()
             service = retrofit.create(SelfossService::class.java)
         } catch (e: IllegalArgumentException) {
-            if (callingActivity != null) {
-                Config.logoutAndRedirect(c, callingActivity, config.settings.edit(), baseUrlFail = true)
-            }
+            Config.logoutAndRedirect(c, callingActivity, config.settings.edit(), baseUrlFail = true)
         }
     }
 
@@ -153,9 +125,6 @@ class SelfossApi(
     ): Call<List<Item>> =
         getItems("starred", tag, sourceId, search, itemsNumber, offset)
 
-    fun allItems(): Call<List<Item>> =
-        service.allItems(userName, password)
-
     private fun getItems(
         type: String,
         tag: String?,
@@ -190,7 +159,7 @@ class SelfossApi(
     fun update(): Call<String> =
         service.update(userName, password)
 
-    val sources: Call<List<Source>>
+    val sources: Call<List<Sources>>
         get() = service.sources(userName, password)
 
     fun deleteSource(id: String): Call<SuccessResponse> =

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

@@ -9,13 +9,13 @@ import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
 import com.google.gson.annotations.SerializedName
 
-private fun constructUrl(config: Config?, path: String, file: String?): String {
+private fun constructUrl(config: Config?, path: String, file: String): String {
+    val baseUriBuilder = Uri.parse(config!!.baseUrl).buildUpon()
+    baseUriBuilder.appendPath(path).appendPath(file)
+
     return if (file.isEmptyOrNullOrNullString()) {
         ""
     } else {
-        val baseUriBuilder = Uri.parse(config!!.baseUrl).buildUpon()
-        baseUriBuilder.appendPath(path).appendPath(file)
-
         baseUriBuilder.toString()
     }
 }
@@ -42,10 +42,10 @@ data class Spout(
     @SerializedName("description") val description: String
 )
 
-data class Source(
+data class Sources(
     @SerializedName("id") val id: String,
     @SerializedName("title") val title: String,
-    @SerializedName("tags") val tags: SelfossTagType,
+    @SerializedName("tags") val tags: String,
     @SerializedName("spout") val spout: String,
     @SerializedName("error") val error: String,
     @SerializedName("icon") val icon: String
@@ -71,7 +71,7 @@ data class Item(
     @SerializedName("icon") val icon: String,
     @SerializedName("link") val link: String,
     @SerializedName("sourcetitle") val sourcetitle: String,
-    @SerializedName("tags") val tags: SelfossTagType
+    @SerializedName("tags") val tags: String
 ) : Parcelable {
 
     var config: Config? = null
@@ -94,7 +94,7 @@ data class Item(
         icon = source.readString(),
         link = source.readString(),
         sourcetitle = source.readString(),
-        tags = source.readParcelable(ClassLoader.getSystemClassLoader())
+        tags = source.readString()
     )
 
     override fun describeContents() = 0
@@ -110,7 +110,7 @@ data class Item(
         dest.writeString(icon)
         dest.writeString(link)
         dest.writeString(sourcetitle)
-        dest.writeParcelable(tags, flags)
+        dest.writeString(tags)
     }
 
     fun getIcon(app: Context): String {
@@ -153,27 +153,4 @@ data class Item(
 
         return stringUrl
     }
-}
-
-data class SelfossTagType(val tags: String) : Parcelable {
-
-    companion object {
-        @JvmField val CREATOR: Parcelable.Creator<SelfossTagType> =
-            object : Parcelable.Creator<SelfossTagType> {
-                override fun createFromParcel(source: Parcel): SelfossTagType =
-                    SelfossTagType(source)
-
-                override fun newArray(size: Int): Array<SelfossTagType?> = arrayOfNulls(size)
-            }
-    }
-
-    constructor(source: Parcel) : this(
-        tags = source.readString()
-    )
-
-    override fun describeContents() = 0
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeString(tags)
-    }
 }

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

@@ -27,12 +27,6 @@ internal interface SelfossService {
         @Query("offset") offset: Int
     ): Call<List<Item>>
 
-    @GET("items")
-    fun allItems(
-        @Query("username") username: String,
-        @Query("password") password: String
-    ): Call<List<Item>>
-
     @Headers("Content-Type: application/x-www-form-urlencoded")
     @POST("mark/{id}")
     fun markAsRead(
@@ -101,7 +95,7 @@ internal interface SelfossService {
     fun sources(
         @Query("username") username: String,
         @Query("password") password: String
-    ): Call<List<Source>>
+    ): Call<List<Sources>>
 
     @DELETE("source/{id}")
     fun deleteSource(

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

@@ -1,22 +0,0 @@
-package apps.amine.bou.readerforselfoss.api.selfoss
-
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonParseException
-import java.lang.reflect.Type
-
-internal class SelfossTagTypeTypeAdapter : JsonDeserializer<SelfossTagType> {
-
-    @Throws(JsonParseException::class)
-    override fun deserialize(
-        json: JsonElement,
-        typeOfT: Type,
-        context: JsonDeserializationContext
-    ): SelfossTagType? =
-        if (json.isJsonArray) {
-            SelfossTagType(json.asJsonArray.joinToString(",") { it.toString() })
-        } else {
-            SelfossTagType(json.toString())
-        }
-}

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

@@ -1,152 +0,0 @@
-package apps.amine.bou.readerforselfoss.background
-
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.preference.PreferenceManager
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
-import androidx.core.app.NotificationCompat.PRIORITY_LOW
-import androidx.room.Room
-import androidx.work.Worker
-import androidx.work.WorkerParameters
-import apps.amine.bou.readerforselfoss.MainActivity
-import apps.amine.bou.readerforselfoss.R
-import apps.amine.bou.readerforselfoss.api.selfoss.Item
-import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
-import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
-import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
-import apps.amine.bou.readerforselfoss.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
-import java.util.*
-import kotlin.concurrent.schedule
-import kotlin.concurrent.thread
-
-class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params) {
-    lateinit var db: AppDatabase
-
-    override fun doWork(): Result {
-        if (context.isNetworkAccessible(null)) {
-
-            val notificationManager =
-                applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-            val notification = NotificationCompat.Builder(applicationContext, Config.syncChannelId)
-                .setContentTitle(context.getString(R.string.loading_notification_title))
-                .setContentText(context.getString(R.string.loading_notification_text))
-                .setOngoing(true)
-                .setPriority(PRIORITY_LOW)
-                .setChannelId(Config.syncChannelId)
-                .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
-
-            notificationManager.notify(1, notification.build())
-
-            val settings =
-                this.context.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-            val sharedPref = PreferenceManager.getDefaultSharedPreferences(this.context)
-            val notifyNewItems = sharedPref.getBoolean("notify_new_items", false)
-
-            db = Room.databaseBuilder(
-                applicationContext,
-                AppDatabase::class.java, "selfoss-database"
-            ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()
-
-            val api = SelfossApi(
-                this.context,
-                null,
-                settings.getBoolean("isSelfSignedCert", false),
-                sharedPref.getString("api_timeout", "-1").toLong(),
-                sharedPref.getBoolean("should_log_everything", false)
-            )
-
-            api.allItems().enqueue(object : Callback<List<Item>> {
-                override fun onFailure(call: Call<List<Item>>, t: Throwable) {
-                    Timer("", false).schedule(4000) {
-                        notificationManager.cancel(1)
-                    }
-                }
-
-                override fun onResponse(
-                    call: Call<List<Item>>,
-                    response: Response<List<Item>>
-                ) {
-                    thread {
-                        if (response.body() != null) {
-                            val apiItems = (response.body() as ArrayList<Item>)
-                            db.itemsDao().deleteAllItems()
-                            db.itemsDao()
-                                .insertAllItems(*(apiItems.map { it.toEntity() }).toTypedArray())
-
-                            val newSize = apiItems.filter { it.unread }.size
-                            if (notifyNewItems && newSize > 0) {
-
-                                val intent = Intent(context, MainActivity::class.java).apply {
-                                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                                }
-                                val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
-
-                                val newItemsNotification = NotificationCompat.Builder(applicationContext, Config.newItemsChannelId)
-                                    .setContentTitle(context.getString(R.string.new_items_notification_title))
-                                    .setContentText(context.getString(R.string.new_items_notification_text, newSize))
-                                    .setPriority(PRIORITY_DEFAULT)
-                                    .setChannelId(Config.newItemsChannelId)
-                                    .setContentIntent(pendingIntent)
-                                    .setAutoCancel(true)
-                                    .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
-
-                                Timer("", false).schedule(4000) {
-                                    notificationManager.notify(2, newItemsNotification.build())
-                                }
-                            }
-                        }
-                        Timer("", false).schedule(4000) {
-                            notificationManager.cancel(1)
-                        }
-                    }
-                }
-            })
-            thread {
-                val actions = db.actionsDao().actions()
-
-                actions.forEach { action ->
-                    when {
-                        action.read -> doAndReportOnFail(api.markItem(action.articleId), action)
-                        action.unread -> doAndReportOnFail(api.unmarkItem(action.articleId), action)
-                        action.starred -> doAndReportOnFail(api.starrItem(action.articleId), action)
-                        action.unstarred -> doAndReportOnFail(
-                            api.unstarrItem(action.articleId),
-                            action
-                        )
-                    }
-                }
-            }
-        }
-        return Result.SUCCESS
-    }
-
-    private fun <T> doAndReportOnFail(call: Call<T>, action: ActionEntity) {
-        call.enqueue(object : Callback<T> {
-            override fun onResponse(
-                call: Call<T>,
-                response: Response<T>
-            ) {
-                thread {
-                    db.actionsDao().delete(action)
-                }
-            }
-
-            override fun onFailure(call: Call<T>, t: Throwable) {
-                ACRA.getErrorReporter().maybeHandleSilentException(t, context)
-            }
-        })
-    }
-}

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

@@ -1,54 +1,45 @@
 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.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.InflateException
 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 androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebSettings
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.res.ResourcesCompat
-import androidx.room.Room
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi
 import apps.amine.bou.readerforselfoss.api.mercury.ParsedContent
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
-import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
-import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
-import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 import apps.amine.bou.readerforselfoss.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.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.request.RequestOptions
 import com.github.rubensousa.floatingtoolbar.FloatingToolbar
-import kotlinx.android.synthetic.main.fragment_article.*
 import kotlinx.android.synthetic.main.fragment_article.view.*
 import org.acra.ACRA
 import retrofit2.Call
@@ -56,353 +47,269 @@ import retrofit2.Callback
 import retrofit2.Response
 import java.net.MalformedURLException
 import java.net.URL
-import kotlin.concurrent.thread
 
 class ArticleFragment : Fragment() {
     private lateinit var pageNumber: Number
-    private var fontSize: Int = 16
+    private var fontSize: Int = 14
     private lateinit var allItems: ArrayList<Item>
-    private var mCustomTabActivityHelper: CustomTabActivityHelper? = null;
+    private lateinit var mCustomTabActivityHelper: CustomTabActivityHelper
     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 var showMalformedUrl: Boolean = false
     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()
-        if (mCustomTabActivityHelper != null) {
-            mCustomTabActivityHelper!!.unbindCustomTabsService(activity)
-        }
+        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)
-
-        db = Room.databaseBuilder(
-            context!!,
-            AppDatabase::class.java, "selfoss-database"
-        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()
     }
 
+    private lateinit var rootView: ViewGroup
+
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        try {
-            rootView = inflater
-                .inflate(R.layout.fragment_article, container, false) as ViewGroup
+        rootView = inflater
+            .inflate(R.layout.fragment_article, container, false) as ViewGroup
 
-            url = allItems[pageNumber.toInt()].getLinkDecoded()
-            contentText = allItems[pageNumber.toInt()].content
-            contentTitle = allItems[pageNumber.toInt()].title
-            contentImage = allItems[pageNumber.toInt()].getThumbnail(activity!!)
-            contentSource = allItems[pageNumber.toInt()].sourceAndDateText()
+        url = allItems[pageNumber.toInt()].getLinkDecoded()
+        contentText = allItems[pageNumber.toInt()].content
+        contentTitle = allItems[pageNumber.toInt()].title
+        contentImage = allItems[pageNumber.toInt()].getThumbnail(activity!!)
+        contentSource = allItems[pageNumber.toInt()].sourceAndDateText()
 
-            prefs = PreferenceManager.getDefaultSharedPreferences(activity)
-            editor = prefs.edit()
-            fontSize = prefs.getString("reader_font_size", "16").toInt()
+        val prefs = PreferenceManager.getDefaultSharedPreferences(activity)
+        editor = prefs.edit()
+        fontSize = prefs.getString("reader_font_size", "14").toInt()
+        showMalformedUrl = prefs.getBoolean("show_error_malformed_url", true)
 
-            font = prefs.getString("reader_font", "")
-            if (font.isNotEmpty()) {
-                resId = context!!.resources.getIdentifier(font, "font", context!!.packageName)
-                typeface = try {
-                    ResourcesCompat.getFont(context!!, resId)!!
-                } catch (e: java.lang.Exception) {
-                    // ACRA.getErrorReporter().maybeHandleSilentException(Throwable("Font loading issue: ${e.message}"), context!!)
-                    // Just to be sure
-                    null
-                }
-            }
+        val settings = activity!!.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+        val debugReadingItems = prefs.getBoolean("read_debug", false)
 
-            refreshAlignment()
+        val api = SelfossApi(
+            context!!,
+            activity!!,
+            settings.getBoolean("isSelfSignedCert", false),
+            prefs.getBoolean("should_log_everything", false)
+        )
 
-            val settings = activity!!.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-            val debugReadingItems = prefs.getBoolean("read_debug", false)
+        fab = rootView.fab
 
-            val api = SelfossApi(
-                context!!,
-                activity!!,
-                settings.getBoolean("isSelfSignedCert", false),
-                prefs.getString("api_timeout", "-1").toLong(),
-                prefs.getBoolean("should_log_everything", false)
-            )
+        fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
 
-            fab = rootView!!.fab
+        fab.rippleColor = appColors.colorAccentDark
 
-            fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
+        val floatingToolbar: FloatingToolbar = rootView.floatingToolbar
+        floatingToolbar.attachFab(fab)
 
-            fab.rippleColor = appColors.colorAccentDark
+        floatingToolbar.background = ColorDrawable(appColors.colorAccent)
 
-            val floatingToolbar: FloatingToolbar = rootView!!.floatingToolbar
-            floatingToolbar.attachFab(fab)
-
-            floatingToolbar.background = ColorDrawable(appColors.colorAccent)
-
-            val customTabsIntent = activity!!.buildCustomTabsIntent()
-            mCustomTabActivityHelper = CustomTabActivityHelper()
-            mCustomTabActivityHelper!!.bindCustomTabsService(activity)
+        val customTabsIntent = activity!!.buildCustomTabsIntent()
+        mCustomTabActivityHelper = CustomTabActivityHelper()
+        mCustomTabActivityHelper.bindCustomTabsService(activity)
 
 
-            floatingToolbar.setClickListener(
-                object : FloatingToolbar.ItemClickListener {
-                    override fun onItemClick(item: MenuItem) {
-                        when (item.itemId) {
-                            R.id.more_action -> getContentFromMercury(customTabsIntent, prefs)
-                            R.id.share_action -> activity!!.shareLink(url, contentTitle)
-                            R.id.open_action -> activity!!.openItemUrl(
-                                allItems,
-                                pageNumber.toInt(),
-                                url,
-                                customTabsIntent,
-                                false,
-                                false,
-                                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!!)
-                                            }
-                                        }
+        floatingToolbar.setClickListener(
+            object : FloatingToolbar.ItemClickListener {
+                override fun onItemClick(item: MenuItem) {
+                    when (item.itemId) {
+                        R.id.more_action -> getContentFromMercury(customTabsIntent, prefs)
+                        R.id.share_action -> activity!!.shareLink(url)
+                        R.id.open_action -> activity!!.openItemUrl(
+                            allItems,
+                            pageNumber.toInt(),
+                            url,
+                            customTabsIntent,
+                            false,
+                            false,
+                            activity!!
+                        )
+                        R.id.unread_action -> api.unmarkItem(allItems[pageNumber.toInt()].id).enqueue(
+                            object : Callback<SuccessResponse> {
+                                override fun onResponse(
+                                    call: Call<SuccessResponse>,
+                                    response: Response<SuccessResponse>
+                                ) {
+                                    if (!response.succeeded() && debugReadingItems) {
+                                        val message =
+                                            "message: ${response.message()} " +
+                                                    "response isSuccess: ${response.isSuccessful} " +
+                                                    "response code: ${response.code()} " +
+                                                    "response message: ${response.message()} " +
+                                                    "response errorBody: ${response.errorBody()?.string()} " +
+                                                    "body success: ${response.body()?.success} " +
+                                                    "body isSuccess: ${response.body()?.isSuccess}"
+                                        ACRA.getErrorReporter().maybeHandleSilentException(Exception(message), activity!!)
+                                    }
+                                }
+
+                                override fun onFailure(
+                                    call: Call<SuccessResponse>,
+                                    t: Throwable
+                                ) {
+                                    if (debugReadingItems) {
+                                        ACRA.getErrorReporter().maybeHandleSilentException(t, activity!!)
                                     }
-                                )
-                            } else {
-                                thread {
-                                    db.actionsDao().insertAllActions(ActionEntity(allItems[pageNumber.toInt()].id, false, true, false, false))
                                 }
                             }
-                            else -> Unit
-                        }
-                    }
-
-                    override fun onItemLongClick(item: MenuItem?) {
+                        )
+                        else -> Unit
                     }
                 }
-            )
 
-            rootView!!.source.text = contentSource
-            if (typeface != null) {
-                rootView!!.source.typeface = typeface
+                override fun onItemLongClick(item: MenuItem?) {
+                }
             }
+        )
 
-            if (contentText.isEmptyOrNullOrNullString()) {
-                getContentFromMercury(customTabsIntent, prefs)
+        rootView.source.text = contentSource
+
+        if (contentText.isEmptyOrNullOrNullString()) {
+            getContentFromMercury(customTabsIntent, prefs)
+        } else {
+            rootView.titleView.text = contentTitle
+
+            htmlToWebview(contentText, prefs)
+
+            if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
+                rootView.imageView.visibility = View.VISIBLE
+                Glide
+                    .with(context!!)
+                    .asBitmap()
+                    .load(contentImage)
+                    .apply(RequestOptions.fitCenterTransform())
+                    .into(rootView.imageView)
             } else {
-                rootView!!.titleView.text = contentTitle
-                if (typeface != null) {
-                    rootView!!.titleView.typeface = typeface
-                }
+                rootView.imageView.visibility = View.GONE
+            }
+        }
 
-                htmlToWebview()
-
-                if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
-                    rootView!!.imageView.visibility = View.VISIBLE
-                    Glide
-                        .with(context!!)
-                        .asBitmap()
-                        .loadMaybeBasicAuth(config, contentImage)
-                        .apply(RequestOptions.fitCenterTransform())
-                        .into(rootView!!.imageView)
+        rootView.nestedScrollView.setOnScrollChangeListener(
+            NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+                if (scrollY > oldScrollY) {
+                    fab.hide()
                 } else {
-                    rootView!!.imageView.visibility = View.GONE
+                    if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
                 }
             }
-
-            rootView!!.nestedScrollView.setOnScrollChangeListener(
-                NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
-                    if (scrollY > oldScrollY) {
-                        fab.hide()
-                    } else {
-                        if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
-                    }
-                }
-            )
-
-        } catch (e: InflateException) {
-            AlertDialog.Builder(context!!)
-                .setMessage(context!!.getString(R.string.webview_dialog_issue_message))
-                .setTitle(context!!.getString(R.string.webview_dialog_issue_title))
-                .setPositiveButton(android.R.string.ok
-                ) { dialog, which ->
-                    val sharedPref = PreferenceManager.getDefaultSharedPreferences(context!!)
-                    val editor = sharedPref.edit()
-                    editor.putBoolean("prefer_article_viewer", false)
-                    editor.commit()
-                    activity!!.finish()
-                }
-                .create()
-                .show()
-        }
+        )
 
         return rootView
     }
 
-    private fun refreshAlignment() {
-        textAlignment = when (prefs.getInt("text_align", 1)) {
-            1 -> "justify"
-            2 -> "left"
-            else -> "justify"
-        }
-    }
-
     private fun getContentFromMercury(
         customTabsIntent: CustomTabsIntent,
         prefs: SharedPreferences
     ) {
-        if ((context != null && context!!.isNetworkAccessible(null)) || context == null) {
-            rootView!!.progressBar.visibility = View.VISIBLE
-            val parser = MercuryApi(
-                prefs.getBoolean("should_log_everything", false)
-            )
+        rootView.progressBar.visibility = View.VISIBLE
+        val parser = MercuryApi(
+            prefs.getBoolean("should_log_everything", false)
+        )
 
-            parser.parseUrl(url).enqueue(
-                object : Callback<ParsedContent> {
-                    override fun onResponse(
-                        call: Call<ParsedContent>,
-                        response: Response<ParsedContent>
-                    ) {
-                        // TODO: clean all the following after finding the mercury content issue
-                        try {
-                            if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) {
-                                try {
-                                    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) {
-                                        // Mercury returned a relative url. We do nothing.
-                                    }
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
-                                    }
-                                }
-
-                                try {
-                                    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
-                                        try {
-                                            Glide
-                                                .with(context!!)
-                                                .asBitmap()
-                                                .loadMaybeBasicAuth(config, response.body()!!.lead_image_url.orEmpty())
-                                                .apply(RequestOptions.fitCenterTransform())
-                                                .into(rootView!!.imageView)
-                                        } catch (e: Exception) {
-                                            ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
-                                        }
-                                    } else {
-                                        rootView!!.imageView.visibility = View.GONE
-                                    }
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
-                                    }
-                                }
-
-                                try {
-                                    rootView!!.nestedScrollView.scrollTo(0, 0)
-
-                                    rootView!!.progressBar.visibility = View.GONE
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
-                                    }
-                                }
-                            } else {
-                                try {
-                                    openInBrowserAfterFailing(customTabsIntent)
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
-                                    }
+        parser.parseUrl(url).enqueue(
+            object : Callback<ParsedContent> {
+                override fun onResponse(
+                    call: Call<ParsedContent>,
+                    response: Response<ParsedContent>
+                ) {
+                    // TODO: clean all the following after finding the mercury content issue
+                    try {
+                        if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) {
+                            try {
+                                rootView.titleView.text = response.body()!!.title
+                                url = response.body()!!.url
+                            } catch (e: Exception) {
+                                if (context != null) {
+                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
                                 }
                             }
-                        } catch (e: Exception) {
-                            if (context != null) {
-                                ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
+
+                            try {
+                                htmlToWebview(response.body()!!.content.orEmpty(), prefs)
+                            } 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
+                                    try {
+                                        Glide
+                                            .with(context!!)
+                                            .asBitmap()
+                                            .load(response.body()!!.lead_image_url)
+                                            .apply(RequestOptions.fitCenterTransform())
+                                            .into(rootView.imageView)
+                                    } catch (e: Exception) {
+                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
+                                    }
+                                } else {
+                                    rootView.imageView.visibility = View.GONE
+                                }
+                            } catch (e: Exception) {
+                                if (context != null) {
+                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
+                                }
+                            }
+
+                            try {
+                                rootView.nestedScrollView.scrollTo(0, 0)
+
+                                rootView.progressBar.visibility = View.GONE
+                            } catch (e: Exception) {
+                                if (context != null) {
+                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
+                                }
+                            }
+                        } else {
+                            try {
+                                openInBrowserAfterFailing(customTabsIntent)
+                            } catch (e: Exception) {
+                                if (context != null) {
+                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
+                                }
                             }
                         }
+                    } catch (e: Exception) {
+                        if (context != null) {
+                            ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
+                        }
                     }
-
-                    override fun onFailure(
-                        call: Call<ParsedContent>,
-                        t: Throwable
-                    ) = openInBrowserAfterFailing(customTabsIntent)
                 }
-            )
-        }
+
+                override fun onFailure(
+                    call: Call<ParsedContent>,
+                    t: Throwable
+                ) = openInBrowserAfterFailing(customTabsIntent)
+            }
+        )
     }
 
-    private fun htmlToWebview() {
+    private fun htmlToWebview(c: String, prefs: SharedPreferences) {
         val stringColor = String.format("#%06X", 0xFFFFFF and appColors.colorAccent)
 
-        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
+        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
@@ -414,7 +321,7 @@ class ArticleFragment : Fragment() {
             }
         } else {
             if (context != null) {
-                rootView!!.webcontent.setBackgroundColor(
+                rootView.webcontent.setBackgroundColor(
                     ContextCompat.getColor(
                         context!!,
                         R.color.light_webview
@@ -438,15 +345,15 @@ class ArticleFragment : Fragment() {
             "#FFFFFF"
         }
 
-        rootView!!.webcontent.settings.useWideViewPort = true
-        rootView!!.webcontent.settings.loadWithOverviewMode = true
-        rootView!!.webcontent.settings.javaScriptEnabled = false
+        rootView.webcontent.settings.useWideViewPort = true
+        rootView.webcontent.settings.loadWithOverviewMode = true
+        rootView.webcontent.settings.javaScriptEnabled = false
 
         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
@@ -455,74 +362,80 @@ class ArticleFragment : Fragment() {
             val itemUrl = URL(url)
             baseUrl = itemUrl.protocol + "://" + itemUrl.host
         } catch (e: MalformedURLException) {
-            ACRA.getErrorReporter().maybeHandleSilentException(e, activity!!)
+            if (showMalformedUrl && context != null) {
+                val alertDialog = AlertDialog.Builder(context!!).create()
+                alertDialog.setTitle("Error")
+                alertDialog.setMessage("You are encountering a bug that I can't solve. Can you please contact me to solve the issue, please ?")
+                alertDialog.setButton(
+                    AlertDialog.BUTTON_POSITIVE,
+                    "Send mail"
+                ) { dialog, _ ->
+
+                    // This won't be translated because it should only be temporary.
+                    val to = Config.feedbackEmail
+                    val subject= "[ReaderForSelfoss MalformedURLException]"
+                    val body= "Please specify the source, item and spout you are using for the url below : \n ${e.message}"
+                    val mailTo = "mailto:" + to + "?&subject=" + Uri.encode(subject) + "&body=" + Uri.encode(body)
+
+                    val emailIntent = Intent(Intent.ACTION_VIEW)
+                    emailIntent.data = Uri.parse(mailTo)
+                    startActivity(emailIntent)
+
+                    dialog.dismiss()
+                }
+                alertDialog.setButton(
+                    AlertDialog.BUTTON_NEUTRAL,
+                    "Not now"
+                ) { dialog, _ -> dialog.dismiss() }
+                alertDialog.setButton(
+                    AlertDialog.BUTTON_NEGATIVE,
+                    "Don't show anymore."
+                ) { dialog, _ ->
+                    editor.putBoolean("show_error_malformed_url", false)
+                    editor.apply()
+                    dialog.dismiss()
+                }
+                alertDialog.show()
+            }
         }
 
-        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(
+        rootView.webcontent.loadDataWithBaseURL(
             baseUrl,
-            """<html>
-                |<head>
-                |   <meta name="viewport" content="width=device-width, initial-scale=1">
-                |   <style>
-                |      img {
-                |        display: inline-block;
-                |        height: auto;
-                |        width: 100%;
-                |        max-width: 100%;
-                |      }
-                |      a {
-                |        color: $stringColor !important;
-                |      }
-                |      *:not(a) {
-                |        color: $stringTextColor;
-                |      }
-                |      * {
-                |        font-size: ${fontSize}px;
-                |        text-align: $textAlignment;
-                |        word-break: break-word;
-                |        overflow:hidden;
-                |        line-height: 1.5em;
-                |      }
-                |      a, pre, code {
-                |        text-align: $textAlignment;
-                |      }
-                |      pre, code {
-                |        white-space: pre-wrap;
-                |        width:100%;
-                |        background-color: $stringBackgroundColor;
-                |      }
-                |   </style>
-                |   $fontLinkAndStyle
-                |</head>
-                |<body>
-                |   $contentText
-                |</body>""".trimMargin(),
-            "text/html",
+            """<style>
+                |img {
+                |  display: inline-block;
+                |  height: auto;
+                |  width: 100%;
+                |  max-width: 100%;
+                |}
+                |a {
+                |  color: $stringColor !important;
+                |}
+                |*:not(a) {
+                |  color: $stringTextColor;
+                |}
+                |* {
+                |  font-size: ${fontSize.toPx}px;
+                |  text-align: justify;
+                |  word-break: break-word;
+                |  overflow:hidden;
+                |}
+                |a, pre, code {
+                |  text-align: left;
+                |}
+                |pre, code {
+                |  white-space: pre-wrap;
+                |  width:100%;
+                |  background-color: $stringBackgroundColor;
+                |}</style>$c""".trimMargin(),
+            "text/html; charset=utf-8",
             "utf-8",
             null
         )
     }
 
     private fun openInBrowserAfterFailing(customTabsIntent: CustomTabsIntent) {
-        rootView!!.progressBar.visibility = View.GONE
+        rootView.progressBar.visibility = View.GONE
         activity!!.openItemUrl(
             allItems,
             pageNumber.toInt(),

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

@@ -1,23 +0,0 @@
-package apps.amine.bou.readerforselfoss.persistence.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
-
-@Dao
-interface ActionsDao {
-    @Query("SELECT * FROM actions order by id asc")
-    fun actions(): List<ActionEntity>
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertAllActions(vararg actions: ActionEntity)
-
-    @Query("DELETE FROM actions WHERE articleid = :article_id AND read = 1")
-    fun deleteReadActionForArticle(article_id: String)
-
-    @Delete
-    fun delete(action: ActionEntity)
-}

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

@@ -1,36 +0,0 @@
-package apps.amine.bou.readerforselfoss.persistence.dao
-
-import androidx.room.Delete
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import apps.amine.bou.readerforselfoss.persistence.entities.SourceEntity
-import apps.amine.bou.readerforselfoss.persistence.entities.TagEntity
-
-@Dao
-interface DrawerDataDao {
-    @Query("SELECT * FROM tags")
-    fun tags(): List<TagEntity>
-
-    @Query("SELECT * FROM sources")
-    fun sources(): List<SourceEntity>
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertAllTags(vararg tags: TagEntity)
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertAllSources(vararg sources: SourceEntity)
-
-    @Query("DELETE FROM tags")
-    fun deleteAllTags()
-
-    @Query("DELETE FROM sources")
-    fun deleteAllSources()
-
-    @Delete
-    fun deleteTag(tag: TagEntity)
-
-    @Delete
-    fun deleteSource(source: SourceEntity)
-}

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

@@ -1,29 +0,0 @@
-package apps.amine.bou.readerforselfoss.persistence.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import apps.amine.bou.readerforselfoss.persistence.entities.ItemEntity
-import androidx.room.Update
-
-
-
-@Dao
-interface ItemsDao {
-    @Query("SELECT * FROM items order by id desc")
-    fun items(): List<ItemEntity>
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertAllItems(vararg items: ItemEntity)
-
-    @Query("DELETE FROM items")
-    fun deleteAllItems()
-
-    @Delete
-    fun delete(item: ItemEntity)
-
-    @Update
-    fun updateItem(item: ItemEntity)
-}

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

@@ -1,20 +0,0 @@
-package apps.amine.bou.readerforselfoss.persistence.database
-
-import androidx.room.RoomDatabase
-import androidx.room.Database
-import apps.amine.bou.readerforselfoss.persistence.dao.ActionsDao
-import apps.amine.bou.readerforselfoss.persistence.dao.DrawerDataDao
-import apps.amine.bou.readerforselfoss.persistence.dao.ItemsDao
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
-import apps.amine.bou.readerforselfoss.persistence.entities.ItemEntity
-import apps.amine.bou.readerforselfoss.persistence.entities.SourceEntity
-import apps.amine.bou.readerforselfoss.persistence.entities.TagEntity
-
-@Database(entities = [TagEntity::class, SourceEntity::class, ItemEntity::class, ActionEntity::class], version = 3)
-abstract class AppDatabase : RoomDatabase() {
-    abstract fun drawerDataDao(): DrawerDataDao
-
-    abstract fun itemsDao(): ItemsDao
-
-    abstract fun actionsDao(): ActionsDao
-}

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

@@ -1,22 +0,0 @@
-package apps.amine.bou.readerforselfoss.persistence.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "actions")
-data class ActionEntity(
-    @ColumnInfo(name = "articleid")
-    val articleId: String,
-    @ColumnInfo(name = "read")
-    val read: Boolean,
-    @ColumnInfo(name = "unread")
-    val unread: Boolean,
-    @ColumnInfo(name = "starred")
-    var starred: Boolean,
-    @ColumnInfo(name = "unstarred")
-    var unstarred: Boolean
-) {
-    @PrimaryKey(autoGenerate = true)
-    var id: Int = 0
-}

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

@@ -1,33 +0,0 @@
-package apps.amine.bou.readerforselfoss.persistence.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "tags")
-data class TagEntity(
-    @PrimaryKey
-    @ColumnInfo(name = "tag")
-    val tag: String,
-    @ColumnInfo(name = "color")
-    val color: String,
-    @ColumnInfo(name = "unread")
-    val unread: Int
-)
-
-@Entity(tableName = "sources")
-data class SourceEntity(
-    @PrimaryKey
-    @ColumnInfo(name = "id")
-    val id: String,
-    @ColumnInfo(name = "title")
-    val title: String,
-    @ColumnInfo(name = "tags")
-    val tags: String,
-    @ColumnInfo(name = "spout")
-    val spout: String,
-    @ColumnInfo(name = "error")
-    val error: String,
-    @ColumnInfo(name = "icon")
-    val icon: String
-)

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

@@ -1,32 +0,0 @@
-package apps.amine.bou.readerforselfoss.persistence.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "items")
-data class ItemEntity(
-    @PrimaryKey
-    @ColumnInfo(name = "id")
-    val id: String,
-    @ColumnInfo(name = "datetime")
-    val datetime: String,
-    @ColumnInfo(name = "title")
-    val title: String,
-    @ColumnInfo(name = "content")
-    val content: String,
-    @ColumnInfo(name = "unread")
-    val unread: Boolean,
-    @ColumnInfo(name = "starred")
-    var starred: Boolean,
-    @ColumnInfo(name = "thumbnail")
-    val thumbnail: String,
-    @ColumnInfo(name = "icon")
-    val icon: String,
-    @ColumnInfo(name = "link")
-    val link: String,
-    @ColumnInfo(name = "sourcetitle")
-    val sourcetitle: String,
-    @ColumnInfo(name = "tags")
-    val tags: String
-)

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

@@ -1,16 +0,0 @@
-package apps.amine.bou.readerforselfoss.persistence.migrations
-
-import androidx.sqlite.db.SupportSQLiteDatabase
-import androidx.room.migration.Migration
-
-val MIGRATION_1_2: Migration = object : Migration(1, 2) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("CREATE TABLE IF NOT EXISTS `items` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT NOT NULL, `icon` TEXT NOT NULL, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))")
-    }
-}
-
-val MIGRATION_2_3: Migration = object : Migration(2, 3) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("CREATE TABLE IF NOT EXISTS `actions` (`id` INTEGER NOT NULL, `articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL, PRIMARY KEY(`id`))")
-    }
-}

app/src/main/java/apps/amine/bou/readerforselfoss/settings/AppCompatPreferenceActivity.java

@@ -7,7 +7,6 @@ import android.preference.PreferenceActivity;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.android.material.appbar.AppBarLayout;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
@@ -18,6 +17,7 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
 import com.ftinc.scoop.Scoop;
+import com.google.android.material.appbar.AppBarLayout;
 
 import apps.amine.bou.readerforselfoss.R;
 import apps.amine.bou.readerforselfoss.themes.AppColors;

app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java

@@ -8,7 +8,6 @@ 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;
@@ -25,7 +24,6 @@ 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;
@@ -126,27 +124,6 @@ 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);
-        }
     }
 
     /**
@@ -158,8 +135,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
         return PreferenceFragment.class.getName().equals(fragmentName)
                 || GeneralPreferenceFragment.class.getName().equals(fragmentName)
                 || 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);
@@ -177,6 +152,17 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             addPreferencesFromResource(R.xml.pref_general);
             setHasOptionsMenu(true);
 
+            SwitchPreference cardViewActive = (SwitchPreference) findPreference("card_view_active");
+            final SwitchPreference tabOnTap = (SwitchPreference) findPreference("tab_on_tap");
+            tabOnTap.setEnabled(!cardViewActive.isChecked());
+            cardViewActive.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    boolean isEnabled = (Boolean) newValue;
+                    tabOnTap.setEnabled(!isEnabled);
+                    return true;
+                }
+            });
+
             EditTextPreference itemsNumber = (EditTextPreference) findPreference("prefer_api_items_number");
             itemsNumber.getEditText().setFilters(new InputFilter[]{
                     new InputFilter() {
@@ -388,47 +374,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
         }
     }
 
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public static class OfflinePreferenceFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_offline);
-            setHasOptionsMenu(true);
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                getActivity().finish();
-                return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public static class ExperimentalPreferenceFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_experimental);
-            setHasOptionsMenu(true);
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                getActivity().finish();
-                return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
-    }
-
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();

app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt

@@ -3,12 +3,9 @@ package apps.amine.bou.readerforselfoss.themes
 import android.app.Activity
 import android.content.Context
 import android.preference.PreferenceManager
-import androidx.annotation.ColorInt
-import androidx.appcompat.view.ContextThemeWrapper
 import android.util.TypedValue
+import androidx.annotation.ColorInt
 import apps.amine.bou.readerforselfoss.R
-import android.view.LayoutInflater
-import android.view.ViewGroup
 
 class AppColors(a: Activity) {
 

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

@@ -2,21 +2,11 @@ package apps.amine.bou.readerforselfoss.utils
 
 import android.content.Context
 import android.preference.PreferenceManager
-import android.provider.Settings
 import org.acra.ErrorReporter
 
 fun ErrorReporter.maybeHandleSilentException(throwable: Throwable, ctx: Context) {
     val sharedPref = PreferenceManager.getDefaultSharedPreferences(ctx)
-    val isTestLab = Settings.System.getString(ctx.contentResolver, "firebase.test.lab") ==  "true"
-
-    if (sharedPref.getBoolean("acra_should_log", false) && !isTestLab) {
-        this.handleSilentException(throwable)
-    }
-}
-
-fun ErrorReporter.doHandleSilentException(throwable: Throwable, ctx: Context) {
-    val isTestLab = Settings.System.getString(ctx.contentResolver, "firebase.test.lab") ==  "true"
-    if (!isTestLab) {
+    if (sharedPref.getBoolean("acra_should_log", false)) {
         this.handleSilentException(throwable)
     }
 }

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

@@ -25,12 +25,11 @@ fun String.toStringUriWithHttp(): String =
         this
     }
 
-fun Context.shareLink(itemUrl: String, itemTitle: String) {
+fun Context.shareLink(itemUrl: 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

@@ -36,10 +36,6 @@ class Config(c: Context) {
 
         const val trackerUrl = "https://github.com/aminecmi/ReaderforSelfoss/issues"
 
-        const val syncChannelId = "sync-channel-id"
-
-        const val newItemsChannelId = "new-items-channel-id"
-
         fun logoutAndRedirect(
             c: Context,
             callingActivity: Activity,

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

@@ -3,7 +3,6 @@ package apps.amine.bou.readerforselfoss.utils
 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
@@ -45,8 +44,8 @@ fun Item.toggleStar(): Item {
 fun List<Item>.flattenTags(): List<Item> =
     this.flatMap {
         val item = it
-        val tags: List<String> = it.tags.tags.split(",")
-        tags.map { t ->
-            item.copy(tags = SelfossTagType(t.trim()))
+        val tags: List<String> = it.tags.split(",")
+        tags.map {
+            item.copy(tags = it.trim())
         }
     }

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

@@ -2,25 +2,18 @@ package apps.amine.bou.readerforselfoss.utils
 
 import android.app.Activity
 import android.app.PendingIntent
-import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.graphics.BitmapFactory
 import android.net.Uri
-import android.text.Spannable
-import android.text.style.ClickableSpan
 import androidx.browser.customtabs.CustomTabsIntent
 import android.util.Patterns
-import android.view.MotionEvent
-import android.view.View
-import android.widget.TextView
 import android.widget.Toast
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.ReaderActivity
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import okhttp3.HttpUrl
-import org.acra.ACRA
 
 fun Context.buildCustomTabsIntent(): CustomTabsIntent {
 
@@ -130,17 +123,13 @@ fun Context.openItemUrl(
 private fun openInBrowser(linkDecoded: String, app: Activity) {
     val intent = Intent(Intent.ACTION_VIEW)
     intent.data = Uri.parse(linkDecoded)
-    try {
-        app.startActivity(intent)
-    } catch (e: ActivityNotFoundException) {
-        Toast.makeText(app.baseContext, e.message, Toast.LENGTH_LONG).show()
-    }
+    app.startActivity(intent)
 }
 
 fun String.isUrlValid(): Boolean =
     HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()
 
-fun String.isBaseUrlValid(logErrors: Boolean, ctx: Context): Boolean {
+fun String.isBaseUrlValid(): Boolean {
     val baseUrl = HttpUrl.parse(this)
     var existsAndEndsWithSlash = false
     if (baseUrl != null) {
@@ -157,40 +146,3 @@ fun Context.openInBrowserAsNewTask(i: Item) {
     intent.data = Uri.parse(i.getLinkDecoded().toStringUriWithHttp())
     startActivity(intent)
 }
-
-class LinkOnTouchListener: View.OnTouchListener {
-    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
-        var ret = false
-        val widget: TextView = v as TextView
-        val text: CharSequence = widget.text
-        val stext = Spannable.Factory.getInstance().newSpannable(text)
-
-        val action = event!!.action
-
-        if (action == MotionEvent.ACTION_UP ||
-            action == MotionEvent.ACTION_DOWN) {
-            var x: Float = event.x
-            var y: Float = event.y
-
-            x -= widget.totalPaddingLeft
-            y -= widget.totalPaddingTop
-
-            x += widget.scrollX
-            y += widget.scrollY
-
-            val layout = widget.layout
-            val line = layout.getLineForVertical(y.toInt())
-            val off = layout.getOffsetForHorizontal(line, x)
-
-            val link = stext.getSpans(off, off, ClickableSpan::class.java)
-
-            if (link.isNotEmpty()) {
-                if (action == MotionEvent.ACTION_UP) {
-                    link[0].onClick(widget)
-                }
-                ret = true
-            }
-        }
-        return ret
-    }
-}

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

@@ -0,0 +1,54 @@
+package apps.amine.bou.readerforselfoss.utils
+
+import android.content.Context
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import android.util.AttributeSet
+import android.view.View
+
+class ScrollAwareFABBehavior(
+    context: Context,
+    attrs: AttributeSet
+) : CoordinatorLayout.Behavior<FloatingActionButton>() {
+
+
+    override fun onStartNestedScroll(
+        coordinatorLayout: CoordinatorLayout,
+        child: FloatingActionButton,
+        directTargetChild: View,
+        target: View,
+        nestedScrollAxes: Int
+    ): Boolean {
+        return true
+    }
+
+    override fun onNestedScroll(
+        coordinatorLayout: CoordinatorLayout,
+        child: FloatingActionButton,
+        target: View,
+        dxConsumed: Int,
+        dyConsumed: Int,
+        dxUnconsumed: Int,
+        dyUnconsumed: Int
+    ) {
+        super.onNestedScroll(
+            coordinatorLayout,
+            child,
+            target,
+            dxConsumed,
+            dyConsumed,
+            dxUnconsumed,
+            dyUnconsumed
+        )
+        if (dyConsumed > 0 && child.visibility == View.VISIBLE) {
+            child.hide(object : FloatingActionButton.OnVisibilityChangedListener() {
+                override fun onHidden(fab: FloatingActionButton?) {
+                    super.onHidden(fab)
+                    fab!!.visibility = View.INVISIBLE
+                }
+            })
+        } else if (dyConsumed < 0 && child.visibility != View.VISIBLE) {
+            child.show()
+        }
+    }
+}

app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabsHelper.java

@@ -24,7 +24,7 @@ class CustomTabsHelper {
     private static final String DEV_PACKAGE = "com.chrome.dev";
     private static final String LOCAL_PACKAGE = "com.google.android.apps.chrome";
     private static final String EXTRA_CUSTOM_TABS_KEEP_ALIVE =
-            "android.support.customtabs.extra.KEEP_ALIVE";
+            "androidx.browser.customtabs.extra.KEEP_ALIVE";
 
     private static String sPackageNameToUse;
 

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

@@ -2,30 +2,30 @@ 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
 
-fun Context.bitmapCenterCrop(config: Config, url: String, iv: ImageView) =
+fun Context.bitmapCenterCrop(url: String, iv: ImageView) =
     Glide.with(this)
         .asBitmap()
-        .loadMaybeBasicAuth(config, url)
+        .load(url)
         .apply(RequestOptions.centerCropTransform())
         .into(iv)
 
-fun Context.circularBitmapDrawable(config: Config, url: String, iv: ImageView) =
+fun Context.bitmapFitCenter(url: String, iv: ImageView) =
     Glide.with(this)
         .asBitmap()
-        .loadMaybeBasicAuth(config, url)
+        .load(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,24 +36,4 @@ fun Context.circularBitmapDrawable(config: Config, 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)
-}
+        })

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

@@ -1,45 +0,0 @@
-package apps.amine.bou.readerforselfoss.utils.network
-
-import android.content.Context
-import android.graphics.Color
-import android.net.ConnectivityManager
-import android.net.NetworkInfo
-import android.view.View
-import android.widget.TextView
-import apps.amine.bou.readerforselfoss.R
-import com.google.android.material.snackbar.Snackbar
-
-var snackBarShown = false
-var view: View? = null
-lateinit var s: Snackbar
-
-fun Context.isNetworkAccessible(v: View?, overrideOffline: Boolean = false): Boolean {
-    val cm = this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-    val activeNetwork: NetworkInfo? = cm.activeNetworkInfo
-    val networkIsAccessible = activeNetwork != null && activeNetwork.isConnectedOrConnecting
-
-    if (v != null && (!networkIsAccessible || overrideOffline) && (!snackBarShown || v != view)) {
-        view = v
-        s = Snackbar
-            .make(
-                v,
-                R.string.no_network_connectivity,
-                Snackbar.LENGTH_INDEFINITE
-            )
-
-        s.setAction(android.R.string.ok) {
-            snackBarShown = false
-            s.dismiss()
-        }
-
-        val view = s.view
-        val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
-        tv.setTextColor(Color.WHITE)
-        s.show()
-        snackBarShown = true
-    }
-    if (snackBarShown && networkIsAccessible && !overrideOffline) {
-        s.dismiss()
-    }
-    return if(overrideOffline) overrideOffline else networkIsAccessible
-}

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

@@ -1,73 +0,0 @@
-package apps.amine.bou.readerforselfoss.utils.persistence
-
-import apps.amine.bou.readerforselfoss.api.selfoss.Item
-import apps.amine.bou.readerforselfoss.api.selfoss.SelfossTagType
-import apps.amine.bou.readerforselfoss.api.selfoss.Source
-import apps.amine.bou.readerforselfoss.api.selfoss.Tag
-import apps.amine.bou.readerforselfoss.persistence.entities.ItemEntity
-import apps.amine.bou.readerforselfoss.persistence.entities.SourceEntity
-import apps.amine.bou.readerforselfoss.persistence.entities.TagEntity
-
-fun TagEntity.toView(): Tag =
-        Tag(
-            this.tag,
-            this.color,
-            this.unread
-        )
-
-fun SourceEntity.toView(): Source =
-        Source(
-            this.id,
-            this.title,
-            SelfossTagType(this.tags),
-            this.spout,
-            this.error,
-            this.icon
-        )
-
-fun Source.toEntity(): SourceEntity =
-        SourceEntity(
-            this.id,
-            this.title,
-            this.tags.tags,
-            this.spout,
-            this.error,
-            this.icon.orEmpty()
-        )
-
-fun Tag.toEntity(): TagEntity =
-        TagEntity(
-            this.tag,
-            this.color,
-            this.unread
-        )
-
-fun ItemEntity.toView(): Item =
-        Item(
-            this.id,
-            this.datetime,
-            this.title,
-            this.content,
-            this.unread,
-            this.starred,
-            this.thumbnail,
-            this.icon,
-            this.link,
-            this.sourcetitle,
-            SelfossTagType(this.tags)
-        )
-
-fun Item.toEntity(): ItemEntity =
-    ItemEntity(
-        this.id,
-        this.datetime,
-        this.title,
-        this.content,
-        this.unread,
-        this.starred,
-        this.thumbnail,
-        this.icon,
-        this.link,
-        this.sourcetitle,
-        this.tags.tags
-    )

app/src/main/res/drawable-anydpi/ic_format_align_justify.xml

@@ -1,9 +0,0 @@
-<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

@@ -1,9 +0,0 @@
-<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>