Store api version and select correct date formatter when offline.

CHANGELOG.md

@@ -42,8 +42,6 @@
 
 - Closing #322. App crashed because of svg images.
 
-- Closing #236. New sources can be added in Selfoss 2.19.
-
 **1.6.x**
 
 - Handling hidden tags.

README.md

@@ -36,12 +36,3 @@ If you are a user, you can still create new issues. I'll fix them when I can.
 - [See what I'm doing](https://github.com/aminecmi/ReaderforSelfoss/projects/1)
 - [Create an issue, or request a new feature](https://github.com/aminecmi/ReaderforSelfoss/issues)
 - [Help translation the app](https://crowdin.com/project/readerforselfoss)
-
-## Contributors (Alphabetical order) ❤️
-
-- [@aancel](https://github.com/aancel)
-- [@Binnette](https://github.com/Binnette)
-- [@davidoskky](https://github.com/davidoskky)
-- [@hectorgabucio](https://github.com/hectorgabucio)
-- [@licaon-kter](https://github.com/licaon-kter)
-- [@sergey-babkin](https://github.com/sergey-babkin)

app/build.gradle

@@ -35,7 +35,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 31
+    compileSdkVersion 30
     buildToolsVersion '30.0.3'
     buildFeatures {
         viewBinding true
@@ -43,7 +43,7 @@ android {
     defaultConfig {
         applicationId "apps.amine.bou.readerforselfoss"
         minSdkVersion 16
-        targetSdkVersion 31
+        targetSdkVersion 30
         versionCode versionCodeFromGit()
         versionName versionNameFromGit()
 
@@ -68,14 +68,11 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            shrinkResources true
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard-rules.pro'
         }
         debug {
-            buildConfigField "String", "LOGIN_URL", appLoginUrl
-            buildConfigField "String", "LOGIN_PASSWORD", appLoginPassword
-            buildConfigField "String", "LOGIN_USERNAME", appLoginUsername
         }
     }
     flavorDimensions "build"
@@ -85,9 +82,6 @@ android {
             dimension "build"
         }
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
 }
 
 dependencies {
@@ -101,14 +95,14 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     // Android Support
-    implementation "androidx.appcompat:appcompat:1.4.0-beta01"
-    implementation 'com.google.android.material:material:1.5.0-alpha04'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0-alpha01'
+    implementation "androidx.appcompat:appcompat:1.3.0-alpha02"
+    implementation 'com.google.android.material:material:1.3.0-beta01'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-beta01'
     implementation "androidx.legacy:legacy-support-v4:$android_version"
     implementation 'androidx.vectordrawable:vectordrawable:1.2.0-alpha02'
     implementation "androidx.browser:browser:1.3.0"
     implementation "androidx.cardview:cardview:$android_version"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0-alpha2'
     implementation 'org.jsoup:jsoup:1.13.1'
 
     //multidex
@@ -119,14 +113,11 @@ dependencies {
         transitive = true
     }
 
-    // Async
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
-
     // Retrofit + http logging + okhttp
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
-    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation 'com.burgstaller:okhttp-digest:2.5'
+    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+    implementation 'com.burgstaller:okhttp-digest:1.12'
 
     // Material-ish things
     implementation 'com.ashokvarma.android:bottom-navigation-bar:2.1.0'
@@ -151,13 +142,13 @@ dependencies {
     //PhotoView
     implementation 'com.github.chrisbanes:PhotoView:2.0.0'
 
-    implementation 'androidx.core:core-ktx:1.7.0-beta02'
+    implementation 'androidx.core:core-ktx:1.5.0-alpha05'
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0-rc01"
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.4.0-rc01"
+    implementation "androidx.lifecycle:lifecycle-livedata:2.3.0-rc01"
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.3.0-rc01"
 
-    implementation "androidx.room:room-ktx:2.4.0-alpha05"
-    kapt "androidx.room:room-compiler:2.4.0-alpha05"
+    implementation "androidx.room:room-runtime:2.3.0-alpha04"
+    kapt "androidx.room:room-compiler:2.3.0-alpha04"
 
     implementation "android.arch.work:work-runtime-ktx:$work_version"
 }

app/src/main/AndroidManifest.xml

@@ -15,8 +15,7 @@
         android:theme="@style/NoBar">
         <activity
             android:name=".MainActivity"
-            android:theme="@style/SplashTheme"
-            android:exported="true">
+            android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -49,8 +48,7 @@
         </activity>
         <activity
             android:name=".AddSourceActivity"
-            android:parentActivityName=".SourcesActivity"
-            android:exported="true">
+            android:parentActivityName=".SourcesActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".SourcesActivity" />

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

@@ -206,78 +206,42 @@ class AddSourceActivity : AppCompatActivity() {
 
     private fun handleSaveSource(tags: EditText, title: String, url: String, api: SelfossApi) {
 
-        val sourceDetailsUnavailable =
+        val sourceDetailsAvailable =
             title.isEmpty() || url.isEmpty() || mSpoutsValue == null || mSpoutsValue!!.isEmpty()
 
-        when {
-            sourceDetailsUnavailable -> {
-                Toast.makeText(this, R.string.form_not_complete, Toast.LENGTH_SHORT).show()
-            }
-            PreferenceManager.getDefaultSharedPreferences(this).getInt("apiVersionMajor", 0) > 1 -> {
-                val tagList = tags.text.toString().split(",").map { it.trim() }
-                api.createSourceApi2(
-                    title,
-                    url,
-                    mSpoutsValue!!,
-                    tagList,
-                    ""
-                ).enqueue(object : Callback<SuccessResponse> {
-                    override fun onResponse(
-                        call: Call<SuccessResponse>,
-                        response: Response<SuccessResponse>
-                    ) {
-                        if (response.body() != null && response.body()!!.isSuccess) {
-                            finish()
-                        } else {
-                            Toast.makeText(
-                                this@AddSourceActivity,
-                                R.string.cant_create_source,
-                                Toast.LENGTH_SHORT
-                            ).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+        if (sourceDetailsAvailable) {
+            Toast.makeText(this, R.string.form_not_complete, Toast.LENGTH_SHORT).show()
+        } else {
+            api.createSource(
+                title,
+                url,
+                mSpoutsValue!!,
+                tags.text.toString(),
+                ""
+            ).enqueue(object : Callback<SuccessResponse> {
+                override fun onResponse(
+                    call: Call<SuccessResponse>,
+                    response: Response<SuccessResponse>
+                ) {
+                    if (response.body() != null && response.body()!!.isSuccess) {
+                        finish()
+                    } else {
                         Toast.makeText(
                             this@AddSourceActivity,
                             R.string.cant_create_source,
                             Toast.LENGTH_SHORT
                         ).show()
                     }
-                })
-            }
-            else -> {
-                api.createSource(
-                    title,
-                    url,
-                    mSpoutsValue!!,
-                    tags.text.toString(),
-                    ""
-                ).enqueue(object : Callback<SuccessResponse> {
-                    override fun onResponse(
-                        call: Call<SuccessResponse>,
-                        response: Response<SuccessResponse>
-                    ) {
-                        if (response.body() != null && response.body()!!.isSuccess) {
-                            finish()
-                        } else {
-                            Toast.makeText(
-                                this@AddSourceActivity,
-                                R.string.cant_create_source,
-                                Toast.LENGTH_SHORT
-                            ).show()
-                        }
-                    }
+                }
 
-                    override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                        Toast.makeText(
-                            this@AddSourceActivity,
-                            R.string.cant_create_source,
-                            Toast.LENGTH_SHORT
-                        ).show()
-                    }
-                })
-            }
+                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                    Toast.makeText(
+                        this@AddSourceActivity,
+                        R.string.cant_create_source,
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+            })
         }
     }
 }

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

@@ -18,7 +18,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.MenuItemCompat
-import androidx.core.view.doOnNextLayout
 import androidx.recyclerview.widget.*
 import androidx.room.Room
 import androidx.work.Constraints
@@ -40,10 +39,10 @@ import apps.amine.bou.readerforselfoss.settings.SettingsActivity
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
 import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.SharedItems
 import apps.amine.bou.readerforselfoss.utils.bottombar.maybeShow
 import apps.amine.bou.readerforselfoss.utils.bottombar.removeBadge
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
+import apps.amine.bou.readerforselfoss.utils.flattenTags
 import apps.amine.bou.readerforselfoss.utils.longHash
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
@@ -58,6 +57,7 @@ import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
 import com.bumptech.glide.Glide
 import com.ftinc.scoop.Scoop
+import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
 import com.mikepenz.materialdrawer.Drawer
 import com.mikepenz.materialdrawer.holder.BadgeStyle
@@ -65,12 +65,10 @@ import com.mikepenz.materialdrawer.holder.StringHolder
 import com.mikepenz.materialdrawer.model.DividerDrawerItem
 import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
 import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import java.text.SimpleDateFormat
 import java.util.concurrent.TimeUnit
 import kotlin.concurrent.thread
 
@@ -105,9 +103,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     private var lastFetchDone: Boolean = false
     private var itemsCaching: Boolean = false
     private var updateSources: Boolean = true
-    private var markOnScroll: Boolean = false
     private var hiddenTags: List<String> = emptyList()
-    private var apiVersionMajor: Int = 0
 
     private var periodicRefresh = false
     private var refreshMinutes: Long = 360L
@@ -130,6 +126,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
     private var recyclerAdapter: RecyclerView.Adapter<*>? = null
 
+    private var badgeNew: Int = -1
+    private var badgeAll: Int = -1
+    private var badgeFavs: Int = -1
+
     private var fromTabShortcut: Boolean = false
     private var offlineShortcut: Boolean = false
 
@@ -194,8 +194,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
         handleSharedPrefs()
 
-        getApiMajorVersion()
-
         getElementsAccordingToTab()
     }
 
@@ -210,11 +208,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             allItems = ArrayList()
             lastFetchDone = false
             handleDrawerItems()
-            CoroutineScope(Dispatchers.Main).launch {
-                refreshFocusedItems(applicationContext, api, db)
-                getElementsAccordingToTab()
-                binding.swipeRefreshLayout.isRefreshing = false
-            }
+            getElementsAccordingToTab()
         }
 
         val simpleItemTouchCallback =
@@ -226,7 +220,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     recyclerView: RecyclerView,
                     viewHolder: RecyclerView.ViewHolder
                 ): Int =
-                    if (elementsShown == FAV_SHOWN) {
+                    if (elementsShown != UNREAD_SHOWN && elementsShown != READ_SHOWN) {
                         0
                     } else {
                         super.getSwipeDirs(
@@ -248,8 +242,16 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     if (i != null) {
                         val adapter = binding.recyclerView.adapter as ItemsAdapter<*>
 
+                        val wasItemUnread = adapter.unreadItemStatusAtIndex(position)
+
                         adapter.handleItemAtIndex(position)
 
+                        if (wasItemUnread) {
+                            badgeNew--
+                        } else {
+                            badgeNew++
+                        }
+
                         reloadBadgeContent()
 
                         val tagHashes = i.tags.tags.split(",").map { it.longHash() }
@@ -327,28 +329,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         }
     }
 
-    private fun getApiMajorVersion() {
-        api.apiVersion.enqueue(object : Callback<ApiVersion> {
-            override fun onFailure(call: Call<ApiVersion>, t: Throwable) {
-                if (apiVersionMajor >= 4) {
-                    Config.dateTimeFormatter = "yyyy-MM-dd'T'HH:mm:ssXXX"
-                }
-            }
-
-            override fun onResponse(call: Call<ApiVersion>, response: Response<ApiVersion>) {
-                if(response.body() != null) {
-                    val version = response.body() as ApiVersion
-                    apiVersionMajor = version.getApiMajorVersion()
-                    sharedPref.edit().putInt("apiVersionMajor", apiVersionMajor).commit()
-
-                    if (apiVersionMajor >= 4) {
-                        Config.dateTimeFormatter = "yyyy-MM-dd'T'HH:mm:ssXXX"
-                    }
-                }
-            }
-        })
-    }
-
     override fun onResume() {
         super.onResume()
 
@@ -376,19 +356,59 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         handleRecurringTask()
 
         handleOfflineActions()
-
-        getElementsAccordingToTab()
     }
 
     private fun getAndStoreAllItems() {
-         CoroutineScope(Dispatchers.Main).launch {
-             binding.swipeRefreshLayout.isRefreshing = true
-             getAndStoreAllItems(applicationContext ,api, db)
-             this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)
-             handleListResult()
-             binding.swipeRefreshLayout.isRefreshing = false
-             SharedItems.updateDatabase(db)
-         }
+        api.allNewItems().enqueue(object : Callback<List<Item>> {
+            override fun onFailure(call: Call<List<Item>>, t: Throwable) {
+            }
+
+            override fun onResponse(
+                call: Call<List<Item>>,
+                response: Response<List<Item>>
+            ) {
+                enqueueArticles(response, true)
+            }
+        })
+
+        api.allReadItems().enqueue(object : Callback<List<Item>> {
+            override fun onFailure(call: Call<List<Item>>, t: Throwable) {
+            }
+
+            override fun onResponse(
+                    call: Call<List<Item>>,
+                    response: Response<List<Item>>
+            ) {
+                enqueueArticles(response, false)
+            }
+        })
+
+        api.allStarredItems().enqueue(object : Callback<List<Item>> {
+            override fun onFailure(call: Call<List<Item>>, t: Throwable) {
+            }
+
+            override fun onResponse(
+                    call: Call<List<Item>>,
+                    response: Response<List<Item>>
+            ) {
+                enqueueArticles(response, false)
+            }
+        })
+    }
+
+    private fun enqueueArticles(response: Response<List<Item>>, clearDatabase: Boolean) {
+        thread {
+            if (response.body() != null) {
+                val apiItems = (response.body() as ArrayList<Item>).filter {
+                    maybeTagFilter != null || filter(it.tags.tags)
+                } as ArrayList<Item>
+                if (clearDatabase) {
+                    db.itemsDao().deleteAllItems()
+                }
+                db.itemsDao()
+                        .insertAllItems(*(apiItems.map { it.toEntity() }).toTypedArray())
+            }
+        }
     }
 
     override fun onStop() {
@@ -408,9 +428,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         displayAccountHeader = sharedPref.getBoolean("account_header_displaying", false)
         infiniteScroll = sharedPref.getBoolean("infinite_loading", false)
         itemsCaching = sharedPref.getBoolean("items_caching", false)
-        SharedItems.itemsCaching = itemsCaching
         updateSources = sharedPref.getBoolean("update_sources", true)
-        markOnScroll = sharedPref.getBoolean("mark_on_scroll", false)
         hiddenTags = if (sharedPref.getString("hidden_tags", "")!!.isNotEmpty()) {
             sharedPref.getString("hidden_tags", "")!!.replace("\\s".toRegex(), "").split(",")
         } else {
@@ -423,8 +441,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         if (refreshMinutes <= 15) {
             refreshMinutes = 15
         }
-
-        apiVersionMajor = sharedPref.getInt("apiVersionMajor", 0)
     }
 
     private fun handleThemeBinding() {
@@ -545,9 +561,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                 .withOnDrawerItemClickListener { _, _, _ ->
                                     allItems = ArrayList()
                                     maybeTagFilter = it
-                                    SharedItems.tagFilter = it.tag
                                     getElementsAccordingToTab()
-                                    fetchOnEmptyList()
                                     false
                                 }
                         if (it.unread > 0) {
@@ -598,9 +612,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                 .withOnDrawerItemClickListener { _, _, _ ->
                                     allItems = ArrayList()
                                     maybeTagFilter = it
-                                    SharedItems.tagFilter = it.tag
                                     getElementsAccordingToTab()
-                                    fetchOnEmptyList()
                                     false
                                 }
                         if (it.unread > 0) {
@@ -632,10 +644,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                 .withOnDrawerItemClickListener { _, _, _ ->
                                     allItems = ArrayList()
                                     maybeSourceFilter = tag
-                                    SharedItems.sourceIDFilter = tag.id.toLong()
-                                    SharedItems.sourceFilter = tag.title
                                     getElementsAccordingToTab()
-                                    fetchOnEmptyList()
                                     false
                                 }
                         if (tag.getIcon(this@HomeActivity).isNotBlank()) {
@@ -665,12 +674,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         .withOnDrawerItemClickListener { _, _, _ ->
                             allItems = ArrayList()
                             maybeSourceFilter = null
-                            SharedItems.sourceFilter = null
-                            SharedItems.sourceIDFilter = null
                             maybeTagFilter = null
-                            SharedItems.tagFilter = null
                             getElementsAccordingToTab()
-                            fetchOnEmptyList()
                             false
                         }
                 )
@@ -859,6 +864,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                 StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
                         binding.recyclerView.layoutManager = layoutManager
                     }
+                } else {
                 }
         }
     }
@@ -891,28 +897,69 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                 offset = 0
                 lastFetchDone = false
 
-                elementsShown = position + 1
-                getElementsAccordingToTab()
-                binding.recyclerView.scrollToPosition(0)
+                if (itemsCaching) {
 
-                fetchOnEmptyList()
+                    if (!binding.swipeRefreshLayout.isRefreshing) {
+                        binding.swipeRefreshLayout.post { binding.swipeRefreshLayout.isRefreshing = true }
+                    }
+
+                    thread {
+                        val dbItems = db.itemsDao().items().map { it.toView() }.sortedByDescending {
+                            SimpleDateFormat(dateTimeFormatter).parse(it.datetime)
+                        }
+                        runOnUiThread {
+                            if (dbItems.isNotEmpty()) {
+                                items = when (position) {
+                                    0 -> ArrayList(dbItems.filter { it.unread })
+                                    1 -> ArrayList(dbItems.filter { !it.unread })
+                                    2 -> ArrayList(dbItems.filter { it.starred })
+                                    else -> ArrayList(dbItems.filter { it.unread })
+                                }
+                                handleListResult()
+                                when (position) {
+                                    0 -> getUnRead()
+                                    1 -> getRead()
+                                    2 -> getStarred()
+                                    else -> Unit
+                                }
+                            } else {
+                                if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)) {
+                                    when (position) {
+                                        0 -> getUnRead()
+                                        1 -> getRead()
+                                        2 -> getStarred()
+                                        else -> Unit
+                                    }
+                                    getAndStoreAllItems()
+                                }
+                            }
+                        }
+                    }
+
+                } else {
+                    when (position) {
+                        0 -> getUnRead()
+                        1 -> getRead()
+                        2 -> getStarred()
+                        else -> Unit
+                    }
+                }
             }
         })
     }
 
-    private fun fetchOnEmptyList() {
-        binding.recyclerView.doOnNextLayout {
-            if (SharedItems.focusedItems.size - 1 == getLastVisibleItem()) {
-                getElementsAccordingToTab(true)
-            }
-        }
-    }
-
     private fun handleInfiniteScroll() {
         recyclerViewScrollListener = object : RecyclerView.OnScrollListener() {
             override fun onScrolled(localRecycler: RecyclerView, dx: Int, dy: Int) {
                 if (dy > 0) {
-                    val lastVisibleItem = getLastVisibleItem()
+                    val manager = binding.recyclerView.layoutManager
+                    val lastVisibleItem: Int = when (manager) {
+                        is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions(
+                            null
+                        ).last()
+                        is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition()
+                        else -> 0
+                    }
 
                     if (lastVisibleItem == (items.size - 1) && items.size < maxItemNumber()) {
                         getElementsAccordingToTab(appendResults = true)
@@ -925,22 +972,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         binding.recyclerView.addOnScrollListener(recyclerViewScrollListener)
     }
 
-    private fun getLastVisibleItem() : Int {
-        val manager = binding.recyclerView.layoutManager
-        return when (manager) {
-            is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions(
-                null
-            ).last()
-            is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition()
-            else -> 0
-        }
-    }
-
     private fun mayBeEmpty() =
         if (items.isEmpty()) {
             binding.emptyText.visibility = View.VISIBLE
+            binding.recyclerView.visibility = View.GONE
         } else {
             binding.emptyText.visibility = View.GONE
+            binding.recyclerView.visibility = View.VISIBLE
         }
 
     private fun getElementsAccordingToTab(
@@ -956,52 +994,153 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             }
         }
 
-        offset = if (appendResults) {
-            SharedItems.focusedItems.size - 1
+        offset = if (appendResults && offsetOverride === null) {
+            (offset + itemsNumber)
         } else {
-            0
+            offsetOverride ?: 0
         }
         firstVisible = if (appendResults) firstVisible else 0
 
-        doGetAccordingToTab()
+        if (itemsCaching) {
+
+            if (!binding.swipeRefreshLayout.isRefreshing) {
+                binding.swipeRefreshLayout.post { binding.swipeRefreshLayout.isRefreshing = true }
+            }
+
+            thread {
+                val dbItems = db.itemsDao().items().map { it.toView() }.sortedByDescending {
+                    SimpleDateFormat(dateTimeFormatter).parse(it.datetime)
+                }
+                runOnUiThread {
+                    if (dbItems.isNotEmpty()) {
+                        items = when (elementsShown) {
+                            UNREAD_SHOWN -> ArrayList(dbItems.filter { it.unread })
+                            READ_SHOWN -> ArrayList(dbItems.filter { !it.unread })
+                            FAV_SHOWN -> ArrayList(dbItems.filter { it.starred })
+                            else -> ArrayList(dbItems.filter { it.unread })
+                        }
+                        handleListResult()
+                        doGetAccordingToTab()
+                    } else {
+                        if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)) {
+                            doGetAccordingToTab()
+                            getAndStoreAllItems()
+                        }
+                    }
+                }
+            }
+
+        } else {
+            doGetAccordingToTab()
+        }
+
+    }
+
+    private fun filter(tags: String): Boolean {
+        val tagsList = tags.replace("\\s".toRegex(), "").split(",")
+        return tagsList.intersect(hiddenTags).isEmpty()
+    }
+
+    private fun doCallTo(
+        appendResults: Boolean,
+        toastMessage: Int,
+        call: (String?, Long?, String?) -> Call<List<Item>>
+    ) {
+        fun handleItemsResponse(response: Response<List<Item>>) {
+            val shouldUpdate = (response.body()?.toSet() != items.toSet())
+            if (response.body() != null) {
+                if (shouldUpdate) {
+                    getAndStoreAllItems()
+                    items = response.body() as ArrayList<Item>
+                    items = items.filter {
+                        maybeTagFilter != null || filter(it.tags.tags)
+                    } as ArrayList<Item>
+
+                    if (allItems.isEmpty()) {
+                        allItems = items
+                    } else {
+                        items.forEach {
+                            if (!allItems.contains(it)) allItems.add(it)
+                        }
+                    }
+                }
+            } else {
+                if (!appendResults) {
+                    items = ArrayList()
+                    allItems = ArrayList()
+                }
+            }
+
+            handleListResult(appendResults)
+
+            if (!appendResults) mayBeEmpty()
+            binding.swipeRefreshLayout.isRefreshing = false
+        }
+
+        if (!binding.swipeRefreshLayout.isRefreshing) {
+            binding.swipeRefreshLayout.post { binding.swipeRefreshLayout.isRefreshing = true }
+        }
+
+        if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)) {
+            call(maybeTagFilter?.tag, maybeSourceFilter?.id?.toLong(), maybeSearchFilter)
+                .enqueue(object : Callback<List<Item>> {
+                    override fun onResponse(
+                        call: Call<List<Item>>,
+                        response: Response<List<Item>>
+                    ) {
+                        handleItemsResponse(response)
+                    }
+
+                    override fun onFailure(call: Call<List<Item>>, t: Throwable) {
+                        binding.swipeRefreshLayout.isRefreshing = false
+                        Toast.makeText(
+                            this@HomeActivity,
+                            toastMessage,
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                })
+        } else {
+            binding.swipeRefreshLayout.post { binding.swipeRefreshLayout.isRefreshing = false }
+        }
     }
 
     private fun getUnRead(appendResults: Boolean = false) {
-        CoroutineScope(Dispatchers.Main).launch {
-            if (appendResults || !SharedItems.fetchedUnread) {
-                binding.swipeRefreshLayout.isRefreshing = true
-                getUnreadItems(applicationContext, api, db, offset)
-                binding.swipeRefreshLayout.isRefreshing = false
-            }
-            SharedItems.getUnRead()
-            items = SharedItems.focusedItems
-            handleListResult()
+        elementsShown = UNREAD_SHOWN
+        doCallTo(appendResults, R.string.cant_get_new_elements) { t, id, f ->
+            api.newItems(
+                t,
+                id,
+                f,
+                itemsNumber,
+                offset
+            )
         }
     }
 
     private fun getRead(appendResults: Boolean = false) {
-        CoroutineScope(Dispatchers.Main).launch {
-            if (appendResults || !SharedItems.fetchedAll) {
-                binding.swipeRefreshLayout.isRefreshing = true
-                getReadItems(applicationContext, api, db, offset)
-                binding.swipeRefreshLayout.isRefreshing = false
-            }
-            SharedItems.getAll()
-            items = SharedItems.focusedItems
-            handleListResult()
+        elementsShown = READ_SHOWN
+        doCallTo(appendResults, R.string.cant_get_read) { t, id, f ->
+            api.readItems(
+                t,
+                id,
+                f,
+                itemsNumber,
+                offset
+            )
         }
     }
 
     private fun getStarred(appendResults: Boolean = false) {
-        CoroutineScope(Dispatchers.Main).launch {
-            if (appendResults || !SharedItems.fetchedStarred) {
-                binding.swipeRefreshLayout.isRefreshing = true
-                getStarredItems(applicationContext, api, db, offset)
-                binding.swipeRefreshLayout.isRefreshing = false
-            }
-            SharedItems.getStarred()
-            items = SharedItems.focusedItems
-            handleListResult()
+        elementsShown = FAV_SHOWN
+        doCallTo(appendResults, R.string.cant_get_favs) { t, id, f ->
+            api.starredItems(
+                t,
+                id,
+                f,
+                itemsNumber,
+                offset
+            )
         }
     }
 
@@ -1061,35 +1200,59 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             }
             binding.recyclerView.adapter = recyclerAdapter
         } else {
-                (recyclerAdapter as ItemsAdapter<*>).updateAllItems()
+            if (!appendResults) {
+                (recyclerAdapter as ItemsAdapter<*>).updateAllItems(items)
+            } else {
+                (recyclerAdapter as ItemsAdapter<*>).addItemsAtEnd(items)
+            }
         }
 
         reloadBadges()
-        mayBeEmpty()
     }
 
     private fun reloadBadges() {
-        if (displayUnreadCount || displayAllCount) {
-            CoroutineScope(Dispatchers.Main).launch {
-                reloadBadges(applicationContext, api)
-                reloadBadgeContent()
-            }
+        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) {
+
+                        badgeNew = response.body()!!.unread
+                        badgeAll = response.body()!!.total
+                        badgeFavs = response.body()!!.starred
+                        reloadBadgeContent()
+                    }
+                }
+
+                override fun onFailure(call: Call<Stats>, t: Throwable) {
+                }
+            })
+        } else {
+            reloadBadgeContent(succeeded = false)
         }
     }
 
-    private fun reloadBadgeContent() {
-        if (displayUnreadCount) {
-            tabNewBadge
-                .setText(SharedItems.badgeUnread.toString())
-                .maybeShow()
-        }
-        if (displayAllCount) {
-            tabArchiveBadge
-                .setText(SharedItems.badgeAll.toString())
-                .maybeShow()
-            tabStarredBadge
-                .setText(SharedItems.badgeStarred.toString())
-                .maybeShow()
+    private fun reloadBadgeContent(succeeded: Boolean = true) {
+        if (succeeded) {
+            if (displayUnreadCount) {
+                tabNewBadge
+                    .setText(badgeNew.toString())
+                    .maybeShow()
+            }
+            if (displayAllCount) {
+                tabArchiveBadge
+                    .setText(badgeAll.toString())
+                    .maybeShow()
+                tabStarredBadge
+                    .setText(badgeFavs.toString())
+                    .maybeShow()
+            } else {
+                tabArchiveBadge.removeBadge()
+                tabStarredBadge.removeBadge()
+            }
+        } else {
+            tabNewBadge.removeBadge()
+            tabArchiveBadge.removeBadge()
+            tabStarredBadge.removeBadge()
         }
     }
 
@@ -1109,18 +1272,14 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     override fun onQueryTextChange(p0: String?): Boolean {
         if (p0.isNullOrBlank()) {
             maybeSearchFilter = null
-            SharedItems.searchFilter = null
             getElementsAccordingToTab()
-            fetchOnEmptyList()
         }
         return false
     }
 
     override fun onQueryTextSubmit(p0: String?): Boolean {
         maybeSearchFilter = p0
-        SharedItems.searchFilter = p0
         getElementsAccordingToTab()
-        fetchOnEmptyList()
         return false
     }
 
@@ -1190,33 +1349,64 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             R.id.readAll -> {
                 if (elementsShown == UNREAD_SHOWN) {
                     needsConfirmation(R.string.readAll, R.string.markall_dialog_message) {
-                        binding.swipeRefreshLayout.isRefreshing = true
+                        binding.swipeRefreshLayout.isRefreshing = false
+                        val ids = allItems.map { it.id }
+                        val itemsByTag: Map<Long, Int> =
+                            allItems.flattenTags()
+                                .groupBy { it.tags.tags.longHash() }
+                                .map { it.key to it.value.size }
+                                .toMap()
 
-                        if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
-                            CoroutineScope(Dispatchers.Main).launch {
-                                val success = readAll(applicationContext, api, db)
-                                if (success) {
-                                    Toast.makeText(
-                                        this@HomeActivity,
-                                        R.string.all_posts_read,
-                                        Toast.LENGTH_SHORT
-                                    ).show()
-                                    tabNewBadge.removeBadge()
+                        if (ids.isNotEmpty() && this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
+                            api.readAll(ids).enqueue(object : Callback<SuccessResponse> {
+                                override fun onResponse(
+                                    call: Call<SuccessResponse>,
+                                    response: Response<SuccessResponse>
+                                ) {
+                                    if (response.body() != null && response.body()!!.isSuccess) {
+                                        Toast.makeText(
+                                            this@HomeActivity,
+                                            R.string.all_posts_read,
+                                            Toast.LENGTH_SHORT
+                                        ).show()
+                                        tabNewBadge.removeBadge()
 
-                                    handleDrawerItems()
+                                        handleDrawerItems()
 
-                                    getElementsAccordingToTab()
-                                } else {
+                                        getElementsAccordingToTab()
+                                    } else {
+                                        Toast.makeText(
+                                            this@HomeActivity,
+                                            R.string.all_posts_not_read,
+                                            Toast.LENGTH_SHORT
+                                        ).show()
+
+
+                                    }
+
+                                    binding.swipeRefreshLayout.isRefreshing = false
+                                }
+
+                                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
                                     Toast.makeText(
                                         this@HomeActivity,
                                         R.string.all_posts_not_read,
                                         Toast.LENGTH_SHORT
                                     ).show()
+                                    binding.swipeRefreshLayout.isRefreshing = false
                                 }
-                                handleListResult()
-                                binding.swipeRefreshLayout.isRefreshing = false
-                            }
+                            })
+                            items = ArrayList()
+                            allItems = ArrayList()
                         }
+                        if (items.isEmpty()) {
+                            Toast.makeText(
+                                this@HomeActivity,
+                                R.string.nothing_here,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                        handleListResult()
                     }
                 }
                 return true
@@ -1230,10 +1420,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
     private fun maxItemNumber(): Int =
         when (elementsShown) {
-            UNREAD_SHOWN -> SharedItems.badgeUnread
-            READ_SHOWN -> SharedItems.badgeAll
-            FAV_SHOWN -> SharedItems.badgeStarred
-            else -> SharedItems.badgeUnread // if !elementsShown then unread are fetched.
+            UNREAD_SHOWN -> badgeNew
+            READ_SHOWN -> badgeAll
+            FAV_SHOWN -> badgeFavs
+            else -> badgeNew // if !elementsShown then unread are fetched.
         }
 
     private fun updateItems(adapterItems: ArrayList<Item>) {
@@ -1277,7 +1467,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         }
 
         if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
-            CoroutineScope(Dispatchers.Main).launch {
+            thread {
                 val actions = db.actionsDao().actions()
 
                 actions.forEach { action ->

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

@@ -3,12 +3,15 @@ package apps.amine.bou.readerforselfoss
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
+import android.content.SharedPreferences
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Build
 import android.preference.PreferenceManager
 import android.widget.ImageView
 import androidx.multidex.MultiDexApplication
+import apps.amine.bou.readerforselfoss.api.selfoss.ApiVersion
+import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
 import com.bumptech.glide.Glide
@@ -16,10 +19,20 @@ import com.bumptech.glide.request.RequestOptions
 import com.ftinc.scoop.Scoop
 import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
 import com.mikepenz.materialdrawer.util.DrawerImageLoader
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 import java.util.UUID.randomUUID
 
+var dateTimeFormatter = "yyyy-MM-dd HH:mm:ss"
+
 class MyApp : MultiDexApplication() {
     private lateinit var config: Config
+    private lateinit var api: SelfossApi
+    private lateinit var settings: SharedPreferences
+    private lateinit var sharedPref: SharedPreferences
+
+    private var apiVersionMajor: Int = 0
 
     override fun onCreate() {
         super.onCreate()
@@ -39,6 +52,19 @@ class MyApp : MultiDexApplication() {
         tryToHandleBug()
 
         handleNotificationChannels()
+
+        sharedPref = PreferenceManager.getDefaultSharedPreferences(this)
+        apiVersionMajor = sharedPref.getInt("apiVersionMajor", 0)
+        settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+
+        api = SelfossApi(
+                this,
+                null,
+                settings.getBoolean("isSelfSignedCert", false),
+                sharedPref.getString("api_timeout", "-1")!!.toLong()
+        )
+
+        getApiMajorVersion()
     }
 
     private fun handleNotificationChannels() {
@@ -103,4 +129,24 @@ class MyApp : MultiDexApplication() {
             }
         }
     }
+
+    private fun getApiMajorVersion() {
+        api.apiVersion.enqueue(object : Callback<ApiVersion> {
+            override fun onFailure(call: Call<ApiVersion>, t: Throwable) {
+                if (apiVersionMajor >= 4) {
+                    dateTimeFormatter = "yyyy-MM-dd'T'HH:mm:ssXXX"
+                }
+            }
+
+            override fun onResponse(call: Call<ApiVersion>, response: Response<ApiVersion>) {
+                val version = response.body() as ApiVersion
+                apiVersionMajor = version.getApiMajorVersion()
+                sharedPref.edit().putInt("apiVersionMajor", apiVersionMajor).commit()
+
+                if (apiVersionMajor >= 4) {
+                    dateTimeFormatter = "yyyy-MM-dd'T'HH:mm:ssXXX"
+                }
+            }
+        })
+    }
 }

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

@@ -32,7 +32,6 @@ import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
 import apps.amine.bou.readerforselfoss.transformers.DepthPageTransformer
 import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.SharedItems
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
 import apps.amine.bou.readerforselfoss.utils.succeeded
@@ -147,16 +146,42 @@ class ReaderActivity : AppCompatActivity() {
                     } else {
                         canFavorite()
                     }
-                    readItem(allItems[position])
+                    readItem(allItems[binding.pager.currentItem])
                 }
             }
         )
     }
 
-    private fun readItem(item: Item) {
+    fun readItem(item: Item) {
         if (markOnScroll) {
-                SharedItems.readItem(applicationContext, api, db, item)
+            thread {
+                db.itemsDao().delete(item.toEntity())
             }
+            if (this@ReaderActivity.isNetworkAccessible(this@ReaderActivity.findViewById(R.id.reader_activity_view))) {
+                api.markItem(item.id).enqueue(
+                    object : Callback<SuccessResponse> {
+                        override fun onResponse(
+                            call: Call<SuccessResponse>,
+                            response: Response<SuccessResponse>
+                        ) {
+                        }
+
+                        override fun onFailure(
+                            call: Call<SuccessResponse>,
+                            t: Throwable
+                        ) {
+                            thread {
+                                db.itemsDao().insertAllItems(item.toEntity())
+                            }
+                        }
+                    }
+                )
+            } else {
+                thread {
+                    db.actionsDao().insertAllActions(ActionEntity(item.id, true, false, false, false))
+                }
+            }
+        }
     }
 
     private fun notifyAdapter() {

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

@@ -2,6 +2,7 @@ package apps.amine.bou.readerforselfoss.adapters
 
 import android.app.Activity
 import android.content.Context
+import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View

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

@@ -2,12 +2,22 @@ package apps.amine.bou.readerforselfoss.adapters
 
 import android.app.Activity
 import android.content.Context
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
+import android.text.Spannable
+import android.text.style.ClickableSpan
+import android.util.TypedValue
 import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
+import android.widget.Toast
 import androidx.core.content.ContextCompat
+import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
+import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.databinding.ListItemBinding
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.themes.AppColors
@@ -17,11 +27,19 @@ import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.bitmapCenterCrop
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
+import apps.amine.bou.readerforselfoss.utils.openInBrowserAsNewTask
 import apps.amine.bou.readerforselfoss.utils.openItemUrl
+import apps.amine.bou.readerforselfoss.utils.shareLink
 import apps.amine.bou.readerforselfoss.utils.sourceAndDateText
 import apps.amine.bou.readerforselfoss.utils.toTextDrawableString
 import com.amulyakhare.textdrawable.TextDrawable
 import com.amulyakhare.textdrawable.util.ColorGenerator
+import com.like.LikeButton
+import com.like.OnLikeListener
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.util.*
 import kotlin.collections.ArrayList
 
 class ItemListAdapter(

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

@@ -2,16 +2,25 @@ package apps.amine.bou.readerforselfoss.adapters
 
 import android.app.Activity
 import android.graphics.Color
-import android.widget.TextView
+import com.google.android.material.snackbar.Snackbar
 import androidx.recyclerview.widget.RecyclerView
+import android.widget.TextView
+import android.widget.Toast
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
+import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.SharedItems
-import com.google.android.material.snackbar.Snackbar
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
+import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
+import apps.amine.bou.readerforselfoss.utils.succeeded
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import kotlin.concurrent.thread
 
 abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapter<VH>() {
     abstract var items: ArrayList<Item>
@@ -23,8 +32,8 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
     abstract val config: Config
     abstract val updateItems: (ArrayList<Item>) -> Unit
 
-    fun updateAllItems() {
-        items = SharedItems.focusedItems
+    fun updateAllItems(newItems: ArrayList<Item>) {
+        items = newItems
         notifyDataSetChanged()
         updateItems(items)
     }
@@ -37,11 +46,34 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                 Snackbar.LENGTH_LONG
             )
             .setAction(R.string.undo_string) {
-                SharedItems.unreadItem(app, api, db, i)
-                if (SharedItems.displayedItems == "unread") {
-                    addItemAtIndex(i, position)
+                items.add(position, i)
+                thread {
+                    db.itemsDao().insertAllItems(i.toEntity())
+                }
+                notifyItemInserted(position)
+                updateItems(items)
+
+                if (app.isNetworkAccessible(null)) {
+                    api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
+                        override fun onResponse(
+                            call: Call<SuccessResponse>,
+                            response: Response<SuccessResponse>
+                        ) {
+                        }
+
+                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                            items.remove(i)
+                            thread {
+                                db.itemsDao().delete(i.toEntity())
+                            }
+                            notifyItemRemoved(position)
+                            updateItems(items)
+                        }
+                    })
                 } else {
-                    notifyItemChanged(position)
+                    thread {
+                        db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
+                    }
                 }
             }
 
@@ -51,7 +83,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         s.show()
     }
 
-    private fun markSnackbar(position: Int) {
+    private fun markSnackbar(i: Item, position: Int) {
         val s = Snackbar
             .make(
                 app.findViewById(R.id.coordLayout),
@@ -59,13 +91,34 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                 Snackbar.LENGTH_LONG
             )
             .setAction(R.string.undo_string) {
-                SharedItems.readItem(app, api, db, items[position])
-                items = SharedItems.focusedItems
-                if (SharedItems.displayedItems == "unread") {
-                    notifyItemRemoved(position)
-                    updateItems(items)
+                items.add(position, i)
+                thread {
+                    db.itemsDao().delete(i.toEntity())
+                }
+                notifyItemInserted(position)
+                updateItems(items)
+
+                if (app.isNetworkAccessible(null)) {
+                    api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
+                        override fun onResponse(
+                            call: Call<SuccessResponse>,
+                            response: Response<SuccessResponse>
+                        ) {
+                        }
+
+                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                            items.remove(i)
+                            thread {
+                                db.itemsDao().insertAllItems(i.toEntity())
+                            }
+                            notifyItemRemoved(position)
+                            updateItems(items)
+                        }
+                    })
                 } else {
-                    notifyItemChanged(position)
+                    thread {
+                        db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
+                    }
                 }
             }
 
@@ -76,30 +129,99 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
     }
 
     fun handleItemAtIndex(position: Int) {
-        if (SharedItems.unreadItemStatusAtIndex(position)) {
+        if (unreadItemStatusAtIndex(position)) {
             readItemAtIndex(position)
         } else {
             unreadItemAtIndex(position)
         }
     }
 
+    fun unreadItemStatusAtIndex(position: Int): Boolean {
+        return items[position].unread
+    }
+
     private fun readItemAtIndex(position: Int) {
         val i = items[position]
-        SharedItems.readItem(app, api, db, i)
-        if (SharedItems.displayedItems == "unread") {
-            items.remove(i)
-            notifyItemRemoved(position)
-            updateItems(items)
-        } else {
-            notifyItemChanged(position)
+        items.remove(i)
+        notifyItemRemoved(position)
+        updateItems(items)
+
+        thread {
+            db.itemsDao().delete(i.toEntity())
+        }
+
+        if (app.isNetworkAccessible(null)) {
+            api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
+                override fun onResponse(
+                    call: Call<SuccessResponse>,
+                    response: Response<SuccessResponse>
+                ) {
+
+                    unmarkSnackbar(i, position)
+                }
+
+                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                    Toast.makeText(
+                        app,
+                        app.getString(R.string.cant_mark_read),
+                        Toast.LENGTH_SHORT
+                    ).show()
+                    items.add(position, i)
+                    notifyItemInserted(position)
+                    updateItems(items)
+
+                    thread {
+                        db.itemsDao().insertAllItems(i.toEntity())
+                    }
+                }
+            })
+        } else {
+            thread {
+                db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
+            }
         }
-        unmarkSnackbar(i, position)
     }
 
     private fun unreadItemAtIndex(position: Int) {
-        SharedItems.unreadItem(app, api, db, items[position])
-        notifyItemChanged(position)
-        markSnackbar(position)
+        val i = items[position]
+        items.remove(i)
+        notifyItemRemoved(position)
+        updateItems(items)
+
+        thread {
+            db.itemsDao().insertAllItems(i.toEntity())
+        }
+
+        if (app.isNetworkAccessible(null)) {
+            api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
+                override fun onResponse(
+                    call: Call<SuccessResponse>,
+                    response: Response<SuccessResponse>
+                ) {
+
+                    markSnackbar(i, position)
+                }
+
+                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                    Toast.makeText(
+                        app,
+                        app.getString(R.string.cant_mark_unread),
+                        Toast.LENGTH_SHORT
+                    ).show()
+                    items.add(i)
+                    notifyItemInserted(position)
+                    updateItems(items)
+
+                    thread {
+                        db.itemsDao().delete(i.toEntity())
+                    }
+                }
+            })
+        } else {
+            thread {
+                db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
+            }
+        }
     }
 
     fun addItemAtIndex(item: Item, position: Int) {

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

@@ -3,7 +3,6 @@ package apps.amine.bou.readerforselfoss.api.selfoss
 import android.app.Activity
 import android.content.Context
 import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.SharedItems
 import apps.amine.bou.readerforselfoss.utils.getUnsafeHttpClient
 import com.burgstaller.okhttp.AuthenticationCacheInterceptor
 import com.burgstaller.okhttp.CachingAuthenticatorDecorator
@@ -14,8 +13,6 @@ import com.burgstaller.okhttp.digest.Credentials
 import com.burgstaller.okhttp.digest.DigestAuthenticator
 import com.google.gson.GsonBuilder
 import okhttp3.*
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.ResponseBody.Companion.toResponseBody
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Call
 import retrofit2.Retrofit
@@ -70,7 +67,7 @@ class SelfossApi(
                     val request: Request = chain.request()
                     val response: Response = chain.proceed(request)
 
-                    if (response.code == 408) {
+                    if (response.code() == 408) {
                         return response
                     }
                     return response
@@ -105,7 +102,7 @@ class SelfossApi(
         httpClient
                 .addInterceptor { chain ->
                     val res = chain.proceed(chain.request())
-                    if (res.code == timeoutCode) {
+                    if (res.code() == timeoutCode) {
                         throw SocketTimeoutException("timeout")
                     }
                     res
@@ -119,7 +116,7 @@ class SelfossApi(
                         Response.Builder()
                                 .code(timeoutCode)
                                 .protocol(Protocol.HTTP_2)
-                                .body("".toResponseBody("text/plain".toMediaTypeOrNull()))
+                                .body(ResponseBody.create(MediaType.parse("text/plain"), ""))
                                 .message("")
                                 .request(request)
                                 .build()
@@ -145,50 +142,54 @@ class SelfossApi(
     fun login(): Call<SuccessResponse> =
         service.loginToSelfoss(config.userLogin, config.userPassword)
 
-    suspend fun readItems(
+    fun readItems(
+        tag: String?,
+        sourceId: Long?,
+        search: String?,
         itemsNumber: Int,
         offset: Int
-    ): retrofit2.Response<List<Item>> =
-        getItems("read", SharedItems.tagFilter, SharedItems.sourceIDFilter, SharedItems.searchFilter, itemsNumber, offset)
+    ): Call<List<Item>> =
+        getItems("read", tag, sourceId, search, itemsNumber, offset)
 
-    suspend fun newItems(
+    fun newItems(
+        tag: String?,
+        sourceId: Long?,
+        search: String?,
         itemsNumber: Int,
         offset: Int
-    ): retrofit2.Response<List<Item>> =
-        getItems("unread", SharedItems.tagFilter, SharedItems.sourceIDFilter, SharedItems.searchFilter, itemsNumber, offset)
+    ): Call<List<Item>> =
+        getItems("unread", tag, sourceId, search, itemsNumber, offset)
 
-    suspend fun starredItems(
+    fun starredItems(
+        tag: String?,
+        sourceId: Long?,
+        search: String?,
         itemsNumber: Int,
         offset: Int
-    ): retrofit2.Response<List<Item>> =
-        getItems("starred", SharedItems.tagFilter, SharedItems.sourceIDFilter, SharedItems.searchFilter, itemsNumber, offset)
+    ): Call<List<Item>> =
+        getItems("starred", tag, sourceId, search, itemsNumber, offset)
 
     fun allItems(): Call<List<Item>> =
         service.allItems(userName, password)
 
-    suspend fun allNewItems(): retrofit2.Response<List<Item>> =
+    fun allNewItems(): Call<List<Item>> =
             getItems("unread", null, null, null, 200, 0)
 
-    suspend fun allReadItems(): retrofit2.Response<List<Item>> =
+    fun allReadItems(): Call<List<Item>> =
             getItems("read", null, null, null, 200, 0)
 
-    suspend fun allStarredItems(): retrofit2.Response<List<Item>> =
-        getItems("read", null, null, null, 200, 0)
+    fun allStarredItems(): Call<List<Item>> =
+            getItems("read", null, null, null, 200, 0)
 
-    private suspend fun getItems(
+    private fun getItems(
         type: String,
         tag: String?,
         sourceId: Long?,
         search: String?,
         items: Int,
         offset: Int
-    ): retrofit2.Response<List<Item>> =
-        service.getItems(type, tag, sourceId, search, null, userName, password, items, offset)
-
-    suspend fun updateItems(
-        updatedSince: String
-    ): retrofit2.Response<List<Item>> =
-        service.getItems("read", null, null, null, updatedSince, userName, password, 200, 0)
+    ): Call<List<Item>> =
+        service.getItems(type, tag, sourceId, search, userName, password, items, offset)
 
     fun markItem(itemId: String): Call<SuccessResponse> =
         service.markAsRead(itemId, userName, password)
@@ -196,7 +197,7 @@ class SelfossApi(
     fun unmarkItem(itemId: String): Call<SuccessResponse> =
         service.unmarkAsRead(itemId, userName, password)
 
-    suspend fun readAll(ids: List<String>): SuccessResponse =
+    fun readAll(ids: List<String>): Call<SuccessResponse> =
         service.markAllAsRead(ids, userName, password)
 
     fun starrItem(itemId: String): Call<SuccessResponse> =
@@ -205,7 +206,8 @@ class SelfossApi(
     fun unstarrItem(itemId: String): Call<SuccessResponse> =
         service.unstarr(itemId, userName, password)
 
-    suspend fun stats(): retrofit2.Response<Stats> = service.stats(userName, password)
+    val stats: Call<Stats>
+        get() = service.stats(userName, password)
 
     val tags: Call<List<Tag>>
         get() = service.tags(userName, password)
@@ -233,13 +235,4 @@ class SelfossApi(
         filter: String
     ): Call<SuccessResponse> =
         service.createSource(title, url, spout, tags, filter, userName, password)
-
-    fun createSourceApi2(
-        title: String,
-        url: String,
-        spout: String,
-        tags: List<String>,
-        filter: String
-    ): Call<SuccessResponse> =
-        service.createSourceApi2(title, url, spout, tags, filter, userName, password)
 }

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

@@ -1,134 +0,0 @@
-package apps.amine.bou.readerforselfoss.api.selfoss
-
-import android.content.Context
-import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
-import apps.amine.bou.readerforselfoss.utils.SharedItems
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAvailable
-import kotlinx.coroutines.*
-import retrofit2.Response
-
-suspend fun getAndStoreAllItems(context: Context, api: SelfossApi, db: AppDatabase) = withContext(Dispatchers.IO) {
-    if (isNetworkAvailable(context)) {
-        launch {
-            try {
-                enqueueArticles(api.allNewItems(), db, true)
-            } catch (e: Throwable) {}
-        }
-        launch {
-            try {
-                enqueueArticles(api.allReadItems(), db, false)
-            } catch (e: Throwable) {}
-        }
-        launch {
-            try {
-                enqueueArticles(api.allStarredItems(), db, false)
-            } catch (e: Throwable) {}
-        }
-    } else {
-        launch { SharedItems.updateDatabase(db) }
-    }
-}
-
-suspend fun updateItems(context: Context, api: SelfossApi, db: AppDatabase) = coroutineScope {
-    if (isNetworkAvailable(context)) {
-        launch {
-            try {
-                enqueueArticles(api.updateItems(SharedItems.items[0].datetime), db, true)
-            } catch (e: Throwable) {}
-        }
-    }
-}
-
-suspend fun refreshFocusedItems(context: Context, api: SelfossApi, db: AppDatabase) = withContext(Dispatchers.IO) {
-    if (isNetworkAvailable(context)) {
-        val response = when (SharedItems.displayedItems) {
-            "read" -> api.readItems(200, 0)
-            "unread" -> api.newItems(200, 0)
-            "starred" -> api.starredItems(200, 0)
-            else -> api.readItems(200, 0)
-        }
-
-        if (response.isSuccessful) {
-            SharedItems.refreshFocusedItems(response.body() as ArrayList<Item>)
-            SharedItems.updateDatabase(db)
-        }
-    }
-}
-
-suspend fun getReadItems(context: Context, api: SelfossApi, db: AppDatabase, offset: Int) = withContext(Dispatchers.IO) {
-    if (isNetworkAvailable(context)) {
-            try {
-                enqueueArticles(api.readItems( 200, offset), db, false)
-                SharedItems.fetchedAll = true
-                SharedItems.updateDatabase(db)
-            } catch (e: Throwable) {}
-    }
-}
-
-suspend fun getUnreadItems(context: Context, api: SelfossApi, db: AppDatabase, offset: Int) = withContext(Dispatchers.IO) {
-    if (isNetworkAvailable(context)) {
-        try {
-            if (!SharedItems.fetchedUnread) {
-                SharedItems.clearDBItems(db)
-            }
-            enqueueArticles(api.newItems(200, offset), db, false)
-            SharedItems.fetchedUnread = true
-        } catch (e: Throwable) {}
-    }
-    SharedItems.updateDatabase(db)
-}
-
-suspend fun getStarredItems(context: Context, api: SelfossApi, db: AppDatabase, offset: Int) = withContext(Dispatchers.IO) {
-    if (isNetworkAvailable(context)) {
-        try {
-            enqueueArticles(api.starredItems(200, offset), db, false)
-            SharedItems.fetchedStarred = true
-            SharedItems.updateDatabase(db)
-        } catch (e: Throwable) {
-        }
-    }
-}
-
-suspend fun readAll(context: Context, api: SelfossApi, db: AppDatabase): Boolean {
-    var success = false
-    if (isNetworkAvailable(context)) {
-        try {
-            val ids = SharedItems.focusedItems.map { it.id }
-            if (ids.isNotEmpty()) {
-                val result = api.readAll(ids)
-                SharedItems.readItems(db, ids)
-                success = result.isSuccess
-            }
-        } catch (e: Throwable) {}
-    }
-    return success
-}
-
-suspend fun reloadBadges(context: Context, api: SelfossApi) = withContext(Dispatchers.IO) {
-    if (isNetworkAvailable(context)) {
-        try {
-            val response = api.stats()
-
-            if (response.isSuccessful) {
-                val badges = response.body()
-                SharedItems.badgeUnread = badges!!.unread
-                SharedItems.badgeAll = badges.total
-                SharedItems.badgeStarred = badges.starred
-            }
-        } catch (e: Throwable) {}
-    } else {
-        SharedItems.computeBadges()
-    }
-}
-
-private fun enqueueArticles(response: Response<List<Item>>, db: AppDatabase, clearDatabase: Boolean) {
-        if (response.isSuccessful) {
-            if (clearDatabase) {
-                CoroutineScope(Dispatchers.IO).launch {
-                    SharedItems.clearDBItems(db)
-                }
-            }
-            val allItems = response.body() as ArrayList<Item>
-            SharedItems.appendNewItems(allItems)
-        }
-}

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

@@ -49,8 +49,8 @@ data class Spout(
 )
 
 data class ApiVersion(
-        @SerializedName("version") val version: String?,
-        @SerializedName("apiversion") val apiversion: String?
+        @SerializedName("version") val version: String,
+        @SerializedName("apiversion") val apiversion: String
 ) {
     fun getApiMajorVersion() : Int {
         var versionNumber = 0
@@ -88,7 +88,7 @@ data class Item(
     @SerializedName("datetime") val datetime: String,
     @SerializedName("title") val title: String,
     @SerializedName("content") val content: String,
-    @SerializedName("unread") var unread: Boolean,
+    @SerializedName("unread") val unread: Boolean,
     @SerializedName("starred") var starred: Boolean,
     @SerializedName("thumbnail") val thumbnail: String?,
     @SerializedName("icon") val icon: String?,

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

@@ -1,7 +1,6 @@
 package apps.amine.bou.readerforselfoss.api.selfoss
 
 import retrofit2.Call
-import retrofit2.Response
 import retrofit2.http.DELETE
 import retrofit2.http.Field
 import retrofit2.http.FormUrlEncoded
@@ -17,17 +16,16 @@ internal interface SelfossService {
     fun loginToSelfoss(@Query("username") username: String, @Query("password") password: String): Call<SuccessResponse>
 
     @GET("items")
-    suspend fun getItems(
+    fun getItems(
         @Query("type") type: String,
         @Query("tag") tag: String?,
         @Query("source") source: Long?,
         @Query("search") search: String?,
-        @Query("updatedsince") updatedSince: String?,
         @Query("username") username: String,
         @Query("password") password: String,
         @Query("items") items: Int,
         @Query("offset") offset: Int
-    ): Response<List<Item>>
+    ): Call<List<Item>>
 
     @GET("items")
     fun allItems(
@@ -53,11 +51,11 @@ internal interface SelfossService {
 
     @FormUrlEncoded
     @POST("mark")
-    suspend fun markAllAsRead(
+    fun markAllAsRead(
         @Field("ids[]") ids: List<String>,
         @Query("username") username: String,
         @Query("password") password: String
-    ): SuccessResponse
+    ): Call<SuccessResponse>
 
     @Headers("Content-Type: application/x-www-form-urlencoded")
     @POST("starr/{id}")
@@ -76,10 +74,10 @@ internal interface SelfossService {
     ): Call<SuccessResponse>
 
     @GET("stats")
-    suspend fun stats(
+    fun stats(
         @Query("username") username: String,
         @Query("password") password: String
-    ): Response<Stats>
+    ): Call<Stats>
 
     @GET("tags")
     fun tags(
@@ -126,16 +124,4 @@ internal interface SelfossService {
         @Query("username") username: String,
         @Query("password") password: String
     ): Call<SuccessResponse>
-
-    @FormUrlEncoded
-    @POST("source")
-    fun createSourceApi2(
-        @Field("title") title: String,
-        @Field("url") url: String,
-        @Field("spout") spout: String,
-        @Field("tags[]") tags: List<String>,
-        @Field("filter") filter: String,
-        @Query("username") username: String,
-        @Query("password") password: String
-    ): Call<SuccessResponse>
 }

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

@@ -13,19 +13,16 @@ 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.api.selfoss.getAndStoreAllItems
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
 import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.SharedItems
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAvailable
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
+import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -36,99 +33,123 @@ import kotlin.concurrent.thread
 class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params) {
     lateinit var db: AppDatabase
 
-override fun doWork(): Result {
-    val settings =
-        this.context.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-    val sharedPref = PreferenceManager.getDefaultSharedPreferences(this.context)
-    val periodicRefresh = sharedPref.getBoolean("periodic_refresh", false)
-    if (periodicRefresh) {
-        val api = SelfossApi(
-            this.context,
-            null,
-            settings.getBoolean("isSelfSignedCert", false),
-            sharedPref.getString("api_timeout", "-1")!!.toLong()
-        )
+    override fun doWork(): Result {
+        if (context.isNetworkAccessible(null)) {
 
-        if (isNetworkAvailable(context)) {
+            val notificationManager =
+                applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-            CoroutineScope(Dispatchers.IO).launch {
-                val notificationManager =
-                    applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            val notification = NotificationCompat.Builder(applicationContext, Config.syncChannelId)
+                .setContentTitle(context.getString(R.string.loading_notification_title))
+                .setContentText(context.getString(R.string.loading_notification_text))
+                .setOngoing(true)
+                .setPriority(PRIORITY_LOW)
+                .setChannelId(Config.syncChannelId)
+                .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
 
-                val notification =
-                    NotificationCompat.Builder(applicationContext, Config.syncChannelId)
-                        .setContentTitle(context.getString(R.string.loading_notification_title))
-                        .setContentText(context.getString(R.string.loading_notification_text))
-                        .setOngoing(true)
-                        .setPriority(PRIORITY_LOW)
-                        .setChannelId(Config.syncChannelId)
-                        .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
+            notificationManager.notify(1, notification.build())
 
-                notificationManager.notify(1, notification.build())
+            val settings =
+                this.context.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+            val sharedPref = PreferenceManager.getDefaultSharedPreferences(this.context)
+            val notifyNewItems = sharedPref.getBoolean("notify_new_items", false)
 
-                val notifyNewItems = sharedPref.getBoolean("notify_new_items", false)
+            db = Room.databaseBuilder(
+                applicationContext,
+                AppDatabase::class.java, "selfoss-database"
+            ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
 
-                db = Room.databaseBuilder(
-                    applicationContext,
-                    AppDatabase::class.java, "selfoss-database"
-                ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3)
-                    .addMigrations(MIGRATION_3_4).build()
+            val api = SelfossApi(
+                this.context,
+                null,
+                settings.getBoolean("isSelfSignedCert", false),
+                sharedPref.getString("api_timeout", "-1")!!.toLong()
+            )
 
+            api.allNewItems().enqueue(object : Callback<List<Item>> {
+                override fun onFailure(call: Call<List<Item>>, t: Throwable) {
+                    Timer("", false).schedule(4000) {
+                        notificationManager.cancel(1)
+                    }
+                }
+
+                override fun onResponse(
+                    call: Call<List<Item>>,
+                    response: Response<List<Item>>
+                ) {
+                    storeItems(response, true, notifyNewItems, notificationManager)
+                }
+            })
+            api.allReadItems().enqueue(object : Callback<List<Item>> {
+                override fun onFailure(call: Call<List<Item>>, t: Throwable) {
+                    Timer("", false).schedule(4000) {
+                        notificationManager.cancel(1)
+                    }
+                }
+
+                override fun onResponse(
+                        call: Call<List<Item>>,
+                        response: Response<List<Item>>
+                ) {
+                    storeItems(response, false, notifyNewItems, notificationManager)
+                }
+            })
+            api.allStarredItems().enqueue(object : Callback<List<Item>> {
+                override fun onFailure(call: Call<List<Item>>, t: Throwable) {
+                    Timer("", false).schedule(4000) {
+                        notificationManager.cancel(1)
+                    }
+                }
+
+                override fun onResponse(
+                        call: Call<List<Item>>,
+                        response: Response<List<Item>>
+                ) {
+                    storeItems(response, false, notifyNewItems, notificationManager)
+                }
+            })
+
+            thread {
                 val actions = db.actionsDao().actions()
 
                 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.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
                         )
                     }
                 }
-
-                getAndStoreAllItems(context, api, db)
-                SharedItems.updateDatabase(db)
-                storeItems(notifyNewItems, notificationManager)
             }
         }
+        return Result.success()
     }
-    return Result.success()
-}
 
-    private fun storeItems(notifyNewItems: Boolean, notificationManager: NotificationManager) {
-        CoroutineScope(Dispatchers.IO).launch {
-                val apiItems = SharedItems.items
+    private fun storeItems(response: Response<List<Item>>, newItems: Boolean, notifyNewItems: Boolean, notificationManager: NotificationManager) {
+        thread {
+            if (response.body() != null) {
+                val apiItems = (response.body() as ArrayList<Item>)
 
+                if (newItems) {
+                    db.itemsDao().deleteAllItems()
+                }
+                db.itemsDao()
+                        .insertAllItems(*(apiItems.map { it.toEntity() }).toTypedArray())
 
                 val newSize = apiItems.filter { it.unread }.size
-                if (notifyNewItems && newSize > 0) {
+                if (newItems && notifyNewItems && newSize > 0) {
 
                     val intent = Intent(context, MainActivity::class.java).apply {
                         flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                     }
-                    val pendingIntent: PendingIntent =
-                        PendingIntent.getActivity(context, 0, intent, 0)
+                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
 
-                    val newItemsNotification =
-                        NotificationCompat.Builder(applicationContext, Config.newItemsChannelId)
+                    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
-                                )
-                            )
+                            .setContentText(context.getString(R.string.new_items_notification_text, newSize))
                             .setPriority(PRIORITY_DEFAULT)
                             .setChannelId(Config.newItemsChannelId)
                             .setContentIntent(pendingIntent)
@@ -140,6 +161,7 @@ override fun doWork(): Result {
                     }
                 }
                 apiItems.map { it.preloadImages(context) }
+            }
             Timer("", false).schedule(4000) {
                 notificationManager.cancel(1)
             }

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

@@ -14,7 +14,6 @@ import android.os.Bundle
 import android.preference.PreferenceManager
 import android.view.*
 import android.webkit.*
-import android.widget.Toast
 import androidx.browser.customtabs.CustomTabsIntent
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import androidx.fragment.app.Fragment
@@ -29,17 +28,25 @@ import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi
 import apps.amine.bou.readerforselfoss.api.mercury.ParsedContent
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
+import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.databinding.FragmentArticleBinding
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
 import apps.amine.bou.readerforselfoss.themes.AppColors
-import apps.amine.bou.readerforselfoss.utils.*
+import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
 import apps.amine.bou.readerforselfoss.utils.glide.getBitmapInputStream
+import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
+import apps.amine.bou.readerforselfoss.utils.openItemUrl
+import apps.amine.bou.readerforselfoss.utils.shareLink
+import apps.amine.bou.readerforselfoss.utils.sourceAndDateText
+import apps.amine.bou.readerforselfoss.utils.succeeded
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
@@ -51,6 +58,7 @@ import java.net.MalformedURLException
 import java.net.URL
 import java.util.concurrent.ExecutionException
 import kotlin.collections.ArrayList
+import kotlin.concurrent.thread
 
 class ArticleFragment : Fragment() {
     private lateinit var pageNumber: Number
@@ -173,33 +181,25 @@ class ArticleFragment : Fragment() {
                                 false,
                                 requireActivity()
                             )
-                            R.id.unread_action -> if (context != null) {
-                                if (allItems[pageNumber.toInt()].unread) {
-                                    SharedItems.readItem(
-                                        context!!,
-                                        api,
-                                        db,
-                                        allItems[pageNumber.toInt()]
-                                    )
-                                    allItems[pageNumber.toInt()].unread = false
-                                    Toast.makeText(
-                                        context,
-                                        R.string.marked_as_read,
-                                        Toast.LENGTH_LONG
-                                    ).show()
-                                } else {
-                                    SharedItems.unreadItem(
-                                        context!!,
-                                        api,
-                                        db,
-                                        allItems[pageNumber.toInt()]
-                                    )
-                                    allItems[pageNumber.toInt()].unread = true
-                                    Toast.makeText(
-                                        context,
-                                        R.string.marked_as_unread,
-                                        Toast.LENGTH_LONG
-                                    ).show()
+                            R.id.unread_action -> if ((context != null && requireContext().isNetworkAccessible(null)) || context == null) {
+                                api.unmarkItem(allItems[pageNumber.toInt()].id).enqueue(
+                                    object : Callback<SuccessResponse> {
+                                        override fun onResponse(
+                                            call: Call<SuccessResponse>,
+                                            response: Response<SuccessResponse>
+                                        ) {
+                                        }
+
+                                        override fun onFailure(
+                                            call: Call<SuccessResponse>,
+                                            t: Throwable
+                                        ) {
+                                        }
+                                    }
+                                )
+                            } else {
+                                thread {
+                                    db.actionsDao().insertAllActions(ActionEntity(allItems[pageNumber.toInt()].id, false, true, false, false))
                                 }
                             }
                             else -> Unit

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

@@ -10,7 +10,7 @@ import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 @Dao
 interface ActionsDao {
     @Query("SELECT * FROM actions order by id asc")
-    suspend fun actions(): List<ActionEntity>
+    fun actions(): List<ActionEntity>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertAllActions(vararg actions: ActionEntity)

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

@@ -13,17 +13,17 @@ import androidx.room.Update
 @Dao
 interface ItemsDao {
     @Query("SELECT * FROM items order by id desc")
-    suspend fun items(): List<ItemEntity>
+    fun items(): List<ItemEntity>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertAllItems(vararg items: ItemEntity)
+    fun insertAllItems(vararg items: ItemEntity)
 
     @Query("DELETE FROM items")
-    suspend fun deleteAllItems()
+    fun deleteAllItems()
 
     @Delete
-    suspend fun delete(item: ItemEntity)
+    fun delete(item: ItemEntity)
 
     @Update
-    suspend fun updateItem(item: ItemEntity)
+    fun updateItem(item: ItemEntity)
 }

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

@@ -40,8 +40,6 @@ class Config(c: Context) {
 
         const val newItemsChannelId = "new-items-channel-id"
 
-        var dateTimeFormatter = "yyyy-MM-dd HH:mm:ss"
-
         fun logoutAndRedirect(
             c: Context,
             callingActivity: Activity,

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

@@ -4,6 +4,7 @@ import android.content.Context
 import android.text.format.DateUtils
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossTagType
+import apps.amine.bou.readerforselfoss.dateTimeFormatter
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
@@ -22,7 +23,7 @@ fun String.toTextDrawableString(c: Context): String {
 fun Item.sourceAndDateText(): String {
     val formattedDate: String = try {
         " " + DateUtils.getRelativeTimeSpanString(
-            SimpleDateFormat(Config.dateTimeFormatter).parse(this.datetime).time,
+            SimpleDateFormat(dateTimeFormatter).parse(this.datetime).time,
             Date().time,
             DateUtils.MINUTE_IN_MILLIS,
             DateUtils.FORMAT_ABBREV_RELATIVE

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

@@ -20,7 +20,6 @@ import apps.amine.bou.readerforselfoss.ReaderActivity
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
 fun Context.buildCustomTabsIntent(): CustomTabsIntent {
 
@@ -75,7 +74,6 @@ fun Context.openItemUrlInternally(
 ) {
     if (articleViewer) {
         ReaderActivity.allItems = allItems
-        SharedItems.position = currentItem
         val intent = Intent(this, ReaderActivity::class.java)
         intent.putExtra("currentItem", currentItem)
         app.startActivity(intent)
@@ -139,13 +137,13 @@ private fun openInBrowser(linkDecoded: String, app: Activity) {
 }
 
 fun String.isUrlValid(): Boolean =
-    this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
+    HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()
 
 fun String.isBaseUrlValid(ctx: Context): Boolean {
-    val baseUrl = this.toHttpUrlOrNull()
+    val baseUrl = HttpUrl.parse(this)
     var existsAndEndsWithSlash = false
     if (baseUrl != null) {
-        val pathSegments = baseUrl.pathSegments
+        val pathSegments = baseUrl.pathSegments()
         existsAndEndsWithSlash = "" == pathSegments[pathSegments.size - 1]
     }
 

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

@@ -1,318 +0,0 @@
-package apps.amine.bou.readerforselfoss.utils
-
-import android.content.Context
-import android.widget.Toast
-import apps.amine.bou.readerforselfoss.R
-import apps.amine.bou.readerforselfoss.api.selfoss.Item
-import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
-import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
-import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
-import apps.amine.bou.readerforselfoss.utils.persistence.toView
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import java.text.SimpleDateFormat
-import kotlin.concurrent.thread
-
-/*
-* Singleton class that contains the articles fetched from Selfoss, it allows sharing the items list
-* between Activities and Fragments
-*/
-object SharedItems {
-    var items: ArrayList<Item> = arrayListOf<Item>()
-        get() {
-            return ArrayList(field)
-        }
-        set(value) {
-            field = ArrayList(value)
-        }
-    var focusedItems: ArrayList<Item> = arrayListOf<Item>()
-        get() {
-            return ArrayList(field)
-        }
-        set(value) {
-            field = ArrayList(value)
-        }
-    var position = 0
-        set(value) {
-            field = when {
-                value < 0 -> 0
-                value > items.size -> items.size
-                else -> value
-            }
-        }
-    var displayedItems: String = "unread"
-        set(value) {
-            field = when (value) {
-                "all" -> "all"
-                "unread" -> "unread"
-                "read" -> "read"
-                "starred" -> "starred"
-                else -> "all"
-            }
-        }
-
-    var searchFilter: String? = null
-    var sourceIDFilter: Long? = null
-    var sourceFilter: String? = null
-    var tagFilter: String? = null
-    var itemsCaching = false
-
-    var fetchedUnread = false
-    var fetchedAll = false
-    var fetchedStarred = false
-
-    var badgeUnread = -1
-    var badgeAll = -1
-    var badgeStarred = -1
-
-    /**
-     * Add new items to the SharedItems list
-     *
-     * The new items are considered more updated than the ones already in the list.
-     * The old items present in the new list are discarded and replaced by the new ones.
-     * Items are compared according to the selfoss id, which should always be unique.
-     */
-    fun appendNewItems(newItems: ArrayList<Item>) {
-        var tmpItems = items
-        if (tmpItems != newItems) {
-            tmpItems = tmpItems.filter { item -> newItems.find { it.id == item.id } == null } as ArrayList<Item>
-            tmpItems.addAll(newItems)
-            items = tmpItems
-
-            sortItems()
-            getFocusedItems()
-        }
-    }
-
-    fun refreshFocusedItems(newItems: ArrayList<Item>) {
-        val tmpItems = items
-        tmpItems.removeAll(focusedItems)
-
-        appendNewItems(newItems)
-    }
-
-    suspend fun clearDBItems(db: AppDatabase) {
-        db.itemsDao().deleteAllItems()
-    }
-
-    suspend fun updateDatabase(db: AppDatabase) {
-        if (itemsCaching) {
-            if (items.isEmpty()) {
-                getFromDB(db)
-            }
-            db.itemsDao().deleteAllItems()
-            db.itemsDao().insertAllItems(*(items.map { it.toEntity() }).toTypedArray())
-        }
-    }
-
-    fun filter() {
-        fun filterSearch(item: Item): Boolean {
-            return if (!searchFilter.isEmptyOrNullOrNullString()) {
-                var matched = item.title.contains(searchFilter.toString(), true)
-                matched = matched || item.content.contains(searchFilter.toString(), true)
-                matched = matched || item.sourcetitle.contains(searchFilter.toString(), true)
-                matched
-            } else {
-                true
-            }
-        }
-
-        var tmpItems = focusedItems
-        if (tagFilter != null) {
-            tmpItems = tmpItems.filter { it.tags.tags.contains(tagFilter.toString()) } as ArrayList<Item>
-        }
-        if (searchFilter != null) {
-            tmpItems = tmpItems.filter { filterSearch(it) } as ArrayList<Item>
-        }
-        if (sourceFilter != null) {
-            tmpItems = tmpItems.filter { it.sourcetitle == sourceFilter } as ArrayList<Item>
-        }
-        focusedItems = tmpItems
-    }
-
-    private fun getFocusedItems() {
-        when (displayedItems) {
-            "all" -> getAll()
-            "unread" -> getUnRead()
-            "read" -> getRead()
-            "starred" -> getStarred()
-            else -> getUnRead()
-        }
-    }
-
-    fun getUnRead() {
-        displayedItems = "unread"
-        focusedItems = items.filter { item -> item.unread } as ArrayList<Item>
-        filter()
-    }
-
-    fun getRead() {
-        displayedItems = "read"
-        focusedItems = items.filter { item -> !item.unread } as ArrayList<Item>
-        filter()
-    }
-
-    fun getStarred() {
-        displayedItems = "starred"
-        focusedItems = items.filter { item -> item.starred } as ArrayList<Item>
-        filter()
-    }
-
-    fun getAll() {
-        displayedItems = "all"
-        focusedItems = items
-        filter()
-    }
-
-    suspend fun getFromDB(db: AppDatabase) {
-        if (itemsCaching) {
-                    val dbItems = db.itemsDao().items().map { it.toView() } as ArrayList<Item>
-                    appendNewItems(dbItems)
-        }
-    }
-
-    private fun removeItemAtIndex(index: Int) {
-        val i = focusedItems[index]
-        val tmpItems = focusedItems
-        tmpItems.remove(i)
-        focusedItems = tmpItems
-    }
-
-    fun addItemAtIndex(newItem: Item, index: Int) {
-        val tmpItems = focusedItems
-        tmpItems.add(index, newItem)
-        focusedItems = tmpItems
-    }
-
-    fun readItem(app: Context, api: SelfossApi, db: AppDatabase, item: Item) {
-        if (items.contains(item)) {
-            position = items.indexOf(item)
-            readItemAtPosition(app, api, db)
-        }
-    }
-
-    fun readItems(db: AppDatabase, ids: List<String>) {
-        for (id in ids) {
-            val match = items.filter { it -> it.id == id }
-            if (match.isNotEmpty() && match.size == 1) {
-                position = items.indexOf(match[0])
-                val tmpItems = items
-                tmpItems[position].unread = false
-                items = tmpItems
-                resetDBItem(db)
-                badgeUnread--
-            }
-        }
-    }
-
-    private fun readItemAtPosition(app: Context, api: SelfossApi, db: AppDatabase) {
-        val i = items[position]
-
-        if (app.isNetworkAccessible(null)) {
-            api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                override fun onResponse(
-                        call: Call<SuccessResponse>,
-                        response: Response<SuccessResponse>
-                ) {
-
-                    val tmpItems = items
-                    tmpItems[position].unread = false
-                    items = tmpItems
-
-                    resetDBItem(db)
-                    getFocusedItems()
-                    badgeUnread--
-                }
-
-                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                    Toast.makeText(
-                            app,
-                            app.getString(R.string.cant_mark_read),
-                            Toast.LENGTH_SHORT
-                    ).show()
-                }
-            })
-        } else if (itemsCaching) {
-            thread {
-                db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
-            }
-        }
-
-        if (position > items.size) {
-            position -= 1
-        }
-    }
-
-    fun unreadItem(app: Context, api: SelfossApi, db: AppDatabase, item: Item) {
-        if (items.contains(item) && !item.unread) {
-            position = items.indexOf(item)
-            unreadItemAtPosition(app, api, db)
-        }
-    }
-
-    private fun unreadItemAtPosition(app: Context, api: SelfossApi, db: AppDatabase) {
-        val i = items[position]
-
-        if (app.isNetworkAccessible(null)) {
-            api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                override fun onResponse(
-                    call: Call<SuccessResponse>,
-                    response: Response<SuccessResponse>
-                ) {
-
-                    val tmpItems = items
-                    tmpItems[position].unread = true
-                    items = tmpItems
-
-                    resetDBItem(db)
-                    getFocusedItems()
-                    badgeUnread++
-                }
-
-                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                    Toast.makeText(
-                        app,
-                        app.getString(R.string.cant_mark_unread),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            })
-        } else if (itemsCaching) {
-            thread {
-                db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
-            }
-        }
-    }
-
-    private fun resetDBItem(db: AppDatabase) {
-        if (itemsCaching) {
-            val i = items[position]
-            CoroutineScope(Dispatchers.IO).launch {
-                db.itemsDao().delete(i.toEntity())
-                db.itemsDao().insertAllItems(i.toEntity())
-            }
-        }
-    }
-
-    fun unreadItemStatusAtIndex(position: Int): Boolean {
-        return focusedItems[position].unread
-    }
-
-    fun computeBadges() {
-        badgeUnread = items.filter { item -> item.unread }.size
-        badgeStarred = items.filter { item -> item.starred }.size
-        badgeAll = items.size
-    }
-
-    private fun sortItems() {
-        val tmpItems = ArrayList(items.sortedByDescending { SimpleDateFormat(Config.dateTimeFormatter).parse((it.datetime)) })
-        items = tmpItems
-    }
-}

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

@@ -3,8 +3,7 @@ package apps.amine.bou.readerforselfoss.utils.network
 import android.content.Context
 import android.graphics.Color
 import android.net.ConnectivityManager
-import android.net.NetworkCapabilities
-import android.os.Build
+import android.net.NetworkInfo
 import android.view.View
 import android.widget.TextView
 import apps.amine.bou.readerforselfoss.R
@@ -15,7 +14,9 @@ var view: View? = null
 lateinit var s: Snackbar
 
 fun Context.isNetworkAccessible(v: View?, overrideOffline: Boolean = false): Boolean {
-    val networkIsAccessible = isNetworkAvailable(this)
+    val cm = this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+    val activeNetwork: NetworkInfo? = cm.activeNetworkInfo
+    val networkIsAccessible = activeNetwork != null && activeNetwork.isConnectedOrConnecting
 
     if (v != null && (!networkIsAccessible || overrideOffline) && (!snackBarShown || v != view)) {
         view = v
@@ -41,24 +42,4 @@ fun Context.isNetworkAccessible(v: View?, overrideOffline: Boolean = false): Boo
         s.dismiss()
     }
     return if(overrideOffline) overrideOffline else networkIsAccessible
-}
-
-fun isNetworkAvailable(context: Context): Boolean {
-    val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-         val network = connectivityManager.activeNetwork ?: return false
-         val networkCapabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
-
-         return when {
-             networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> true
-             networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
-             networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
-             networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
-             else -> false
-         }
-    } else {
-        val network = connectivityManager.activeNetworkInfo ?: return false
-         return network.isConnectedOrConnecting
-    }
 }

app/src/main/res/drawable/ic_baseline_white_eye_24dp.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
-</vector>

app/src/main/res/drawable/ic_fiber_new_white_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM8.5,15L7.3,15l-2.55,-3.5L4.75,15L3.5,15L3.5,9h1.25l2.5,3.5L7.25,9L8.5,9v6zM13.5,10.26L11,10.26v1.12h2.5v1.26L11,12.64v1.11h2.5L13.5,15h-4L9.5,9h4v1.26zM20.5,14c0,0.55 -0.45,1 -1,1h-4c-0.55,0 -1,-0.45 -1,-1L14.5,9h1.25v4.51h1.13L16.88,9.99h1.25v3.51h1.12L19.25,9h1.25v5z"/>
+</vector>

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

@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/unread_action"
-        android:icon="@drawable/ic_baseline_white_eye_24dp"
+        android:icon="@drawable/ic_fiber_new_white_24dp"
         android:title="@string/unmark"
         app:showAsAction="ifRoom" />
 
@@ -17,6 +17,7 @@
     <item
         android:id="@+id/open_action"
         android:icon="@drawable/ic_open_in_browser_white_24dp"
+        android:iconTint="@color/white"
         android:title="@string/reader_action_open"
         app:showAsAction="ifRoom" />
 

build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.5.31'
+        kotlin_version = '1.4.21'
         android_version = '1.0.0'
         androidx_version = '1.1.0-alpha05'
         lifecycle_version = '2.2.0-alpha01'
@@ -17,7 +17,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -37,4 +37,14 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
-project.ext.preDexLibs = !project.hasProperty('disablePreDex')
+project.ext.preDexLibs = !project.hasProperty('disablePreDex')
+
+subprojects {
+    project.plugins.whenPluginAdded { plugin ->
+        if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {
+            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
+        } else if ("com.android.build.gradle.LibraryPlugin" == plugin.class.name) {
+            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
+        }
+    }
+}

gradle.properties

@@ -16,5 +16,6 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 org.gradle.caching=true
+android.enableD8=true
 android.useAndroidX=true
 android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip