Merge pull request 'enhancement/too-many-calls' (#68) from enhancement/too-many-calls into master

Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/68

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt

@@ -143,11 +143,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
         handleSwipeRefreshLayout()
 
-        getElementsAccordingToTab()
 
-
+        if (appSettingsService.isItemCachingEnabled()) {
-        CoroutineScope(Dispatchers.Main).launch {
+            CoroutineScope(Dispatchers.Main).launch {
-            repository.tryToCacheItemsAndGetNewOnes()
+                repository.tryToCacheItemsAndGetNewOnes()
+            }
         }
     }
 

androidApp/src/main/res/layout/activity_add_source.xml

@@ -18,7 +18,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                app:theme="@style/ToolBarStyle"
+                android:theme="@style/ToolBarStyle"
                 app:popupTheme="?attr/toolbarPopupTheme" />
 
         </com.google.android.material.appbar.AppBarLayout>

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

@@ -32,7 +32,7 @@
                         android:id="@+id/toolBar"
                         android:layout_width="match_parent"
                         android:layout_height="?attr/actionBarSize"
-                        app:theme="@style/ToolBarStyle"
+                        android:theme="@style/ToolBarStyle"
                         app:popupTheme="?attr/toolbarPopupTheme" />
 
                 </com.google.android.material.appbar.AppBarLayout>

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

@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:popupTheme="?attr/toolbarPopupTheme"
-            app:theme="@style/ToolBarStyle" />
+            android:theme="@style/ToolBarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

androidApp/src/main/res/layout/activity_login.xml

@@ -14,7 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:theme="@style/ToolBarStyle"
+            android:theme="@style/ToolBarStyle"
             app:popupTheme="?attr/toolbarPopupTheme" />
 
     </com.google.android.material.appbar.AppBarLayout>

androidApp/src/main/res/layout/activity_reader.xml

@@ -18,7 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:popupTheme="?attr/toolbarPopupTheme"
-            app:theme="@style/ToolBarStyle" />
+            android:theme="@style/ToolBarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

androidApp/src/main/res/layout/activity_sources.xml

@@ -14,7 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:theme="@style/ToolBarStyle"
+            android:theme="@style/ToolBarStyle"
             app:popupTheme="?attr/toolbarPopupTheme" />
 
     </com.google.android.material.appbar.AppBarLayout>

androidApp/src/main/res/xml/pref_general.xml

@@ -6,7 +6,7 @@
 
     </PreferenceCategory>
     <EditTextPreference
-        android:defaultValue="200"
+        android:defaultValue="20"
         android:inputType="number"
         android:key="prefer_api_items_number"
         android:selectAllOnFocus="true"

shared/build.gradle.kts

@@ -28,12 +28,12 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("io.ktor:ktor-client-core:2.0.1")
+                implementation("io.ktor:ktor-client-core:2.1.1")
-                implementation("io.ktor:ktor-client-content-negotiation:2.0.1")
+                implementation("io.ktor:ktor-client-content-negotiation:2.1.1")
-                implementation("io.ktor:ktor-serialization-kotlinx-json:2.0.1")
+                implementation("io.ktor:ktor-serialization-kotlinx-json:2.1.1")
-                implementation("io.ktor:ktor-client-logging:2.0.1")
+                implementation("io.ktor:ktor-client-logging:2.1.1")
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
-                implementation("io.ktor:ktor-client-auth:2.0.1")
+                implementation("io.ktor:ktor-client-auth:2.1.1")
                 implementation("org.jsoup:jsoup:1.14.3")
 
                 //Dependency Injection
@@ -60,7 +60,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                implementation("io.ktor:ktor-client-android:2.0.1")
+                implementation("io.ktor:ktor-client-okhttp:2.1.1")
 
                 // Sql
                 implementation(SqlDelight.android)
@@ -94,7 +94,7 @@ kotlin {
             iosX64Test.dependsOn(this)
             iosArm64Test.dependsOn(this)
             dependencies {
-                implementation("io.ktor:ktor-client-ios:2.0.1")
+                implementation("io.ktor:ktor-client-ios:2.1.1")
             }
             //iosSimulatorArm64Test.dependsOn(this)
         }

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt

@@ -48,6 +48,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
         // TODO: Use the updatedSince parameter
         var fetchedItems: SelfossModel.StatusAndData<List<SelfossModel.Item>> = SelfossModel.StatusAndData.error()
+        var fromDB = false
         if (isNetworkAvailable()) {
             fetchedItems = api.getItems(
                 displayedItems.type,
@@ -59,6 +60,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
             )
         } else {
             if (appSettingsService.isItemCachingEnabled()) {
+                fromDB = true
                 fetchedItems = SelfossModel.StatusAndData.succes(
                     getDBItems().filter {
                         displayedItems == ItemType.ALL ||
@@ -71,7 +73,9 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
         if (fetchedItems.success && fetchedItems.data != null) {
             items = ArrayList(fetchedItems.data!!)
-            sortItems()
+            if (fromDB) {
+                items.sortByDescending { dateUtils.parseDate(it.datetime) }
+            }
         }
         return items
     }
@@ -92,7 +96,6 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
         if (fetchedItems.success && fetchedItems.data != null) {
             items.addAll(fetchedItems.data!!)
-            sortItems()
         }
         return items
     }
@@ -118,10 +121,6 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         }
     }
 
-    private fun sortItems() {
-        items.sortByDescending { dateUtils.parseDate(it.datetime) }
-    }
-
     suspend fun reloadBadges(): Boolean {
         var success = false
         if (isNetworkAvailable()) {

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/AppSettingsService.kt

@@ -88,7 +88,7 @@ class AppSettingsService {
     }
 
     fun refreshItemsNumber() {
-        _itemsNumber = settings.getString("prefer_api_items_number", "200").toInt()
+        _itemsNumber = settings.getString("prefer_api_items_number", "20").toInt()
     }
 
     fun getApiTimeout(): Long {