Store api version and select correct date formatter when offline.

* New translations strings.xml (Sinhala)

* New translations strings.xml (Sinhala)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Catalan)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Chinese Traditional)

* New translations strings.xml (Galician)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Indonesian)

* New translations strings.xml (Persian)

* New translations strings.xml (Sinhala)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

CHANGELOG.md

@@ -26,6 +26,22 @@
 
 - Closing #38. Only doing api calls on network available.
 
+- Closing #298 and #287. Issues with Listview rendering
+
+- Closing #290. Fixing back button issue in Settings
+
+- Closing #300. Fixing issues when displaying some special characters.
+
+- Closing #310. Some feeds don't have icons nor thumbnails.
+
+- Closing #178. Expending images on tap.
+
+- Closing #323. Old issue with textview not having the right color.
+
+- Closing #324. Svg images loading crashes the app.
+
+- Closing #322. App crashed because of svg images.
+
 **1.6.x**
 
 - Handling hidden tags.
@@ -46,6 +62,8 @@
 
 - Fixes #215, #208.
 
+- Fixes #328.
+
 **1.5.7.x**
 
 - Added confirmation to the mark as read and update menues.

README.md

@@ -1,20 +1,26 @@
-# ReaderForSelfoss
+# ReaderForSelfoss **(Only available from F-Droid)**
 
-[![Slack Channel](https://img.shields.io/badge/chat-slack-green.svg)](https://join.slack.com/t/readerforselfoss/shared_invite/enQtMjkyNzc3NjM2Mjc1LTUzZTZhOGM5YjQ1MTI5MWZiODRjMjE1ZDBmMzQxZmQ3NWZhYTNhMTBjNGEwNmE2ZGFjODU5NjUxZjBkMWJmMDQ) [![Build Status](https://jenkins.amine-bou.fr/job/ReaderForSelfoss/badge/icon)](https://jenkins.amine-bou.fr/job/ReaderForSelfoss/) [![Code Triagers Badge](https://www.codetriage.com/aminecmi/readerforselfoss/badges/users.svg)](https://www.codetriage.com/aminecmi/readerforselfoss) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/readerforselfoss/localized.svg)](https://crowdin.com/project/readerforselfoss)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/readerforselfoss/localized.svg)](https://crowdin.com/project/readerforselfoss)
 
 It's an RSS Reader for Android, that **only** works with [Selfoss](https://selfoss.aditu.de/)
 
-<a href='https://play.google.com/store/apps/details?id=apps.amine.bou.readerforselfoss'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="100"/></a> <a href="https://f-droid.org/packages/apps.amine.bou.readerforselfoss"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a>
+**The project is not dead at all.** 
 
-Also, the last APK built from source is available [here](https://jenkins.amine-bou.fr/job/ReaderForSelfoss/lastSuccessfulBuild/artifact/SignApksBuilder-out/selfoss-key/selfoss/app-githubConfig-release-unsigned.apk/app-githubConfig-release.apk).
+I still want to work on it, but for the last few months, I didn't have that much time to do so. 
 
-## Join the alpha channel
+If you are a developer, don't hesitate to help with PRs.
 
-**Keep in mind, it could be instable, but you'll have the new updates faster**
+If you are a user, you can still create new issues. I'll fix them when I can.
 
-- First, join the google [group](https://groups.google.com/d/forum/reader-for-selfoss-alpha-testing).
+<a href="https://f-droid.org/packages/apps.amine.bou.readerforselfoss"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a>
-- Then, join the [alpha channel](https://play.google.com/apps/testing/apps.amine.bou.readerforselfoss) of the app.
+
-- You'll be able to update the app for the current alpha version.
+## Screen captures
+
+<img src="res//fr-card.png?raw=true" alt="card view" width="400"/> <img src="res//fr-list.png?raw=true" alt="list view" width="400"/>
+
+## Like my app ?
+
+<a href="https://www.buymeacoffee.com/aminecmi" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/lato-orange.png" alt="Buy Me A Coffee" style="height: 51px !important;width: 217px !important;" ></a>
 
 ## Want to help ?
 
@@ -30,4 +36,3 @@ Also, the last APK built from source is available [here](https://jenkins.amine-b
 - [See what I'm doing](https://github.com/aminecmi/ReaderforSelfoss/projects/1)
 - [Create an issue, or request a new feature](https://github.com/aminecmi/ReaderforSelfoss/issues)
 - [Help translation the app](https://crowdin.com/project/readerforselfoss)
-- [Ask for help](https://join.slack.com/t/readerforselfoss/shared_invite/enQtMjkyNzc3NjM2Mjc1LTUzZTZhOGM5YjQ1MTI5MWZiODRjMjE1ZDBmMzQxZmQ3NWZhYTNhMTBjNGEwNmE2ZGFjODU5NjUxZjBkMWJmMDQ)

app/build.gradle

@@ -24,25 +24,26 @@ def versionNameFromGit() {
     return gitVersion()
 }
 
-apply plugin: 'kotlin-kapt'
-
 apply plugin: 'com.android.application'
 
 apply plugin: 'kotlin-android'
 
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 28
+    compileSdkVersion 30
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '30.0.3'
+    buildFeatures {
+        viewBinding true
+    }
     defaultConfig {
         applicationId "apps.amine.bou.readerforselfoss"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode versionCodeFromGit()
         versionName versionNameFromGit()
 
@@ -72,9 +73,6 @@ android {
                     'proguard-rules.pro'
         }
         debug {
-            buildConfigField "String", "LOGIN_URL", appLoginUrl
-            buildConfigField "String", "LOGIN_USERNAME", appLoginUsername
-            buildConfigField "String", "LOGIN_PASSWORD", appLoginPassword
         }
     }
     flavorDimensions "build"
@@ -83,33 +81,29 @@ android {
             versionNameSuffix '-github'
             dimension "build"
         }
-        storeConfig {
-            // As jenkins publishes to alpha first, this is the default suffix now.
-            versionNameSuffix '-store'
-            dimension "build"
-        }
     }
 }
 
 dependencies {
     // Testing
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-beta02'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0-alpha02'
-    androidTestImplementation 'androidx.test:runner:1.1.0-beta02'
+    androidTestImplementation 'androidx.test:runner:1.3.1-alpha02'
     // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0-beta02'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0-alpha02'
     // Espresso-intents for validation and stubbing of Intents
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0-beta02'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0-alpha02'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     // Android Support
-    implementation "androidx.appcompat:appcompat:$android_version"
+    implementation "androidx.appcompat:appcompat:1.3.0-alpha02"
-    implementation "com.google.android.material:material:$android_version"
+    implementation 'com.google.android.material:material:1.3.0-beta01'
-    implementation "androidx.recyclerview:recyclerview:$android_version"
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-beta01'
     implementation "androidx.legacy:legacy-support-v4:$android_version"
-    implementation "androidx.vectordrawable:vectordrawable:$android_version"
+    implementation 'androidx.vectordrawable:vectordrawable:1.2.0-alpha02'
-    implementation "androidx.browser:browser:$android_version"
+    implementation "androidx.browser:browser:1.3.0"
     implementation "androidx.cardview:cardview:$android_version"
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0-alpha2'
+    implementation 'org.jsoup:jsoup:1.13.1'
 
     //multidex
     implementation 'androidx.multidex:multidex:2.0.1'
@@ -126,7 +120,7 @@ dependencies {
     implementation 'com.burgstaller:okhttp-digest:1.12'
 
     // Material-ish things
-    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.0.5'
+    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.1.0'
     implementation 'com.github.jd-alexander:LikeButton:0.2.3'
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
 
@@ -134,11 +128,8 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.1.1'
     implementation 'com.github.bumptech.glide:okhttp3-integration:4.1.1'
 
-    // Asking politely users to rate the app
-    implementation 'com.github.stkent:amplify:2.2.0'
-
     // Drawer
-    implementation 'co.zsmb:materialdrawer-kt:2.0.1'
+    implementation 'co.zsmb:materialdrawer-kt:2.0.2'
 
     // Themes
     implementation 'com.52inc:scoops:1.0.0'
@@ -148,34 +139,16 @@ dependencies {
     // Pager
     implementation 'me.relex:circleindicator:2.0.0@aar'
 
-    implementation 'androidx.core:core-ktx:1.0.0'
+    //PhotoView
+    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
 
-    // Crash
+    implementation 'androidx.core:core-ktx:1.5.0-alpha05'
-    implementation 'ch.acra:acra-http:5.2.1'
-    implementation 'ch.acra:acra-dialog:5.2.1'
 
-    implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata:2.3.0-rc01"
-    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.3.0-rc01"
 
-    implementation "androidx.room:room-runtime:$room_version"
+    implementation "androidx.room:room-runtime:2.3.0-alpha04"
-    kapt "androidx.room:room-compiler:$room_version"
+    kapt "androidx.room:room-compiler:2.3.0-alpha04"
 
     implementation "android.arch.work:work-runtime-ktx:$work_version"
 }
-
-
-afterEvaluate {
-    initAppLoginPropertiesIfNeeded()
-}
-
-def initAppLoginPropertiesIfNeeded() {
-    def propertiesFile = file(System.getProperty("user.home") + '/.gradle/gradle.properties')
-    if (!propertiesFile.exists()) {
-        def commentMessage = "This is autogenerated local property from system environment to prevent key to be committed to source control."
-        ant.propertyfile(file: System.getProperty("user.home") + "/.gradle/gradle.properties", comment: commentMessage) {
-            entry(key: "appLoginUrl", value: System.getProperty("appLoginUrl"))
-            entry(key: "appLoginUsername", value: System.getProperty("appLoginUsername"))
-            entry(key: "appLoginPassword", value: System.getProperty("appLoginPassword"))
-        }
-    }
-}

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

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

app/src/main/AndroidManifest.xml

@@ -62,6 +62,9 @@
         <activity
             android:name=".ReaderActivity">
         </activity>
+        <activity
+            android:name=".ImageActivity">
+        </activity>
 
         <meta-data
             android:name="apps.amine.bou.readerforselfoss.utils.glide.SelfSignedGlideModule"

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

@@ -23,11 +23,11 @@ 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 apps.amine.bou.readerforselfoss.databinding.ActivityAddSourceBinding
 
 
 
@@ -37,50 +37,53 @@ class AddSourceActivity : AppCompatActivity() {
     private lateinit var api: SelfossApi
 
     private lateinit var appColors: AppColors
+    private lateinit var binding: ActivityAddSourceBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         appColors = AppColors(this@AddSourceActivity)
 
         super.onCreate(savedInstanceState)
+        binding = ActivityAddSourceBinding.inflate(layoutInflater)
+        val view = binding.root
 
-        setContentView(R.layout.activity_add_source)
+        setContentView(view)
 
         val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, toolbar)
+        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
         if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
         }
 
-        val drawable = nameInput.background
+        val drawable = binding.nameInput.background
         drawable.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)
 
 
         // TODO: clean
         if(Build.VERSION.SDK_INT > 16) {
-            nameInput.background = drawable
+            binding.nameInput.background = drawable
         } else{
-            nameInput.setBackgroundDrawable(drawable)
+            binding.nameInput.setBackgroundDrawable(drawable)
         }
 
-        val drawable1 = sourceUri.background
+        val drawable1 = binding.sourceUri.background
         drawable1.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)
 
         if(Build.VERSION.SDK_INT > 16) {
-            sourceUri.background = drawable1
+            binding.sourceUri.background = drawable1
         } else{
-            sourceUri.setBackgroundDrawable(drawable1)
+            binding.sourceUri.setBackgroundDrawable(drawable1)
         }
 
-        val drawable2 = tags.background
+        val drawable2 = binding.tags.background
         drawable2.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)
 
         if(Build.VERSION.SDK_INT > 16) {
-            tags.background = drawable2
+            binding.tags.background = drawable2
         } else{
-            tags.setBackgroundDrawable(drawable2)
+            binding.tags.setBackgroundDrawable(drawable2)
         }
 
-        setSupportActionBar(toolbar)
+        setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
@@ -92,19 +95,18 @@ class AddSourceActivity : AppCompatActivity() {
                 this,
                 this@AddSourceActivity,
                 settings.getBoolean("isSelfSignedCert", false),
-                prefs.getString("api_timeout", "-1").toLong(),
+                prefs.getString("api_timeout", "-1")!!.toLong()
-                prefs.getBoolean("should_log_everything", false)
             )
         } catch (e: IllegalArgumentException) {
             mustLoginToAddSource()
         }
 
-        maybeGetDetailsFromIntentSharing(intent, sourceUri, nameInput)
+        maybeGetDetailsFromIntentSharing(intent, binding.sourceUri, binding.nameInput)
 
-        saveBtn.setTextColor(appColors.colorAccent)
+        binding.saveBtn.setTextColor(appColors.colorAccent)
 
-        saveBtn.setOnClickListener {
+        binding.saveBtn.setOnClickListener {
-            handleSaveSource(tags, nameInput.text.toString(), sourceUri.text.toString(), api!!)
+            handleSaveSource(binding.tags, binding.nameInput.text.toString(), binding.sourceUri.text.toString(), api)
         }
     }
 
@@ -112,10 +114,10 @@ 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(this@AddSourceActivity)) {
             mustLoginToAddSource()
         } else {
-            handleSpoutsSpinner(spoutsSpinner, api, progress, formContainer)
+            handleSpoutsSpinner(binding.spoutsSpinner, api, binding.progress, binding.formContainer)
         }
     }
 

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

@@ -4,24 +4,21 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.graphics.Color
+import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.GradientDrawable
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
-import androidx.core.view.MenuItemCompat
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.appcompat.widget.SearchView
-import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import androidx.recyclerview.widget.ItemTouchHelper
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.SearchView
+import androidx.core.view.MenuItemCompat
+import androidx.recyclerview.widget.*
 import androidx.room.Room
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
@@ -30,17 +27,14 @@ import androidx.work.WorkManager
 import apps.amine.bou.readerforselfoss.adapters.ItemCardAdapter
 import apps.amine.bou.readerforselfoss.adapters.ItemListAdapter
 import apps.amine.bou.readerforselfoss.adapters.ItemsAdapter
-import apps.amine.bou.readerforselfoss.api.selfoss.Item
+import apps.amine.bou.readerforselfoss.api.selfoss.*
-import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.Source
-import apps.amine.bou.readerforselfoss.api.selfoss.Stats
-import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
-import apps.amine.bou.readerforselfoss.api.selfoss.Tag
 import apps.amine.bou.readerforselfoss.background.LoadingWorker
+import apps.amine.bou.readerforselfoss.databinding.ActivityHomeBinding
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
 import apps.amine.bou.readerforselfoss.settings.SettingsActivity
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
@@ -48,10 +42,8 @@ import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.bottombar.maybeShow
 import apps.amine.bou.readerforselfoss.utils.bottombar.removeBadge
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
-import apps.amine.bou.readerforselfoss.utils.drawer.CustomUrlPrimaryDrawerItem
 import apps.amine.bou.readerforselfoss.utils.flattenTags
 import apps.amine.bou.readerforselfoss.utils.longHash
-import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
 import apps.amine.bou.readerforselfoss.utils.persistence.toView
@@ -63,8 +55,8 @@ import co.zsmb.materialdrawerkt.draweritems.profile.profile
 import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
+import com.bumptech.glide.Glide
 import com.ftinc.scoop.Scoop
-import com.github.stkent.amplify.tracking.Amplify
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
 import com.mikepenz.materialdrawer.Drawer
@@ -73,11 +65,10 @@ import com.mikepenz.materialdrawer.holder.StringHolder
 import com.mikepenz.materialdrawer.model.DividerDrawerItem
 import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
 import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
-import kotlinx.android.synthetic.main.activity_home.*
-import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import java.text.SimpleDateFormat
 import java.util.concurrent.TimeUnit
 import kotlin.concurrent.thread
 
@@ -95,8 +86,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     private var items: ArrayList<Item> = ArrayList()
     private var allItems: ArrayList<Item> = ArrayList()
 
-    private var debugReadingItems = false
-    private var shouldLogEverything = false
     private var internalBrowser = false
     private var articleViewer = false
     private var shouldBeCardView = false
@@ -113,6 +102,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     private var infiniteScroll: Boolean = false
     private var lastFetchDone: Boolean = false
     private var itemsCaching: Boolean = false
+    private var updateSources: Boolean = true
     private var hiddenTags: List<String> = emptyList()
 
     private var periodicRefresh = false
@@ -132,6 +122,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     private var firstVisible: Int = 0
     private lateinit var recyclerViewScrollListener: RecyclerView.OnScrollListener
     private lateinit var settings: SharedPreferences
+    private lateinit var binding: ActivityHomeBinding
 
     private var recyclerAdapter: RecyclerView.Adapter<*>? = null
 
@@ -160,6 +151,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         config = Config(this@HomeActivity)
 
         super.onCreate(savedInstanceState)
+        binding = ActivityHomeBinding.inflate(layoutInflater)
+        val view = binding.root
 
         fromTabShortcut =  intent.getIntExtra("shortcutTab", -1) != -1
         offlineShortcut =  intent.getBooleanExtra("startOffline", false)
@@ -168,19 +161,16 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             elementsShown = intent.getIntExtra("shortcutTab", UNREAD_SHOWN)
         }
 
-        setContentView(R.layout.activity_home)
+        setContentView(view)
 
         handleThemeBinding()
 
-        setSupportActionBar(toolBar)
+        setSupportActionBar(binding.toolBar)
-        if (savedInstanceState == null) {
-            Amplify.getSharedInstance().promptIfReady(promptView)
-        }
 
         db = Room.databaseBuilder(
             applicationContext,
             AppDatabase::class.java, "selfoss-database"
-        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()
+        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
 
 
         customTabActivityHelper = CustomTabActivityHelper()
@@ -192,8 +182,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             this,
             this@HomeActivity,
             settings.getBoolean("isSelfSignedCert", false),
-            sharedPref.getString("api_timeout", "-1").toLong(),
+            sharedPref.getString("api_timeout", "-1")!!.toLong()
-            shouldLogEverything
         )
         items = ArrayList()
         allItems = ArrayList()
@@ -202,15 +191,19 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         handleDrawer()
 
         handleSwipeRefreshLayout()
+
+        handleSharedPrefs()
+
+        getElementsAccordingToTab()
     }
 
     private fun handleSwipeRefreshLayout() {
-        swipeRefreshLayout.setColorSchemeResources(
+        binding.swipeRefreshLayout.setColorSchemeResources(
             R.color.refresh_progress_1,
             R.color.refresh_progress_2,
             R.color.refresh_progress_3
         )
-        swipeRefreshLayout.setOnRefreshListener {
+        binding.swipeRefreshLayout.setOnRefreshListener {
             offlineShortcut = false
             allItems = ArrayList()
             lastFetchDone = false
@@ -247,7 +240,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     val i = items.elementAtOrNull(position)
 
                     if (i != null) {
-                        val adapter = recyclerView.adapter as ItemsAdapter<*>
+                        val adapter = binding.recyclerView.adapter as ItemsAdapter<*>
 
                         val wasItemUnread = adapter.unreadItemStatusAtIndex(position)
 
@@ -285,7 +278,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                 }
             }
 
-        ItemTouchHelper(simpleItemTouchCallback).attachToRecyclerView(recyclerView)
+        ItemTouchHelper(simpleItemTouchCallback).attachToRecyclerView(binding.recyclerView)
     }
 
     private fun handleBottomBar() {
@@ -322,18 +315,17 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             ).setActiveColorResource(R.color.pink)
                 .setBadgeItem(tabStarredBadge)
 
-        bottomBar
+        binding.bottomBar
             .addItem(tabNew)
             .addItem(tabArchive)
             .addItem(tabStarred)
             .setFirstSelectedPosition(0)
             .initialise()
-
+        binding.bottomBar.setMode(BottomNavigationBar.MODE_SHIFTING)
-        bottomBar.setMode(BottomNavigationBar.MODE_SHIFTING)
+        binding.bottomBar.setBackgroundStyle(BottomNavigationBar.BACKGROUND_STYLE_STATIC)
-        bottomBar.setBackgroundStyle(BottomNavigationBar.BACKGROUND_STYLE_STATIC)
 
         if (fromTabShortcut) {
-            bottomBar.selectTab(elementsShown - 1)
+            binding.bottomBar.selectTab(elementsShown - 1)
         }
     }
 
@@ -347,8 +339,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
         editor = settings.edit()
 
-        handleSharedPrefs()
-
         handleDrawerItems()
 
         handleThemeUpdate()
@@ -356,24 +346,20 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         reloadLayoutManager()
 
         if (!infiniteScroll) {
-            recyclerView.setHasFixedSize(true)
+            binding.recyclerView.setHasFixedSize(true)
         } else {
             handleInfiniteScroll()
         }
 
         handleBottomBarActions()
 
-        getElementsAccordingToTab()
-
-        handleGDPRDialog(sharedPref.getBoolean("GDPR_shown", false))
-
         handleRecurringTask()
 
         handleOfflineActions()
     }
 
     private fun getAndStoreAllItems() {
-        api.allItems().enqueue(object : Callback<List<Item>> {
+        api.allNewItems().enqueue(object : Callback<List<Item>> {
             override fun onFailure(call: Call<List<Item>>, t: Throwable) {
             }
 
@@ -381,18 +367,48 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                 call: Call<List<Item>>,
                 response: Response<List<Item>>
             ) {
-                thread {
+                enqueueArticles(response, true)
-                    if (response.body() != null) {
-                        val apiItems = (response.body() as ArrayList<Item>).filter {
-                            maybeTagFilter != null || filter(it.tags.tags)
-                        } as ArrayList<Item>
-                        db.itemsDao().deleteAllItems()
-                        db.itemsDao()
-                            .insertAllItems(*(apiItems.map { it.toEntity() }).toTypedArray())
-                    }
-                }
             }
         })
+
+        api.allReadItems().enqueue(object : Callback<List<Item>> {
+            override fun onFailure(call: Call<List<Item>>, t: Throwable) {
+            }
+
+            override fun onResponse(
+                    call: Call<List<Item>>,
+                    response: Response<List<Item>>
+            ) {
+                enqueueArticles(response, false)
+            }
+        })
+
+        api.allStarredItems().enqueue(object : Callback<List<Item>> {
+            override fun onFailure(call: Call<List<Item>>, t: Throwable) {
+            }
+
+            override fun onResponse(
+                    call: Call<List<Item>>,
+                    response: Response<List<Item>>
+            ) {
+                enqueueArticles(response, false)
+            }
+        })
+    }
+
+    private fun enqueueArticles(response: Response<List<Item>>, clearDatabase: Boolean) {
+        thread {
+            if (response.body() != null) {
+                val apiItems = (response.body() as ArrayList<Item>).filter {
+                    maybeTagFilter != null || filter(it.tags.tags)
+                } as ArrayList<Item>
+                if (clearDatabase) {
+                    db.itemsDao().deleteAllItems()
+                }
+                db.itemsDao()
+                        .insertAllItems(*(apiItems.map { it.toEntity() }).toTypedArray())
+            }
+        }
     }
 
     override fun onStop() {
@@ -401,27 +417,26 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     }
 
     private fun handleSharedPrefs() {
-        debugReadingItems = sharedPref.getBoolean("read_debug", false)
-        shouldLogEverything = sharedPref.getBoolean("should_log_everything", false)
         internalBrowser = sharedPref.getBoolean("prefer_internal_browser", true)
         articleViewer = sharedPref.getBoolean("prefer_article_viewer", true)
         shouldBeCardView = sharedPref.getBoolean("card_view_active", false)
         displayUnreadCount = sharedPref.getBoolean("display_unread_count", true)
         displayAllCount = sharedPref.getBoolean("display_other_count", false)
         fullHeightCards = sharedPref.getBoolean("full_height_cards", false)
-        itemsNumber = sharedPref.getString("prefer_api_items_number", "200").toInt()
+        itemsNumber = sharedPref.getString("prefer_api_items_number", "200")!!.toInt()
-        userIdentifier = sharedPref.getString("unique_id", "")
+        userIdentifier = sharedPref.getString("unique_id", "")!!
         displayAccountHeader = sharedPref.getBoolean("account_header_displaying", false)
         infiniteScroll = sharedPref.getBoolean("infinite_loading", false)
         itemsCaching = sharedPref.getBoolean("items_caching", false)
-        hiddenTags = if (sharedPref.getString("hidden_tags", "").isNotEmpty()) {
+        updateSources = sharedPref.getBoolean("update_sources", true)
-            sharedPref.getString("hidden_tags", "").replace("\\s".toRegex(), "").split(",")
+        hiddenTags = if (sharedPref.getString("hidden_tags", "")!!.isNotEmpty()) {
+            sharedPref.getString("hidden_tags", "")!!.replace("\\s".toRegex(), "").split(",")
         } else {
             emptyList()
         }
         periodicRefresh = sharedPref.getBoolean("periodic_refresh", false)
         refreshWhenChargingOnly = sharedPref.getBoolean("refresh_when_charging", false)
-        refreshMinutes = sharedPref.getString("periodic_refresh_minutes", "360").toLong()
+        refreshMinutes = sharedPref.getString("periodic_refresh_minutes", "360")!!.toLong()
 
         if (refreshMinutes <= 15) {
             refreshMinutes = 15
@@ -430,7 +445,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
     private fun handleThemeBinding() {
         val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, toolBar)
+        scoop.bind(this, Toppings.PRIMARY.value, binding.toolBar)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
         }
@@ -453,24 +468,24 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
         drawer = drawer {
             rootViewRes = R.id.drawer_layout
-            toolbar = toolBar
+            toolbar = binding.toolBar
             actionBarDrawerToggleEnabled = true
             actionBarDrawerToggleAnimated = true
             showOnFirstLaunch = true
             onSlide { _, p1 ->
-                bottomBar.alpha = (1 - p1)
+                binding.bottomBar.alpha = (1 - p1)
             }
             onClosed {
-                bottomBar.show()
+                binding.bottomBar.show()
             }
             onOpened {
-                bottomBar.hide()
+                binding.bottomBar.hide()
             }
 
             if (displayAccountHeader) {
                 accountHeader {
                     background = R.drawable.bg
-                    profile(settings.getString("url", "")) {
+                    profile(settings.getString("url", "")!!) {
                         iconDrawable = resources.getDrawable(R.mipmap.ic_launcher)
                     }
                     selectionListEnabledForSingleProfile = false
@@ -623,18 +638,27 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     }
                 } else {
                     for (tag in maybeSources) {
-                        drawer.addItem(
+                        val item = PrimaryDrawerItem()
-                            CustomUrlPrimaryDrawerItem()
+                                .withName(tag.getTitleDecoded())
-                                .withName(tag.title)
                                 .withIdentifier(tag.id.toLong())
-                                .withIcon(tag.getIcon(this@HomeActivity))
                                 .withOnDrawerItemClickListener { _, _, _ ->
                                     allItems = ArrayList()
                                     maybeSourceFilter = tag
                                     getElementsAccordingToTab()
                                     false
                                 }
-                        )
+                        if (tag.getIcon(this@HomeActivity).isNotBlank()) {
+                            thread {
+                                try {
+                                    item.withIcon(BitmapDrawable(resources, Glide.with(this@HomeActivity).asBitmap().load(tag.getIcon(this@HomeActivity)).submit(100, 100).get()))
+                                } catch (e: Exception) {
+                                }
+                            }
+                        } else {
+                            item.withIcon(R.mipmap.ic_launcher)
+                        }
+                        drawer.addItem(item)
+
                     }
                 }
             }
@@ -695,13 +719,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         .withIconTintingEnabled(true)
                         .withOnDrawerItemClickListener { _, _, _ ->
                             LibsBuilder()
-                                .withActivityStyle(
-                                    if (appColors.isDarkTheme) {
-                                        Libs.ActivityStyle.DARK
-                                    } else {
-                                        Libs.ActivityStyle.LIGHT_DARK_TOOLBAR
-                                    }
-                                )
                                 .withAboutIconShown(true)
                                 .withAboutVersionShown(true)
                                 .start(this@HomeActivity)
@@ -714,6 +731,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     if (maybeDrawerData.tags != null) {
                         thread {
                             val tagEntities = maybeDrawerData.tags.map { it.toEntity() }
+                            db.drawerDataDao().deleteAllTags()
                             db.drawerDataDao().insertAllTags(*tagEntities.toTypedArray())
                         }
                     }
@@ -721,6 +739,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         thread {
                             val sourceEntities =
                                 maybeDrawerData.sources.map { it.toEntity() }
+                            db.drawerDataDao().deleteAllSources()
                             db.drawerDataDao().insertAllSources(*sourceEntities.toTypedArray())
                         }
                     }
@@ -748,7 +767,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             var sources: List<Source>?
 
             fun sourcesApiCall() {
-                if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
+                if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut) && updateSources) {
                     api.sources.enqueue(object : Callback<List<Source>> {
                         override fun onResponse(
                             call: Call<List<Source>>?,
@@ -771,7 +790,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                 }
             }
 
-            if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
+            if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut) && updateSources) {
                 api.tags.enqueue(object : Callback<List<Tag>> {
                     override fun onResponse(
                         call: Call<List<Tag>>,
@@ -805,7 +824,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     }
 
     private fun reloadLayoutManager() {
-        val currentManager = recyclerView.layoutManager
+        val currentManager = binding.recyclerView.layoutManager
         val layoutManager: RecyclerView.LayoutManager
 
         // This will only update the layout manager if settings changed
@@ -816,7 +835,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         this,
                         calculateNoOfColumns()
                     )
-                    recyclerView.layoutManager = layoutManager
+                    binding.recyclerView.layoutManager = layoutManager
                 }
             is GridLayoutManager ->
                 if (shouldBeCardView) {
@@ -826,7 +845,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     )
                     layoutManager.gapStrategy =
                             StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
-                    recyclerView.layoutManager = layoutManager
+                    binding.recyclerView.layoutManager = layoutManager
                 }
             else ->
                 if (currentManager == null) {
@@ -835,7 +854,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                             this,
                             calculateNoOfColumns()
                         )
-                        recyclerView.layoutManager = layoutManager
+                        binding.recyclerView.layoutManager = layoutManager
                     } else {
                         layoutManager = StaggeredGridLayoutManager(
                             calculateNoOfColumns(),
@@ -843,7 +862,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         )
                         layoutManager.gapStrategy =
                                 StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
-                        recyclerView.layoutManager = layoutManager
+                        binding.recyclerView.layoutManager = layoutManager
                     }
                 } else {
                 }
@@ -851,11 +870,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     }
 
     private fun handleBottomBarActions() {
-        bottomBar.setTabSelectedListener(object : BottomNavigationBar.OnTabSelectedListener {
+        binding.bottomBar.setTabSelectedListener(object : BottomNavigationBar.OnTabSelectedListener {
             override fun onTabUnselected(position: Int) = Unit
 
             override fun onTabReselected(position: Int) {
-                val layoutManager = recyclerView.adapter
+                val layoutManager = binding.recyclerView.adapter
 
                 when (layoutManager) {
                     is StaggeredGridLayoutManager ->
@@ -880,12 +899,14 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
                 if (itemsCaching) {
 
-                    if (!swipeRefreshLayout.isRefreshing) {
+                    if (!binding.swipeRefreshLayout.isRefreshing) {
-                        swipeRefreshLayout.post { swipeRefreshLayout.isRefreshing = true }
+                        binding.swipeRefreshLayout.post { binding.swipeRefreshLayout.isRefreshing = true }
                     }
 
                     thread {
-                        val dbItems = db.itemsDao().items().map { it.toView() }
+                        val dbItems = db.itemsDao().items().map { it.toView() }.sortedByDescending {
+                            SimpleDateFormat(dateTimeFormatter).parse(it.datetime)
+                        }
                         runOnUiThread {
                             if (dbItems.isNotEmpty()) {
                                 items = when (position) {
@@ -931,7 +952,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         recyclerViewScrollListener = object : RecyclerView.OnScrollListener() {
             override fun onScrolled(localRecycler: RecyclerView, dx: Int, dy: Int) {
                 if (dy > 0) {
-                    val manager = recyclerView.layoutManager
+                    val manager = binding.recyclerView.layoutManager
                     val lastVisibleItem: Int = when (manager) {
                         is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions(
                             null
@@ -947,17 +968,17 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             }
         }
 
-        recyclerView.clearOnScrollListeners()
+        binding.recyclerView.clearOnScrollListeners()
-        recyclerView.addOnScrollListener(recyclerViewScrollListener)
+        binding.recyclerView.addOnScrollListener(recyclerViewScrollListener)
     }
 
     private fun mayBeEmpty() =
         if (items.isEmpty()) {
-            emptyText.visibility = View.VISIBLE
+            binding.emptyText.visibility = View.VISIBLE
-            recyclerView.visibility = View.GONE
+            binding.recyclerView.visibility = View.GONE
         } else {
-            emptyText.visibility = View.GONE
+            binding.emptyText.visibility = View.GONE
-            recyclerView.visibility = View.VISIBLE
+            binding.recyclerView.visibility = View.VISIBLE
         }
 
     private fun getElementsAccordingToTab(
@@ -982,12 +1003,14 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
         if (itemsCaching) {
 
-            if (!swipeRefreshLayout.isRefreshing) {
+            if (!binding.swipeRefreshLayout.isRefreshing) {
-                swipeRefreshLayout.post { swipeRefreshLayout.isRefreshing = true }
+                binding.swipeRefreshLayout.post { binding.swipeRefreshLayout.isRefreshing = true }
             }
 
             thread {
-                val dbItems = db.itemsDao().items().map { it.toView() }
+                val dbItems = db.itemsDao().items().map { it.toView() }.sortedByDescending {
+                    SimpleDateFormat(dateTimeFormatter).parse(it.datetime)
+                }
                 runOnUiThread {
                     if (dbItems.isNotEmpty()) {
                         items = when (elementsShown) {
@@ -1051,11 +1074,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             handleListResult(appendResults)
 
             if (!appendResults) mayBeEmpty()
-            swipeRefreshLayout.isRefreshing = false
+            binding.swipeRefreshLayout.isRefreshing = false
         }
 
-        if (!swipeRefreshLayout.isRefreshing) {
+        if (!binding.swipeRefreshLayout.isRefreshing) {
-            swipeRefreshLayout.post { swipeRefreshLayout.isRefreshing = true }
+            binding.swipeRefreshLayout.post { binding.swipeRefreshLayout.isRefreshing = true }
         }
 
         if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)) {
@@ -1069,7 +1092,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     }
 
                     override fun onFailure(call: Call<List<Item>>, t: Throwable) {
-                        swipeRefreshLayout.isRefreshing = false
+                        binding.swipeRefreshLayout.isRefreshing = false
                         Toast.makeText(
                             this@HomeActivity,
                             toastMessage,
@@ -1078,7 +1101,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     }
                 })
         } else {
-            swipeRefreshLayout.post { swipeRefreshLayout.isRefreshing = false }
+            binding.swipeRefreshLayout.post { binding.swipeRefreshLayout.isRefreshing = false }
         }
     }
 
@@ -1123,7 +1146,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
     private fun handleListResult(appendResults: Boolean = false) {
         if (appendResults) {
-            val oldManager = recyclerView.layoutManager
+            val oldManager = binding.recyclerView.layoutManager
             firstVisible = when (oldManager) {
                 is StaggeredGridLayoutManager ->
                     oldManager.findFirstCompletelyVisibleItemPositions(null).last()
@@ -1146,7 +1169,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                             articleViewer,
                             fullHeightCards,
                             appColors,
-                            debugReadingItems,
                             userIdentifier,
                             config
                         ) {
@@ -1162,7 +1184,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                             customTabActivityHelper,
                             internalBrowser,
                             articleViewer,
-                            debugReadingItems,
                             userIdentifier,
                             appColors,
                             config
@@ -1170,14 +1191,14 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                             updateItems(it)
                         }
 
-                recyclerView.addItemDecoration(
+                binding.recyclerView.addItemDecoration(
                     DividerItemDecoration(
                         this@HomeActivity,
                         DividerItemDecoration.VERTICAL
                     )
                 )
             }
-            recyclerView.adapter = recyclerAdapter
+            binding.recyclerView.adapter = recyclerAdapter
         } else {
             if (!appendResults) {
                 (recyclerAdapter as ItemsAdapter<*>).updateAllItems(items)
@@ -1328,7 +1349,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             R.id.readAll -> {
                 if (elementsShown == UNREAD_SHOWN) {
                     needsConfirmation(R.string.readAll, R.string.markall_dialog_message) {
-                        swipeRefreshLayout.isRefreshing = false
+                        binding.swipeRefreshLayout.isRefreshing = false
                         val ids = allItems.map { it.id }
                         val itemsByTag: Map<Long, Int> =
                             allItems.flattenTags()
@@ -1336,10 +1357,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                 .map { it.key to it.value.size }
                                 .toMap()
 
-                        fun readAllDebug(e: Throwable) {
-                            ACRA.getErrorReporter().maybeHandleSilentException(e, this@HomeActivity)
-                        }
-
                         if (ids.isNotEmpty() && this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
                             api.readAll(ids).enqueue(object : Callback<SuccessResponse> {
                                 override fun onResponse(
@@ -1364,17 +1381,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                             Toast.LENGTH_SHORT
                                         ).show()
 
-                                        if (debugReadingItems) {
+
-                                            readAllDebug(
-                                                Throwable(
-                                                    "Got response, but : response.body() (${response.body()}) != null && response.body()!!.isSuccess (${response.body()?.isSuccess})." +
-                                                            "Request url was (${call.request().url()}), ids were $ids"
-                                                )
-                                            )
-                                        }
                                     }
 
-                                    swipeRefreshLayout.isRefreshing = false
+                                    binding.swipeRefreshLayout.isRefreshing = false
                                 }
 
                                 override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
@@ -1383,11 +1393,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                         R.string.all_posts_not_read,
                                         Toast.LENGTH_SHORT
                                     ).show()
-                                    swipeRefreshLayout.isRefreshing = false
+                                    binding.swipeRefreshLayout.isRefreshing = false
-
-                                    if (debugReadingItems) {
-                                        readAllDebug(t)
-                                    }
                                 }
                             })
                             items = ArrayList()
@@ -1424,24 +1430,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         items = adapterItems
     }
 
-    private fun handleGDPRDialog(GDPRShown: Boolean) {
-        val sharedEditor = sharedPref.edit()
-        if (!GDPRShown) {
-            val alertDialog = AlertDialog.Builder(this).create()
-            alertDialog.setTitle(getString(R.string.gdpr_dialog_title))
-            alertDialog.setMessage(getString(R.string.gdpr_dialog_message))
-            alertDialog.setButton(
-                AlertDialog.BUTTON_NEUTRAL,
-                "OK"
-            ) { dialog, _ ->
-                sharedEditor.putBoolean("GDPR_shown", true)
-                sharedEditor.commit()
-                dialog.dismiss()
-            }
-            alertDialog.show()
-        }
-    }
-
     private fun handleRecurringTask() {
         if (periodicRefresh) {
             val myConstraints = Constraints.Builder()
@@ -1474,7 +1462,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                }
 
                override fun onFailure(call: Call<T>, t: Throwable) {
-                   ACRA.getErrorReporter().maybeHandleSilentException(t, this@HomeActivity)
                }
            })
         }

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

@@ -0,0 +1,56 @@
+package apps.amine.bou.readerforselfoss
+
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
+import apps.amine.bou.readerforselfoss.databinding.ActivityImageBinding
+import apps.amine.bou.readerforselfoss.fragments.ImageFragment
+
+class ImageActivity : AppCompatActivity() {
+    private lateinit var allImages : ArrayList<String>
+    private var position : Int = 0
+
+    private lateinit var binding: ActivityImageBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityImageBinding.inflate(layoutInflater)
+        val view = binding.root
+
+        setContentView(view)
+
+        setSupportActionBar(binding.toolBar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        allImages = intent.getStringArrayListExtra("allImages") as ArrayList<String>
+        position = intent.getIntExtra("position", 0)
+
+        binding.pager.adapter = ScreenSlidePagerAdapter(supportFragmentManager)
+        binding.pager.currentItem = position
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> {
+                onBackPressed()
+                return true
+            }
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+    private inner class ScreenSlidePagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm, FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+
+        override fun getCount(): Int {
+            return allImages.size
+        }
+
+        override fun getItem(position: Int): ImageFragment {
+            return ImageFragment.newInstance(allImages[position])
+        }
+    }
+}

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

@@ -17,15 +17,13 @@ import android.widget.TextView
 import android.widget.Toast
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.databinding.ActivityLoginBinding
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid
-import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
-import kotlinx.android.synthetic.main.activity_login.*
-import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -40,27 +38,28 @@ class LoginActivity : AppCompatActivity() {
     private lateinit var settings: SharedPreferences
     private lateinit var editor: SharedPreferences.Editor
     private lateinit var userIdentifier: String
-    private var logErrors: Boolean = false
     private lateinit var appColors: AppColors
+    private lateinit var binding: ActivityLoginBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         appColors = AppColors(this@LoginActivity)
 
         super.onCreate(savedInstanceState)
+        binding = ActivityLoginBinding.inflate(layoutInflater)
+        val view = binding.root
 
-        setContentView(R.layout.activity_login)
+        setContentView(view)
 
-        setSupportActionBar(toolbar)
+        setSupportActionBar(binding.toolbar)
 
         handleBaseUrlFail()
 
         settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-        userIdentifier = settings.getString("unique_id", "")
+        userIdentifier = settings.getString("unique_id", "")!!
-        logErrors = settings.getBoolean("login_debug", false)
 
         editor = settings.edit()
 
-        if (settings.getString("url", "").isNotEmpty()) {
+        if (settings.getString("url", "")!!.isNotEmpty()) {
             goToMain()
         }
 
@@ -69,14 +68,14 @@ class LoginActivity : AppCompatActivity() {
 
     private fun handleActions() {
 
-        withSelfhostedCert.setOnCheckedChangeListener { _, b ->
+        binding.withSelfhostedCert.setOnCheckedChangeListener { _, b ->
             isWithSelfSignedCert = !isWithSelfSignedCert
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            warningText.visibility = visi
+            binding.warningText.visibility = visi
         }
 
-        passwordView.setOnEditorActionListener(
+        binding.passwordView.setOnEditorActionListener(
             TextView.OnEditorActionListener { _, id, _ ->
                 if (id == R.id.loginView || id == EditorInfo.IME_NULL) {
                     attemptLogin()
@@ -86,22 +85,22 @@ class LoginActivity : AppCompatActivity() {
             }
         )
 
-        signInButton.setOnClickListener { attemptLogin() }
+        binding.signInButton.setOnClickListener { attemptLogin() }
 
-        withLogin.setOnCheckedChangeListener { _, b ->
+        binding.withLogin.setOnCheckedChangeListener { _, b ->
             isWithLogin = !isWithLogin
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            loginLayout.visibility = visi
+            binding.loginLayout.visibility = visi
-            passwordLayout.visibility = visi
+            binding.passwordLayout.visibility = visi
         }
 
-        withHttpLogin.setOnCheckedChangeListener { _, b ->
+        binding.withHttpLogin.setOnCheckedChangeListener { _, b ->
             isWithHTTPLogin = !isWithHTTPLogin
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            httpLoginInput.visibility = visi
+            binding.httpLoginInput.visibility = visi
-            httpPasswordInput.visibility = visi
+            binding.httpPasswordInput.visibility = visi
         }
     }
 
@@ -128,25 +127,25 @@ class LoginActivity : AppCompatActivity() {
     private fun attemptLogin() {
 
         // Reset errors.
-        urlView.error = null
+        binding.urlView.error = null
-        loginView.error = null
+        binding.loginView.error = null
-        httpLoginView.error = null
+        binding.httpLoginView.error = null
-        passwordView.error = null
+        binding.passwordView.error = null
-        httpPasswordView.error = null
+        binding.httpPasswordView.error = null
 
         // Store values at the time of the login attempt.
-        val url = urlView.text.toString()
+        val url = binding.urlView.text.toString()
-        val login = loginView.text.toString()
+        val login = binding.loginView.text.toString()
-        val httpLogin = httpLoginView.text.toString()
+        val httpLogin = binding.httpLoginView.text.toString()
-        val password = passwordView.text.toString()
+        val password = binding.passwordView.text.toString()
-        val httpPassword = httpPasswordView.text.toString()
+        val httpPassword = binding.httpPasswordView.text.toString()
 
         var cancel = false
         var focusView: View? = null
 
-        if (!url.isBaseUrlValid(logErrors, this@LoginActivity)) {
+        if (!url.isBaseUrlValid(this@LoginActivity)) {
-            urlView.error = getString(R.string.login_url_problem)
+            binding.urlView.error = getString(R.string.login_url_problem)
-            focusView = urlView
+            focusView = binding.urlView
             cancel = true
             inValidCount++
             if (inValidCount == 3) {
@@ -165,28 +164,28 @@ class LoginActivity : AppCompatActivity() {
 
         if (isWithLogin) {
             if (TextUtils.isEmpty(password)) {
-                passwordView.error = getString(R.string.error_invalid_password)
+                binding.passwordView.error = getString(R.string.error_invalid_password)
-                focusView = passwordView
+                focusView = binding.passwordView
                 cancel = true
             }
 
             if (TextUtils.isEmpty(login)) {
-                loginView.error = getString(R.string.error_field_required)
+                binding.loginView.error = getString(R.string.error_field_required)
-                focusView = loginView
+                focusView = binding.loginView
                 cancel = true
             }
         }
 
         if (isWithHTTPLogin) {
             if (TextUtils.isEmpty(httpPassword)) {
-                httpPasswordView.error = getString(R.string.error_invalid_password)
+                binding.httpPasswordView.error = getString(R.string.error_invalid_password)
-                focusView = httpPasswordView
+                focusView = binding.httpPasswordView
                 cancel = true
             }
 
             if (TextUtils.isEmpty(httpLogin)) {
-                httpLoginView.error = getString(R.string.error_field_required)
+                binding.httpLoginView.error = getString(R.string.error_field_required)
-                focusView = httpLoginView
+                focusView = binding.httpLoginView
                 cancel = true
             }
         }
@@ -208,8 +207,7 @@ class LoginActivity : AppCompatActivity() {
                 this,
                 this@LoginActivity,
                 isWithSelfSignedCert,
-                -1L,
+                -1L
-                isWithSelfSignedCert
             )
 
             if (this@LoginActivity.isNetworkAccessible(this@LoginActivity.findViewById(R.id.loginForm))) {
@@ -221,19 +219,11 @@ class LoginActivity : AppCompatActivity() {
                         editor.remove("password")
                         editor.remove("httpPassword")
                         editor.apply()
-                        urlView.error = getString(R.string.wrong_infos)
+                        binding.urlView.error = getString(R.string.wrong_infos)
-                        loginView.error = getString(R.string.wrong_infos)
+                        binding.loginView.error = getString(R.string.wrong_infos)
-                        passwordView.error = getString(R.string.wrong_infos)
+                        binding.passwordView.error = getString(R.string.wrong_infos)
-                        httpLoginView.error = getString(R.string.wrong_infos)
+                        binding.httpLoginView.error = getString(R.string.wrong_infos)
-                        httpPasswordView.error = getString(R.string.wrong_infos)
+                        binding.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)
                     }
 
@@ -261,28 +251,28 @@ class LoginActivity : AppCompatActivity() {
     private fun showProgress(show: Boolean) {
         val shortAnimTime = resources.getInteger(android.R.integer.config_shortAnimTime)
 
-        loginForm.visibility = if (show) View.GONE else View.VISIBLE
+        binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE
-        loginForm
+        binding.loginForm
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
                 if (show) 0F else 1F
             ).setListener(object : AnimatorListenerAdapter() {
             override fun onAnimationEnd(animation: Animator) {
-                loginForm.visibility = if (show) View.GONE else View.VISIBLE
+                binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE
             }
         }
         )
 
-        loginProgress.visibility = if (show) View.VISIBLE else View.GONE
+        binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
-        loginProgress
+        binding.loginProgress
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
                 if (show) 1F else 0F
             ).setListener(object : AnimatorListenerAdapter() {
             override fun onAnimationEnd(animation: Animator) {
-                loginProgress.visibility = if (show) View.VISIBLE else View.GONE
+                binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
             }
         }
         )
@@ -290,29 +280,19 @@ class LoginActivity : AppCompatActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.login_menu, menu)
-        menu.findItem(R.id.login_debug).isChecked = logErrors
         return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
+        return when (item.itemId) {
             R.id.about -> {
                 LibsBuilder()
-                    .withActivityStyle(Libs.ActivityStyle.LIGHT_DARK_TOOLBAR)
                     .withAboutIconShown(true)
                     .withAboutVersionShown(true)
                     .start(this)
-                return true
+                true
             }
-            R.id.login_debug -> {
+            else -> super.onOptionsItemSelected(item)
-                val newState = !item.isChecked
-                item.isChecked = newState
-                logErrors = newState
-                editor.putBoolean("login_debug", newState)
-                editor.apply()
-                return true
-            }
-            else -> return super.onOptionsItemSelected(item)
         }
     }
 }

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

@@ -4,12 +4,18 @@ import android.content.Intent
 import android.os.Bundle
 import android.preference.PreferenceManager
 import androidx.appcompat.app.AppCompatActivity
+import apps.amine.bou.readerforselfoss.databinding.ActivityAddSourceBinding
+import apps.amine.bou.readerforselfoss.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityMainBinding
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        val view = binding.root
+        setContentView(view)
 
         val intent = Intent(this, LoginActivity::class.java)
 

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

@@ -3,55 +3,43 @@ 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.api.selfoss.ApiVersion
+import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.ftinc.scoop.Scoop
-import com.github.stkent.amplify.feedback.DefaultEmailFeedbackCollector
-import com.github.stkent.amplify.feedback.GooglePlayStoreFeedbackCollector
-import com.github.stkent.amplify.tracking.Amplify
 import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
 import com.mikepenz.materialdrawer.util.DrawerImageLoader
-import org.acra.ACRA
+import retrofit2.Call
-import org.acra.ReportField
+import retrofit2.Callback
-import org.acra.annotation.AcraCore
+import retrofit2.Response
-import org.acra.annotation.AcraDialog
-import org.acra.annotation.AcraHttpSender
-import org.acra.sender.HttpSender
-import java.io.IOException
 import java.util.UUID.randomUUID
 
+var dateTimeFormatter = "yyyy-MM-dd HH:mm:ss"
 
-@AcraHttpSender(uri = "http://37.187.110.167/amine/acra/simplest-acra.php",
-                httpMethod = HttpSender.Method.POST)
-@AcraDialog(resText = R.string.crash_dialog_text,
-            resCommentPrompt = R.string.crash_dialog_comment,
-            resTheme = android.R.style.Theme_DeviceDefault_Dialog)
-@AcraCore(reportContent = [ReportField.REPORT_ID, ReportField.INSTALLATION_ID,
-    ReportField.APP_VERSION_CODE, ReportField.APP_VERSION_NAME,
-    ReportField.BUILD, ReportField.ANDROID_VERSION, ReportField.BRAND, ReportField.PHONE_MODEL,
-    ReportField.AVAILABLE_MEM_SIZE, ReportField.TOTAL_MEM_SIZE,
-    ReportField.STACK_TRACE, ReportField.APPLICATION_LOG, ReportField.LOGCAT,
-    ReportField.INITIAL_CONFIGURATION, ReportField.CRASH_CONFIGURATION, ReportField.IS_SILENT,
-    ReportField.USER_APP_START_DATE, ReportField.USER_COMMENT, ReportField.USER_CRASH_DATE, ReportField.USER_EMAIL, ReportField.CUSTOM_DATA],
-          buildConfigClass = BuildConfig::class)
 class MyApp : MultiDexApplication() {
     private lateinit var config: Config
+    private lateinit var api: SelfossApi
+    private lateinit var settings: SharedPreferences
+    private lateinit var sharedPref: SharedPreferences
+
+    private var apiVersionMajor: Int = 0
 
     override fun onCreate() {
         super.onCreate()
         config = Config(baseContext)
-        initAmplify()
 
         val prefs = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-        if (prefs.getString("unique_id", "").isEmpty()) {
+        if (prefs.getString("unique_id", "")!!.isEmpty()) {
             val editor = prefs.edit()
             editor.putString("unique_id", randomUUID().toString())
             editor.apply()
@@ -64,6 +52,19 @@ class MyApp : MultiDexApplication() {
         tryToHandleBug()
 
         handleNotificationChannels()
+
+        sharedPref = PreferenceManager.getDefaultSharedPreferences(this)
+        apiVersionMajor = sharedPref.getInt("apiVersionMajor", 0)
+        settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+
+        api = SelfossApi(
+                this,
+                null,
+                settings.getBoolean("isSelfSignedCert", false),
+                sharedPref.getString("api_timeout", "-1")!!.toLong()
+        )
+
+        getApiMajorVersion()
     }
 
     private fun handleNotificationChannels() {
@@ -83,21 +84,6 @@ class MyApp : MultiDexApplication() {
         }
     }
 
-    override fun attachBaseContext(base: Context?) {
-        super.attachBaseContext(base)
-        val prefs = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-        ACRA.init(this)
-        ACRA.getErrorReporter().putCustomData("unique_id", prefs.getString("unique_id", ""))
-
-    }
-
-    private fun initAmplify() {
-        Amplify.initSharedInstance(this)
-            .setPositiveFeedbackCollectors(GooglePlayStoreFeedbackCollector())
-            .setCriticalFeedbackCollectors(DefaultEmailFeedbackCollector(Config.feedbackEmail))
-            .applyAllDefaultRules()
-    }
-
     private fun initDrawerImageLoader() {
         DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
             override fun set(
@@ -143,4 +129,24 @@ class MyApp : MultiDexApplication() {
             }
         }
     }
+
+    private fun getApiMajorVersion() {
+        api.apiVersion.enqueue(object : Callback<ApiVersion> {
+            override fun onFailure(call: Call<ApiVersion>, t: Throwable) {
+                if (apiVersionMajor >= 4) {
+                    dateTimeFormatter = "yyyy-MM-dd'T'HH:mm:ssXXX"
+                }
+            }
+
+            override fun onResponse(call: Call<ApiVersion>, response: Response<ApiVersion>) {
+                val version = response.body() as ApiVersion
+                apiVersionMajor = version.getApiMajorVersion()
+                sharedPref.edit().putInt("apiVersionMajor", apiVersionMajor).commit()
+
+                if (apiVersionMajor >= 4) {
+                    dateTimeFormatter = "yyyy-MM-dd'T'HH:mm:ssXXX"
+                }
+            }
+        })
+    }
 }

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

@@ -20,24 +20,24 @@ 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.databinding.ActivityImageBinding
+import apps.amine.bou.readerforselfoss.databinding.ActivityReaderBinding
 import apps.amine.bou.readerforselfoss.fragments.ArticleFragment
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
 import apps.amine.bou.readerforselfoss.transformers.DepthPageTransformer
 import apps.amine.bou.readerforselfoss.utils.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
-import kotlinx.android.synthetic.main.activity_reader.*
 import me.relex.circleindicator.CircleIndicator
-import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -46,7 +46,6 @@ import kotlin.concurrent.thread
 class ReaderActivity : AppCompatActivity() {
 
     private var markOnScroll: Boolean = false
-    private var debugReadingItems: Boolean = false
     private var currentItem: Int = 0
     private lateinit var userIdentifier: String
 
@@ -56,6 +55,7 @@ class ReaderActivity : AppCompatActivity() {
 
     private lateinit var db: AppDatabase
     private lateinit var prefs: SharedPreferences
+    private lateinit var binding: ActivityReaderBinding
 
     private var activeAlignment: Int = 1
     val JUSTIFY = 1
@@ -78,21 +78,23 @@ class ReaderActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        binding = ActivityReaderBinding.inflate(layoutInflater)
+        val view = binding.root
 
-        setContentView(R.layout.activity_reader)
+        setContentView(view)
 
         db = Room.databaseBuilder(
             applicationContext,
             AppDatabase::class.java, "selfoss-database"
-        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()
+        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
 
         val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, toolBar)
+        scoop.bind(this, Toppings.PRIMARY.value, binding.toolBar)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
         }
 
-        setSupportActionBar(toolBar)
+        setSupportActionBar(binding.toolBar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
@@ -102,8 +104,7 @@ class ReaderActivity : AppCompatActivity() {
         prefs = PreferenceManager.getDefaultSharedPreferences(this)
         editor = prefs.edit()
 
-        debugReadingItems = prefs.getBoolean("read_debug", false)
+        userIdentifier = prefs.getString("unique_id", "")!!
-        userIdentifier = prefs.getString("unique_id", "")
         markOnScroll = prefs.getBoolean("mark_on_scroll", false)
         activeAlignment = prefs.getInt("text_align", JUSTIFY)
 
@@ -111,8 +112,7 @@ class ReaderActivity : AppCompatActivity() {
             this,
             this@ReaderActivity,
             settings.getBoolean("isSelfSignedCert", false),
-            prefs.getString("api_timeout", "-1").toLong(),
+            prefs.getString("api_timeout", "-1")!!.toLong()
-            prefs.getBoolean("should_log_everything", false)
         )
 
         if (allItems.isEmpty()) {
@@ -123,9 +123,9 @@ class ReaderActivity : AppCompatActivity() {
 
         readItem(allItems[currentItem])
 
-        pager.adapter =
+        binding.pager.adapter =
                 ScreenSlidePagerAdapter(supportFragmentManager, AppColors(this@ReaderActivity))
-        pager.currentItem = currentItem
+        binding.pager.currentItem = currentItem
     }
 
     override fun onResume() {
@@ -133,10 +133,10 @@ class ReaderActivity : AppCompatActivity() {
 
         notifyAdapter()
 
-        pager.setPageTransformer(true, DepthPageTransformer())
+        binding.pager.setPageTransformer(true, DepthPageTransformer())
-        (indicator as CircleIndicator).setViewPager(pager)
+        (binding.indicator as CircleIndicator).setViewPager(binding.pager)
 
-        pager.addOnPageChangeListener(
+        binding.pager.addOnPageChangeListener(
             object : ViewPager.SimpleOnPageChangeListener() {
 
                 override fun onPageSelected(position: Int) {
@@ -146,7 +146,7 @@ class ReaderActivity : AppCompatActivity() {
                     } else {
                         canFavorite()
                     }
-                    readItem(allItems[pager.currentItem])
+                    readItem(allItems[binding.pager.currentItem])
                 }
             }
         )
@@ -164,18 +164,6 @@ class ReaderActivity : AppCompatActivity() {
                             call: Call<SuccessResponse>,
                             response: Response<SuccessResponse>
                         ) {
-                            if (!response.succeeded() && debugReadingItems) {
-                                val message =
-                                    "message: ${response.message()} " +
-                                            "response isSuccess: ${response.isSuccessful} " +
-                                            "response code: ${response.code()} " +
-                                            "response message: ${response.message()} " +
-                                            "response errorBody: ${response.errorBody()?.string()} " +
-                                            "body success: ${response.body()?.success} " +
-                                            "body isSuccess: ${response.body()?.isSuccess}"
-                                ACRA.getErrorReporter()
-                                    .maybeHandleSilentException(Exception(message), this@ReaderActivity)
-                            }
                         }
 
                         override fun onFailure(
@@ -185,10 +173,6 @@ class ReaderActivity : AppCompatActivity() {
                             thread {
                                 db.itemsDao().insertAllItems(item.toEntity())
                             }
-                            if (debugReadingItems) {
-                                ACRA.getErrorReporter()
-                                    .maybeHandleSilentException(t, this@ReaderActivity)
-                            }
                         }
                     }
                 )
@@ -201,19 +185,19 @@ class ReaderActivity : AppCompatActivity() {
     }
 
     private fun notifyAdapter() {
-        (pager.adapter as ScreenSlidePagerAdapter).notifyDataSetChanged()
+        (binding.pager.adapter as ScreenSlidePagerAdapter).notifyDataSetChanged()
     }
 
     override fun onPause() {
         super.onPause()
         if (markOnScroll) {
-            pager.clearOnPageChangeListeners()
+            binding.pager.clearOnPageChangeListeners()
         }
     }
 
-    override fun onSaveInstanceState(oldInstanceState: Bundle?) {
+    override fun onSaveInstanceState(oldInstanceState: Bundle) {
         super.onSaveInstanceState(oldInstanceState)
-        oldInstanceState!!.clear()
+        oldInstanceState.clear()
     }
 
     private inner class ScreenSlidePagerAdapter(fm: FragmentManager, val appColors: AppColors) :
@@ -265,14 +249,14 @@ class ReaderActivity : AppCompatActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         fun afterSave() {
-            allItems[pager.currentItem] =
+            allItems[binding.pager.currentItem] =
-                    allItems[pager.currentItem].toggleStar()
+                    allItems[binding.pager.currentItem].toggleStar()
             notifyAdapter()
             canRemoveFromFavorite()
         }
 
         fun afterUnsave() {
-            allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
+            allItems[binding.pager.currentItem] = allItems[binding.pager.currentItem].toggleStar()
             notifyAdapter()
             canFavorite()
         }
@@ -284,7 +268,7 @@ class ReaderActivity : AppCompatActivity() {
             }
             R.id.save -> {
                 if (this@ReaderActivity.isNetworkAccessible(null)) {
-                    api.starrItem(allItems[pager.currentItem].id)
+                    api.starrItem(allItems[binding.pager.currentItem].id)
                         .enqueue(object : Callback<SuccessResponse> {
                             override fun onResponse(
                                 call: Call<SuccessResponse>,
@@ -306,14 +290,14 @@ class ReaderActivity : AppCompatActivity() {
                         })
                 } else {
                     thread {
-                        db.actionsDao().insertAllActions(ActionEntity(allItems[pager.currentItem].id, false, false, true, false))
+                        db.actionsDao().insertAllActions(ActionEntity(allItems[binding.pager.currentItem].id, false, false, true, false))
                         afterSave()
                     }
                 }
             }
             R.id.unsave -> {
                 if (this@ReaderActivity.isNetworkAccessible(null)) {
-                    api.unstarrItem(allItems[pager.currentItem].id)
+                    api.unstarrItem(allItems[binding.pager.currentItem].id)
                         .enqueue(object : Callback<SuccessResponse> {
                             override fun onResponse(
                                 call: Call<SuccessResponse>,
@@ -335,7 +319,7 @@ class ReaderActivity : AppCompatActivity() {
                         })
                 } else {
                     thread {
-                        db.actionsDao().insertAllActions(ActionEntity(allItems[pager.currentItem].id, false, false, false, true))
+                        db.actionsDao().insertAllActions(ActionEntity(allItems[binding.pager.currentItem].id, false, false, false, true))
                         afterUnsave()
                     }
                 }

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

@@ -12,12 +12,13 @@ import android.widget.Toast
 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.databinding.ActivityImageBinding
+import apps.amine.bou.readerforselfoss.databinding.ActivitySourcesBinding
 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
 import retrofit2.Callback
 import retrofit2.Response
@@ -25,31 +26,34 @@ import retrofit2.Response
 class SourcesActivity : AppCompatActivity() {
 
     private lateinit var appColors: AppColors
+    private lateinit var binding: ActivitySourcesBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         appColors = AppColors(this@SourcesActivity)
 
         super.onCreate(savedInstanceState)
+        binding = ActivitySourcesBinding.inflate(layoutInflater)
+        val view = binding.root
 
-        setContentView(R.layout.activity_sources)
+        setContentView(view)
 
         val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, toolbar)
+        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
         if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
         }
 
-        setSupportActionBar(toolbar)
+        setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
-        fab.rippleColor = appColors.colorAccentDark
+        binding.fab.rippleColor = appColors.colorAccentDark
-        fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
+        binding.fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
     }
 
     override fun onStop() {
         super.onStop()
-        recyclerView.clearOnScrollListeners()
+        binding.recyclerView.clearOnScrollListeners()
     }
 
     override fun onResume() {
@@ -64,13 +68,12 @@ class SourcesActivity : AppCompatActivity() {
             this,
             this@SourcesActivity,
             settings.getBoolean("isSelfSignedCert", false),
-            prefs.getString("api_timeout", "-1").toLong(),
+            prefs.getString("api_timeout", "-1")!!.toLong()
-            prefs.getBoolean("should_log_everything", false)
         )
         var items: ArrayList<Source> = ArrayList()
 
-        recyclerView.setHasFixedSize(true)
+        binding.recyclerView.setHasFixedSize(true)
-        recyclerView.layoutManager = mLayoutManager
+        binding.recyclerView.layoutManager = mLayoutManager
 
         if (this@SourcesActivity.isNetworkAccessible(this@SourcesActivity.findViewById(R.id.recyclerView))) {
             api.sources.enqueue(object : Callback<List<Source>> {
@@ -82,7 +85,7 @@ class SourcesActivity : AppCompatActivity() {
                         items = response.body() as ArrayList<Source>
                     }
                     val mAdapter = SourcesListAdapter(this@SourcesActivity, items, api)
-                    recyclerView.adapter = mAdapter
+                    binding.recyclerView.adapter = mAdapter
                     mAdapter.notifyDataSetChanged()
                     if (items.isEmpty()) {
                         Toast.makeText(
@@ -103,7 +106,7 @@ class SourcesActivity : AppCompatActivity() {
             })
         }
 
-        fab.setOnClickListener {
+        binding.fab.setOnClickListener {
             startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))
         }
     }

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

@@ -4,16 +4,17 @@ import android.app.Activity
 import android.content.Context
 import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
-import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView.ScaleType
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.databinding.CardItemBinding
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.themes.AppColors
@@ -34,7 +35,6 @@ import com.amulyakhare.textdrawable.util.ColorGenerator
 import com.bumptech.glide.Glide
 import com.like.LikeButton
 import com.like.OnLikeListener
-import kotlinx.android.synthetic.main.card_item.view.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -50,7 +50,6 @@ class ItemCardAdapter(
     private val articleViewer: Boolean,
     private val fullHeightCards: Boolean,
     override val appColors: AppColors,
-    override val debugReadingItems: Boolean,
     override val userIdentifier: String,
     override val config: Config,
     override val updateItems: (ArrayList<Item>) -> Unit
@@ -61,68 +60,79 @@ class ItemCardAdapter(
         c.resources.getDimension(R.dimen.card_image_max_height).toInt()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val v = LayoutInflater.from(c).inflate(R.layout.card_item, parent, false) as CardView
+        val binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return ViewHolder(v)
+        return ViewHolder(binding)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val itm = items[position]
+        with(holder) {
+            val itm = items[position]
 
 
-        holder.mView.favButton.isLiked = itm.starred
+            binding.favButton.isLiked = itm.starred
-        holder.mView.title.text = Html.fromHtml(itm.title)
+            binding.title.text = itm.getTitleDecoded()
-        holder.mView.title.setOnTouchListener(LinkOnTouchListener())
+            binding.title.setTextColor(ContextCompat.getColor(
+                    c,
+                    appColors.textColor
+            ))
+            binding.title.setOnTouchListener(LinkOnTouchListener())
 
-        holder.mView.title.setLinkTextColor(appColors.colorAccent)
+            binding.title.setLinkTextColor(appColors.colorAccent)
 
-        holder.mView.sourceTitleAndDate.text = itm.sourceAndDateText()
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
 
-        if (!fullHeightCards) {
+            binding.sourceTitleAndDate.setTextColor(ContextCompat.getColor(
-            holder.mView.itemImage.maxHeight = imageMaxHeight
+                    c,
-            holder.mView.itemImage.scaleType = ScaleType.CENTER_CROP
+                    appColors.textColor
+            ))
+
+            if (!fullHeightCards) {
+                binding.itemImage.maxHeight = imageMaxHeight
+                binding.itemImage.scaleType = ScaleType.CENTER_CROP
+            }
+
+            if (itm.getThumbnail(c).isEmpty()) {
+                binding.itemImage.visibility = View.GONE
+                Glide.with(c).clear(binding.itemImage)
+                binding.itemImage.setImageDrawable(null)
+            } else {
+                binding.itemImage.visibility = View.VISIBLE
+                c.bitmapCenterCrop(config, itm.getThumbnail(c), binding.itemImage)
+            }
+
+            if (itm.getIcon(c).isEmpty()) {
+                val color = generator.getColor(itm.getSourceTitle())
+
+                val drawable =
+                        TextDrawable
+                                .builder()
+                                .round()
+                                .build(itm.getSourceTitle().toTextDrawableString(c), color)
+                binding.sourceImage.setImageDrawable(drawable)
+            } else {
+                c.circularBitmapDrawable(config, itm.getIcon(c), binding.sourceImage)
+            }
+
+            binding.favButton.isLiked = itm.starred
         }
-
-        if (itm.getThumbnail(c).isEmpty()) {
-            holder.mView.itemImage.visibility = View.GONE
-            Glide.with(c).clear(holder.mView.itemImage)
-            holder.mView.itemImage.setImageDrawable(null)
-        } else {
-            holder.mView.itemImage.visibility = View.VISIBLE
-            c.bitmapCenterCrop(config, itm.getThumbnail(c), holder.mView.itemImage)
-        }
-
-        if (itm.getIcon(c).isEmpty()) {
-            val color = generator.getColor(itm.sourcetitle)
-
-            val drawable =
-                TextDrawable
-                    .builder()
-                    .round()
-                    .build(itm.sourcetitle.toTextDrawableString(c), color)
-            holder.mView.sourceImage.setImageDrawable(drawable)
-        } else {
-            c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.sourceImage)
-        }
-
-        holder.mView.favButton.isLiked = itm.starred
     }
 
     override fun getItemCount(): Int {
         return items.size
     }
 
-    inner class ViewHolder(val mView: CardView) : RecyclerView.ViewHolder(mView) {
+    inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root) {
         init {
-            mView.setCardBackgroundColor(appColors.cardBackgroundColor)
+            binding.root.setCardBackgroundColor(appColors.cardBackgroundColor)
             handleClickListeners()
             handleCustomTabActions()
         }
 
         private fun handleClickListeners() {
 
-            mView.favButton.setOnLikeListener(object : OnLikeListener {
+            binding.favButton.setOnLikeListener(object : OnLikeListener {
                 override fun liked(likeButton: LikeButton) {
-                    val (id) = items[adapterPosition]
+                    val (id) = items[bindingAdapterPosition]
                     if (c.isNetworkAccessible(null)) {
                         api.starrItem(id).enqueue(object : Callback<SuccessResponse> {
                             override fun onResponse(
@@ -135,7 +145,7 @@ class ItemCardAdapter(
                                 call: Call<SuccessResponse>,
                                 t: Throwable
                             ) {
-                                mView.favButton.isLiked = false
+                                binding.favButton.isLiked = false
                                 Toast.makeText(
                                     c,
                                     R.string.cant_mark_favortie,
@@ -151,7 +161,7 @@ class ItemCardAdapter(
                 }
 
                 override fun unLiked(likeButton: LikeButton) {
-                    val (id) = items[adapterPosition]
+                    val (id) = items[bindingAdapterPosition]
                     if (c.isNetworkAccessible(null)) {
                         api.unstarrItem(id).enqueue(object : Callback<SuccessResponse> {
                             override fun onResponse(
@@ -164,7 +174,7 @@ class ItemCardAdapter(
                                 call: Call<SuccessResponse>,
                                 t: Throwable
                             ) {
-                                mView.favButton.isLiked = true
+                                binding.favButton.isLiked = true
                                 Toast.makeText(
                                     c,
                                     R.string.cant_unmark_favortie,
@@ -180,13 +190,13 @@ class ItemCardAdapter(
                 }
             })
 
-            mView.shareBtn.setOnClickListener {
+            binding.shareBtn.setOnClickListener {
-                val item = items[adapterPosition]
+                val item = items[bindingAdapterPosition]
-                c.shareLink(item.getLinkDecoded(), item.title)
+                c.shareLink(item.getLinkDecoded(), item.getTitleDecoded())
             }
 
-            mView.browserBtn.setOnClickListener {
+            binding.browserBtn.setOnClickListener {
-                c.openInBrowserAsNewTask(items[adapterPosition])
+                c.openInBrowserAsNewTask(items[bindingAdapterPosition])
             }
         }
 
@@ -194,11 +204,11 @@ class ItemCardAdapter(
             val customTabsIntent = c.buildCustomTabsIntent()
             helper.bindCustomTabsService(app)
 
-            mView.setOnClickListener {
+            binding.root.setOnClickListener {
                 c.openItemUrl(
                     items,
-                    adapterPosition,
+                    bindingAdapterPosition,
-                    items[adapterPosition].getLinkDecoded(),
+                    items[bindingAdapterPosition].getLinkDecoded(),
                     customTabsIntent,
                     internalBrowser,
                     articleViewer,

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

@@ -4,7 +4,6 @@ import android.app.Activity
 import android.content.Context
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
-import android.text.Html
 import android.text.Spannable
 import android.text.style.ClickableSpan
 import android.util.TypedValue
@@ -14,10 +13,12 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.databinding.ListItemBinding
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
@@ -35,7 +36,6 @@ import com.amulyakhare.textdrawable.TextDrawable
 import com.amulyakhare.textdrawable.util.ColorGenerator
 import com.like.LikeButton
 import com.like.OnLikeListener
-import kotlinx.android.synthetic.main.list_item.view.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -50,7 +50,6 @@ class ItemListAdapter(
     private val helper: CustomTabActivityHelper,
     private val internalBrowser: Boolean,
     private val articleViewer: Boolean,
-    override val debugReadingItems: Boolean,
     override val userIdentifier: String,
     override val appColors: AppColors,
     override val config: Config,
@@ -60,66 +59,57 @@ class ItemListAdapter(
     private val c: Context = app.baseContext
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val v = LayoutInflater.from(c).inflate(
+        val binding = ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-            R.layout.list_item,
+        return ViewHolder(binding)
-            parent,
-            false
-        ) as ConstraintLayout
-        return ViewHolder(v)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val itm = items[position]
+        with(holder) {
+            val itm = items[position]
 
 
-        holder.mView.title.text = Html.fromHtml(itm.title)
+            binding.title.text = itm.getTitleDecoded()
 
-        holder.mView.title.setOnTouchListener(LinkOnTouchListener())
+            binding.title.setTextColor(ContextCompat.getColor(
+                    c,
+                    appColors.textColor
+            ))
 
-        holder.mView.title.setLinkTextColor(appColors.colorAccent)
+            binding.title.setOnTouchListener(LinkOnTouchListener())
 
-        holder.mView.sourceTitleAndDate.text = itm.sourceAndDateText()
+            binding.title.setLinkTextColor(appColors.colorAccent)
 
-        if (itm.getThumbnail(c).isEmpty()) {
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
-            val sizeInInt = 46
-            val sizeInDp = TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_DIP, sizeInInt.toFloat(), c.resources
-                    .displayMetrics
-            ).toInt()
 
-            val marginInInt = 16
+            binding.sourceTitleAndDate.setTextColor(ContextCompat.getColor(
-            val marginInDp = TypedValue.applyDimension(
+                    c,
-                TypedValue.COMPLEX_UNIT_DIP, marginInInt.toFloat(), c.resources
+                    appColors.textColor
-                    .displayMetrics
+            ))
-            ).toInt()
 
-            val params = holder.mView.itemImage.layoutParams as ViewGroup.MarginLayoutParams
+            if (itm.getThumbnail(c).isEmpty()) {
-            params.height = sizeInDp
-            params.width = sizeInDp
-            params.setMargins(marginInDp, 0, 0, 0)
-            holder.mView.itemImage.layoutParams = params
 
-            if (itm.getIcon(c).isEmpty()) {
+                if (itm.getIcon(c).isEmpty()) {
-                val color = generator.getColor(itm.sourcetitle)
+                    val color = generator.getColor(itm.getSourceTitle())
 
-                val drawable =
+                    val drawable =
-                    TextDrawable
+                            TextDrawable
-                        .builder()
+                                    .builder()
-                        .round()
+                                    .round()
-                        .build(itm.sourcetitle.toTextDrawableString(c), color)
+                                    .build(itm.getSourceTitle().toTextDrawableString(c), color)
 
-                holder.mView.itemImage.setImageDrawable(drawable)
+                    binding.itemImage.setImageDrawable(drawable)
+                } else {
+                    c.circularBitmapDrawable(config, itm.getIcon(c), binding.itemImage)
+                }
             } else {
-                c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.itemImage)
+                c.bitmapCenterCrop(config, itm.getThumbnail(c), binding.itemImage)
             }
-        } else {
-            c.bitmapCenterCrop(config, itm.getThumbnail(c), holder.mView.itemImage)
         }
     }
 
     override fun getItemCount(): Int = items.size
 
-    inner class ViewHolder(val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
+    inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root) {
 
         init {
             handleCustomTabActions()
@@ -129,11 +119,11 @@ class ItemListAdapter(
             val customTabsIntent = c.buildCustomTabsIntent()
             helper.bindCustomTabsService(app)
 
-            mView.setOnClickListener {
+            binding.root.setOnClickListener {
                 c.openItemUrl(
                     items,
-                    adapterPosition,
+                    bindingAdapterPosition,
-                    items[adapterPosition].getLinkDecoded(),
+                    items[bindingAdapterPosition].getLinkDecoded(),
                     customTabsIntent,
                     internalBrowser,
                     articleViewer,

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

@@ -14,11 +14,9 @@ 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 org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -28,7 +26,6 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
     abstract var items: ArrayList<Item>
     abstract val api: SelfossApi
     abstract val db: AppDatabase
-    abstract val debugReadingItems: Boolean
     abstract val userIdentifier: String
     abstract val app: Activity
     abstract val appColors: AppColors
@@ -159,27 +156,11 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                     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),
@@ -217,27 +198,11 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                     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),

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

@@ -12,13 +12,13 @@ import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.Source
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.databinding.SourceListItemBinding
 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
-import kotlinx.android.synthetic.main.source_list_item.view.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -31,14 +31,11 @@ class SourcesListAdapter(
     private val c: Context = app.baseContext
     private val generator: ColorGenerator = ColorGenerator.MATERIAL
     private lateinit var config: Config
+    private lateinit var binding: SourceListItemBinding
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val v = LayoutInflater.from(c).inflate(
+        binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-            R.layout.source_list_item,
+        return ViewHolder(binding.root)
-            parent,
-            false
-        ) as ConstraintLayout
-        return ViewHolder(v)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@@ -46,19 +43,19 @@ class SourcesListAdapter(
         config = Config(c)
 
         if (itm.getIcon(c).isEmpty()) {
-            val color = generator.getColor(itm.title)
+            val color = generator.getColor(itm.getTitleDecoded())
 
             val drawable =
                 TextDrawable
                     .builder()
                     .round()
-                    .build(itm.title.toTextDrawableString(c), color)
+                    .build(itm.getTitleDecoded().toTextDrawableString(c), color)
-            holder.mView.itemImage.setImageDrawable(drawable)
+            binding.itemImage.setImageDrawable(drawable)
         } else {
-            c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.itemImage)
+            c.circularBitmapDrawable(config, itm.getIcon(c), binding.itemImage)
         }
 
-        holder.mView.sourceTitle.text = itm.title
+        binding.sourceTitle.text = itm.getTitleDecoded()
     }
 
     override fun getItemCount(): Int = items.size

app/src/main/java/apps/amine/bou/readerforselfoss/api/mercury/MercuryApi.kt

@@ -7,17 +7,13 @@ import retrofit2.Call
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
-class MercuryApi(shouldLog: Boolean) {
+class MercuryApi() {
     private val service: MercuryService
 
     init {
 
         val interceptor = HttpLoggingInterceptor()
-        interceptor.level = if (shouldLog) {
+        interceptor.level = HttpLoggingInterceptor.Level.NONE
-            HttpLoggingInterceptor.Level.BODY
-        } else {
-            HttpLoggingInterceptor.Level.NONE
-        }
         val client = OkHttpClient.Builder().addInterceptor(interceptor).build()
 
         val gson = GsonBuilder()

app/src/main/java/apps/amine/bou/readerforselfoss/api/mercury/MercuryModels.kt

@@ -28,17 +28,17 @@ class ParsedContent(
     }
 
     constructor(source: Parcel) : this(
-        title = source.readString(),
+        title = source.readString().orEmpty(),
         content = source.readString(),
-        date_published = source.readString(),
+        date_published = source.readString().orEmpty(),
         lead_image_url = source.readString(),
-        dek = source.readString(),
+        dek = source.readString().orEmpty(),
-        url = source.readString(),
+        url = source.readString().orEmpty(),
-        domain = source.readString(),
+        domain = source.readString().orEmpty(),
-        excerpt = source.readString(),
+        excerpt = source.readString().orEmpty(),
         total_pages = source.readInt(),
         rendered_pages = source.readInt(),
-        next_page_url = source.readString()
+        next_page_url = source.readString().orEmpty()
     )
 
     override fun describeContents() = 0

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

@@ -12,11 +12,12 @@ import com.burgstaller.okhttp.digest.CachingAuthenticator
 import com.burgstaller.okhttp.digest.Credentials
 import com.burgstaller.okhttp.digest.DigestAuthenticator
 import com.google.gson.GsonBuilder
-import okhttp3.OkHttpClient
+import okhttp3.*
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Call
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import java.net.SocketTimeoutException
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.TimeUnit
 
@@ -24,8 +25,7 @@ class SelfossApi(
     c: Context,
     callingActivity: Activity?,
     isWithSelfSignedCert: Boolean,
-    timeout: Long,
+    timeout: Long
-    shouldLog: Boolean
 ) {
 
     private lateinit var service: SelfossService
@@ -62,6 +62,17 @@ class SelfossApi(
             .maybeWithSelfSigned(isWithSelfSignedCert)
             .authenticator(CachingAuthenticatorDecorator(this, authCache))
             .addInterceptor(AuthenticationCacheInterceptor(authCache))
+            .addInterceptor(object: Interceptor {
+                override fun intercept(chain: Interceptor.Chain): Response {
+                    val request: Request = chain.request()
+                    val response: Response = chain.proceed(request)
+
+                    if (response.code() == 408) {
+                        return response
+                    }
+                    return response
+                }
+            })
     }
 
     init {
@@ -83,15 +94,34 @@ class SelfossApi(
 
         val logging = HttpLoggingInterceptor()
 
-        logging.level = if (shouldLog) {
-            HttpLoggingInterceptor.Level.BODY
-        } else {
-            HttpLoggingInterceptor.Level.NONE
-        }
 
+        logging.level = HttpLoggingInterceptor.Level.NONE
         val httpClient = authenticator.getHttpClien(isWithSelfSignedCert, timeout)
 
-        httpClient.addInterceptor(logging)
+        val timeoutCode = 504
+        httpClient
+                .addInterceptor { chain ->
+                    val res = chain.proceed(chain.request())
+                    if (res.code() == timeoutCode) {
+                        throw SocketTimeoutException("timeout")
+                    }
+                    res
+                }
+                .addInterceptor(logging)
+                .addInterceptor { chain ->
+                    val request = chain.request()
+                    try {
+                        chain.proceed(request)
+                    } catch (e: SocketTimeoutException) {
+                        Response.Builder()
+                                .code(timeoutCode)
+                                .protocol(Protocol.HTTP_2)
+                                .body(ResponseBody.create(MediaType.parse("text/plain"), ""))
+                                .message("")
+                                .request(request)
+                                .build()
+                    }
+                }
 
         try {
             val retrofit =
@@ -142,6 +172,15 @@ class SelfossApi(
     fun allItems(): Call<List<Item>> =
         service.allItems(userName, password)
 
+    fun allNewItems(): Call<List<Item>> =
+            getItems("unread", null, null, null, 200, 0)
+
+    fun allReadItems(): Call<List<Item>> =
+            getItems("read", null, null, null, 200, 0)
+
+    fun allStarredItems(): Call<List<Item>> =
+            getItems("read", null, null, null, 200, 0)
+
     private fun getItems(
         type: String,
         tag: String?,
@@ -176,6 +215,9 @@ class SelfossApi(
     fun update(): Call<String> =
         service.update(userName, password)
 
+    val apiVersion: Call<ApiVersion>
+        get() = service.version()
+
     val sources: Call<List<Source>>
         get() = service.sources(userName, password)
 

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

@@ -4,9 +4,15 @@ import android.content.Context
 import android.net.Uri
 import android.os.Parcel
 import android.os.Parcelable
+import android.text.Html
+import android.webkit.URLUtil
+import org.jsoup.Jsoup
 
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.request.RequestOptions
 import com.google.gson.annotations.SerializedName
 
 private fun constructUrl(config: Config?, path: String, file: String?): String {
@@ -42,6 +48,19 @@ data class Spout(
     @SerializedName("description") val description: String
 )
 
+data class ApiVersion(
+        @SerializedName("version") val version: String,
+        @SerializedName("apiversion") val apiversion: String
+) {
+    fun getApiMajorVersion() : Int {
+        var versionNumber = 0
+        if (apiversion != null) {
+            versionNumber = apiversion.substringBefore(".").toInt()
+        }
+        return versionNumber
+    }
+}
+
 data class Source(
     @SerializedName("id") val id: String,
     @SerializedName("title") val title: String,
@@ -58,6 +77,10 @@ data class Source(
         }
         return constructUrl(config, "favicons", icon)
     }
+
+    fun getTitleDecoded(): String {
+        return Html.fromHtml(title).toString()
+    }
 }
 
 data class Item(
@@ -67,8 +90,8 @@ data class Item(
     @SerializedName("content") val content: String,
     @SerializedName("unread") val unread: Boolean,
     @SerializedName("starred") var starred: Boolean,
-    @SerializedName("thumbnail") val thumbnail: String,
+    @SerializedName("thumbnail") val thumbnail: String?,
-    @SerializedName("icon") val icon: String,
+    @SerializedName("icon") val icon: String?,
     @SerializedName("link") val link: String,
     @SerializedName("sourcetitle") val sourcetitle: String,
     @SerializedName("tags") val tags: SelfossTagType
@@ -84,17 +107,17 @@ data class Item(
     }
 
     constructor(source: Parcel) : this(
-        id = source.readString(),
+        id = source.readString().orEmpty(),
-        datetime = source.readString(),
+        datetime = source.readString().orEmpty(),
-        title = source.readString(),
+        title = source.readString().orEmpty(),
-        content = source.readString(),
+        content = source.readString().orEmpty(),
         unread = 0.toByte() != source.readByte(),
         starred = 0.toByte() != source.readByte(),
         thumbnail = source.readString(),
         icon = source.readString(),
-        link = source.readString(),
+        link = source.readString().orEmpty(),
-        sourcetitle = source.readString(),
+        sourcetitle = source.readString().orEmpty(),
-        tags = source.readParcelable(ClassLoader.getSystemClassLoader())
+        tags = if (source.readParcelable<SelfossTagType>(ClassLoader.getSystemClassLoader()) != null) source.readParcelable(ClassLoader.getSystemClassLoader())!! else SelfossTagType("")
     )
 
     override fun describeContents() = 0
@@ -127,6 +150,51 @@ data class Item(
         return constructUrl(config, "thumbnails", thumbnail)
     }
 
+    fun getImages() : ArrayList<String> {
+        var allImages = ArrayList<String>()
+
+        for ( image in Jsoup.parse(content).getElementsByTag("img")) {
+            val url = image.attr("src")
+            if (url.toLowerCase().contains(".jpg") ||
+                    url.toLowerCase().contains(".jpeg") ||
+                    url.toLowerCase().contains(".png") ||
+                    url.toLowerCase().contains(".webp"))
+            {
+                allImages.add(url)
+            }
+        }
+        return allImages
+    }
+
+    fun preloadImages(context: Context) : Boolean {
+        val imageUrls = this.getImages()
+
+        val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL).timeout(10000)
+
+
+        try {
+            for (url in imageUrls) {
+                if ( URLUtil.isValidUrl(url)) {
+                    val image = Glide.with(context).asBitmap()
+                            .apply(glideOptions)
+                            .load(url).submit()
+                }
+            }
+        } catch (e : Error) {
+            return false
+        }
+
+        return true
+    }
+
+    fun getTitleDecoded(): String {
+        return Html.fromHtml(title).toString()
+    }
+
+    fun getSourceTitle(): String {
+        return Html.fromHtml(sourcetitle).toString()
+    }
+
     // TODO: maybe find a better way to handle these kind of urls
     fun getLinkDecoded(): String {
         var stringUrl: String
@@ -168,7 +236,7 @@ data class SelfossTagType(val tags: String) : Parcelable {
     }
 
     constructor(source: Parcel) : this(
-        tags = source.readString()
+        tags = source.readString().orEmpty()
     )
 
     override fun describeContents() = 0

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

@@ -103,6 +103,9 @@ internal interface SelfossService {
         @Query("password") password: String
     ): Call<List<Source>>
 
+    @GET("api/about")
+    fun version(): Call<ApiVersion>
+
     @DELETE("source/{id}")
     fun deleteSource(
         @Path("id") id: String,

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

@@ -19,11 +19,10 @@ import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
 import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
-import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -58,17 +57,16 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
             db = Room.databaseBuilder(
                 applicationContext,
                 AppDatabase::class.java, "selfoss-database"
-            ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()
+            ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
 
             val api = SelfossApi(
                 this.context,
                 null,
                 settings.getBoolean("isSelfSignedCert", false),
-                sharedPref.getString("api_timeout", "-1").toLong(),
+                sharedPref.getString("api_timeout", "-1")!!.toLong()
-                sharedPref.getBoolean("should_log_everything", false)
             )
 
-            api.allItems().enqueue(object : Callback<List<Item>> {
+            api.allNewItems().enqueue(object : Callback<List<Item>> {
                 override fun onFailure(call: Call<List<Item>>, t: Throwable) {
                     Timer("", false).schedule(4000) {
                         notificationManager.cancel(1)
@@ -79,41 +77,38 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
                     call: Call<List<Item>>,
                     response: Response<List<Item>>
                 ) {
-                    thread {
+                    storeItems(response, true, notifyNewItems, notificationManager)
-                        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)
-                        }
-                    }
                 }
             })
+            api.allReadItems().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>>
+                ) {
+                    storeItems(response, false, notifyNewItems, notificationManager)
+                }
+            })
+            api.allStarredItems().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>>
+                ) {
+                    storeItems(response, false, notifyNewItems, notificationManager)
+                }
+            })
+
             thread {
                 val actions = db.actionsDao().actions()
 
@@ -130,7 +125,47 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
                 }
             }
         }
-        return Result.SUCCESS
+        return Result.success()
+    }
+
+    private fun storeItems(response: Response<List<Item>>, newItems: Boolean, notifyNewItems: Boolean, notificationManager: NotificationManager) {
+        thread {
+            if (response.body() != null) {
+                val apiItems = (response.body() as ArrayList<Item>)
+
+                if (newItems) {
+                    db.itemsDao().deleteAllItems()
+                }
+                db.itemsDao()
+                        .insertAllItems(*(apiItems.map { it.toEntity() }).toTypedArray())
+
+                val newSize = apiItems.filter { it.unread }.size
+                if (newItems && notifyNewItems && newSize > 0) {
+
+                    val intent = Intent(context, MainActivity::class.java).apply {
+                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                    }
+                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
+
+                    val newItemsNotification = NotificationCompat.Builder(applicationContext, Config.newItemsChannelId)
+                            .setContentTitle(context.getString(R.string.new_items_notification_title))
+                            .setContentText(context.getString(R.string.new_items_notification_text, newSize))
+                            .setPriority(PRIORITY_DEFAULT)
+                            .setChannelId(Config.newItemsChannelId)
+                            .setContentIntent(pendingIntent)
+                            .setAutoCancel(true)
+                            .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
+
+                    Timer("", false).schedule(4000) {
+                        notificationManager.notify(2, newItemsNotification.build())
+                    }
+                }
+                apiItems.map { it.preloadImages(context) }
+            }
+            Timer("", false).schedule(4000) {
+                notificationManager.cancel(1)
+            }
+        }
     }
 
     private fun <T> doAndReportOnFail(call: Call<T>, action: ActionEntity) {
@@ -145,7 +180,6 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
             }
 
             override fun onFailure(call: Call<T>, t: Throwable) {
-                ACRA.getErrorReporter().maybeHandleSilentException(t, context)
             }
         })
     }

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

@@ -1,61 +1,63 @@
 package apps.amine.bou.readerforselfoss.fragments
 
 import android.content.Context
+import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
 import android.content.res.TypedArray
+import android.graphics.Bitmap
 import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.view.InflateException
+import android.view.*
+import android.webkit.*
 import androidx.browser.customtabs.CustomTabsIntent
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import androidx.fragment.app.Fragment
 import androidx.core.content.ContextCompat
 import androidx.core.widget.NestedScrollView
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.webkit.WebSettings
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.res.ResourcesCompat
 import androidx.room.Room
+import apps.amine.bou.readerforselfoss.ImageActivity
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi
 import apps.amine.bou.readerforselfoss.api.mercury.ParsedContent
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.databinding.FragmentArticleBinding
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
+import apps.amine.bou.readerforselfoss.utils.glide.getBitmapInputStream
 import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
-import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.openItemUrl
 import apps.amine.bou.readerforselfoss.utils.shareLink
 import apps.amine.bou.readerforselfoss.utils.sourceAndDateText
 import apps.amine.bou.readerforselfoss.utils.succeeded
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
 import com.github.rubensousa.floatingtoolbar.FloatingToolbar
-import kotlinx.android.synthetic.main.fragment_article.*
-import kotlinx.android.synthetic.main.fragment_article.view.*
-import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 import java.net.MalformedURLException
 import java.net.URL
+import java.util.concurrent.ExecutionException
+import kotlin.collections.ArrayList
 import kotlin.concurrent.thread
 
 class ArticleFragment : Fragment() {
@@ -68,14 +70,15 @@ class ArticleFragment : Fragment() {
     private lateinit var contentSource: String
     private lateinit var contentImage: String
     private lateinit var contentTitle: String
+    private lateinit var allImages : ArrayList<String>
     private lateinit var editor: SharedPreferences.Editor
     private lateinit var fab: FloatingActionButton
     private lateinit var appColors: AppColors
     private lateinit var db: AppDatabase
     private lateinit var textAlignment: String
     private lateinit var config: Config
-
+    private var _binding: FragmentArticleBinding? = null
-    private var rootView: ViewGroup? = null
+    private val binding get() = _binding!!
 
     private lateinit var prefs: SharedPreferences
 
@@ -91,18 +94,18 @@ class ArticleFragment : Fragment() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        appColors = AppColors(activity!!)
+        appColors = AppColors(requireActivity())
-        config = Config(activity!!)
+        config = Config(requireActivity())
 
         super.onCreate(savedInstanceState)
 
-        pageNumber = arguments!!.getInt(ARG_POSITION)
+        pageNumber = requireArguments().getInt(ARG_POSITION)
-        allItems = arguments!!.getParcelableArrayList(ARG_ITEMS)
+        allItems = requireArguments().getParcelableArrayList<Item>(ARG_ITEMS) as ArrayList<Item>
 
         db = Room.databaseBuilder(
-            context!!,
+            requireContext(),
             AppDatabase::class.java, "selfoss-database"
-        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()
+        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
     }
 
     override fun onCreateView(
@@ -111,26 +114,26 @@ class ArticleFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
         try {
-            rootView = inflater
+            _binding = FragmentArticleBinding.inflate(inflater, container, false)
-                .inflate(R.layout.fragment_article, container, false) as ViewGroup
 
             url = allItems[pageNumber.toInt()].getLinkDecoded()
             contentText = allItems[pageNumber.toInt()].content
-            contentTitle = allItems[pageNumber.toInt()].title
+            contentTitle = allItems[pageNumber.toInt()].getTitleDecoded()
-            contentImage = allItems[pageNumber.toInt()].getThumbnail(activity!!)
+            contentImage = allItems[pageNumber.toInt()].getThumbnail(requireActivity())
             contentSource = allItems[pageNumber.toInt()].sourceAndDateText()
+            allImages = allItems[pageNumber.toInt()].getImages()
 
             prefs = PreferenceManager.getDefaultSharedPreferences(activity)
             editor = prefs.edit()
-            fontSize = prefs.getString("reader_font_size", "16").toInt()
+            fontSize = prefs.getString("reader_font_size", "16")!!.toInt()
 
-            font = prefs.getString("reader_font", "")
+            font = prefs.getString("reader_font", "")!!
             if (font.isNotEmpty()) {
-                resId = context!!.resources.getIdentifier(font, "font", context!!.packageName)
+                resId = requireContext().resources.getIdentifier(font, "font", requireContext().packageName)
                 typeface = try {
-                    ResourcesCompat.getFont(context!!, resId)!!
+                    ResourcesCompat.getFont(requireContext(), resId)!!
                 } catch (e: java.lang.Exception) {
-                    // ACRA.getErrorReporter().maybeHandleSilentException(Throwable("Font loading issue: ${e.message}"), context!!)
+                    // ACRA.getErrorReporter().maybeHandleSilentException(Throwable("Font loading issue: ${e.message}"), requireContext())
                     // Just to be sure
                     null
                 }
@@ -138,29 +141,27 @@ class ArticleFragment : Fragment() {
 
             refreshAlignment()
 
-            val settings = activity!!.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+            val settings = requireActivity().getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-            val debugReadingItems = prefs.getBoolean("read_debug", false)
 
             val api = SelfossApi(
-                context!!,
+                requireContext(),
-                activity!!,
+                requireActivity(),
                 settings.getBoolean("isSelfSignedCert", false),
-                prefs.getString("api_timeout", "-1").toLong(),
+                prefs.getString("api_timeout", "-1")!!.toLong()
-                prefs.getBoolean("should_log_everything", false)
             )
 
-            fab = rootView!!.fab
+            fab = binding.fab
 
             fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
 
             fab.rippleColor = appColors.colorAccentDark
 
-            val floatingToolbar: FloatingToolbar = rootView!!.floatingToolbar
+            val floatingToolbar: FloatingToolbar = binding.floatingToolbar
             floatingToolbar.attachFab(fab)
 
             floatingToolbar.background = ColorDrawable(appColors.colorAccent)
 
-            val customTabsIntent = activity!!.buildCustomTabsIntent()
+            val customTabsIntent = requireActivity().buildCustomTabsIntent()
             mCustomTabActivityHelper = CustomTabActivityHelper()
             mCustomTabActivityHelper!!.bindCustomTabsService(activity)
 
@@ -170,43 +171,29 @@ class ArticleFragment : Fragment() {
                     override fun onItemClick(item: MenuItem) {
                         when (item.itemId) {
                             R.id.more_action -> getContentFromMercury(customTabsIntent, prefs)
-                            R.id.share_action -> activity!!.shareLink(url, contentTitle)
+                            R.id.share_action -> requireActivity().shareLink(url, contentTitle)
-                            R.id.open_action -> activity!!.openItemUrl(
+                            R.id.open_action -> requireActivity().openItemUrl(
                                 allItems,
                                 pageNumber.toInt(),
                                 url,
                                 customTabsIntent,
                                 false,
                                 false,
-                                activity!!
+                                requireActivity()
                             )
-                            R.id.unread_action -> if ((context != null && context!!.isNetworkAccessible(null)) || context == null) {
+                            R.id.unread_action -> if ((context != null && requireContext().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!!)
-                                            }
                                         }
                                     }
                                 )
@@ -224,35 +211,35 @@ class ArticleFragment : Fragment() {
                 }
             )
 
-            rootView!!.source.text = contentSource
+            binding.source.text = contentSource
             if (typeface != null) {
-                rootView!!.source.typeface = typeface
+                binding.source.typeface = typeface
             }
 
             if (contentText.isEmptyOrNullOrNullString()) {
                 getContentFromMercury(customTabsIntent, prefs)
             } else {
-                rootView!!.titleView.text = contentTitle
+                binding.titleView.text = contentTitle
                 if (typeface != null) {
-                    rootView!!.titleView.typeface = typeface
+                    binding.titleView.typeface = typeface
                 }
 
                 htmlToWebview()
 
                 if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
-                    rootView!!.imageView.visibility = View.VISIBLE
+                    binding.imageView.visibility = View.VISIBLE
                     Glide
-                        .with(context!!)
+                        .with(requireContext())
                         .asBitmap()
                         .loadMaybeBasicAuth(config, contentImage)
                         .apply(RequestOptions.fitCenterTransform())
-                        .into(rootView!!.imageView)
+                        .into(binding.imageView)
                 } else {
-                    rootView!!.imageView.visibility = View.GONE
+                    binding.imageView.visibility = View.GONE
                 }
             }
 
-            rootView!!.nestedScrollView.setOnScrollChangeListener(
+            binding.nestedScrollView.setOnScrollChangeListener(
                 NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                     if (scrollY > oldScrollY) {
                         fab.hide()
@@ -263,22 +250,27 @@ class ArticleFragment : Fragment() {
             )
 
         } catch (e: InflateException) {
-            AlertDialog.Builder(context!!)
+            AlertDialog.Builder(requireContext())
-                .setMessage(context!!.getString(R.string.webview_dialog_issue_message))
+                .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
-                .setTitle(context!!.getString(R.string.webview_dialog_issue_title))
+                .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
                 .setPositiveButton(android.R.string.ok
                 ) { dialog, which ->
-                    val sharedPref = PreferenceManager.getDefaultSharedPreferences(context!!)
+                    val sharedPref = PreferenceManager.getDefaultSharedPreferences(requireContext())
                     val editor = sharedPref.edit()
                     editor.putBoolean("prefer_article_viewer", false)
                     editor.commit()
-                    activity!!.finish()
+                    requireActivity().finish()
                 }
                 .create()
                 .show()
         }
 
-        return rootView
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
     }
 
     private fun refreshAlignment() {
@@ -293,11 +285,9 @@ class ArticleFragment : Fragment() {
         customTabsIntent: CustomTabsIntent,
         prefs: SharedPreferences
     ) {
-        if ((context != null && context!!.isNetworkAccessible(null)) || context == null) {
+        if ((context != null && requireContext().isNetworkAccessible(null)) || context == null) {
-            rootView!!.progressBar.visibility = View.VISIBLE
+            binding.progressBar.visibility = View.VISIBLE
-            val parser = MercuryApi(
+            val parser = MercuryApi()
-                prefs.getBoolean("should_log_everything", false)
-            )
 
             parser.parseUrl(url).enqueue(
                 object : Callback<ParsedContent> {
@@ -309,9 +299,9 @@ class ArticleFragment : Fragment() {
                         try {
                             if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) {
                                 try {
-                                    rootView!!.titleView.text = response.body()!!.title
+                                    binding.titleView.text = response.body()!!.title
                                     if (typeface != null) {
-                                        rootView!!.titleView.typeface = typeface
+                                        binding.titleView.typeface = typeface
                                     }
                                     try {
                                         // Note: Mercury may return relative urls... If it does the url val will not be changed.
@@ -321,49 +311,40 @@ class ArticleFragment : Fragment() {
                                         // 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
+                                        binding.imageView.visibility = View.VISIBLE
                                         try {
                                             Glide
-                                                .with(context!!)
+                                                .with(requireContext())
                                                 .asBitmap()
                                                 .loadMaybeBasicAuth(config, response.body()!!.lead_image_url.orEmpty())
                                                 .apply(RequestOptions.fitCenterTransform())
-                                                .into(rootView!!.imageView)
+                                                .into(binding.imageView)
                                         } catch (e: Exception) {
-                                            ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
                                         }
                                     } else {
-                                        rootView!!.imageView.visibility = View.GONE
+                                        binding.imageView.visibility = View.GONE
                                     }
                                 } catch (e: Exception) {
                                     if (context != null) {
-                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
                                     }
                                 }
 
                                 try {
-                                    rootView!!.nestedScrollView.scrollTo(0, 0)
+                                    binding.nestedScrollView.scrollTo(0, 0)
 
-                                    rootView!!.progressBar.visibility = View.GONE
+                                    binding.progressBar.visibility = View.GONE
                                 } catch (e: Exception) {
                                     if (context != null) {
-                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
                                     }
                                 }
                             } else {
@@ -371,13 +352,11 @@ class ArticleFragment : Fragment() {
                                     openInBrowserAfterFailing(customTabsIntent)
                                 } catch (e: Exception) {
                                     if (context != null) {
-                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
                                     }
                                 }
                             }
                         } catch (e: Exception) {
                             if (context != null) {
-                                ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
                             }
                         }
                     }
@@ -395,32 +374,32 @@ class ArticleFragment : Fragment() {
         val stringColor = String.format("#%06X", 0xFFFFFF and appColors.colorAccent)
 
         val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
-        val a: TypedArray = context!!.obtainStyledAttributes(resId, attrs)
+        val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
 
 
-        rootView!!.webcontent.settings.standardFontFamily = a.getString(0)
+        binding.webcontent.settings.standardFontFamily = a.getString(0)
-        rootView!!.webcontent.visibility = View.VISIBLE
+        binding.webcontent.visibility = View.VISIBLE
         val (textColor, backgroundColor) = if (appColors.isDarkTheme) {
             if (context != null) {
-                rootView!!.webcontent.setBackgroundColor(
+                binding.webcontent.setBackgroundColor(
                     ContextCompat.getColor(
-                        context!!,
+                        requireContext(),
                         R.color.dark_webview
                     )
                 )
-                Pair(ContextCompat.getColor(context!!, R.color.dark_webview_text), ContextCompat.getColor(context!!, R.color.light_webview_text))
+                Pair(ContextCompat.getColor(requireContext(), R.color.dark_webview_text), ContextCompat.getColor(requireContext(), R.color.dark_webview))
             } else {
                 Pair(null, null)
             }
         } else {
             if (context != null) {
-                rootView!!.webcontent.setBackgroundColor(
+                binding.webcontent.setBackgroundColor(
                     ContextCompat.getColor(
-                        context!!,
+                        requireContext(),
                         R.color.light_webview
                     )
                 )
-                Pair(ContextCompat.getColor(context!!, R.color.light_webview_text), ContextCompat.getColor(context!!, R.color.dark_webview_text))
+                Pair(ContextCompat.getColor(requireContext(), R.color.light_webview_text), ContextCompat.getColor(requireContext(), R.color.light_webview))
             } else {
                 Pair(null, null)
             }
@@ -438,15 +417,56 @@ class ArticleFragment : Fragment() {
             "#FFFFFF"
         }
 
-        rootView!!.webcontent.settings.useWideViewPort = true
+        binding.webcontent.settings.useWideViewPort = true
-        rootView!!.webcontent.settings.loadWithOverviewMode = true
+        binding.webcontent.settings.loadWithOverviewMode = true
-        rootView!!.webcontent.settings.javaScriptEnabled = false
+        binding.webcontent.settings.javaScriptEnabled = false
+
+        binding.webcontent.webViewClient = object : WebViewClient() {
+            override fun shouldOverrideUrlLoading(view: WebView?, url : String): Boolean {
+                if (binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+                    requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+                }
+                return true
+            }
+
+            override fun shouldInterceptRequest(view: WebView?, url: String): WebResourceResponse? {
+                val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
+                if (url.toLowerCase().contains(".jpg") || url.toLowerCase().contains(".jpeg")) {
+                    try {
+                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.JPEG))
+                    }catch ( e : ExecutionException) {}
+                }
+                else if (url.toLowerCase().contains(".png")) {
+                    try {
+                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
+                    }catch ( e : ExecutionException) {}
+                }
+                else if (url.toLowerCase().contains(".webp")) {
+                    try {
+                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
+                    }catch ( e : ExecutionException) {}
+                }
+
+                return super.shouldInterceptRequest(view, url)
+            }
+        }
+
+        val gestureDetector = GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
+            override fun onSingleTapUp(e: MotionEvent?): Boolean {
+                return performClick()
+            }
+        })
+
+        binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            rootView!!.webcontent.settings.layoutAlgorithm =
+            binding.webcontent.settings.layoutAlgorithm =
                     WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
         } else {
-            rootView!!.webcontent.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
+            binding.webcontent.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
         }
 
         var baseUrl: String? = null
@@ -455,7 +475,6 @@ class ArticleFragment : Fragment() {
             val itemUrl = URL(url)
             baseUrl = itemUrl.protocol + "://" + itemUrl.host
         } catch (e: MalformedURLException) {
-            ACRA.getErrorReporter().maybeHandleSilentException(e, activity!!)
         }
 
         val fontName =  when (font) {
@@ -476,7 +495,7 @@ class ArticleFragment : Fragment() {
             ""
         }
 
-        rootView!!.webcontent.loadDataWithBaseURL(
+        binding.webcontent.loadDataWithBaseURL(
             baseUrl,
             """<html>
                 |<head>
@@ -500,6 +519,13 @@ class ArticleFragment : Fragment() {
                 |        word-break: break-word;
                 |        overflow:hidden;
                 |        line-height: 1.5em;
+                |        background-color: $stringBackgroundColor;
+                |      }
+                |      body, html {
+                |        background-color: $stringBackgroundColor !important;
+                |        border-color: $stringBackgroundColor  !important;
+                |        padding: 0 !important;
+                |        margin: 0 !important;
                 |      }
                 |      a, pre, code {
                 |        text-align: $textAlignment;
@@ -522,15 +548,15 @@ class ArticleFragment : Fragment() {
     }
 
     private fun openInBrowserAfterFailing(customTabsIntent: CustomTabsIntent) {
-        rootView!!.progressBar.visibility = View.GONE
+        binding.progressBar.visibility = View.GONE
-        activity!!.openItemUrl(
+        requireActivity().openItemUrl(
             allItems,
             pageNumber.toInt(),
             url,
             customTabsIntent,
             true,
             false,
-            activity!!
+            requireActivity()
         )
     }
 
@@ -551,5 +577,20 @@ class ArticleFragment : Fragment() {
         }
     }
 
+    fun performClick(): Boolean {
+        if (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
+                binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+
+            val position : Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
+
+            val intent = Intent(activity, ImageActivity::class.java)
+            intent.putExtra("allImages", allImages)
+            intent.putExtra("position", position)
+            startActivity(intent)
+            return false
+        }
+        return false
+    }
+
 
 }

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

@@ -0,0 +1,57 @@
+package apps.amine.bou.readerforselfoss.fragments
+
+import android.os.Bundle
+import android.view.*
+import androidx.fragment.app.Fragment
+import apps.amine.bou.readerforselfoss.R
+import apps.amine.bou.readerforselfoss.databinding.FragmentImageBinding
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.request.RequestOptions
+
+class ImageFragment : Fragment() {
+
+    private lateinit var imageUrl : String
+    private val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
+    private var _binding: FragmentImageBinding? = null
+    private val binding get() = _binding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        imageUrl = requireArguments().getString("imageUrl")!!
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        _binding = FragmentImageBinding.inflate(inflater, container, false)
+        val view = binding?.root
+
+        binding!!.photoView.visibility = View.VISIBLE
+        Glide.with(activity)
+                .asBitmap()
+                .apply(glideOptions)
+                .load(imageUrl)
+                .into(binding!!.photoView)
+
+        return view
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        private const val ARG_IMAGE = "imageUrl"
+
+        fun newInstance(
+                imageUrl : String
+        ): ImageFragment {
+            val fragment = ImageFragment()
+            val args = Bundle()
+            args.putString(ARG_IMAGE, imageUrl)
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}

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

@@ -10,7 +10,7 @@ import apps.amine.bou.readerforselfoss.persistence.entities.ItemEntity
 import apps.amine.bou.readerforselfoss.persistence.entities.SourceEntity
 import apps.amine.bou.readerforselfoss.persistence.entities.TagEntity
 
-@Database(entities = [TagEntity::class, SourceEntity::class, ItemEntity::class, ActionEntity::class], version = 3)
+@Database(entities = [TagEntity::class, SourceEntity::class, ItemEntity::class, ActionEntity::class], version = 4)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun drawerDataDao(): DrawerDataDao
 

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

@@ -20,9 +20,9 @@ data class ItemEntity(
     @ColumnInfo(name = "starred")
     var starred: Boolean,
     @ColumnInfo(name = "thumbnail")
-    val thumbnail: String,
+    val thumbnail: String?,
     @ColumnInfo(name = "icon")
-    val icon: String,
+    val icon: String?,
     @ColumnInfo(name = "link")
     val link: String,
     @ColumnInfo(name = "sourcetitle")

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

@@ -14,3 +14,21 @@ val MIGRATION_2_3: Migration = object : Migration(2, 3) {
         database.execSQL("CREATE TABLE IF NOT EXISTS `actions` (`id` INTEGER NOT NULL, `articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL, PRIMARY KEY(`id`))")
     }
 }
+
+val MIGRATION_3_4: Migration = object : Migration(3, 4) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        // @see https://stackoverflow.com/questions/57392015/how-to-migrate-not-null-table-column-into-null-in-android-room-database
+        // Create the new table
+        database.execSQL("CREATE TABLE IF NOT EXISTS `itemstmp` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT, `icon` TEXT, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))")
+
+        // Copy the data
+        database.execSQL(
+                "INSERT INTO itemstmp (`id`, `datetime`, `title`, `content`, `unread`, `starred`, `thumbnail`, `icon`, `link`, `sourcetitle`, `tags`) SELECT `id`, `datetime`, `title`, `content`, `unread`, `starred`, `thumbnail`, `icon`, `link`, `sourcetitle`, `tags` FROM items")
+
+        // Remove the old table
+        database.execSQL("DROP TABLE items")
+
+        // Change the table name to the correct one
+        database.execSQL("ALTER TABLE itemstmp RENAME TO items")
+    }
+}

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

@@ -160,7 +160,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                 || ArticleViewerPreferenceFragment.class.getName().equals(fragmentName)
                 || OfflinePreferenceFragment.class.getName().equals(fragmentName)
                 || ExperimentalPreferenceFragment.class.getName().equals(fragmentName)
-                || DebugPreferenceFragment.class.getName().equals(fragmentName)
                 || LinksPreferenceFragment.class.getName().equals(fragmentName)
                 || ThemePreferenceFragment.class.getName().equals(fragmentName);
     }
@@ -196,16 +195,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             });
 
         }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                getActivity().finish();
-                return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
     }
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
@@ -246,58 +235,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                     }
             });
         }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                getActivity().finish();
-                return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public static class DebugPreferenceFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_debug);
-            setHasOptionsMenu(true);
-
-            SharedPreferences pref = getActivity().getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE);
-            final String id = pref.getString("unique_id", "...");
-
-            final Preference identifier = findPreference("debug_identifier");
-            final ClipboardManager clipboard = (ClipboardManager)
-                    getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
-
-            identifier.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    if (clipboard != null) {
-                        ClipData clip = ClipData.newPlainText("Selfoss unique id", id);
-                        clipboard.setPrimaryClip(clip);
-
-                        Toast.makeText(getActivity(), R.string.unique_id_to_clipboard, Toast.LENGTH_LONG).show();
-                        return true;
-                    }
-                    return false;
-                }
-            });
-            identifier.setTitle(id);
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                getActivity().finish();
-                return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
     }
 
     /**
@@ -341,16 +278,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                 }
             });
         }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                getActivity().finish();
-                return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
     }
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
@@ -365,10 +292,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
         @Override
         public boolean onOptionsItemSelected(MenuItem item) {
             int id = item.getItemId();
-            if (id == android.R.id.home) {
+            if (id == R.id.clear) {
-                getActivity().finish();
-                return true;
-            } else if (id == R.id.clear) {
                 SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(getActivity());
                 SharedPreferences.Editor editor = pref.edit();
                 editor.remove("color_primary");
@@ -377,7 +301,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                 editor.remove("color_accent_dark");
                 editor.remove("dark_theme");
                 editor.apply();
-                getActivity().finish();
+                getActivity().recreate();
             }
             return super.onOptionsItemSelected(item);
         }
@@ -396,16 +320,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             addPreferencesFromResource(R.xml.pref_offline);
             setHasOptionsMenu(true);
         }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                getActivity().finish();
-                return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
     }
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
@@ -416,16 +330,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             addPreferencesFromResource(R.xml.pref_experimental);
             setHasOptionsMenu(true);
         }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                getActivity().finish();
-                return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
     }
 
 
@@ -433,7 +337,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
         if (id == android.R.id.home) {
-            finish();
+            super.onBackPressed();
             return true;
         }
         return super.onOptionsItemSelected(item);

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

@@ -18,6 +18,7 @@ class AppColors(a: Activity) {
     @ColorInt val colorAccentDark: Int
     @ColorInt val cardBackgroundColor: Int
     @ColorInt val colorBackground: Int
+    @ColorInt val textColor: Int
     val isDarkTheme: Boolean
 
     init {
@@ -57,6 +58,12 @@ class AppColors(a: Activity) {
             android.R.color.background_light
         }
 
+        textColor = if (isDarkTheme) {
+            R.color.md_white_1000
+        } else {
+            R.color.md_grey_900
+        }
+
         val wrapper = Context::class.java
         val method = wrapper!!.getMethod("getThemeResId")
         method.isAccessible = true

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

@@ -1,22 +0,0 @@
-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) {
-        this.handleSilentException(throwable)
-    }
-}

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

@@ -11,19 +11,19 @@ class Config(c: Context) {
     val settings: SharedPreferences = c.getSharedPreferences(settingsName, Context.MODE_PRIVATE)
 
     val baseUrl: String
-        get() = settings.getString("url", "")
+        get() = settings.getString("url", "")!!
 
     val userLogin: String
-        get() = settings.getString("login", "")
+        get() = settings.getString("login", "")!!
 
     val userPassword: String
-        get() = settings.getString("password", "")
+        get() = settings.getString("password", "")!!
 
     val httpUserLogin: String
-        get() = settings.getString("httpUserName", "")
+        get() = settings.getString("httpUserName", "")!!
 
     val httpUserPassword: String
-        get() = settings.getString("httpPassword", "")
+        get() = settings.getString("httpPassword", "")!!
 
     companion object {
         const val settingsName = "paramsselfoss"

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

@@ -4,7 +4,7 @@ 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 apps.amine.bou.readerforselfoss.dateTimeFormatter
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
@@ -15,7 +15,6 @@ fun String.toTextDrawableString(c: Context): String {
         try {
             textDrawable.append(s[0])
         } catch (e: StringIndexOutOfBoundsException) {
-            ACRA.getErrorReporter().maybeHandleSilentException(e, c)
         }
     }
     return textDrawable.toString()
@@ -24,7 +23,7 @@ fun String.toTextDrawableString(c: Context): String {
 fun Item.sourceAndDateText(): String {
     val formattedDate: String = try {
         " " + DateUtils.getRelativeTimeSpanString(
-            SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(this.datetime).time,
+            SimpleDateFormat(dateTimeFormatter).parse(this.datetime).time,
             Date().time,
             DateUtils.MINUTE_IN_MILLIS,
             DateUtils.FORMAT_ABBREV_RELATIVE
@@ -34,7 +33,7 @@ fun Item.sourceAndDateText(): String {
         ""
     }
 
-    return this.sourcetitle + formattedDate
+    return this.getSourceTitle() + formattedDate
 }
 
 fun Item.toggleStar(): Item {

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

@@ -20,7 +20,6 @@ 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 {
 
@@ -140,7 +139,7 @@ private fun openInBrowser(linkDecoded: String, app: Activity) {
 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(ctx: Context): Boolean {
     val baseUrl = HttpUrl.parse(this)
     var existsAndEndsWithSlash = false
     if (baseUrl != null) {

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

@@ -1,112 +0,0 @@
-/* From https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/CustomUrlBasePrimaryDrawerItem.java */
-package apps.amine.bou.readerforselfoss.utils.drawer
-
-import android.net.Uri
-import androidx.annotation.ColorInt
-import androidx.annotation.ColorRes
-import androidx.annotation.StringRes
-import androidx.recyclerview.widget.RecyclerView
-
-import com.mikepenz.materialdrawer.holder.ColorHolder
-import com.mikepenz.materialdrawer.holder.ImageHolder
-import com.mikepenz.materialdrawer.holder.StringHolder
-import com.mikepenz.materialdrawer.model.BaseDrawerItem
-import com.mikepenz.materialdrawer.util.DrawerImageLoader
-import com.mikepenz.materialdrawer.util.DrawerUIUtils
-import com.mikepenz.materialize.util.UIUtils
-
-abstract class CustomUrlBasePrimaryDrawerItem<T, VH : RecyclerView.ViewHolder> :
-    BaseDrawerItem<T, VH>() {
-    fun withIcon(url: String): T {
-        this.icon = ImageHolder(url)
-        return this as T
-    }
-
-    fun withIcon(uri: Uri): T {
-        this.icon = ImageHolder(uri)
-        return this as T
-    }
-
-    var description: StringHolder? = null
-        private set
-    var descriptionTextColor: ColorHolder? = null
-        private set
-
-    fun withDescription(description: String): T {
-        this.description = StringHolder(description)
-        return this as T
-    }
-
-    fun withDescription(@StringRes descriptionRes: Int): T {
-        this.description = StringHolder(descriptionRes)
-        return this as T
-    }
-
-    fun withDescriptionTextColor(@ColorInt color: Int): T {
-        this.descriptionTextColor = ColorHolder.fromColor(color)
-        return this as T
-    }
-
-    fun withDescriptionTextColorRes(@ColorRes colorRes: Int): T {
-        this.descriptionTextColor = ColorHolder.fromColorRes(colorRes)
-        return this as T
-    }
-
-    /**
-     * a helper method to have the logic for all secondaryDrawerItems only once
-
-     * @param viewHolder
-     */
-    protected fun bindViewHelper(viewHolder: CustomBaseViewHolder) {
-        val ctx = viewHolder.itemView.context
-
-        //set the identifier from the drawerItem here. It can be used to run tests
-        viewHolder.itemView.id = hashCode()
-
-        //set the item selected if it is
-        viewHolder.itemView.isSelected = isSelected
-
-        //get the correct color for the background
-        val selectedColor = getSelectedColor(ctx)
-        //get the correct color for the text
-        val color = getColor(ctx)
-        val selectedTextColor = getSelectedTextColor(ctx)
-        //get the correct color for the icon
-        val iconColor = getIconColor(ctx)
-        val selectedIconColor = getSelectedIconColor(ctx)
-
-        //set the background for the item
-        UIUtils.setBackground(
-            viewHolder.view,
-            UIUtils.getSelectableBackground(ctx, selectedColor, true)
-        )
-        //set the text for the name
-        StringHolder.applyTo(this.getName(), viewHolder.name)
-        //set the text for the description or hide
-        StringHolder.applyToOrHide(this.description, viewHolder.description)
-
-        //set the colors for textViews
-        viewHolder.name.setTextColor(getTextColorStateList(color, selectedTextColor))
-        //set the description text color
-        ColorHolder.applyToOr(
-            descriptionTextColor,
-            viewHolder.description,
-            getTextColorStateList(color, selectedTextColor)
-        )
-
-        //define the typeface for our textViews
-        if (getTypeface() != null) {
-            viewHolder.name.typeface = getTypeface()
-            viewHolder.description.typeface = getTypeface()
-        }
-
-        //we make sure we reset the image first before setting the new one in case there is an empty one
-        DrawerImageLoader.getInstance().cancelImage(viewHolder.icon)
-        viewHolder.icon.setImageBitmap(null)
-        //get the drawables for our icon and set it
-        ImageHolder.applyTo(icon, viewHolder.icon, "customUrlItem")
-
-        //for android API 17 --> Padding not applied via xml
-        DrawerUIUtils.setDrawerVerticalPadding(viewHolder.view)
-    }
-}

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

@@ -1,94 +0,0 @@
-/* From https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/CustomUrlPrimaryDrawerItem.java */
-package apps.amine.bou.readerforselfoss.utils.drawer
-
-import androidx.annotation.LayoutRes
-import androidx.annotation.StringRes
-import android.view.View
-import android.widget.TextView
-import apps.amine.bou.readerforselfoss.R
-import com.mikepenz.materialdrawer.holder.BadgeStyle
-import com.mikepenz.materialdrawer.holder.StringHolder
-import com.mikepenz.materialdrawer.model.interfaces.ColorfulBadgeable
-
-class CustomUrlPrimaryDrawerItem :
-    CustomUrlBasePrimaryDrawerItem<CustomUrlPrimaryDrawerItem, CustomUrlPrimaryDrawerItem.ViewHolder>(),
-    ColorfulBadgeable<CustomUrlPrimaryDrawerItem> {
-    protected var mBadge: StringHolder = StringHolder("")
-    protected var mBadgeStyle = BadgeStyle()
-
-    override fun withBadge(badge: StringHolder): CustomUrlPrimaryDrawerItem {
-        this.mBadge = badge
-        return this
-    }
-
-    override fun withBadge(badge: String): CustomUrlPrimaryDrawerItem {
-        this.mBadge = StringHolder(badge)
-        return this
-    }
-
-    override fun withBadge(@StringRes badgeRes: Int): CustomUrlPrimaryDrawerItem {
-        this.mBadge = StringHolder(badgeRes)
-        return this
-    }
-
-    override fun withBadgeStyle(badgeStyle: BadgeStyle): CustomUrlPrimaryDrawerItem {
-        this.mBadgeStyle = badgeStyle
-        return this
-    }
-
-    override fun getBadge(): StringHolder {
-        return mBadge
-    }
-
-    override fun getBadgeStyle(): BadgeStyle {
-        return mBadgeStyle
-    }
-
-    override fun getType(): Int {
-        return R.id.material_drawer_item_custom_url_item
-    }
-
-    @LayoutRes
-    override fun getLayoutRes(): Int {
-        return R.layout.material_drawer_item_primary
-    }
-
-    override fun bindView(viewHolder: ViewHolder, payloads: List<*>?) {
-        super.bindView(viewHolder, payloads)
-
-        val ctx = viewHolder.itemView.context
-
-        //bind the basic view parts
-        bindViewHelper(viewHolder)
-
-        //set the text for the badge or hide
-        val badgeVisible = StringHolder.applyToOrHide(mBadge, viewHolder.badge)
-        //style the badge if it is visible
-        if (badgeVisible) {
-            mBadgeStyle.style(
-                viewHolder.badge,
-                getTextColorStateList(getColor(ctx), getSelectedTextColor(ctx))
-            )
-            viewHolder.badgeContainer.visibility = View.VISIBLE
-        } else {
-            viewHolder.badgeContainer.visibility = View.GONE
-        }
-
-        //define the typeface for our textViews
-        if (getTypeface() != null) {
-            viewHolder.badge.typeface = getTypeface()
-        }
-
-        //call the onPostBindView method to trigger post bind view actions (like the listener to modify the item if required)
-        onPostBindView(this, viewHolder.itemView)
-    }
-
-    override fun getViewHolder(v: View): ViewHolder {
-        return ViewHolder(v)
-    }
-
-    class ViewHolder(view: View) : CustomBaseViewHolder(view) {
-        val badgeContainer: View = view.findViewById(R.id.material_drawer_badge_container)
-        val badge: TextView = view.findViewById(R.id.material_drawer_badge)
-    }
-}

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

@@ -14,6 +14,9 @@ import com.bumptech.glide.load.model.GlideUrl
 import com.bumptech.glide.load.model.LazyHeaders
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.BitmapImageViewTarget
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
 
 fun Context.bitmapCenterCrop(config: Config, url: String, iv: ImageView) =
     Glide.with(this)
@@ -56,4 +59,11 @@ fun RequestManager.loadMaybeBasicAuth(config: Config, url: String): RequestBuild
     }
     val glideUrl = GlideUrl(url, builder.build())
     return this.load(glideUrl)
+}
+
+fun getBitmapInputStream(bitmap:Bitmap,compressFormat: Bitmap.CompressFormat): InputStream {
+    val byteArrayOutputStream = ByteArrayOutputStream()
+    bitmap.compress(compressFormat, 80, byteArrayOutputStream)
+    val bitmapData: ByteArray = byteArrayOutputStream.toByteArray()
+    return ByteArrayInputStream(bitmapData)
 }

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

@@ -28,7 +28,7 @@ fun SourceEntity.toView(): Source =
 fun Source.toEntity(): SourceEntity =
         SourceEntity(
             this.id,
-            this.title,
+            this.getTitleDecoded(),
             this.tags.tags,
             this.spout,
             this.error,
@@ -61,13 +61,13 @@ fun Item.toEntity(): ItemEntity =
     ItemEntity(
         this.id,
         this.datetime,
-        this.title,
+        this.getTitleDecoded(),
         this.content,
         this.unread,
         this.starred,
         this.thumbnail,
         this.icon,
         this.link,
-        this.sourcetitle,
+        this.getSourceTitle(),
         this.tags.tags
     )

app/src/main/res/layout/activity_home.xml

@@ -8,33 +8,10 @@
     android:fitsSystemWindows="true"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <com.github.stkent.amplify.prompt.DefaultLayoutPromptView
-        android:id="@+id/promptView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:prompt_view_user_opinion_question_title="@string/rating_prompt_title"
-        app:prompt_view_user_opinion_question_positive_button_label="@string/rating_prompt_yes"
-        app:prompt_view_user_opinion_question_negative_button_label="@string/rating_prompt_no"
-        app:prompt_view_positive_feedback_question_title="@string/rating_prompt_rating_title"
-        app:prompt_view_positive_feedback_question_positive_button_label="@string/rating_prompt_rating_yes"
-        app:prompt_view_positive_feedback_question_negative_button_label="@string/rating_prompt_rating_no"
-        app:prompt_view_critical_feedback_question_title="@string/rating_prompt_feedback_title"
-        app:prompt_view_critical_feedback_question_positive_button_label="@string/rating_prompt_feedback_yes"
-        app:prompt_view_critical_feedback_question_negative_button_label="@string/rating_prompt_feedback_no"
-        app:prompt_view_thanks_title="@string/rating_prompt_thanks"
-        app:prompt_view_positive_button_background_color="@color/colorPrimary"
-        app:prompt_view_positive_button_text_color="@color/white"
-        app:prompt_view_positive_button_border_color="@color/colorPrimary"
-        app:prompt_view_negative_button_background_color="@color/colorAccent"
-        app:prompt_view_negative_button_border_color="@color/white"
-        app:prompt_view_background_color="?attr/colorAccent"
-        app:prompt_view_thanks_display_time_ms="2000"/>
-
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="match_parent">
-        android:layout_below="@id/promptView">
 
         <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:id="@+id/intern_coordLayout"

app/src/main/res/layout/activity_image.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolBar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:popupTheme="?attr/toolbarPopupTheme"
+            app:theme="@style/ToolBarStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_image.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.github.chrisbanes.photoview.PhotoView
+        android:id="@+id/photoView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
+        android:layout_centerHorizontal="true"
+        android:background="@android:color/black"
+        app:srcCompat="@android:drawable/screen_background_dark" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/list_item.xml

@@ -3,14 +3,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="88dp">
-    android:minHeight="88dp">
-
 
     <ImageView
         android:id="@+id/itemImage"
-        android:layout_width="88dp"
+        android:layout_width="46dp"
-        android:layout_height="88dp"
+        android:layout_height="46dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="21dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -18,9 +18,9 @@
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
+        android:layout_marginStart="8dp"
-        android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
         android:ellipsize="end"
         android:fontFamily="sans-serif"
         android:gravity="start"
@@ -39,16 +39,17 @@
         android:id="@+id/sourceTitleAndDate"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="66dp"
         android:layout_marginEnd="16dp"
         android:gravity="start"
+        android:maxLines="1"
         android:textAlignment="viewStart"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/itemImage"
-        app:layout_constraintTop_toBottomOf="@+id/title"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="Google Actualité Il y a 5h" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/login_menu.xml

@@ -2,13 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/login_debug"
-        android:checkable="true"
-        android:checked="false"
-        android:icon="@drawable/ic_bug_report_black_24dp"
-        android:title="@string/login_menu_debug"
-        app:showAsAction="never" />
 
     <item android:id="@+id/about"
           android:title="@string/action_about"

app/src/main/res/values-ca-rES/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Lector per a Selfoss"</string>
     <string name="title_activity_login">"Inicia la sessió"</string>
@@ -102,25 +101,15 @@
     <string name="default_theme">Predeterminat</string>
     <string name="default_dark_theme">Predeterminat/Fosc</string>
     <string name="pref_header_debug">Depuració</string>
-    <string name="login_debug_title">Registra els errors d\'inici de sessió</string>
-    <string name="login_debug_on">Es registraran tots els errors que es produeixin a la pàgina d\'inici de sessió</string>
-    <string name="login_debug_off">No es registrarà cap error que es produeixi a la pàgina d\'inici de sessió</string>
-    <string name="login_menu_debug">Depuració</string>
     <string name="self_hosted_cert_switch">Utilitzeu un certificat autoallotjat?</string>
     <string name="self_signed_cert_warning">Per raons de seguretat, els certificats autosignats no seran compatibles per defecte. En activar aquesta opció, sereu responsable de qualsevol problema de seguretat que es pugui produir.</string>
     <string name="pref_selfoss_category">API de Selfoss</string>
     <string name="pref_api_items_number_title">Nombre d\'elements carregats</string>
     <string name="pref_hidden_tags">Etiquetes ocultes</string>
-    <string name="read_debug_title">Voleu llegir els articles que apareixen com a no llegits?</string>
-    <string name="read_debug_off">No es registraran quan es marquen elements com a llegits</string>
-    <string name="read_debug_on">Les crides de l\'API es registraran en marcar un article com a llegit</string>
     <string name="summary_debug_identifier">Identificador de depuració</string>
     <string name="unique_id_to_clipboard">S\'ha copiat l\'identificador al porta-retalls</string>
     <string name="display_header_drawer_summary">Mostra una capçalera amb la instància URL de Selfoss al panell lateral.</string>
     <string name="display_header_drawer_title">Capçalera de menú</string>
-    <string name="login_everything_title">Registra totes les crides de l\'API</string>
-    <string name="login_everything_on">Aquesta acció registrarà totes les crides de l\'API per als programadors.</string>
-    <string name="login_everything_off">No es registrarà cap crida de l\'API</string>
     <string name="pref_general_infinite_loading_title">Carrega articles en desplaçar</string>
     <string name="translation">Traducció</string>
     <string name="cant_open_invalid_url">L\'element URL no és vàlid. Estic intentant solucionar aquest problema perquè l\'aplicació no falli.</string>
@@ -138,10 +127,6 @@
     <string name="markall_dialog_message">Aquesta acció marcarà els elements com a llegits.</string>
     <string name="pref_switch_actions_pager_scroll">Marca com a llegit en lliscar el dit</string>
     <string name="pref_switch_actions_pager_scroll_off">No es marcaran els articles com a llegits en lliscar el dit d\'un article a l\'altre.</string>
-    <string name="gdpr_dialog_message">Aquesta aplicació no recull cap dada personal. S\'han suprimit totes les eines d\'anàlisi. A partir d\'ara, l\'enviament d\'informes és opcional, així com el registre de depuració d\'errors. Recordeu que la depuració i els informes d\'error són essencials per al desenvolupament de l\'aplicació (Ho podeu configurar tot a Configuració &gt; Depura).</string>
-    <string name="gdpr_dialog_title">Aquesta aplicació no comparteix cap dada personal vostra.</string>
-    <string name="crash_dialog_text">Alguna cosa ha anat malament. Envieu l\'informe al desenvolupador.</string>
-    <string name="crash_dialog_comment">Podeu afegir informació útil en la secció de comentaris. No incloeu cap dada personal en el vostre comentari. També em podeu enviar un correu electrònic amb l\'identificador de depuració i us ho faré saber quan el problema s\'hagi resolt.</string>
     <string name="pref_acra_alwaysaccept">Envia informes d\'error automàtics</string>
     <string name="pref_acra_alwaysaccept_enabled">S\'enviaran informes d\'error automàticament</string>
     <string name="pref_acra_alwaysaccept_disabled">Us preguntarem abans d\'enviar un informe d\'error.</string>
@@ -154,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Els articles no es guardaran a la memòria del dispositiu i l\'aplicació no es podrà utilitzar sense connexió.</string>
     <string name="pref_switch_items_caching_on">Els articles es guardaran a la memòria del dispositiu i es podran utilitzar sense connexió.</string>
     <string name="pref_switch_items_caching">Guarda els elements per utilitzar-los sense connexió</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Sense connexió!</string>
     <string name="pref_switch_periodic_refresh">Sincronitza els articles</string>
     <string name="pref_switch_periodic_refresh_off">Els articles no se sincronitzaran en segon pla</string>

app/src/main/res/values-de-rDE/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Reader für selfoss"</string>
     <string name="title_activity_login">"Anmelden"</string>
@@ -102,25 +101,15 @@
     <string name="default_theme">Standard</string>
     <string name="default_dark_theme">Standard (Dunkel)</string>
     <string name="pref_header_debug">Debug</string>
-    <string name="login_debug_title">Aktivieren, um Login-Fehler zu protokollieren</string>
-    <string name="login_debug_on">Fehler auf der Login-Seite werden protokolliert</string>
-    <string name="login_debug_off">Fehler auf der Login-Seite werden nicht protokolliert</string>
-    <string name="login_menu_debug">Debug</string>
     <string name="self_hosted_cert_switch">Verwenden Sie einen selbst gehostetes Zertifikat?</string>
     <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
     <string name="pref_selfoss_category">selfoss API</string>
     <string name="pref_api_items_number_title">Loaded items number</string>
     <string name="pref_hidden_tags">Hidden Tags</string>
-    <string name="read_debug_title">Read articles appearing as unread ?</string>
-    <string name="read_debug_off">No log when marking an item as read</string>
-    <string name="read_debug_on">Api calls will be logged when marking an article as read</string>
     <string name="summary_debug_identifier">Debug identifier</string>
     <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
     <string name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
     <string name="display_header_drawer_title">Account header</string>
-    <string name="login_everything_title">Logging every api calls</string>
-    <string name="login_everything_on">This will log every api call for debug purpose.</string>
-    <string name="login_everything_off">No api call will be logged</string>
     <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
     <string name="translation">Übersetzung</string>
     <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
@@ -138,10 +127,6 @@
     <string name="markall_dialog_message">Dies wird alle Elemente als gelesen markieren.</string>
     <string name="pref_switch_actions_pager_scroll">Beim Wischen als gelesen markieren</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="gdpr_dialog_message">The app does not collect any personal data. Every analytics tools were removed. Crash reports sending is now optional, as is the debug logging. Keep in mind that debugging and crash reports are essential for the app development (You can configure everything in Settings &gt; Debug).</string>
-    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="crash_dialog_text">Something went wrong. Please send the report to the developer.</string>
-    <string name="crash_dialog_comment">You can add any helpful details in the comment bellow. Don\'t include any personal data in your comment. You could send me and email with your debug id, and I\'ll keep you posted when the issue is resolved.</string>
     <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
     <string name="pref_acra_alwaysaccept_enabled">Fehlerberichte werden automatisch gesendet</string>
     <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
@@ -154,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Nicht verbunden !</string>
     <string name="pref_switch_periodic_refresh">Synchronisiere Artikel</string>
     <string name="pref_switch_periodic_refresh_off">Artikel werden nicht im Hintergrund synchronisiert</string>

app/src/main/res/values-es-rES/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Lector para Selfoss"</string>
     <string name="title_activity_login">"Iniciar sesión"</string>
@@ -102,25 +101,15 @@
     <string name="default_theme">Predeterminado</string>
     <string name="default_dark_theme">Predeterminado/Oscuro</string>
     <string name="pref_header_debug">Depurar</string>
-    <string name="login_debug_title">Activar para registrar errores de inicio de sesión</string>
-    <string name="login_debug_on">Cualquier error en la página de inicio de sesión se registrará</string>
-    <string name="login_debug_off">No hay registro en la página de inicio de sesión</string>
-    <string name="login_menu_debug">Depurar</string>
     <string name="self_hosted_cert_switch">Utilizando un certificado alojado propiamente ?</string>
     <string name="self_signed_cert_warning">Por razones de seguridad, los certificados propios no son compatibles por defecto. Activando esto, no seré responsable de cualquier problema de seguridad que encuentre.</string>
     <string name="pref_selfoss_category">Api de Selfoss</string>
     <string name="pref_api_items_number_title">Número de artículos cargados</string>
     <string name="pref_hidden_tags">Etiquetas ocultas</string>
-    <string name="read_debug_title">¿Leer los artículos que aparecen como no leídos?</string>
-    <string name="read_debug_off">Sin registro al marcar un elemento como leído</string>
-    <string name="read_debug_on">Llamadas a la Api se registrarán al marcar un artículo como leído</string>
     <string name="summary_debug_identifier">Identificador de depuración</string>
     <string name="unique_id_to_clipboard">Identificador copiado a su portapapeles</string>
     <string name="display_header_drawer_summary">Mostrar una cabecera con la url de instancia de selfoss en el cajón lateral.</string>
     <string name="display_header_drawer_title">Cabecera de cuenta</string>
-    <string name="login_everything_title">Registrando todas las llamadas a la api</string>
-    <string name="login_everything_on">Esto registrará cada llamada a la api para propósito de depuración.</string>
-    <string name="login_everything_off">Ninguna llamada de api se registrará</string>
     <string name="pref_general_infinite_loading_title">Cargar más artículos en desplazamiento</string>
     <string name="translation">Traducción</string>
     <string name="cant_open_invalid_url">La url del elemento no es válida. Estoy buscando resolver este problema para que la aplicación no colapse.</string>
@@ -138,10 +127,6 @@
     <string name="markall_dialog_message">Esto marcará todos los artículos como leídos.</string>
     <string name="pref_switch_actions_pager_scroll">Marcar artículos como leídos al deslizar con el dedo hacia los lados</string>
     <string name="pref_switch_actions_pager_scroll_off">No marcar artículos como leídos al deslizar con el dedo hacia los lados.</string>
-    <string name="gdpr_dialog_message">La aplicación no recopila ningún dato personal. Todas las herramientas de analítica fueron eliminadas. El envío de informes de errores es opcional, así como los registros de depuración. Ten en cuenta que tanto los registros como los informes de errores son esenciales para el desarrollo de la aplicación (Puedes configurar todo en \"Configuración &gt; Depurar\").</string>
-    <string name="gdpr_dialog_title">La aplicación no comparte ningún dato personal sobre usted.</string>
-    <string name="crash_dialog_text">Algo salió mal. Envié el informe al desarrollador.</string>
-    <string name="crash_dialog_comment">Puede agregar cualquier información útil en el siguiente comentario. No incluya ningún dato personal en el comentario. Podría enviarme un correo electrónico con el id de depuración para ser notificado cuando el problema se resuelva.</string>
     <string name="pref_acra_alwaysaccept">Enviar automáticamente informe de fallos</string>
     <string name="pref_acra_alwaysaccept_enabled">Se enviaran automáticamente los informes de fallos</string>
     <string name="pref_acra_alwaysaccept_disabled">Le preguntará al enviar informes de fallos.</string>
@@ -154,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Los artículos no se guardarán en la memoria del dispositivo y la aplicación no se podrá utilizar sin conexión.</string>
     <string name="pref_switch_items_caching_on">Los artículos se guardarán en la memoria del dispositivo y se utilizarán para el uso sin conexión.</string>
     <string name="pref_switch_items_caching">Guardar elementos para uso sin conexión</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Sin conexión!</string>
     <string name="pref_switch_periodic_refresh">Sincronizar artículos</string>
     <string name="pref_switch_periodic_refresh_off">Los artículos no se sincronizarán en segundo plano</string>

app/src/main/res/values-fa-rIR/strings.xml

@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Reader for Selfoss"</string>
+    <string name="title_activity_login">"Log in"</string>
+    <string name="prompt_password">"Password"</string>
+    <string name="prompt_http_password">"HTTP Password"</string>
+    <string name="action_sign_in">"Go"</string>
+    <string name="error_invalid_password">"Password not long enough"</string>
+    <string name="error_field_required">"Field required"</string>
+    <string name="prompt_url">"Url"</string>
+    <string name="withLoginSwitch">"Login required ?"</string>
+    <string name="withHttpLoginSwitch">"HTTP Login required ?"</string>
+    <string name="login_url_problem">"Oops. You may need to add a \"/\" at the end of the url."</string>
+    <string name="prompt_login">"Username"</string>
+    <string name="prompt_http_login">"HTTP Username"</string>
+    <string name="label_share">"Share"</string>
+    <string name="readAll">"Read all"</string>
+    <string name="action_disconnect">"Disconnect"</string>
+    <string name="title_activity_settings">"Settings"</string>
+    <string name="pref_header_general">"General"</string>
+    <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
+    <string name="add_source_hint_url">"Link"</string>
+    <string name="add_source_hint_name">"Name"</string>
+    <string name="add_source">"Add a source"</string>
+    <string name="add_source_save">"Save"</string>
+    <string name="wrong_infos">"Check your details again."</string>
+    <string name="all_posts_not_read">"All posts weren't read"</string>
+    <string name="all_posts_read">"All posts were read"</string>
+    <string name="cant_get_favs">"Can't get favorites"</string>
+    <string name="cant_get_new_elements">"Can't get new articles"</string>
+    <string name="cant_get_read">"Can't get read articles"</string>
+    <string name="nothing_here">"Nothing here"</string>
+    <string name="tab_new">"New"</string>
+    <string name="tab_read">"All"</string>
+    <string name="tab_favs">"Favorites"</string>
+    <string name="action_about">"About"</string>
+    <string name="marked_as_read">"Item read"</string>
+    <string name="marked_as_unread">"Item unread"</string>
+    <string name="undo_string">"Undo"</string>
+    <string name="addStringNoUrl">"Log in to add sources."</string>
+    <string name="cant_get_sources">"Can't get sources list."</string>
+    <string name="cant_create_source">"Can't create source."</string>
+    <string name="cant_get_spouts">"Can't get spouts list."</string>
+    <string name="form_not_complete">"The form is not complete"</string>
+    <string name="pref_header_links">"Links"</string>
+    <string name="issue_tracker_link">"Issue Tracker"</string>
+    <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
+    <string name="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</string>
+    <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
+    <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
+    <string name="share">"Share"</string>
+    <string name="rating_prompt_title">"Enjoying the app ?"</string>
+    <string name="rating_prompt_yes">"Yes !"</string>
+    <string name="rating_prompt_no">"Not really …"</string>
+    <string name="rating_prompt_feedback_title">"Can you tell us why ?"</string>
+    <string name="rating_prompt_feedback_yes">"OK !"</string>
+    <string name="rating_prompt_feedback_no">"Not now."</string>
+    <string name="rating_prompt_rating_title">"Great ! Can you rate us on the Store ?"</string>
+    <string name="rating_prompt_rating_yes">"Sure !"</string>
+    <string name="rating_prompt_rating_no">"Not right now."</string>
+    <string name="rating_prompt_thanks">"Thanks, your feedback help enhance the app !"</string>
+    <string name="switch_unread_count">"Display the unread count as a badge for the bottom bar."</string>
+    <string name="switch_unread_count_title">"Display unread count"</string>
+    <string name="display_all_counts_title">"Display count for favorite and read"</string>
+    <string name="text_wrong_url">"You seem to be trying to use an invalid URL. Make sure it is correct, and if the problem persists, contact me (via the store contact link). Please note that the app needs you to be using Selfoss. You can't access RSS feeds without it."</string>
+    <string name="pref_general_internal_browser_title">"Open links inside the app"</string>
+    <string name="pref_general_internal_browser_on">"Articles will open inside the app"</string>
+    <string name="pref_general_internal_browser_off">"Articles will open with your default browser"</string>
+    <string name="prefer_article_viewer_title">"Use the article viewer"</string>
+    <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
+    <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
+    <string name="pref_general_category_links">"Link handling"</string>
+    <string name="pref_general_category_displaying">"Displaying"</string>
+    <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
+    <string name="pref_switch_card_view_off">"The articles will be displayed as a list"</string>
+    <string name="menu_home_refresh">"Update remote"</string>
+    <string name="refresh_success_response">"The remote is updated, you can now reload the articles list"</string>
+    <string name="refresh_failer_message">"The update didn't work, try again later, or check your selfoss logs."</string>
+    <string name="refresh_in_progress">"Refresh in progress"</string>
+    <string name="card_height_title">Full height cards</string>
+    <string name="card_height_on">Cards height will adjust to its content</string>
+    <string name="card_height_off">Card height will be fixed</string>
+    <string name="source_code">Source code</string>
+    <string name="cant_mark_read">Can\'t mark article as read</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">Error loading tags…</string>
+    <string name="drawer_error_loading_sources">Error loading sources…</string>
+    <string name="drawer_item_filters">Filters</string>
+    <string name="drawer_action_clear">clear</string>
+    <string name="drawer_item_tags">Tags</string>
+    <string name="drawer_item_sources">Sources</string>
+    <string name="drawer_action_edit">edit</string>
+    <string name="no_tags_loaded">No tags loaded</string>
+    <string name="no_sources_loaded">No sources loaded</string>
+    <string name="drawer_loading">Loading …</string>
+    <string name="menu_home_search">Search</string>
+    <string name="can_delete_source">Can\'t delete the source…</string>
+    <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
+    <string name="pref_header_theme">Themes</string>
+    <string name="default_theme">Default</string>
+    <string name="default_dark_theme">Default/Dark</string>
+    <string name="pref_header_debug">Debug</string>
+    <string name="self_hosted_cert_switch">Using a self hosted certificate ?</string>
+    <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
+    <string name="pref_selfoss_category">Selfoss Api</string>
+    <string name="pref_api_items_number_title">Loaded items number</string>
+    <string name="pref_hidden_tags">Hidden Tags</string>
+    <string name="summary_debug_identifier">Debug identifier</string>
+    <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
+    <string name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
+    <string name="display_header_drawer_title">Account header</string>
+    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
+    <string name="translation">Translation</string>
+    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+    <string name="drawer_report_bug">Report a bug</string>
+    <string name="items_number_should_be_number">The items number should be an integer.</string>
+    <string name="reader_action_more">Read more</string>
+    <string name="reader_action_open">Open in browser</string>
+    <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
+    <string name="remove_to_favs_reader">Remove from favorites</string>
+    <string name="pref_content_reader_font_size">Article reader content font size</string>
+    <string name="pref_header_viewer">Article viewer</string>
+    <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
+    <string name="markall_dialog_message">This will mark all the items as read.</string>
+    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
+    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
+    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
+    <string name="acra_login">Enable logging</string>
+    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Mark item as unread</string>
+    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Not connected !</string>
+    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="notification_channel_sync">Sync notification</string>
+    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="shortcut_offline">Offline</string>
+    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+</resources>

app/src/main/res/values-fr-rFR/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Reader for Selfoss"</string>
     <string name="title_activity_login">"Login"</string>
@@ -102,25 +101,15 @@
     <string name="default_theme">Par défaut</string>
     <string name="default_dark_theme">Par défaut/Foncé</string>
     <string name="pref_header_debug">Debug</string>
-    <string name="login_debug_title">Activez pour loguer toutes les erreurs de connexion</string>
-    <string name="login_debug_on">Toutes les erreurs de connexion vont être loguées</string>
-    <string name="login_debug_off">Aucune erreur de connexion ne sera loguée</string>
-    <string name="login_menu_debug">Debug</string>
     <string name="self_hosted_cert_switch">Certificat auto-signé ?</string>
     <string name="self_signed_cert_warning">Pour des raisons de sécurité, les certificats auto-signés sont désactivés par défaut. En les activant, je ne serais pas responsable de quelconques problèmes de sécurité rencontrés.</string>
     <string name="pref_selfoss_category">Api Selfoss</string>
     <string name="pref_api_items_number_title">Nombre d\'articles chargés</string>
     <string name="pref_hidden_tags">Tags Cachés</string>
-    <string name="read_debug_title">Des articles lus marqués comme non lus ?</string>
-    <string name="read_debug_off">Aucun log quand un article est marqué comme lu</string>
-    <string name="read_debug_on">Les appels API vont être logués lorsqu\'un article est marqué comme lu</string>
     <string name="summary_debug_identifier">Identifiant de debug</string>
     <string name="unique_id_to_clipboard">Texte copié</string>
     <string name="display_header_drawer_summary">Afficher une entête avec l\'url de votre instance de Selfoss en haut du drawer lateral.</string>
     <string name="display_header_drawer_title">Entête de compte</string>
-    <string name="login_everything_title">Log de tous les appels à l\'API</string>
-    <string name="login_everything_on">Tous les appels à l\'API vont êtres logués</string>
-    <string name="login_everything_off">Aucun appel à l\'API ne sera logué</string>
     <string name="pref_general_infinite_loading_title">Charger plus d\'articles au scroll</string>
     <string name="translation">Traduction</string>
     <string name="cant_open_invalid_url">L’url de l’élément n’est pas valide. En attendant la résolution du problème, le lien ne s\'ouvrira pas.</string>
@@ -138,10 +127,6 @@
     <string name="markall_dialog_message">Marquer tous les éléments comme lus ?</string>
     <string name="pref_switch_actions_pager_scroll">Marquer comme lu à la navigation.</string>
     <string name="pref_switch_actions_pager_scroll_off">Ne pas marquer les articles comme lus à la navigation.</string>
-    <string name="gdpr_dialog_message">L\'application ne collecte aucune donnée personnelle. Tous les outils d\'analytics ont été supprimés. Les rapports d\'erreurs sont maintenant optionnels, ainsi que les logs. N\'oubliez pas que les rapports d\'erreurs sont essentiels pour la résolution des bugs (vous pouvez configurer tout cela dans Paramètres &gt; Debug).</string>
-    <string name="gdpr_dialog_title">L\'application ne partage aucune de vos données.</string>
-    <string name="crash_dialog_text">Quelque chose s\'est mal passé, S\'il vous plaît, envoyez le rapport au développeur.</string>
-    <string name="crash_dialog_comment">Vous pouvez ajouter tous les détails utiles dans le champ de commentaire plus bas. N\'ajoutez aucune information personnelle. Vous pouvez m\'envoyer un email avec votre identifiant de debug, et je vous informerai à la correction du problème.</string>
     <string name="pref_acra_alwaysaccept">Envoyer automatiquement les rapports d\'erreur</string>
     <string name="pref_acra_alwaysaccept_enabled">Enverra automatiquement les rapports d\'erreur</string>
     <string name="pref_acra_alwaysaccept_disabled">Demandera une confirmation à chaque incident.</string>
@@ -154,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Les articles ne seront pas enregistrés et l\'application ne sera pas utilisable hors ligne.</string>
     <string name="pref_switch_items_caching_on">Les articles seront enregistrés et l\'application sera utilisable hors ligne.</string>
     <string name="pref_switch_items_caching">Sauvegarder les articles pour une utilisation hors ligne</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Hors connexion !</string>
     <string name="pref_switch_periodic_refresh">Synchroniser les articles</string>
     <string name="pref_switch_periodic_refresh_off">Les articles ne seront pas synchronisés en arrière plan</string>

app/src/main/res/values-gl-rES/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Lector para Selfoss"</string>
     <string name="title_activity_login">"Acceder"</string>
@@ -102,25 +101,15 @@
     <string name="default_theme">Predeterminado</string>
     <string name="default_dark_theme">Predeterminado/Escuro</string>
     <string name="pref_header_debug">Depuración</string>
-    <string name="login_debug_title">Activar pra rexistrar os erros de acceso</string>
-    <string name="login_debug_on">Rexistrarse todos os erros na páxina de acceso</string>
-    <string name="login_debug_off">Non se rexistrará ningún erro na páxina de acceso</string>
-    <string name="login_menu_debug">Depuración</string>
     <string name="self_hosted_cert_switch">Utilizas un certificado autoaloxado?</string>
     <string name="self_signed_cert_warning">Por razóns de seguridade, por defecto non se permiten os certificados autoasinados. Activando isto, non serei responsable de calquera problema de seguridade que atopes.</string>
     <string name="pref_selfoss_category">API de Selfoss</string>
     <string name="pref_api_items_number_title">Número de elementos cargados</string>
     <string name="pref_hidden_tags">Etiquetas ocultas</string>
-    <string name="read_debug_title">Ler os artigos que aparecen coma non lidos?</string>
-    <string name="read_debug_off">Non rexistrar cando se marca un elemento coma lido</string>
-    <string name="read_debug_on">As chamadas á API serán rexistradas cando se marque un artigo coma lido</string>
     <string name="summary_debug_identifier">Identificador de depuración</string>
     <string name="unique_id_to_clipboard">Copiouse o identificador ao portapapeis</string>
     <string name="display_header_drawer_summary">Amosar unha cabeceira coa URL da instancia de Selfoss no panel lateral.</string>
     <string name="display_header_drawer_title">Cabeceira da conta</string>
-    <string name="login_everything_title">Rexistrando todas as chamadas á API</string>
-    <string name="login_everything_on">Isto rexistrará todas as chamadas á API con fins de depuración.</string>
-    <string name="login_everything_off">Non se rexistrará ningunha chamada á API</string>
     <string name="pref_general_infinite_loading_title">Cargar máis artigos ao desprazarse</string>
     <string name="translation">Traducción</string>
     <string name="cant_open_invalid_url">A URL do elemento non é válida. Estou tratando de solucionar isto pra que a aplicación non falle.</string>
@@ -138,10 +127,6 @@
     <string name="markall_dialog_message">Isto marcara todos os elementos como lidos.</string>
     <string name="pref_switch_actions_pager_scroll">Marcar artigos como lidos ao deslizar co dedo cara os lados</string>
     <string name="pref_switch_actions_pager_scroll_off">Non marcar artigos como lidos ao deslizar co dedo cara os lados.</string>
-    <string name="gdpr_dialog_message">A aplicación non recolle ningún dato persoal. Todas as ferramentas de analítica foron eliminadas. O envío de informes de erros agora é opcional, así coma os rexistros de depuración. Ten en conta que tanto os rexistros coma os informes de erros son esenciais prao desenvolvemento da aplicación (Podes configurar todo en \"Axustes &gt; Depurar\").</string>
-    <string name="gdpr_dialog_title">A aplicación non comparte ningún dato persoal seu.</string>
-    <string name="crash_dialog_text">Algo foi mal. Pregámoslle que envíe o informe de erro ao desarrollador.</string>
-    <string name="crash_dialog_comment">Podes engadir calquera información útil nos comentarios. Non inclúas datos persoais. Podes enviarme un correo coa Id de depuración pra que me poña en contacto contigo cando a incidencia se resolva.</string>
     <string name="pref_acra_alwaysaccept">Enviar automáticamente informes de erros</string>
     <string name="pref_acra_alwaysaccept_enabled">Enviaranse automáticamente os informes de erros</string>
     <string name="pref_acra_alwaysaccept_disabled">Preguntarase cada vez pra enviar os informes de erros.</string>
@@ -154,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Os artigos non se gardaran na memoria do dispositivo e non se poderá utilizar a aplicación sen conexión.</string>
     <string name="pref_switch_items_caching_on">Os artigos gardaranse na memoria do dispositivo e estarán dispoñibles sen conexión.</string>
     <string name="pref_switch_items_caching">Gardar elementos para uso sen conexión</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Non conectado!</string>
     <string name="pref_switch_periodic_refresh">Sincronizar artigos</string>
     <string name="pref_switch_periodic_refresh_off">Os artigos non se sincronizarán coa aplicación de fondo</string>

app/src/main/res/values-in-rID/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Reader for Selfoss"</string>
     <string name="title_activity_login">"Masuk"</string>
@@ -102,25 +101,15 @@
     <string name="default_theme">Bawaan</string>
     <string name="default_dark_theme">Bawaan/Gelap</string>
     <string name="pref_header_debug">Debug</string>
-    <string name="login_debug_title">Aktifkan untuk mencatat semua kesalahan koneksi</string>
-    <string name="login_debug_on">Semua kesalahan koneksi akan dicatat</string>
-    <string name="login_debug_off">Kesalahan pada halaman masuk</string>
-    <string name="login_menu_debug">Debug</string>
     <string name="self_hosted_cert_switch">Sertifikat yang ditandatangani sendiri?</string>
     <string name="self_signed_cert_warning">Untuk alasan keamanan, sertifikat yang ditandatangani sendiri tidak didukung secara bawaan. Jika Anda mengaktifkan item ini, saya tidak akan bertanggung jawab atas masalah keamanan yang Anda hadapi.</string>
     <string name="pref_selfoss_category">Selfoss Api</string>
     <string name="pref_api_items_number_title">Item nomor dimuat</string>
     <string name="pref_hidden_tags">Hidden Tags</string>
-    <string name="read_debug_title">Baca artikel yang ini sebagai belum dibaca ?</string>
-    <string name="read_debug_off">Tidak ada catatan saat item ditandai sebagai telah dibaca</string>
-    <string name="read_debug_on">Panggilan api dicatat saat item ditandai sebagai telah dibaca</string>
     <string name="summary_debug_identifier">Identifikasi debug</string>
     <string name="unique_id_to_clipboard">Salin pengenal ke papan klip Anda</string>
     <string name="display_header_drawer_summary">Kop dengan alamat link Selfoss ditampilkan di laci lateral.</string>
     <string name="display_header_drawer_title">Kop akun</string>
-    <string name="login_everything_title">Catat setiap panggilan api</string>
-    <string name="login_everything_on">Untuk debug program, ini akan mencatat setiap panggilan api.</string>
-    <string name="login_everything_off">Tidak ada panggilan api yang akan dicatat</string>
     <string name="pref_general_infinite_loading_title">Muat lebih banyak artikel saat membalik halaman</string>
     <string name="translation">Terjemahan</string>
     <string name="cant_open_invalid_url">Alamat tautan proyek tidak valid. Saya mencoba memecahkan masalah ini untuk menghindari aplikasi berhenti.</string>
@@ -138,10 +127,6 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="gdpr_dialog_message">The app does not collect any personal data. Every analytics tools were removed. Crash reports sending is now optional, as is the debug logging. Keep in mind that debugging and crash reports are essential for the app development (You can configure everything in Settings &gt; Debug).</string>
-    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="crash_dialog_text">Something went wrong. Please send the report to the developer.</string>
-    <string name="crash_dialog_comment">You can add any helpful details in the comment bellow. Don\'t include any personal data in your comment. You could send me and email with your debug id, and I\'ll keep you posted when the issue is resolved.</string>
     <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
     <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
     <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
@@ -154,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>

app/src/main/res/values-it-rIT/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Lettore RSS per Selfoss"</string>
     <string name="title_activity_login">"Accedi"</string>
@@ -102,25 +101,15 @@
     <string name="default_theme">Predefinito</string>
     <string name="default_dark_theme">Predefinito (Scuro)</string>
     <string name="pref_header_debug">Debug</string>
-    <string name="login_debug_title">Activate to log login errors</string>
-    <string name="login_debug_on">Any error on the login page will be logged</string>
-    <string name="login_debug_off">No log on the login page</string>
-    <string name="login_menu_debug">Debug</string>
     <string name="self_hosted_cert_switch">Using a self hosted certificate ?</string>
     <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
     <string name="pref_selfoss_category">Api di Selfoss</string>
     <string name="pref_api_items_number_title">Numero di elementi caricati</string>
     <string name="pref_hidden_tags">Tag nascosti</string>
-    <string name="read_debug_title">Read articles appearing as unread ?</string>
-    <string name="read_debug_off">No log when marking an item as read</string>
-    <string name="read_debug_on">Api calls will be logged when marking an article as read</string>
     <string name="summary_debug_identifier">Debug identifier</string>
     <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
     <string name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
     <string name="display_header_drawer_title">Account header</string>
-    <string name="login_everything_title">Logging every api calls</string>
-    <string name="login_everything_on">This will log every api call for debug purpose.</string>
-    <string name="login_everything_off">No api call will be logged</string>
     <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
     <string name="translation">Traduzioni</string>
     <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
@@ -138,10 +127,6 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="gdpr_dialog_message">The app does not collect any personal data. Every analytics tools were removed. Crash reports sending is now optional, as is the debug logging. Keep in mind that debugging and crash reports are essential for the app development (You can configure everything in Settings &gt; Debug).</string>
-    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="crash_dialog_text">Something went wrong. Please send the report to the developer.</string>
-    <string name="crash_dialog_comment">You can add any helpful details in the comment bellow. Don\'t include any personal data in your comment. You could send me and email with your debug id, and I\'ll keep you posted when the issue is resolved.</string>
     <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
     <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
     <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
@@ -154,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>

app/src/main/res/values-ko-rKR/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Reader for Selfoss"</string>
     <string name="title_activity_login">"로그인"</string>
@@ -102,25 +101,15 @@
     <string name="default_theme">Default</string>
     <string name="default_dark_theme">Default/Dark</string>
     <string name="pref_header_debug">Debug</string>
-    <string name="login_debug_title">Activate to log login errors</string>
-    <string name="login_debug_on">Any error on the login page will be logged</string>
-    <string name="login_debug_off">No log on the login page</string>
-    <string name="login_menu_debug">Debug</string>
     <string name="self_hosted_cert_switch">Using a self hosted certificate ?</string>
     <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
     <string name="pref_selfoss_category">Selfoss Api</string>
     <string name="pref_api_items_number_title">Loaded items number</string>
     <string name="pref_hidden_tags">Hidden Tags</string>
-    <string name="read_debug_title">Read articles appearing as unread ?</string>
-    <string name="read_debug_off">No log when marking an item as read</string>
-    <string name="read_debug_on">Api calls will be logged when marking an article as read</string>
     <string name="summary_debug_identifier">Debug identifier</string>
     <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
     <string name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
     <string name="display_header_drawer_title">Account header</string>
-    <string name="login_everything_title">Logging every api calls</string>
-    <string name="login_everything_on">This will log every api call for debug purpose.</string>
-    <string name="login_everything_off">No api call will be logged</string>
     <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
     <string name="translation">Translation</string>
     <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
@@ -138,10 +127,6 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="gdpr_dialog_message">The app does not collect any personal data. Every analytics tools were removed. Crash reports sending is now optional, as is the debug logging. Keep in mind that debugging and crash reports are essential for the app development (You can configure everything in Settings &gt; Debug).</string>
-    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="crash_dialog_text">Something went wrong. Please send the report to the developer.</string>
-    <string name="crash_dialog_comment">You can add any helpful details in the comment bellow. Don\'t include any personal data in your comment. You could send me and email with your debug id, and I\'ll keep you posted when the issue is resolved.</string>
     <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
     <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
     <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
@@ -154,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>

app/src/main/res/values-nl-rNL/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Selfoss Reader"</string>
     <string name="title_activity_login">"Inloggen"</string>
@@ -102,25 +101,15 @@
     <string name="default_theme">Standaard</string>
     <string name="default_dark_theme">Standaard/Donker</string>
     <string name="pref_header_debug">Fout opsporen</string>
-    <string name="login_debug_title">Activeer om login-fouten te loggen</string>
-    <string name="login_debug_on">Elke fout op de inlogpagina wordt gelogd</string>
-    <string name="login_debug_off">Geen log op de inlogpagina</string>
-    <string name="login_menu_debug">Fout opsporen</string>
     <string name="self_hosted_cert_switch">Gebruik een zelf gehost certificaat?</string>
     <string name="self_signed_cert_warning">Vanwege veiligheidsredenen worden zelfondertekende certificaten niet standaard ondersteund. Door dit te activeren, ben ik niet verantwoordelijk voor beveiligingsproblemen die u tegenkomt.</string>
     <string name="pref_selfoss_category">Selfoss Api</string>
     <string name="pref_api_items_number_title">Geladen items nummer</string>
     <string name="pref_hidden_tags">Hidden Tags</string>
-    <string name="read_debug_title">Gelezen artikelen verschijnen als ongelezen?</string>
-    <string name="read_debug_off">Geen logboek bij het markeren van een artikel als gelezen</string>
-    <string name="read_debug_on">Api-oproepen zullen gelogd worden wanneer een artikel als gelezen wordt gemarkeerd</string>
     <string name="summary_debug_identifier">ID voor foutopsporing</string>
     <string name="unique_id_to_clipboard">ID naar uw klembord gekopieerd</string>
     <string name="display_header_drawer_summary">Laat een koptekst weergeven met de url van de selfoss instantie in de zijlade.</string>
     <string name="display_header_drawer_title">Account titel</string>
-    <string name="login_everything_title">Elke api-oproepen loggen</string>
-    <string name="login_everything_on">Hiermee wordt elke api oproepen gelogt voor foutopsporingsdoeleinden.</string>
-    <string name="login_everything_off">Geen api-oproep wordt gelogt</string>
     <string name="pref_general_infinite_loading_title">Laad meer artikelen door te bladeren</string>
     <string name="translation">Vertaling</string>
     <string name="cant_open_invalid_url">De URL is ongeldig. Ik probeer dit probleem op te lossen, zodat de toepassing niet wordt afgesloten.</string>
@@ -138,10 +127,6 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="gdpr_dialog_message">The app does not collect any personal data. Every analytics tools were removed. Crash reports sending is now optional, as is the debug logging. Keep in mind that debugging and crash reports are essential for the app development (You can configure everything in Settings &gt; Debug).</string>
-    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="crash_dialog_text">Something went wrong. Please send the report to the developer.</string>
-    <string name="crash_dialog_comment">You can add any helpful details in the comment bellow. Don\'t include any personal data in your comment. You could send me and email with your debug id, and I\'ll keep you posted when the issue is resolved.</string>
     <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
     <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
     <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
@@ -154,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Reader for Selfoss"</string>
     <string name="title_activity_login">"Entrar"</string>
@@ -102,25 +101,15 @@
     <string name="default_theme">Padrão</string>
     <string name="default_dark_theme">Padrão/Escuro</string>
     <string name="pref_header_debug">Depurar</string>
-    <string name="login_debug_title">Ativar para registrar erros de login</string>
-    <string name="login_debug_on">Qualquer erro na página de login será registrado</string>
-    <string name="login_debug_off">Nenhum registro na página de login</string>
-    <string name="login_menu_debug">Depurar</string>
     <string name="self_hosted_cert_switch">Usando um certificado autônomo ?</string>
     <string name="self_signed_cert_warning">Por motivos de segurança, certificados autônomos não são suportados por padrão. Ao ativar, não serei responsável por qualquer problema de segurança que você encontre.</string>
     <string name="pref_selfoss_category">Selfoss Api</string>
     <string name="pref_api_items_number_title">Quantidade de itens carregados</string>
     <string name="pref_hidden_tags">Hidden Tags</string>
-    <string name="read_debug_title">Ler os artigos que aparecem como não lidos ?</string>
-    <string name="read_debug_off">Nenhum registro ao marcar um item como lido</string>
-    <string name="read_debug_on">As chamadas Api serão registradas ao marcar um artigo como lido</string>
     <string name="summary_debug_identifier">Identificador de depuração</string>
     <string name="unique_id_to_clipboard">Identificador copiado para a área de transferência</string>
     <string name="display_header_drawer_summary">Exibir um cabeçalho com o URL da instância do Selfoss na barra lateral.</string>
     <string name="display_header_drawer_title">Cabeçalho da conta</string>
-    <string name="login_everything_title">Registrando todas as chamadas a api</string>
-    <string name="login_everything_on">Isso registrará todas as chamadas api para fins de depuração.</string>
-    <string name="login_everything_off">Nenhuma chamada a api será registrada</string>
     <string name="pref_general_infinite_loading_title">Carregar mais artigos ao realizar o scroll</string>
     <string name="translation">Traduções</string>
     <string name="cant_open_invalid_url">A url está inválida. Estou tentando resolver esse problema para que o aplicativo não encerre.</string>
@@ -138,10 +127,6 @@
     <string name="markall_dialog_message">Isso marcará todos os itens como lidos.</string>
     <string name="pref_switch_actions_pager_scroll">Marcar Como Lida ao Abrir</string>
     <string name="pref_switch_actions_pager_scroll_off">Não marca artigos como lido quando abrir.</string>
-    <string name="gdpr_dialog_message">O app não recolhe quaisquer dados pessoais. Todas as ferramentas de análise foram removidas. Envio de relatórios de erro agora é opcional, como é o log de depuração. Tenha em mente que a depuração e relatórios de erro são essenciais para o desenvolvimento do app (você pode configurar tudo em configurações &gt; Debug).</string>
-    <string name="gdpr_dialog_title">O app não compartilha dados pessoais sobre você.</string>
-    <string name="crash_dialog_text">Algo deu errado. Por favor envie o relatório para o desenvolvedor.</string>
-    <string name="crash_dialog_comment">Você pode adicionar informação útil no comentário abaixo. Não inclua quaisquer dados pessoais no seu comentário. Você pode enviar um e-mail com sua id de depuração, e eu vou mantê-lo informado quando o problema for resolvido.</string>
     <string name="pref_acra_alwaysaccept">Envia relatórios de erros automaticamente</string>
     <string name="pref_acra_alwaysaccept_enabled">Enviar relatórios de erro automaticamente</string>
     <string name="pref_acra_alwaysaccept_disabled">Perguntar sempre, ao enviar relatórios de erro.</string>
@@ -154,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Leitor para Selfoss"</string>
     <string name="title_activity_login">"Iniciar sessão"</string>
@@ -102,25 +101,15 @@
     <string name="default_theme">Predefinição</string>
     <string name="default_dark_theme">Padrão/escuro</string>
     <string name="pref_header_debug">Depurar</string>
-    <string name="login_debug_title">Ativar para registrar erros de logon</string>
-    <string name="login_debug_on">Qualquer erro na página de login será registrado</string>
-    <string name="login_debug_off">Não há registro na página de login</string>
-    <string name="login_menu_debug">Depurar</string>
     <string name="self_hosted_cert_switch">Usando um certificado hospedado?</string>
     <string name="self_signed_cert_warning">Devido a razões de segurança, auto certificados auto-assinados não são suportados por padrão. Ao activar isto, eu não vou ser responsável de qualquer problema de segurança que você encontrar.</string>
     <string name="pref_selfoss_category">Api de Selfoss</string>
     <string name="pref_api_items_number_title">Número de itens carregados</string>
     <string name="pref_hidden_tags">Hidden Tags</string>
-    <string name="read_debug_title">Leia artigos aparecem como não lidas?</string>
-    <string name="read_debug_off">Sem log quando marcar um item como lido</string>
-    <string name="read_debug_on">Chamadas de Api serão registradas quando marcar um artigo como lido</string>
     <string name="summary_debug_identifier">Depurar o identificador</string>
     <string name="unique_id_to_clipboard">Identificador de copiados para a área de transferência</string>
     <string name="display_header_drawer_summary">Exibir um cabeçalho com o url de instância de selfoss na gaveta lateral.</string>
     <string name="display_header_drawer_title">Cabeçalho de conta</string>
-    <string name="login_everything_title">Logando todas as chamadas api</string>
-    <string name="login_everything_on">Isto irá registrar todas as chamadas de api para fins de depuração.</string>
-    <string name="login_everything_off">Nenhuma chamada de api será registrada</string>
     <string name="pref_general_infinite_loading_title">Carregar mais artigos no pergaminho</string>
     <string name="translation">Tradução</string>
     <string name="cant_open_invalid_url">A url do item é inválido. Eu estou olhando para resolver esta questão, para que o app não vai falhar.</string>
@@ -138,10 +127,6 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="gdpr_dialog_message">The app does not collect any personal data. Every analytics tools were removed. Crash reports sending is now optional, as is the debug logging. Keep in mind that debugging and crash reports are essential for the app development (You can configure everything in Settings &gt; Debug).</string>
-    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="crash_dialog_text">Something went wrong. Please send the report to the developer.</string>
-    <string name="crash_dialog_comment">You can add any helpful details in the comment bellow. Don\'t include any personal data in your comment. You could send me and email with your debug id, and I\'ll keep you posted when the issue is resolved.</string>
     <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
     <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
     <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
@@ -154,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>

app/src/main/res/values-si-rLK/strings.xml

@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Reader for Selfoss"</string>
+    <string name="title_activity_login">"පිවිසෙන්න"</string>
+    <string name="prompt_password">"මුර පදය"</string>
+    <string name="prompt_http_password">"HTTP Password"</string>
+    <string name="action_sign_in">"Go"</string>
+    <string name="error_invalid_password">"Password not long enough"</string>
+    <string name="error_field_required">"Field required"</string>
+    <string name="prompt_url">"Url"</string>
+    <string name="withLoginSwitch">"Login required ?"</string>
+    <string name="withHttpLoginSwitch">"HTTP Login required ?"</string>
+    <string name="login_url_problem">"Oops. You may need to add a \"/\" at the end of the url."</string>
+    <string name="prompt_login">"පරිශීලක නාමය"</string>
+    <string name="prompt_http_login">"HTTP Username"</string>
+    <string name="label_share">"Share"</string>
+    <string name="readAll">"Read all"</string>
+    <string name="action_disconnect">"Disconnect"</string>
+    <string name="title_activity_settings">"සැකසුම්"</string>
+    <string name="pref_header_general">"General"</string>
+    <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
+    <string name="add_source_hint_url">"Link"</string>
+    <string name="add_source_hint_name">"නම"</string>
+    <string name="add_source">"Add a source"</string>
+    <string name="add_source_save">"සුරකින්න"</string>
+    <string name="wrong_infos">"Check your details again."</string>
+    <string name="all_posts_not_read">"All posts weren't read"</string>
+    <string name="all_posts_read">"All posts were read"</string>
+    <string name="cant_get_favs">"Can't get favorites"</string>
+    <string name="cant_get_new_elements">"Can't get new articles"</string>
+    <string name="cant_get_read">"Can't get read articles"</string>
+    <string name="nothing_here">"Nothing here"</string>
+    <string name="tab_new">"New"</string>
+    <string name="tab_read">"සියල්ල"</string>
+    <string name="tab_favs">"Favorites"</string>
+    <string name="action_about">"මේ ගැන"</string>
+    <string name="marked_as_read">"Item read"</string>
+    <string name="marked_as_unread">"Item unread"</string>
+    <string name="undo_string">"Undo"</string>
+    <string name="addStringNoUrl">"Log in to add sources."</string>
+    <string name="cant_get_sources">"Can't get sources list."</string>
+    <string name="cant_create_source">"Can't create source."</string>
+    <string name="cant_get_spouts">"Can't get spouts list."</string>
+    <string name="form_not_complete">"The form is not complete"</string>
+    <string name="pref_header_links">"Links"</string>
+    <string name="issue_tracker_link">"Issue Tracker"</string>
+    <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
+    <string name="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</string>
+    <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
+    <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
+    <string name="share">"Share"</string>
+    <string name="rating_prompt_title">"Enjoying the app ?"</string>
+    <string name="rating_prompt_yes">"Yes !"</string>
+    <string name="rating_prompt_no">"Not really …"</string>
+    <string name="rating_prompt_feedback_title">"Can you tell us why ?"</string>
+    <string name="rating_prompt_feedback_yes">"OK !"</string>
+    <string name="rating_prompt_feedback_no">"Not now."</string>
+    <string name="rating_prompt_rating_title">"Great ! Can you rate us on the Store ?"</string>
+    <string name="rating_prompt_rating_yes">"Sure !"</string>
+    <string name="rating_prompt_rating_no">"Not right now."</string>
+    <string name="rating_prompt_thanks">"Thanks, your feedback help enhance the app !"</string>
+    <string name="switch_unread_count">"Display the unread count as a badge for the bottom bar."</string>
+    <string name="switch_unread_count_title">"Display unread count"</string>
+    <string name="display_all_counts_title">"Display count for favorite and read"</string>
+    <string name="text_wrong_url">"You seem to be trying to use an invalid URL. Make sure it is correct, and if the problem persists, contact me (via the store contact link). Please note that the app needs you to be using Selfoss. You can't access RSS feeds without it."</string>
+    <string name="pref_general_internal_browser_title">"Open links inside the app"</string>
+    <string name="pref_general_internal_browser_on">"Articles will open inside the app"</string>
+    <string name="pref_general_internal_browser_off">"Articles will open with your default browser"</string>
+    <string name="prefer_article_viewer_title">"Use the article viewer"</string>
+    <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
+    <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
+    <string name="pref_general_category_links">"Link handling"</string>
+    <string name="pref_general_category_displaying">"Displaying"</string>
+    <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
+    <string name="pref_switch_card_view_off">"The articles will be displayed as a list"</string>
+    <string name="menu_home_refresh">"Update remote"</string>
+    <string name="refresh_success_response">"The remote is updated, you can now reload the articles list"</string>
+    <string name="refresh_failer_message">"The update didn't work, try again later, or check your selfoss logs."</string>
+    <string name="refresh_in_progress">"Refresh in progress"</string>
+    <string name="card_height_title">Full height cards</string>
+    <string name="card_height_on">Cards height will adjust to its content</string>
+    <string name="card_height_off">Card height will be fixed</string>
+    <string name="source_code">Source code</string>
+    <string name="cant_mark_read">Can\'t mark article as read</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">Error loading tags…</string>
+    <string name="drawer_error_loading_sources">Error loading sources…</string>
+    <string name="drawer_item_filters">Filters</string>
+    <string name="drawer_action_clear">clear</string>
+    <string name="drawer_item_tags">Tags</string>
+    <string name="drawer_item_sources">Sources</string>
+    <string name="drawer_action_edit">edit</string>
+    <string name="no_tags_loaded">No tags loaded</string>
+    <string name="no_sources_loaded">No sources loaded</string>
+    <string name="drawer_loading">Loading …</string>
+    <string name="menu_home_search">Search</string>
+    <string name="can_delete_source">Can\'t delete the source…</string>
+    <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
+    <string name="pref_header_theme">Themes</string>
+    <string name="default_theme">Default</string>
+    <string name="default_dark_theme">Default/Dark</string>
+    <string name="pref_header_debug">Debug</string>
+    <string name="self_hosted_cert_switch">Using a self hosted certificate ?</string>
+    <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
+    <string name="pref_selfoss_category">Selfoss Api</string>
+    <string name="pref_api_items_number_title">Loaded items number</string>
+    <string name="pref_hidden_tags">Hidden Tags</string>
+    <string name="summary_debug_identifier">Debug identifier</string>
+    <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
+    <string name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
+    <string name="display_header_drawer_title">Account header</string>
+    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
+    <string name="translation">Translation</string>
+    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+    <string name="drawer_report_bug">Report a bug</string>
+    <string name="items_number_should_be_number">The items number should be an integer.</string>
+    <string name="reader_action_more">Read more</string>
+    <string name="reader_action_open">Open in browser</string>
+    <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
+    <string name="remove_to_favs_reader">Remove from favorites</string>
+    <string name="pref_content_reader_font_size">Article reader content font size</string>
+    <string name="pref_header_viewer">Article viewer</string>
+    <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
+    <string name="markall_dialog_message">This will mark all the items as read.</string>
+    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
+    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
+    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
+    <string name="acra_login">Enable logging</string>
+    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Mark item as unread</string>
+    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Not connected !</string>
+    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="notification_channel_sync">Sync notification</string>
+    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="shortcut_offline">Offline</string>
+    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+</resources>

app/src/main/res/values-tr-rTR/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Selfoss için okuyucu"</string>
     <string name="title_activity_login">"Giriş"</string>
@@ -102,25 +101,15 @@
     <string name="default_theme">Varsayılan</string>
     <string name="default_dark_theme">Varsayılan/koyu</string>
     <string name="pref_header_debug">Hata ayıklama</string>
-    <string name="login_debug_title">Giriş hatalarını kaydetmek için etkinleştir</string>
-    <string name="login_debug_on">Oturum açma sayfasındaki herhangi bir hata günlüğe kaydedilecek</string>
-    <string name="login_debug_off">Oturum açma sayfasında oturum yok</string>
-    <string name="login_menu_debug">Hata ayıklama</string>
     <string name="self_hosted_cert_switch">Kendi kendine barındırılan bir sertifika mı kullanıyorsunuz?</string>
     <string name="self_signed_cert_warning">Güvenlik nedeniyle, kendinden imzalı sertifikalar varsayılan olarak desteklenmez. Bunu etkinleştirerek karşılaştığınız herhangi bir güvenlik sorununun sorumluluğunu almayacağım.</string>
     <string name="pref_selfoss_category">Selfoss Uygulaması</string>
     <string name="pref_api_items_number_title">Yüklenen öğe numarası</string>
     <string name="pref_hidden_tags">Hidden Tags</string>
-    <string name="read_debug_title">Okunmamış makaleleri görüntüle?</string>
-    <string name="read_debug_off">Bir öğeyi işaretlediğinde günlük yok</string>
-    <string name="read_debug_on">Bir makaleyi okundu olarak işaretlerken Api çağrıları günlüğe kaydedilir</string>
     <string name="summary_debug_identifier">Hata ayıklama tanıtıcısı</string>
     <string name="unique_id_to_clipboard">Tanımlayıcı panonuza kopyalanır</string>
     <string name="display_header_drawer_summary">Selfoss örneği url\'li bir üstbilgi, yan çekmece üzerine gösterin.</string>
     <string name="display_header_drawer_title">Hesap başlığı</string>
-    <string name="login_everything_title">Bütün api aramalarına giriyor</string>
-    <string name="login_everything_on">Bu, her api çağrısını hata ayıklama amacına yönelik olarak günlüğe kaydeder.</string>
-    <string name="login_everything_off">Hiçbir api çağrısı günlüğe kaydedilmez</string>
     <string name="pref_general_infinite_loading_title">Kaydırma üzerine daha fazla makale yükleyin</string>
     <string name="translation">Çeviri</string>
     <string name="cant_open_invalid_url">Öğe url geçersiz. Uygulama çökmeyeceği için bu sorunu çözmeye çalışıyorum.</string>
@@ -138,10 +127,6 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="gdpr_dialog_message">The app does not collect any personal data. Every analytics tools were removed. Crash reports sending is now optional, as is the debug logging. Keep in mind that debugging and crash reports are essential for the app development (You can configure everything in Settings &gt; Debug).</string>
-    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="crash_dialog_text">Something went wrong. Please send the report to the developer.</string>
-    <string name="crash_dialog_comment">You can add any helpful details in the comment bellow. Don\'t include any personal data in your comment. You could send me and email with your debug id, and I\'ll keep you posted when the issue is resolved.</string>
     <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
     <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
     <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
@@ -154,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Selfoss 阅读器"</string>
     <string name="title_activity_login">"登录"</string>
@@ -36,7 +35,7 @@
     <string name="tab_favs">"收藏夹"</string>
     <string name="action_about">"关于我们"</string>
     <string name="marked_as_read">"已读"</string>
-    <string name="marked_as_unread">"Item unread"</string>
+    <string name="marked_as_unread">"未读条目"</string>
     <string name="undo_string">"撤销"</string>
     <string name="addStringNoUrl">"登录以添加数据源。"</string>
     <string name="cant_get_sources">"无法获取数据列表。"</string>
@@ -84,7 +83,7 @@
     <string name="card_height_off">卡片高度将被固定</string>
     <string name="source_code">源代码</string>
     <string name="cant_mark_read">无法将文章标记为已读</string>
-    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="cant_mark_unread">无法将文章标记为未读</string>
     <string name="drawer_error_loading_tags">加载标记时出错..。</string>
     <string name="drawer_error_loading_sources">加载源时出错..。</string>
     <string name="drawer_item_filters">搜索条件</string>
@@ -102,25 +101,15 @@
     <string name="default_theme">默认​​​​​</string>
     <string name="default_dark_theme">默认值/暗</string>
     <string name="pref_header_debug">调试</string>
-    <string name="login_debug_title">激活以记录登录错误</string>
-    <string name="login_debug_on">登录页上的任何错误都将被记录</string>
-    <string name="login_debug_off">登录页上没有记录</string>
-    <string name="login_menu_debug">调试</string>
     <string name="self_hosted_cert_switch">使用自托管证书？</string>
     <string name="self_signed_cert_warning">出于安全考虑, 默认情况下不支持自签名证书。如果激活此项, 您遇到的任何安全问题我将概不负责。</string>
     <string name="pref_selfoss_category">塞尔福斯 Api</string>
     <string name="pref_api_items_number_title">已加载项目编号</string>
-    <string name="pref_hidden_tags">隐藏段落</string>
+    <string name="pref_hidden_tags">隐藏标签</string>
-    <string name="read_debug_title">已读文章显示为未读？</string>
-    <string name="read_debug_off">将项目标记为已读时没有记录</string>
-    <string name="read_debug_on">将项目标记为已读时将记录 Api 调用</string>
     <string name="summary_debug_identifier">除错标识符</string>
     <string name="unique_id_to_clipboard">复制到你的剪贴板的标识符</string>
     <string name="display_header_drawer_summary">在侧边栏中显示带有 Selfoss 链接地址的页眉。</string>
     <string name="display_header_drawer_title">帐户页眉</string>
-    <string name="login_everything_title">记录每个 api 调用</string>
-    <string name="login_everything_on">为了程序除错，这将记录每个 api 调用</string>
-    <string name="login_everything_off">将不记录任何 api 调用</string>
     <string name="pref_general_infinite_loading_title">翻页时载入更多文章</string>
     <string name="translation">翻译</string>
     <string name="cant_open_invalid_url">项目链接地址无效。我正在设法解决这个问题，以避免应用程序崩溃。</string>
@@ -132,47 +121,45 @@
     <string name="pref_switch_actions_pager_scroll_on">切换文章时将文章标记为已读。</string>
     <string name="add_to_favs_reader">添加到收藏</string>
     <string name="remove_to_favs_reader">从收藏中移除</string>
-    <string name="pref_content_reader_font_size">Article reader content font size</string>
+    <string name="pref_content_reader_font_size">文章阅读器内容字体大小</string>
-    <string name="pref_header_viewer">Article viewer</string>
+    <string name="pref_header_viewer">文章查看器</string>
-    <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
+    <string name="refresh_dialog_message">这将刷新您的 Selfoss 实例。</string>
-    <string name="markall_dialog_message">這會使全部項目標示為已讀</string>
+    <string name="markall_dialog_message">这将标记所有项目为已读。</string>
-    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="pref_switch_actions_pager_scroll">滑动时标为已读</string>
-    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="pref_switch_actions_pager_scroll_off">滑动时不标记文章为已读</string>
-    <string name="gdpr_dialog_message">The app does not collect any personal data. Every analytics tools were removed. Crash reports sending is now optional, as is the debug logging. Keep in mind that debugging and crash reports are essential for the app development (You can configure everything in Settings &gt; Debug).</string>
+    <string name="pref_acra_alwaysaccept">自动发送崩溃报告</string>
-    <string name="gdpr_dialog_title">這應用程式不會分享你的任何個人資訊</string>
+    <string name="pref_acra_alwaysaccept_enabled">允许自动发送故障报告</string>
-    <string name="crash_dialog_text">Something went wrong. Please send the report to the developer.</string>
+    <string name="pref_acra_alwaysaccept_disabled">每次发送崩溃报告时都会询问。</string>
-    <string name="crash_dialog_comment">You can add any helpful details in the comment bellow. Don\'t include any personal data in your comment. You could send me and email with your debug id, and I\'ll keep you posted when the issue is resolved.</string>
+    <string name="pref_debug_crash_reports">崩溃报告</string>
-    <string name="pref_acra_alwaysaccept">自动发送錯誤报告</string>
+    <string name="pref_debug_debug_logs">调试日志(这些日志将在没有对话框的情况下发送)</string>
-    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="acra_login">启用日志记录</string>
-    <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
+    <string name="drawer_item_hidden_tags">隐藏标签</string>
-    <string name="pref_debug_crash_reports">错误报告</string>
+    <string name="unmark">标记条目为未读</string>
-    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
+    <string name="pref_header_offline">离线和缓存</string>
-    <string name="acra_login">Enable logging</string>
+    <string name="pref_switch_items_caching_off">文章不会被保存到设备内存，应用程序在离线时将无法阅读它们</string>
-    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="pref_switch_items_caching_on">文章将被保存到设备内存并可在离线时使用</string>
-    <string name="unmark">Mark item as unread</string>
+    <string name="pref_switch_items_caching">保存项目以便离线使用</string>
-    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_update_sources">检查新来源和标签</string>
-    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_update_sources_summary">如果你的服务器接收过多的数据库查询，请禁用此功能。</string>
-    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="no_network_connectivity">未连接！</string>
-    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_periodic_refresh">同步文章</string>
-    <string name="no_network_connectivity">未连接</string>
+    <string name="pref_switch_periodic_refresh_off">文章将不会在后台同步</string>
-    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh_on">将定期同步文章</string>
-    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[同步间隔 (>= 15分钟)]]></string>
-    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_switch_refresh_when_charging">仅在手机充电时刷新</string>
-    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
-    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
     <string name="loading_notification_title">加载中...</string>
-    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="loading_notification_text">Selfoss 正在同步您的文章</string>
     <string name="notification_channel_sync">同步通知</string>
-    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_channel_sync">新条目通知</string>
-    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_title">新条目 ！</string>
-    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="new_items_notification_text">已加载%1$d新条目</string>
-    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="pref_switch_notify_new_items">通知已同步的新条目</string>
-    <string name="shortcut_offline">Offline</string>
+    <string name="shortcut_offline">离线</string>
-    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_api_timeout">Api 超时</string>
-    <string name="pref_header_experimental">Experimental</string>
+    <string name="pref_header_experimental">实验性功能</string>
-    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_message">Webview不可用。禁用文章查看器以避免将来发生崩溃。从现在起将在浏览器内加载文章。</string>
-    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="webview_dialog_issue_title">Webview问题</string>
-    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_left">左对齐</string>
-    <string name="reader_text_align_justify">Justify</string>
+    <string name="reader_text_align_justify">左右对齐</string>
-    <string name="settings_reader_font">Reader font</string>
+    <string name="settings_reader_font">阅读器字体</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">"Selfoss 阅读器"</string>
     <string name="title_activity_login">"登录"</string>
     <string name="prompt_password">"密码"</string>
-    <string name="prompt_http_password">"HTTP 密码"</string>
+    <string name="prompt_http_password">"HTTP 密碼"</string>
     <string name="action_sign_in">"转至"</string>
     <string name="error_invalid_password">"密码不够长"</string>
-    <string name="error_field_required">"必填字段"</string>
+    <string name="error_field_required">"欄位必填"</string>
     <string name="prompt_url">"网址"</string>
-    <string name="withLoginSwitch">"需要登录？"</string>
+    <string name="withLoginSwitch">"需要登入？"</string>
     <string name="withHttpLoginSwitch">"请先登录网站"</string>
     <string name="login_url_problem">"哎呀。您可能需要在网址的末尾添加一个 \"/\"。"</string>
-    <string name="prompt_login">"用户名"</string>
+    <string name="prompt_login">"使用者名稱"</string>
     <string name="prompt_http_login">"HTTP 用户名"</string>
     <string name="label_share">"分享"</string>
     <string name="readAll">"全部阅读"</string>
@@ -102,25 +101,15 @@
     <string name="default_theme">默认​​​​​</string>
     <string name="default_dark_theme">默认值/暗</string>
     <string name="pref_header_debug">调试</string>
-    <string name="login_debug_title">激活以记录登录错误</string>
-    <string name="login_debug_on">登录页上的任何错误都将被记录</string>
-    <string name="login_debug_off">登录页上没有记录</string>
-    <string name="login_menu_debug">调试</string>
     <string name="self_hosted_cert_switch">使用自托管证书？</string>
     <string name="self_signed_cert_warning">出于安全考虑, 默认情况下不支持自签名证书。如果激活此项, 您遇到的任何安全问题我将概不负责。</string>
     <string name="pref_selfoss_category">塞尔福斯 Api</string>
     <string name="pref_api_items_number_title">已加载项目编号</string>
     <string name="pref_hidden_tags">Hidden Tags</string>
-    <string name="read_debug_title">已读文章显示为未读？</string>
-    <string name="read_debug_off">将项目标记为已读时没有记录</string>
-    <string name="read_debug_on">将项目标记为已读时将记录 Api 调用</string>
     <string name="summary_debug_identifier">除错标识符</string>
     <string name="unique_id_to_clipboard">复制到你的剪贴板的标识符</string>
     <string name="display_header_drawer_summary">在侧边栏中显示带有 Selfoss 链接地址的页眉。</string>
     <string name="display_header_drawer_title">帐户页眉</string>
-    <string name="login_everything_title">记录每个 api 调用</string>
-    <string name="login_everything_on">为了程序除错，这将记录每个 api 调用</string>
-    <string name="login_everything_off">将不记录任何 api 调用</string>
     <string name="pref_general_infinite_loading_title">翻页时载入更多文章</string>
     <string name="translation">翻译</string>
     <string name="cant_open_invalid_url">项目链接地址无效。我正在设法解决这个问题，以避免应用程序崩溃。</string>
@@ -138,10 +127,6 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="gdpr_dialog_message">The app does not collect any personal data. Every analytics tools were removed. Crash reports sending is now optional, as is the debug logging. Keep in mind that debugging and crash reports are essential for the app development (You can configure everything in Settings &gt; Debug).</string>
-    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="crash_dialog_text">Something went wrong. Please send the report to the developer.</string>
-    <string name="crash_dialog_comment">You can add any helpful details in the comment bellow. Don\'t include any personal data in your comment. You could send me and email with your debug id, and I\'ll keep you posted when the issue is resolved.</string>
     <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
     <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
     <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
@@ -154,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>

app/src/main/res/values/colors.xml

@@ -13,11 +13,11 @@
     <color name="background_grey">#FFe4e4e4</color>
 
     <color name="dark_webview">#FF303030</color>
-    <color name="dark_webview_text">@color/md_white_1000</color>
+    <color name="dark_webview_text">#FFFFFF</color>
-    <color name="light_webview">@color/md_grey_50</color>
+    <color name="light_webview">#FFFFFF</color>
-    <color name="light_webview_text">@color/md_grey_900</color>
+    <color name="light_webview_text">#212121</color>
 
     <color name="cardBackgroundColor">#FFFFFFFF</color>
-    <color name="materialDrawerHeaderSelectionText">@color/md_grey_900</color>
+    <color name="materialDrawerHeaderSelectionText">#212121</color>
     <color name="darkBackground">#FF303030</color>
 </resources>

app/src/main/res/values/ids.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="material_drawer_item_custom_url_item" type="id" />
-</resources>

app/src/main/res/values/strings.xml

@@ -101,26 +101,16 @@
     <string name="default_theme">Default</string>
     <string name="default_dark_theme">Default/Dark</string>
     <string name="pref_header_debug">Debug</string>
-    <string name="login_debug_title">Activate to log login errors</string>
-    <string name="login_debug_on">Any error on the login page will be logged</string>
-    <string name="login_debug_off">No log on the login page</string>
-    <string name="login_menu_debug">Debug</string>
     <string name="self_hosted_cert_switch">Using a self hosted certificate ?</string>
     <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
     <string name="pref_selfoss_category">Selfoss Api</string>
     <string name="pref_api_items_number_title">Loaded items number</string>
     <string name="pref_hidden_tags">Hidden Tags</string>
-    <string name="read_debug_title">Read articles appearing as unread ?</string>
-    <string name="read_debug_off">No log when marking an item as read</string>
-    <string name="read_debug_on">Api calls will be logged when marking an article as read</string>
     <string name="summary_debug_identifier">Debug identifier</string>
     <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
     <string
         name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
     <string name="display_header_drawer_title">Account header</string>
-    <string name="login_everything_title">Logging every api calls</string>
-    <string name="login_everything_on">This will log every api call for debug purpose.</string>
-    <string name="login_everything_off">No api call will be logged</string>
     <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
     <string name="translation">Translation</string>
     <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
@@ -138,10 +128,6 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="gdpr_dialog_message">The app does not collect any personal data. Every analytics tools were removed. Crash reports sending is now optional, as is the debug logging. Keep in mind that debugging and crash reports are essential for the app development (You can configure everything in Settings > Debug).</string>
-    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="crash_dialog_text">Something went wrong. Please send the report to the developer.</string>
-    <string name="crash_dialog_comment">You can add any helpful details in the comment bellow. Don\'t include any personal data in your comment. You could send me and email with your debug id, and I\'ll keep you posted when the issue is resolved.</string>
     <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
     <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
     <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
@@ -154,6 +140,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>

app/src/main/res/xml/pref_debug.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory android:title="@string/pref_debug_crash_reports">
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="acra.alwaysaccept"
-            android:summaryOff="@string/pref_acra_alwaysaccept_disabled"
-            android:summaryOn="@string/pref_acra_alwaysaccept_enabled"
-            android:title="@string/pref_acra_alwaysaccept" />
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/pref_debug_debug_logs">
-
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="acra_should_log"
-            android:title="@string/acra_login" />
-
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="should_log_everything"
-            android:dependency="acra_should_log"
-            android:summaryOff="@string/login_everything_off"
-            android:summaryOn="@string/login_everything_on"
-            android:title="@string/login_everything_title" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="login_debug"
-            android:dependency="acra_should_log"
-            android:summaryOff="@string/login_debug_off"
-            android:summaryOn="@string/login_debug_on"
-            android:title="@string/login_debug_title" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="read_debug"
-            android:dependency="acra_should_log"
-            android:summaryOff="@string/read_debug_off"
-            android:summaryOn="@string/read_debug_on"
-            android:title="@string/read_debug_title" />
-    </PreferenceCategory>
-
-
-    <Preference
-        android:enabled="true"
-        android:key="debug_identifier"
-        android:summary="@string/summary_debug_identifier" />
-</PreferenceScreen>

app/src/main/res/xml/pref_headers.xml

@@ -27,15 +27,6 @@
             android:value="ic_signal_wifi_off_white_24dp"/>
     </header>
 
-    <header
-        android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$DebugPreferenceFragment"
-        android:icon="@drawable/ic_bug_report_black_24dp"
-        android:title="@string/pref_header_debug">
-        <extra
-            android:name="iconDark"
-            android:value="ic_bug_report_white_24dp"/>
-    </header>
-
     <header
         android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$ThemePreferenceFragment"
         android:icon="@drawable/ic_color_lens_black_24dp"

app/src/main/res/xml/pref_offline.xml

@@ -34,4 +34,10 @@
         android:key="notify_new_items"
         android:dependency="periodic_refresh"
         android:title="@string/pref_switch_notify_new_items" />
+
+    <SwitchPreference
+        android:defaultValue="true"
+        android:key="update_sources"
+        android:summary="@string/pref_switch_update_sources_summary"
+        android:title="@string/pref_switch_update_sources" />
 </PreferenceScreen>

build.gradle

@@ -2,11 +2,12 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.3.0'
+        kotlin_version = '1.4.21'
         android_version = '1.0.0'
-        lifecycle_version = '2.0.0'
+        androidx_version = '1.1.0-alpha05'
-        room_version = '2.1.0-alpha01'
+        lifecycle_version = '2.2.0-alpha01'
-        work_version = "1.0.0-alpha10"
+        room_version = '2.1.0-beta01'
+        work_version = '1.0.1'
     }
     repositories {
         google()
@@ -16,7 +17,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

check-for-issues.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+./gradlew clean --info
+./gradlew assembleAndroidTest --info
+./gradlew assembleDebug --info
+./gradlew assemble --info

docs/index.html

@@ -55,27 +55,10 @@ redirect_from: "/ReaderforSelfoss/"
 
 
         <script async defer src="https://buttons.github.io/buttons.js"></script>
-        <script>
+      
-          (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-          (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-          m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-          })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-          ga('create', 'UA-102547516-1', 'auto');
-          ga('send', 'pageview');
-
-        </script>
-        <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-            new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-            j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-            'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-            })(window,document,'script','dataLayer','GTM-5R5LR4V');</script>
-
     </head>
 
     <body id="main">
-        <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-5R5LR4V"
-        height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 
         <div id="container" itemscope itemtype="http://schema.org/SoftwareApplication">
             <div id="titles"><h1 itemprop="name">Reader For Selfoss</h1><h2>A new <span itemprop="operatingSystem">Android</span> Selfoss RSS reader</h2></div>
@@ -83,7 +66,6 @@ redirect_from: "/ReaderforSelfoss/"
                 <img src="images/icon.png" id="logo" itemprop="image">
             </div>
             <div id="links">
-                <a itemprop="downloadUrl" id="store" href='https://play.google.com/store/apps/details?id=apps.amine.bou.readerforselfoss&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a>
 
 
                 <a class="github-button" href="https://github.com/aminecmi/readerforselfoss" data-size="large" aria-label="Star aminecmi/readerforselfoss on GitHub">Star</a>

fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1,13 @@
+A new RSS reader for <a href="http://selfoss.aditu.de/">selfoss</a>.
+
+What it does:
+
+<ul>
+  <li>Fetches read, unread, and favorite feeds.</li>
+  <li>Marking as read, marking as favorite.</li>
+  <li>Manage selfoss sources from the app.</li>
+  <li>Add an RSS feed from within the app, or by sharing a link from your browser.</li>
+  <li>Choose between multiple light and dark themes.</li>
+</ul>
+
+PS: It only works with Selfoss

fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1,3 @@
+A new RSS reader for <a href="http://selfoss.aditu.de/">selfoss</a>.
+
+It connects to your selfoss instance (works only with selfoss, and can't work without it), and you'll be able to read and manage all your RSS feeds.

fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+Reader for Selfoss

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jan 14 20:50:06 CET 2019
+#Sat Dec 12 19:38:31 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip