Explicitly failing for non selfoss rss files.

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

@@ -11,6 +11,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
@@ -40,15 +41,16 @@ class LoginActivity : AppCompatActivity(), DIAware {
     private lateinit var binding: ActivityLoginBinding
 
     override val di by closestDI()
-    private val repository : Repository by instance()
-    private val appSettingsService : AppSettingsService by instance()
-    private val tracker : Tracker by instance()
+    private val repository: Repository by instance()
+    private val appSettingsService: AppSettingsService by instance()
+    private val tracker: Tracker by instance()
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        TrackHelper.track().download().identifier(DownloadTracker.Extra.ApkChecksum(applicationContext))
+        TrackHelper.track().download()
+            .identifier(DownloadTracker.Extra.ApkChecksum(applicationContext))
             .with(tracker)
         TrackHelper.track().screen("/login").with(tracker)
 
@@ -64,7 +66,30 @@ class LoginActivity : AppCompatActivity(), DIAware {
         handleBaseUrlFail()
 
         if (appSettingsService.getBaseUrl().isNotEmpty()) {
+            showProgress(true)
+            // This should be reverted when "old" users connected with a non-selfoss rss
+            // are handled. Revert to "simple" way.
+            CoroutineScope(Dispatchers.Main).launch {
+                try {
+                    val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance()
+                    if (!errorFetching && !displaySelfossOnly) {
                         goToMain()
+                    } else {
+                        showProgress(false)
+                        if (displaySelfossOnly) {
+                            Toast.makeText(
+                                applicationContext,
+                                R.string.application_selfoss_only,
+                                Toast.LENGTH_LONG
+                            ).show()
+                        }
+                        repository.logout()
+                    }
+                } catch (e: Throwable) {
+                    repository.logout()
+                    showProgress(false)
+                }
+            }
         }
 
         handleActions()
@@ -191,19 +216,29 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
             repository.refreshLoginInformation(url, login, password)
 
-            CoroutineScope(Dispatchers.IO).launch {
+            CoroutineScope(Dispatchers.Main).launch {
                 val result = repository.login()
                 if (result) {
+                    val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance()
+                    if (!errorFetching && !displaySelfossOnly) {
                         goToMain()
                     } else {
-                    CoroutineScope(Dispatchers.Main).launch {
+                        if (displaySelfossOnly) {
+                            Toast.makeText(
+                                applicationContext,
+                                R.string.application_selfoss_only,
+                                Toast.LENGTH_LONG
+                            ).show()
+                        }
                         preferenceError()
                     }
-                }
+                } else {
+                    preferenceError()
                 }
                 showProgress(false)
             }
         }
+    }
 
     private fun showProgress(show: Boolean) {
         val shortAnimTime = resources.getInteger(android.R.integer.config_shortAnimTime)

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

androidApp/src/main/res/values-night/strings.xml

@@ -6,4 +6,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">发生崩溃。请将细节发送给开发人员。</string>
     <string name="pref_switch_disable_acra">"禁用自动错误报告 "</string>
     <string name="menu_home_filter">筛选器</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -126,4 +126,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -129,4 +129,5 @@
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
 </resources>

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

@@ -8,13 +8,19 @@ import bou.amine.apps.readerforselfossv2.rest.SelfossApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.*
 import io.github.aakira.napier.Napier
+import io.ktor.client.call.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
-class Repository(private val api: SelfossApi, private val appSettingsService: AppSettingsService, val isConnectionAvailable: MutableStateFlow<Boolean>, private val db: ReaderForSelfossDB) {
+class Repository(
+    private val api: SelfossApi,
+    private val appSettingsService: AppSettingsService,
+    val isConnectionAvailable: MutableStateFlow<Boolean>,
+    private val db: ReaderForSelfossDB
+) {
 
     var items = ArrayList<SelfossModel.Item>()
     var connectionMonitored = false
@@ -146,7 +152,8 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     }
 
     suspend fun getTags(): List<SelfossModel.Tag> {
-        val isDatabaseEnabled = appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
+        val isDatabaseEnabled =
+            appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
         return if (isNetworkAvailable() && !fetchedTags) {
             val apiTags = api.tags()
             if (apiTags.success && apiTags.data != null && isDatabaseEnabled) {
@@ -178,7 +185,8 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     }
 
     suspend fun getSources(): ArrayList<SelfossModel.Source> {
-        val isDatabaseEnabled = appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
+        val isDatabaseEnabled =
+            appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
         return if (isNetworkAvailable() && !fetchedSources) {
             val apiSources = api.sources()
             if (apiSources.success && apiSources.data != null && isDatabaseEnabled) {
@@ -380,18 +388,35 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         return result
     }
 
+    suspend fun shouldBeSelfossInstance(): Pair<Boolean, Boolean> {
+        var fetchFailed = true
+        var showSelfossOnlyModal = false
+        if (isNetworkAvailable()) {
+            try {
+                // Trying to fetch one item, and check someone is trying to use the app with
+                // a random rss feed, that would throw a NoTransformationFoundException
+                fetchFailed = !api.getItemsWithoutCatch().success
+            } catch (e: NoTransformationFoundException) {
+                showSelfossOnlyModal = true
+            } catch (e: Throwable) {
+                Napier.e(e.stackTraceToString(), tag = "RepositoryImpl.shouldBeSelfossInstance")
+            }
+        }
+
+        return Pair(fetchFailed, showSelfossOnlyModal)
+    }
+
     suspend fun logout() {
         if (isNetworkAvailable()) {
             try {
                 val response = api.logout()
-                if (response.isSuccess) {
+                if (!response.isSuccess) {
                     Napier.e("Couldn't logout.", tag = "RepositoryImpl.logout")
                 }
             } catch (cause: Throwable) {
                 Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.logout")
-            } finally {
-                appSettingsService.clearAll()
             }
+            appSettingsService.clearAll()
         } else {
             appSettingsService.clearAll()
         }
@@ -456,11 +481,29 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
     private fun getDBItems(): List<ITEM> = db.itemsQueries.items().executeAsList()
 
-    private fun insertDBAction(articleid: String, read: Boolean = false, unread: Boolean = false, starred: Boolean = false, unstarred: Boolean = false) =
+    private fun insertDBAction(
+        articleid: String,
+        read: Boolean = false,
+        unread: Boolean = false,
+        starred: Boolean = false,
+        unstarred: Boolean = false
+    ) =
         db.actionsQueries.insertAction(articleid, read, unread, starred, unstarred)
 
     private fun updateDBItem(item: SelfossModel.Item) =
-        db.itemsQueries.updateItem(item.datetime, item.title.getHtmlDecoded(), item.content, item.unread, item.starred, item.thumbnail, item.icon, item.link, item.sourcetitle, item.tags.joinToString(","), item.id.toString())
+        db.itemsQueries.updateItem(
+            item.datetime,
+            item.title.getHtmlDecoded(),
+            item.content,
+            item.unread,
+            item.starred,
+            item.thumbnail,
+            item.icon,
+            item.link,
+            item.sourcetitle,
+            item.tags.joinToString(","),
+            item.id.toString()
+        )
 
     suspend fun tryToCacheItemsAndGetNewOnes(): List<SelfossModel.Item> {
         try {

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt

@@ -47,7 +47,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             }
             install(HttpCookies)
             install(HttpRequestRetry) {
-                maxRetries = 2
+                maxRetries = 1
                 retryIf { _, response ->
                     response.status == HttpStatusCode.Forbidden && shouldHavePostLogin() && hasLoginInfo()
                 }
@@ -134,6 +134,16 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             parameter("offset", offset)
         })
 
+    suspend fun getItemsWithoutCatch(): StatusAndData<List<SelfossModel.Item>> =
+        bodyOrFailure(client.get(url("/items")) {
+            if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
+            }
+            parameter("type", "all")
+            parameter("items", 1)
+        })
+
     suspend fun stats(): StatusAndData<SelfossModel.Stats> =
         bodyOrFailure(client.tryToGet(url("/stats")) {
             if (!shouldHavePostLogin()) {