Changelog. Previous commit should close #238 .

Added experimental settings with a custom timeout setting.
New Crowdin translations (#241 )
2018-11-11 12:25:45 +01:00 · 2018-11-11 12:23:59 +01:00 · 2018-11-08 08:59:37 +01:00 · 2018-11-07 21:25:14 +01:00 · 2018-11-07 21:22:19 +01:00 · 2018-11-07 21:22:06 +01:00
69 changed files with 991 additions and 173 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,15 @@
 **1.7.x**

+- Added experimental issue to set a default timeout. Should work for #238.
+
+- Closing #220.
+
+- Start of #238. "Add a quick shortcut to open the app on offline mode ?"
+
+- Closes #216. Issue with selfoss version 2.19.
+
+- Closes #179. Sync of read/unread/star/unstar items on background task or on app reload with network available.
+
 - Closes #33. Background sync with settings.

 - Closing #1. Initial article caching.
--- a/app/build.gradle
+++ b/app/build.gradle
@ -75,7 +75,6 @@ android {
            buildConfigField "String", "LOGIN_URL", appLoginUrl
            buildConfigField "String", "LOGIN_USERNAME", appLoginUsername
            buildConfigField "String", "LOGIN_PASSWORD", appLoginPassword
-            applicationIdSuffix ".dev"
        }
    }
    flavorDimensions "build"
@ -152,8 +151,8 @@ dependencies {
    implementation 'androidx.core:core-ktx:1.0.0'

    // Crash
-    implementation 'ch.acra:acra-http:5.1.3'
-    implementation 'ch.acra:acra-dialog:5.1.3'
+    implementation 'ch.acra:acra-http:5.2.1'
+    implementation 'ch.acra:acra-dialog:5.2.1'

    implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
--- a/app/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/3.json
+++ b/app/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/3.json
@ -0,0 +1,226 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "7ad9c4961992c13b670128485ebb3efc",
+    "entities": [
+      {
+        "tableName": "tags",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
+        "fields": [
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "tag"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "sources",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "spout",
+            "columnName": "spout",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "error",
+            "columnName": "error",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "items",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT NOT NULL, `icon` TEXT NOT NULL, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datetime",
+            "columnName": "datetime",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "starred",
+            "columnName": "starred",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thumbnail",
+            "columnName": "thumbnail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "link",
+            "columnName": "link",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourcetitle",
+            "columnName": "sourcetitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "actions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "articleId",
+            "columnName": "articleid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "read",
+            "columnName": "read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "starred",
+            "columnName": "starred",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unstarred",
+            "columnName": "unstarred",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"7ad9c4961992c13b670128485ebb3efc\")"
+    ]
+  }
+}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -21,6 +21,9 @@

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
+
+            <meta-data android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
        </activity>
        <activity
            android:name=".LoginActivity"
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt
@ -89,6 +89,7 @@ class AddSourceActivity : AppCompatActivity() {
                this,
                this@AddSourceActivity,
                prefs.getBoolean("isSelfSignedCert", false),
+                prefs.getString("api_timeout", "-1").toLong(),
                prefs.getBoolean("should_log_everything", false)
            )
        } catch (e: IllegalArgumentException) {
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
@ -42,7 +42,9 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.api.selfoss.Tag
 import apps.amine.bou.readerforselfoss.background.LoadingWorker
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 import apps.amine.bou.readerforselfoss.settings.SettingsActivity
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
@ -143,6 +145,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    private var badgeAll: Int = -1
    private var badgeFavs: Int = -1

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

    private lateinit var db: AppDatabase
@ -159,6 +164,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {

        super.onCreate(savedInstanceState)

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

        handleThemeBinding()
@ -171,7 +183,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
        db = Room.databaseBuilder(
            applicationContext,
            AppDatabase::class.java, "selfoss-database"
-        ).addMigrations(MIGRATION_1_2).build()
+        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()


        customTabActivityHelper = CustomTabActivityHelper()
@ -183,6 +195,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            this,
            this@HomeActivity,
            settings.getBoolean("isSelfSignedCert", false),
+            sharedPref.getString("api_timeout", "-1").toLong(),
            shouldLogEverything
        )
        items = ArrayList()
@ -201,6 +214,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            R.color.refresh_progress_3
        )
        swipeRefreshLayout.setOnRefreshListener {
+            offlineShortcut = false
            allItems = ArrayList()
            lastFetchDone = false
            handleDrawerItems()
@ -216,7 +230,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                    recyclerView: RecyclerView,
                    viewHolder: RecyclerView.ViewHolder
                ): Int =
-                    if (elementsShown != UNREAD_SHOWN || !this@HomeActivity.isNetworkAccessible(null)) {
+                    if (elementsShown != UNREAD_SHOWN) {
                        0
                    } else {
                        super.getSwipeDirs(
@ -246,7 +260,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        badgeNew--
                        reloadBadgeContent()

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

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

    override fun onResume() {
@ -349,6 +367,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
        handleGDPRDialog(sharedPref.getBoolean("GDPR_shown", false))

        handleRecurringTask()
+
+        handleOfflineActions()
    }

    private fun getAndStoreAllItems() {
@ -363,7 +383,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                thread {
                    if (response.body() != null) {
                        val apiItems = (response.body() as ArrayList<Item>).filter {
-                            maybeTagFilter != null || filter(it.tags)
+                            maybeTagFilter != null || filter(it.tags.tags)
                        } as ArrayList<Item>
                        db.itemsDao().deleteAllItems()
                        db.itemsDao()
@ -624,14 +644,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                            false
                        }
                )
-                drawer.addItem(DividerDrawerItem())
-                drawer.addItem(
-                    SecondaryDrawerItem()
-                        .withName(getString(R.string.drawer_item_tags))
-                        .withIdentifier(DRAWER_ID_TAGS)
-                        .withSelectable(false)
-                )
-                handleTags(maybeDrawerData.tags)
                if (hiddenTags.isNotEmpty()) {
                    drawer.addItem(DividerDrawerItem())
                    drawer.addItem(
@ -643,6 +655,14 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                    handleHiddenTags(maybeDrawerData.tags)
                }
                drawer.addItem(DividerDrawerItem())
+                drawer.addItem(
+                    SecondaryDrawerItem()
+                        .withName(getString(R.string.drawer_item_tags))
+                        .withIdentifier(DRAWER_ID_TAGS)
+                        .withSelectable(false)
+                )
+                handleTags(maybeDrawerData.tags)
+                drawer.addItem(DividerDrawerItem())
                drawer.addItem(
                    SecondaryDrawerItem()
                        .withName(getString(R.string.drawer_item_sources))
@ -717,7 +737,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            var sources: List<Source>?

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

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

-            if (this@HomeActivity.isNetworkAccessible(null)) {
+            if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
                api.tags.enqueue(object : Callback<List<Tag>> {
                    override fun onResponse(
                        call: Call<List<Tag>>,
@ -867,7 +891,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                    else -> Unit
                                }
                            } else {
-                                if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout))) {
+                                if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)) {
                                    when (position) {
                                        0 -> getUnRead()
                                        1 -> getRead()
@ -964,7 +988,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        handleListResult()
                        doGetAccordingToTab()
                    } else {
-                        if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout))) {
+                        if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)) {
                            doGetAccordingToTab()
                            getAndStoreAllItems()
                        }
@ -995,7 +1019,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                    getAndStoreAllItems()
                    items = response.body() as ArrayList<Item>
                    items = items.filter {
-                        maybeTagFilter != null || filter(it.tags)
+                        maybeTagFilter != null || filter(it.tags.tags)
                    } as ArrayList<Item>

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

-        if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout))) {
+        if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)) {
            call(maybeTagFilter?.tag, maybeSourceFilter?.id?.toLong(), maybeSearchFilter)
                .enqueue(object : Callback<List<Item>> {
                    override fun onResponse(
@ -1153,7 +1177,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    }

    private fun reloadBadges() {
-        if (this@HomeActivity.isNetworkAccessible(null) && (displayUnreadCount || displayAllCount)) {
+        if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut) && (displayUnreadCount || displayAllCount)) {
            api.stats.enqueue(object : Callback<Stats> {
                override fun onResponse(call: Call<Stats>, response: Response<Stats>) {
                    if (response.body() != null) {
@ -1259,7 +1283,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when (item.itemId) {
            R.id.refresh -> {
-                if (this@HomeActivity.isNetworkAccessible(null)) {
+                if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
                    needsConfirmation(R.string.menu_home_refresh, R.string.refresh_dialog_message) {
                        api.update().enqueue(object : Callback<String> {
                            override fun onResponse(
@ -1289,13 +1313,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                }
            }
            R.id.readAll -> {
-                if (elementsShown == UNREAD_SHOWN && this@HomeActivity.isNetworkAccessible(null)) {
+                if (elementsShown == UNREAD_SHOWN) {
                    needsConfirmation(R.string.readAll, R.string.markall_dialog_message) {
                        swipeRefreshLayout.isRefreshing = false
                        val ids = allItems.map { it.id }
                        val itemsByTag: Map<Long, Int> =
                            allItems.flattenTags()
-                                .groupBy { it.tags.longHash() }
+                                .groupBy { it.tags.tags.longHash() }
                                .map { it.key to it.value.size }
                                .toMap()

@ -1303,7 +1327,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                            ACRA.getErrorReporter().maybeHandleSilentException(e, this@HomeActivity)
                        }

-                        if (ids.isNotEmpty()) {
+                        if (ids.isNotEmpty() && this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
                            api.readAll(ids).enqueue(object : Callback<SuccessResponse> {
                                override fun onResponse(
                                    call: Call<SuccessResponse>,
@ -1428,5 +1452,39 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            WorkManager.getInstance().enqueueUniquePeriodicWork("selfoss-loading", ExistingPeriodicWorkPolicy.KEEP, backgroundWork)
        }
    }
+
+    private fun handleOfflineActions() {
+        fun <T>doAndReportOnFail(call: Call<T>, action: ActionEntity) {
+           call.enqueue(object: Callback<T> {
+               override fun onResponse(
+                   call: Call<T>,
+                   response: Response<T>
+               ) {
+                   thread {
+                       db.actionsDao().delete(action)
+                   }
+               }
+
+               override fun onFailure(call: Call<T>, t: Throwable) {
+                   ACRA.getErrorReporter().maybeHandleSilentException(t, this@HomeActivity)
+               }
+           })
+        }
+
+        if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
+            thread {
+                val actions = db.actionsDao().actions()
+
+                actions.forEach { action ->
+                    when {
+                        action.read -> doAndReportOnFail(api.markItem(action.articleId), action)
+                        action.unread -> doAndReportOnFail(api.unmarkItem(action.articleId), action)
+                        action.starred -> doAndReportOnFail(api.starrItem(action.articleId), action)
+                        action.unstarred -> doAndReportOnFail(api.unstarrItem(action.articleId), action)
+                    }
+                }
+            }
+        }
+    }
 }

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt
@ -195,6 +195,7 @@ class LoginActivity : AppCompatActivity() {
                this,
                this@LoginActivity,
                isWithSelfSignedCert,
+                -1L,
                isWithSelfSignedCert
            )

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
@ -68,11 +68,18 @@ class MyApp : MultiDexApplication() {

    private fun handleNotificationChannels() {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+
            val name = getString(R.string.notification_channel_sync)
            val importance = NotificationManager.IMPORTANCE_LOW
            val mChannel = NotificationChannel(Config.syncChannelId, name, importance)
-            val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+
+            val newItemsChannelname = getString(R.string.new_items_channel_sync)
+            val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT
+            val newItemsChannelmChannel = NotificationChannel(Config.newItemsChannelId, newItemsChannelname, newItemsChannelimportance)
+
            notificationManager.createNotificationChannel(mChannel)
+            notificationManager.createNotificationChannel(newItemsChannelmChannel)
        }
    }

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
@ -19,7 +19,9 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.fragments.ArticleFragment
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
 import apps.amine.bou.readerforselfoss.transformers.DepthPageTransformer
@ -71,7 +73,7 @@ class ReaderActivity : AppCompatActivity() {
        db = Room.databaseBuilder(
            applicationContext,
            AppDatabase::class.java, "selfoss-database"
-        ).addMigrations(MIGRATION_1_2).build()
+        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()

        val scoop = Scoop.getInstance()
        scoop.bind(this, Toppings.PRIMARY.value, toolBar)
@ -93,6 +95,7 @@ class ReaderActivity : AppCompatActivity() {
            this,
            this@ReaderActivity,
            prefs.getBoolean("isSelfSignedCert", false),
+            prefs.getString("api_timeout", "-1").toLong(),
            prefs.getBoolean("should_log_everything", false)
        )

@ -134,44 +137,50 @@ class ReaderActivity : AppCompatActivity() {
    }

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

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

@ -229,6 +238,19 @@ class ReaderActivity : AppCompatActivity() {
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        fun afterSave() {
+            allItems[pager.currentItem] =
+                    allItems[pager.currentItem].toggleStar()
+            notifyAdapter()
+            canRemoveFromFavorite()
+        }
+
+        fun afterUnsave() {
+            allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
+            notifyAdapter()
+            canFavorite()
+        }
+
        when (item.itemId) {
            android.R.id.home -> {
                onBackPressed()
@ -242,9 +264,7 @@ class ReaderActivity : AppCompatActivity() {
                                call: Call<SuccessResponse>,
                                response: Response<SuccessResponse>
                            ) {
-                                allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
-                                notifyAdapter()
-                                canRemoveFromFavorite()
+                                afterSave()
                            }

                            override fun onFailure(
@ -258,6 +278,11 @@ class ReaderActivity : AppCompatActivity() {
                                ).show()
                            }
                        })
+                } else {
+                    thread {
+                        db.actionsDao().insertAllActions(ActionEntity(allItems[pager.currentItem].id, false, false, true, false))
+                        afterSave()
+                    }
                }
            }
            R.id.unsave -> {
@ -268,9 +293,7 @@ class ReaderActivity : AppCompatActivity() {
                                call: Call<SuccessResponse>,
                                response: Response<SuccessResponse>
                            ) {
-                                allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
-                                notifyAdapter()
-                                canFavorite()
+                                afterUnsave()
                            }

                            override fun onFailure(
@ -284,6 +307,11 @@ class ReaderActivity : AppCompatActivity() {
                                ).show()
                            }
                        })
+                } else {
+                    thread {
+                        db.actionsDao().insertAllActions(ActionEntity(allItems[pager.currentItem].id, false, false, false, true))
+                        afterUnsave()
+                    }
                }
            }
        }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
@ -60,6 +60,7 @@ class SourcesActivity : AppCompatActivity() {
            this,
            this@SourcesActivity,
            prefs.getBoolean("isSelfSignedCert", false),
+            prefs.getString("api_timeout", "-1").toLong(),
            prefs.getBoolean("should_log_everything", false)
        )
        var items: ArrayList<Source> = ArrayList()
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt
@ -15,6 +15,7 @@ import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.LinkOnTouchListener
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
@ -36,6 +37,7 @@ import kotlinx.android.synthetic.main.card_item.view.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import kotlin.concurrent.thread

 class ItemCardAdapter(
    override val app: Activity,
@ -118,8 +120,8 @@ class ItemCardAdapter(

            mView.favButton.setOnLikeListener(object : OnLikeListener {
                override fun liked(likeButton: LikeButton) {
+                    val (id) = items[adapterPosition]
                    if (c.isNetworkAccessible(null)) {
-                        val (id) = items[adapterPosition]
                        api.starrItem(id).enqueue(object : Callback<SuccessResponse> {
                            override fun onResponse(
                                call: Call<SuccessResponse>,
@ -139,12 +141,16 @@ class ItemCardAdapter(
                                ).show()
                            }
                        })
+                    } else {
+                        thread {
+                            db.actionsDao().insertAllActions(ActionEntity(id, false, false, true, false))
+                        }
                    }
                }

                override fun unLiked(likeButton: LikeButton) {
+                    val (id) = items[adapterPosition]
                    if (c.isNetworkAccessible(null)) {
-                        val (id) = items[adapterPosition]
                        api.unstarrItem(id).enqueue(object : Callback<SuccessResponse> {
                            override fun onResponse(
                                call: Call<SuccessResponse>,
@ -164,6 +170,10 @@ class ItemCardAdapter(
                                ).show()
                            }
                        })
+                    } else {
+                        thread {
+                            db.actionsDao().insertAllActions(ActionEntity(id, false, false, false, true))
+                        }
                    }
                }
            })
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt
@ -11,6 +11,7 @@ import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
@ -46,14 +47,14 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                Snackbar.LENGTH_LONG
            )
            .setAction(R.string.undo_string) {
-                if (app.isNetworkAccessible(null)) {
-                    items.add(position, i)
-                    thread {
-                        db.itemsDao().insertAllItems(i.toEntity())
-                    }
-                    notifyItemInserted(position)
-                    updateItems(items)
+                items.add(position, i)
+                thread {
+                    db.itemsDao().insertAllItems(i.toEntity())
+                }
+                notifyItemInserted(position)
+                updateItems(items)

+                if (app.isNetworkAccessible(null)) {
                    api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
                        override fun onResponse(
                            call: Call<SuccessResponse>,
@ -71,6 +72,10 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                            doUnmark(i, position)
                        }
                    })
+                } else {
+                    thread {
+                        db.actionsDao().deleteReadActionForArticle(i.id)
+                    }
                }
            }

@ -81,20 +86,16 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
    }

    fun removeItemAtIndex(position: Int) {
+        val i = items[position]
+        items.remove(i)
+        notifyItemRemoved(position)
+        updateItems(items)
+
+        thread {
+            db.itemsDao().delete(i.toEntity())
+        }
+
        if (app.isNetworkAccessible(null)) {
-            val i = items[position]
-
-            items.remove(i)
-            notifyItemRemoved(position)
-            updateItems(items)
-
-            // TODO: Handle network status.
-            // IF offline, delete from cached articles, and add to some table that will replay the calls on network activation.
-
-            thread {
-                db.itemsDao().delete(i.toEntity())
-            }
-
            api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
                override fun onResponse(
                    call: Call<SuccessResponse>,
@ -135,6 +136,11 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                    }
                }
            })
+        } else {
+            thread {
+                db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
+                doUnmark(i, position)
+            }
        }
    }

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossApi.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossApi.kt
@ -18,11 +18,13 @@ import retrofit2.Call
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.TimeUnit

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

@ -38,16 +40,25 @@ class SelfossApi(
            this
        }

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

-    fun DispatchingAuthenticator.getHttpClien(isWithSelfSignedCert: Boolean): OkHttpClient.Builder {
+    fun DispatchingAuthenticator.getHttpClien(isWithSelfSignedCert: Boolean, timeout: Long): OkHttpClient.Builder {
        val authCache = ConcurrentHashMap<String, CachingAuthenticator>()
        return OkHttpClient
            .Builder()
+            .maybeWithSettingsTimeout(timeout)
            .maybeWithSelfSigned(isWithSelfSignedCert)
            .authenticator(CachingAuthenticatorDecorator(this, authCache))
            .addInterceptor(AuthenticationCacheInterceptor(authCache))
@ -66,6 +77,7 @@ class SelfossApi(
        val gson =
            GsonBuilder()
                .registerTypeAdapter(Boolean::class.javaPrimitiveType, BooleanTypeAdapter())
+                .registerTypeAdapter(SelfossTagType::class.java, SelfossTagTypeTypeAdapter())
                .setLenient()
                .create()

@ -77,7 +89,7 @@ class SelfossApi(
            HttpLoggingInterceptor.Level.NONE
        }

-        val httpClient = authenticator.getHttpClien(isWithSelfSignedCert)
+        val httpClient = authenticator.getHttpClien(isWithSelfSignedCert, timeout)

        httpClient.addInterceptor(logging)

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
@ -45,7 +45,7 @@ data class Spout(
 data class Source(
    @SerializedName("id") val id: String,
    @SerializedName("title") val title: String,
-    @SerializedName("tags") val tags: String,
+    @SerializedName("tags") val tags: SelfossTagType,
    @SerializedName("spout") val spout: String,
    @SerializedName("error") val error: String,
    @SerializedName("icon") val icon: String
@ -71,7 +71,7 @@ data class Item(
    @SerializedName("icon") val icon: String,
    @SerializedName("link") val link: String,
    @SerializedName("sourcetitle") val sourcetitle: String,
-    @SerializedName("tags") val tags: String
+    @SerializedName("tags") val tags: SelfossTagType
 ) : Parcelable {

    var config: Config? = null
@ -94,7 +94,7 @@ data class Item(
        icon = source.readString(),
        link = source.readString(),
        sourcetitle = source.readString(),
-        tags = source.readString()
+        tags = source.readParcelable(ClassLoader.getSystemClassLoader())
    )

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

    fun getIcon(app: Context): String {
@ -153,4 +153,27 @@ data class Item(

        return stringUrl
    }
+}
+
+data class SelfossTagType(val tags: String) : Parcelable {
+
+    companion object {
+        @JvmField val CREATOR: Parcelable.Creator<SelfossTagType> =
+            object : Parcelable.Creator<SelfossTagType> {
+                override fun createFromParcel(source: Parcel): SelfossTagType =
+                    SelfossTagType(source)
+
+                override fun newArray(size: Int): Array<SelfossTagType?> = arrayOfNulls(size)
+            }
+    }
+
+    constructor(source: Parcel) : this(
+        tags = source.readString()
+    )
+
+    override fun describeContents() = 0
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(tags)
+    }
 }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossTagTypeTypeAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossTagTypeTypeAdapter.kt
@ -0,0 +1,22 @@
+package apps.amine.bou.readerforselfoss.api.selfoss
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import java.lang.reflect.Type
+
+internal class SelfossTagTypeTypeAdapter : JsonDeserializer<SelfossTagType> {
+
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): SelfossTagType? =
+        if (json.isJsonArray) {
+            SelfossTagType(json.asJsonArray.joinToString(",") { it.toString() })
+        } else {
+            SelfossTagType(json.toString())
+        }
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/background/background.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/background/background.kt
@ -1,21 +1,29 @@
 package apps.amine.bou.readerforselfoss.background

 import android.app.NotificationManager
+import android.app.PendingIntent
 import android.content.Context
-import android.os.Handler
+import android.content.Intent
 import android.preference.PreferenceManager
 import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
 import androidx.core.app.NotificationCompat.PRIORITY_LOW
 import androidx.room.Room
 import androidx.work.Worker
 import androidx.work.WorkerParameters
+import apps.amine.bou.readerforselfoss.MainActivity
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
+import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@ -24,60 +32,121 @@ import kotlin.concurrent.schedule
 import kotlin.concurrent.thread

 class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params) {
+    lateinit var db: AppDatabase

    override fun doWork(): Result {
-        val notificationManager =
-            applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        if (context.isNetworkAccessible(null)) {

-        val notification = NotificationCompat.Builder(applicationContext, Config.syncChannelId)
-            .setContentTitle(context.getString(R.string.loading_notification_title))
-            .setContentText(context.getString(R.string.loading_notification_text))
-            .setOngoing(true)
-            .setPriority(PRIORITY_LOW)
-            .setChannelId(Config.syncChannelId)
-            .setSmallIcon(R.drawable.ic_cloud_download)
+            val notificationManager =
+                applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager

-        notificationManager.notify(1, notification.build())
+            val notification = NotificationCompat.Builder(applicationContext, Config.syncChannelId)
+                .setContentTitle(context.getString(R.string.loading_notification_title))
+                .setContentText(context.getString(R.string.loading_notification_text))
+                .setOngoing(true)
+                .setPriority(PRIORITY_LOW)
+                .setChannelId(Config.syncChannelId)
+                .setSmallIcon(R.drawable.ic_cloud_download)

-        val settings = this.context.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-        val sharedPref = PreferenceManager.getDefaultSharedPreferences(this.context)
-        val shouldLogEverything = sharedPref.getBoolean("should_log_everything", false)
+            notificationManager.notify(1, notification.build())

-        val db = Room.databaseBuilder(
-            applicationContext,
-            AppDatabase::class.java, "selfoss-database"
-        ).addMigrations(MIGRATION_1_2).build()
+            val settings =
+                this.context.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+            val sharedPref = PreferenceManager.getDefaultSharedPreferences(this.context)
+            val notifyNewItems = sharedPref.getBoolean("notify_new_items", false)

-        val api = SelfossApi(
-            this.context,
-            null,
-            settings.getBoolean("isSelfSignedCert", false),
-            shouldLogEverything
-        )
-        api.allItems().enqueue(object : Callback<List<Item>> {
-            override fun onFailure(call: Call<List<Item>>, t: Throwable) {
-                Timer("", false).schedule(4000) {
-                    notificationManager.cancel(1)
-                }
-            }
+            db = Room.databaseBuilder(
+                applicationContext,
+                AppDatabase::class.java, "selfoss-database"
+            ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()

-            override fun onResponse(
-                call: Call<List<Item>>,
-                response: Response<List<Item>>
-            ) {
-                thread {
-                    if (response.body() != null) {
-                        val apiItems = (response.body() as ArrayList<Item>)
-                        db.itemsDao().deleteAllItems()
-                        db.itemsDao()
-                            .insertAllItems(*(apiItems.map { it.toEntity() }).toTypedArray())
-                    }
+            val api = SelfossApi(
+                this.context,
+                null,
+                settings.getBoolean("isSelfSignedCert", false),
+                sharedPref.getString("api_timeout", "-1").toLong(),
+                sharedPref.getBoolean("should_log_everything", false)
+            )
+
+            api.allItems().enqueue(object : Callback<List<Item>> {
+                override fun onFailure(call: Call<List<Item>>, t: Throwable) {
                    Timer("", false).schedule(4000) {
                        notificationManager.cancel(1)
                    }
                }
+
+                override fun onResponse(
+                    call: Call<List<Item>>,
+                    response: Response<List<Item>>
+                ) {
+                    thread {
+                        if (response.body() != null) {
+                            val apiItems = (response.body() as ArrayList<Item>)
+                            db.itemsDao().deleteAllItems()
+                            db.itemsDao()
+                                .insertAllItems(*(apiItems.map { it.toEntity() }).toTypedArray())
+
+                            val newSize = apiItems.filter { it.unread }.size
+                            if (notifyNewItems && newSize > 0) {
+
+                                val intent = Intent(context, MainActivity::class.java).apply {
+                                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                                }
+                                val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
+
+                                val newItemsNotification = NotificationCompat.Builder(applicationContext, Config.newItemsChannelId)
+                                    .setContentTitle(context.getString(R.string.new_items_notification_title))
+                                    .setContentText(context.getString(R.string.new_items_notification_text, newSize))
+                                    .setPriority(PRIORITY_DEFAULT)
+                                    .setChannelId(Config.newItemsChannelId)
+                                    .setContentIntent(pendingIntent)
+                                    .setAutoCancel(true)
+                                    .setSmallIcon(R.drawable.ic_fiber_new_black_24dp)
+
+                                Timer("", false).schedule(4000) {
+                                    notificationManager.notify(2, newItemsNotification.build())
+                                }
+                            }
+                        }
+                        Timer("", false).schedule(4000) {
+                            notificationManager.cancel(1)
+                        }
+                    }
+                }
+            })
+            thread {
+                val actions = db.actionsDao().actions()
+
+                actions.forEach { action ->
+                    when {
+                        action.read -> doAndReportOnFail(api.markItem(action.articleId), action)
+                        action.unread -> doAndReportOnFail(api.unmarkItem(action.articleId), action)
+                        action.starred -> doAndReportOnFail(api.starrItem(action.articleId), action)
+                        action.unstarred -> doAndReportOnFail(
+                            api.unstarrItem(action.articleId),
+                            action
+                        )
+                    }
+                }
            }
-        })
+        }
        return Result.SUCCESS
    }
+
+    private fun <T> doAndReportOnFail(call: Call<T>, action: ActionEntity) {
+        call.enqueue(object : Callback<T> {
+            override fun onResponse(
+                call: Call<T>,
+                response: Response<T>
+            ) {
+                thread {
+                    db.actionsDao().delete(action)
+                }
+            }
+
+            override fun onFailure(call: Call<T>, t: Throwable) {
+                ACRA.getErrorReporter().maybeHandleSilentException(t, context)
+            }
+        })
+    }
 }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt
@ -17,12 +17,17 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebSettings
+import androidx.room.Room
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi
 import apps.amine.bou.readerforselfoss.api.mercury.ParsedContent
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
+import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
@ -45,6 +50,7 @@ import retrofit2.Callback
 import retrofit2.Response
 import java.net.MalformedURLException
 import java.net.URL
+import kotlin.concurrent.thread

 class ArticleFragment : Fragment() {
    private lateinit var pageNumber: Number
@ -59,6 +65,7 @@ class ArticleFragment : Fragment() {
    private lateinit var editor: SharedPreferences.Editor
    private lateinit var fab: FloatingActionButton
    private lateinit var appColors: AppColors
+    private lateinit var db: AppDatabase

    override fun onStop() {
        super.onStop()
@ -72,6 +79,11 @@ class ArticleFragment : Fragment() {

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

    private lateinit var rootView: ViewGroup
@ -102,6 +114,7 @@ class ArticleFragment : Fragment() {
            context!!,
            activity!!,
            settings.getBoolean("isSelfSignedCert", false),
+            prefs.getString("api_timeout", "-1").toLong(),
            prefs.getBoolean("should_log_everything", false)
        )

@ -166,6 +179,10 @@ class ArticleFragment : Fragment() {
                                    }
                                }
                            )
+                        } else {
+                            thread {
+                                db.actionsDao().insertAllActions(ActionEntity(allItems[pageNumber.toInt()].id, false, true, false, false))
+                            }
                        }
                        else -> Unit
                    }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/dao/ActionsDao.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/dao/ActionsDao.kt
@ -0,0 +1,23 @@
+package apps.amine.bou.readerforselfoss.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
+
+@Dao
+interface ActionsDao {
+    @Query("SELECT * FROM actions order by id asc")
+    fun actions(): List<ActionEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertAllActions(vararg actions: ActionEntity)
+
+    @Query("DELETE FROM actions WHERE articleid = :article_id AND read = 1")
+    fun deleteReadActionForArticle(article_id: String)
+
+    @Delete
+    fun delete(action: ActionEntity)
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/database/AppDatabase.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/database/AppDatabase.kt
@ -2,15 +2,19 @@ package apps.amine.bou.readerforselfoss.persistence.database

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

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

    abstract fun itemsDao(): ItemsDao
+
+    abstract fun actionsDao(): ActionsDao
 }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/entities/ActionEntity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/entities/ActionEntity.kt
@ -0,0 +1,22 @@
+package apps.amine.bou.readerforselfoss.persistence.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "actions")
+data class ActionEntity(
+    @ColumnInfo(name = "articleid")
+    val articleId: String,
+    @ColumnInfo(name = "read")
+    val read: Boolean,
+    @ColumnInfo(name = "unread")
+    val unread: Boolean,
+    @ColumnInfo(name = "starred")
+    var starred: Boolean,
+    @ColumnInfo(name = "unstarred")
+    var unstarred: Boolean
+) {
+    @PrimaryKey(autoGenerate = true)
+    var id: Int = 0
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/migrations/migrations.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/migrations/migrations.kt
@ -8,3 +8,9 @@ val MIGRATION_1_2: Migration = object : Migration(1, 2) {
        database.execSQL("CREATE TABLE IF NOT EXISTS `items` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT NOT NULL, `icon` TEXT NOT NULL, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))")
    }
 }
+
+val MIGRATION_2_3: Migration = object : Migration(2, 3) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE TABLE IF NOT EXISTS `actions` (`id` INTEGER NOT NULL, `articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL, PRIMARY KEY(`id`))")
+    }
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java
@ -136,6 +136,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                || GeneralPreferenceFragment.class.getName().equals(fragmentName)
                || ArticleViewerPreferenceFragment.class.getName().equals(fragmentName)
                || OfflinePreferenceFragment.class.getName().equals(fragmentName)
+                || ExperimentalPreferenceFragment.class.getName().equals(fragmentName)
                || DebugPreferenceFragment.class.getName().equals(fragmentName)
                || LinksPreferenceFragment.class.getName().equals(fragmentName)
                || ThemePreferenceFragment.class.getName().equals(fragmentName);
@ -384,6 +385,26 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
        }
    }

+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    public static class ExperimentalPreferenceFragment extends PreferenceFragment {
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            addPreferencesFromResource(R.xml.pref_experimental);
+            setHasOptionsMenu(true);
+        }
+
+        @Override
+        public boolean onOptionsItemSelected(MenuItem item) {
+            int id = item.getItemId();
+            if (id == android.R.id.home) {
+                getActivity().finish();
+                return true;
+            }
+            return super.onOptionsItemSelected(item);
+        }
+    }
+

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt
@ -38,6 +38,8 @@ class Config(c: Context) {

        const val syncChannelId = "sync-channel-id"

+        const val newItemsChannelId = "new-items-channel-id"
+
        fun logoutAndRedirect(
            c: Context,
            callingActivity: Activity,
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt
@ -3,6 +3,7 @@ package apps.amine.bou.readerforselfoss.utils
 import android.content.Context
 import android.text.format.DateUtils
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
+import apps.amine.bou.readerforselfoss.api.selfoss.SelfossTagType
 import org.acra.ACRA
 import java.text.ParseException
 import java.text.SimpleDateFormat
@ -44,8 +45,8 @@ fun Item.toggleStar(): Item {
 fun List<Item>.flattenTags(): List<Item> =
    this.flatMap {
        val item = it
-        val tags: List<String> = it.tags.split(",")
-        tags.map {
-            item.copy(tags = it.trim())
+        val tags: List<String> = it.tags.tags.split(",")
+        tags.map { t ->
+            item.copy(tags = SelfossTagType(t.trim()))
        }
    }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/network/NetworkUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/network/NetworkUtils.kt
@ -11,15 +11,16 @@ import com.google.android.material.snackbar.Snackbar

 var snackBarShown = false
 var view: View? = null
+lateinit var s: Snackbar

-fun Context.isNetworkAccessible(v: View?): Boolean {
+fun Context.isNetworkAccessible(v: View?, overrideOffline: Boolean = false): Boolean {
    val cm = this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
    val activeNetwork: NetworkInfo? = cm.activeNetworkInfo
    val networkIsAccessible = activeNetwork != null && activeNetwork.isConnectedOrConnecting

-    if (v != null && !networkIsAccessible && (!snackBarShown || v != view)) {
+    if (v != null && (!networkIsAccessible || overrideOffline) && (!snackBarShown || v != view)) {
        view = v
-        val s = Snackbar
+        s = Snackbar
            .make(
                v,
                R.string.no_network_connectivity,
@ -37,5 +38,8 @@ fun Context.isNetworkAccessible(v: View?): Boolean {
        s.show()
        snackBarShown = true
    }
-    return networkIsAccessible
+    if (snackBarShown && networkIsAccessible && !overrideOffline) {
+        s.dismiss()
+    }
+    return if(overrideOffline) overrideOffline else networkIsAccessible
 }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/persistence/EntitiesUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/persistence/EntitiesUtils.kt
@ -1,6 +1,7 @@
 package apps.amine.bou.readerforselfoss.utils.persistence

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

 fun Item.toEntity(): ItemEntity =
@ -68,5 +69,5 @@ fun Item.toEntity(): ItemEntity =
        this.icon,
        this.link,
        this.sourcetitle,
-        this.tags
+        this.tags.tags
    )
--- a/app/src/main/res/drawable-hdpi/ic_action_lab.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_lab.png
--- a/app/src/main/res/drawable-mdpi/ic_action_lab.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_lab.png
--- a/app/src/main/res/drawable-xhdpi/ic_action_lab.png
+++ b/app/src/main/res/drawable-xhdpi/ic_action_lab.png
--- a/app/src/main/res/drawable-xxhdpi/ic_action_lab.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_lab.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_action_lab.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_action_lab.png
--- a/app/src/main/res/layout/activity_sources.xml
+++ b/app/src/main/res/layout/activity_sources.xml
@ -40,6 +40,5 @@
        android:layout_alignParentEnd="true"
        android:layout_marginBottom="16dp"
        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        app:layout_behavior="apps.amine.bou.readerforselfoss.utils.ScrollAwareFABBehavior" />
+        android:layout_marginRight="16dp"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -153,12 +153,17 @@
    <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="no_network_connectivity">Sin conexión!</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="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>
+    <string name="pref_switch_periodic_refresh_on">Los artículos se sincronizarán periódicamente</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Intervalo de sincronización (>= 15 minutos)]]></string>
+    <string name="pref_switch_refresh_when_charging">Sólo refrescar cuando el teléfono está cargando</string>
+    <string name="loading_notification_title">Cargando...</string>
+    <string name="loading_notification_text">Selfoss está sincronizando tus artículos</string>
+    <string name="notification_channel_sync">Notificación de sincronización</string>
+    <string name="new_items_channel_sync">Notificación de elementos nuevos</string>
+    <string name="new_items_notification_title">¡Nuevos artículos!</string>
+    <string name="new_items_notification_text">%1$d artículos cargados.</string>
+    <string name="pref_switch_notify_new_items">Notificarme cuando se sincronicen nuevos artículos.</string>
+    <string name="shortcut_offline">Sin conexión</string>
 </resources>
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@ -161,4 +161,9 @@
    <string name="loading_notification_title">Chargement ...</string>
    <string name="loading_notification_text">Selfoss synchronise vos articles</string>
    <string name="notification_channel_sync">Notification de synchronisation</string>
+    <string name="new_items_channel_sync">Notification de nouveaux articles</string>
+    <string name="new_items_notification_title">Nouveaux articles !</string>
+    <string name="new_items_notification_text">%1$d nouveaux articles synchronisés.</string>
+    <string name="pref_switch_notify_new_items">Notification quand des nouveaux articles sont synchronisés.</string>
+    <string name="shortcut_offline">Hors ligne</string>
 </resources>
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@ -153,12 +153,17 @@
    <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="no_network_connectivity">Non conectado!</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="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>
+    <string name="pref_switch_periodic_refresh_on">Os artigos sincronizaranse periódicamente</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Intervalo de sincronización (>= 15 minutos)]]></string>
+    <string name="pref_switch_refresh_when_charging">Só refrescar cando o teléfono se está a cargar</string>
+    <string name="loading_notification_title">Cargando...</string>
+    <string name="loading_notification_text">Selfoss está sincronizando os teus ar tigos</string>
+    <string name="notification_channel_sync">Notificación de sincronización</string>
+    <string name="new_items_channel_sync">Notificación de actualizacións</string>
+    <string name="new_items_notification_title">Novo(s) elemento(s)!</string>
+    <string name="new_items_notification_text">%1$d novos elementos cargados.</string>
+    <string name="pref_switch_notify_new_items">Notificarme cando se sincronicen novos elementos.</string>
+    <string name="shortcut_offline">Sen conexión</string>
 </resources>
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -137,13 +137,13 @@
    <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="gdpr_dialog_title">這應用程式不會分享你的任何個人資訊</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">自动发送錯誤报告</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_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>
@ -152,13 +152,18 @@
    <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="no_network_connectivity">Not connected !</string>
+    <string name="no_network_connectivity">未连接</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_title">加载中...</string>
    <string name="loading_notification_text">Selfoss is syncing your articles</string>
-    <string name="notification_channel_sync">Sync notification</string>
+    <string name="notification_channel_sync">同步通知</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>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -161,4 +161,9 @@
    <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>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -161,4 +161,11 @@
    <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>
 </resources>
--- a/app/src/main/res/xml-v25/shortcuts.xml
+++ b/app/src/main/res/xml-v25/shortcuts.xml
@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:shortcutId="new"
+        android:enabled="true"
+        android:icon="@drawable/ic_fiber_new_black_24dp"
+        android:shortcutShortLabel="@string/tab_new">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="apps.amine.bou.readerforselfoss"
+            android:targetClass="apps.amine.bou.readerforselfoss.HomeActivity">
+            <extra
+                android:name="shortcutTab"
+                android:value="1" />
+        </intent>
+    </shortcut>
+    <shortcut
+        android:shortcutId="read"
+        android:enabled="true"
+        android:icon="@drawable/ic_archive_black_24dp"
+        android:shortcutShortLabel="@string/tab_read">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="apps.amine.bou.readerforselfoss"
+            android:targetClass="apps.amine.bou.readerforselfoss.HomeActivity">
+            <extra
+                android:name="shortcutTab"
+                android:value="2" />
+        </intent>
+    </shortcut>
+    <shortcut
+        android:shortcutId="favs"
+        android:enabled="true"
+        android:icon="@drawable/ic_favorite_black_24dp"
+        android:shortcutShortLabel="@string/tab_favs">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="apps.amine.bou.readerforselfoss"
+            android:targetClass="apps.amine.bou.readerforselfoss.HomeActivity">
+            <extra
+                android:name="shortcutTab"
+                android:value="3" />
+        </intent>
+    </shortcut>
+    <shortcut
+        android:shortcutId="offline"
+        android:enabled="true"
+        android:icon="@drawable/ic_signal_wifi_statusbar_not_connected"
+        android:shortcutShortLabel="@string/shortcut_offline">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="apps.amine.bou.readerforselfoss"
+            android:targetClass="apps.amine.bou.readerforselfoss.HomeActivity">
+            <extra
+                android:name="startOffline"
+                android:value="true" />
+        </intent>
+    </shortcut>
+</shortcuts>
--- a/app/src/main/res/xml/pref_experimental.xml
+++ b/app/src/main/res/xml/pref_experimental.xml
@ -0,0 +1,9 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <EditTextPreference
+        android:inputType="number"
+        android:key="api_timeout"
+        android:selectAllOnFocus="true"
+        android:singleLine="true"
+        android:title="@string/pref_api_timeout" />
+
+</PreferenceScreen>
--- a/app/src/main/res/xml/pref_headers.xml
+++ b/app/src/main/res/xml/pref_headers.xml
@ -32,4 +32,9 @@
        android:icon="@drawable/ic_info_black_24"
        android:title="@string/pref_header_links"/>

+    <header
+        android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$ExperimentalPreferenceFragment"
+        android:icon="@drawable/ic_action_lab"
+        android:title="@string/pref_header_experimental"/>
+
 </preference-headers>
--- a/app/src/main/res/xml/pref_offline.xml
+++ b/app/src/main/res/xml/pref_offline.xml
@ -23,10 +23,15 @@
        android:singleLine="true"
        android:title="@string/pref_periodic_refresh_minutes_title" />

-
    <SwitchPreference
        android:defaultValue="false"
        android:key="refresh_when_charging"
-        android:dependency="items_caching"
+        android:dependency="periodic_refresh"
        android:title="@string/pref_switch_refresh_when_charging" />
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="notify_new_items"
+        android:dependency="periodic_refresh"
+        android:title="@string/pref_switch_notify_new_items" />
 </PreferenceScreen>
--- a/build.sh
+++ b/build.sh
@ -5,7 +5,9 @@ TODAYS_VERSION="1"

 VERSION="${BASE_VERSION//./}$(date '+%y%m%j')$TODAYS_VERSION"

-./version.sh ${VERSION} $1
+PARAMS_EXCEPT_PUBLISH=$(echo $1 | sed 's/\-\-publish//')
+
+./version.sh ${VERSION} ${PARAMS_EXCEPT_PUBLISH}

 if [[ "$@" == *'--publish'* ]]
 then
Author	SHA1	Message	Date
Amine	9b45365441	Changelog. Previous commit should close #238 .	2018-11-11 12:25:45 +01:00
Amine	91a7464bce	Added experimental settings with a custom timeout setting.	2018-11-11 12:23:59 +01:00
Amine Bou	51add226eb	New Crowdin translations (#241 ) * New translations strings.xml (Spanish) * New translations strings.xml (Galician)	2018-11-08 08:59:37 +01:00
Amine Bou	332e9f5108	New Crowdin translations (#240 ) * New translations strings.xml (Catalan) * New translations strings.xml (Japanese) * New translations strings.xml (Vietnamese) * New translations strings.xml (Ukrainian) * New translations strings.xml (Turkish) * New translations strings.xml (Swedish) * New translations strings.xml (Spanish) * New translations strings.xml (Serbian (Cyrillic)) * New translations strings.xml (Russian) * New translations strings.xml (Romanian) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Portuguese) * New translations strings.xml (Polish) * New translations strings.xml (Norwegian) * New translations strings.xml (Korean) * New translations strings.xml (Italian) * New translations strings.xml (Afrikaans) * New translations strings.xml (Indonesian) * New translations strings.xml (Hungarian) * New translations strings.xml (Hebrew) * New translations strings.xml (Greek) * New translations strings.xml (German) * New translations strings.xml (French) * New translations strings.xml (Finnish) * New translations strings.xml (Dutch) * New translations strings.xml (Danish) * New translations strings.xml (Czech) * New translations strings.xml (Chinese Traditional) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Arabic) * New translations strings.xml (Galician) * New translations strings.xml (French)	2018-11-07 21:25:14 +01:00
Amine	0b91087c07	CHANGELOG.	2018-11-07 21:22:19 +01:00
Amine	ebbb1ba0f8	Closes #220 .	2018-11-07 21:22:06 +01:00
Amine	e9143ae852	Initial changes for #238 .	2018-11-07 21:07:29 +01:00
Amine	42e8ecee78	Offline shortcut.	2018-11-07 21:05:23 +01:00
Amine	4efd76fcbc	Tab selection from app shortcut.	2018-11-07 20:45:51 +01:00
Amine	fb1614070e	Inital app shortcuts.	2018-11-07 20:25:48 +01:00
Amine	c473dd7227	Fixes #239 .	2018-11-07 19:32:10 +01:00
Amine Bou	76bddb195d	New Crowdin translations (#237 ) * New translations strings.xml (Catalan) * New translations strings.xml (Japanese) * New translations strings.xml (Vietnamese) * New translations strings.xml (Ukrainian) * New translations strings.xml (Turkish) * New translations strings.xml (Swedish) * New translations strings.xml (Spanish) * New translations strings.xml (Serbian (Cyrillic)) * New translations strings.xml (Russian) * New translations strings.xml (Romanian) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Portuguese) * New translations strings.xml (Polish) * New translations strings.xml (Norwegian) * New translations strings.xml (Korean) * New translations strings.xml (Italian) * New translations strings.xml (Afrikaans) * New translations strings.xml (Indonesian) * New translations strings.xml (Hungarian) * New translations strings.xml (Hebrew) * New translations strings.xml (Greek) * New translations strings.xml (German) * New translations strings.xml (French) * New translations strings.xml (Finnish) * New translations strings.xml (Dutch) * New translations strings.xml (Danish) * New translations strings.xml (Czech) * New translations strings.xml (Chinese Traditional) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Arabic) * New translations strings.xml (Galician) * New translations strings.xml (French)	2018-11-06 20:35:30 +01:00
Amine	1e02ad2041	Closes #201 .	2018-11-06 20:29:00 +01:00
Amine	f6ab909f8b	Fixed issue.	2018-11-06 20:11:07 +01:00
Amine	7e520e9bed	Still fixing selfoss version issues.	2018-11-05 21:11:25 +01:00
Amine	32e2d05014	CHANGELOG.	2018-11-05 20:30:58 +01:00
Amine	40d9c97f73	Fixes #216 .	2018-11-05 20:30:37 +01:00
Amine Bou	1aa68d3449	New Crowdin translations (#234 ) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Galician) * New translations strings.xml (Spanish) * New translations strings.xml (Galician)	2018-11-05 13:44:22 +01:00
Amine	aeeac8cccd	Little fix.	2018-11-04 14:56:48 +01:00
Amine	7292edf997	#Closes #179 .	2018-11-04 14:37:22 +01:00
Amine	f49256c72f	Manual sync for read/unread/star/unstar.	2018-11-04 14:33:50 +01:00
Amine	d02b28b81f	Initial changes for #179 .	2018-11-04 14:25:05 +01:00