androidApp/src/main/AndroidManifest.xml

@@ -52,7 +52,7 @@
                 android:value=".HomeActivity" />
         </activity>
         <activity
-            android:name=".UpsertSourceActivity"
+            android:name=".AddSourceActivity"
             android:parentActivityName=".SourcesActivity"
             android:exported="true">
             <meta-data

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

@@ -3,15 +3,12 @@ package bou.amine.apps.readerforselfossv2.android
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.TextView
-import android.widget.Toast
+import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
-import bou.amine.apps.readerforselfossv2.android.databinding.ActivityUpsertSourceBinding
+import androidx.constraintlayout.widget.ConstraintLayout
+import bou.amine.apps.readerforselfossv2.android.databinding.ActivityAddSourceBinding
 import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlInvalid
 import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
-import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import kotlinx.coroutines.CoroutineScope
@@ -22,59 +19,38 @@ import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
 
-class UpsertSourceActivity : AppCompatActivity(), DIAware {
+class AddSourceActivity : AppCompatActivity(), DIAware {
 
-    private var existingSource: SelfossModel.Source? = null
     private var mSpoutsValue: String? = null
 
-    private lateinit var binding: ActivityUpsertSourceBinding
+    private lateinit var binding: ActivityAddSourceBinding
 
     override val di by closestDI()
-    private val repository: Repository by instance()
-    private val appSettingsService: AppSettingsService by instance()
+    private val repository : Repository by instance()
+    private val appSettingsService : AppSettingsService by instance()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityUpsertSourceBinding.inflate(layoutInflater)
+        binding = ActivityAddSourceBinding.inflate(layoutInflater)
         val view = binding.root
 
-        existingSource = repository.getSelectedSource()
-        if (existingSource != null) {
-            binding.formContainer.visibility = View.GONE
-            binding.progress.visibility = View.VISIBLE
-        }
-        val title = if (existingSource == null) R.string.add_source else R.string.update_source
-
-        supportFragmentManager.addOnBackStackChangedListener {
-            if (supportFragmentManager.backStackEntryCount == 0) {
-                setTitle(title)
-            }
-        }
-
         setContentView(view)
 
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
-        supportActionBar?.title = resources.getString(title)
 
-
-        maybeGetDetailsFromIntentSharing(intent)
+        maybeGetDetailsFromIntentSharing(intent, binding.sourceUri, binding.nameInput)
 
         binding.saveBtn.setOnClickListener {
-            handleSaveSource()
+            handleSaveSource(
+                binding.tags,
+                binding.nameInput.text.toString(),
+                binding.sourceUri.text.toString()
+            )
         }
     }
 
-    private fun initFields(items: Map<String, SelfossModel.Spout>) {
-        binding.nameInput.setText(existingSource!!.title)
-        binding.tags.setText(existingSource!!.tags.joinToString(", "))
-        binding.sourceUri.setText(existingSource!!.params?.url)
-        binding.spoutsSpinner.setSelection(items.keys.indexOf(existingSource!!.spout))
-        binding.progress.visibility = View.GONE
-        binding.formContainer.visibility = View.VISIBLE
-    }
-
     override fun onResume() {
         super.onResume()
 
@@ -82,13 +58,17 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
         if (baseUrl.isEmpty() || baseUrl.isBaseUrlInvalid()) {
             mustLoginToAddSource()
         } else {
-            handleSpoutsSpinner()
+            handleSpoutsSpinner(binding.spoutsSpinner, binding.progress, binding.formContainer)
         }
     }
 
-    private fun handleSpoutsSpinner() {
+    private fun handleSpoutsSpinner(
+        spoutsSpinner: Spinner,
+        mProgress: ProgressBar,
+        formContainer: ConstraintLayout
+    ) {
         val spoutsKV = HashMap<String, String>()
-        binding.spoutsSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+        spoutsSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(adapterView: AdapterView<*>, view: View?, i: Int, l: Long) {
                 if (view != null) {
                     val spoutName = (view as TextView).text.toString()
@@ -104,11 +84,11 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
 
         fun handleSpoutFailure(networkIssue: Boolean = false) {
             Toast.makeText(
-                this@UpsertSourceActivity,
+                this@AddSourceActivity,
                 if (networkIssue) R.string.cant_get_spouts_no_network else R.string.cant_get_spouts,
                 Toast.LENGTH_SHORT
             ).show()
-            binding.progress.visibility = View.GONE
+            mProgress.visibility = View.GONE
         }
 
         CoroutineScope(Dispatchers.Main).launch {
@@ -120,21 +100,17 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
                         spoutsKV[value.name] = key
                     }
 
-                    binding.progress.visibility = View.GONE
-                    binding.formContainer.visibility = View.VISIBLE
+                    mProgress.visibility = View.GONE
+                    formContainer.visibility = View.VISIBLE
 
                     val spinnerArrayAdapter =
                         ArrayAdapter(
-                            this@UpsertSourceActivity,
+                            this@AddSourceActivity,
                             android.R.layout.simple_spinner_item,
                             itemsStrings
                         )
                     spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-                    binding.spoutsSpinner.adapter = spinnerArrayAdapter
-
-                    if (existingSource != null) {
-                        initFields(items)
-                    }
+                    spoutsSpinner.adapter = spinnerArrayAdapter
                 } else {
                     handleSpoutFailure()
                 }
@@ -145,11 +121,13 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
     }
 
     private fun maybeGetDetailsFromIntentSharing(
-        intent: Intent
+        intent: Intent,
+        sourceUri: EditText,
+        nameInput: EditText
     ) {
         if (Intent.ACTION_SEND == intent.action && "text/plain" == intent.type) {
-            binding.sourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
-            binding.nameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
+            sourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
+            nameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
         }
     }
 
@@ -160,8 +138,7 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
         finish()
     }
 
-    private fun handleSaveSource() {
-        val url = binding.sourceUri.text.toString()
+    private fun handleSaveSource(tags: EditText, title: String, url: String) {
 
         val sourceDetailsUnavailable =
             title.isEmpty() || url.isEmpty() || mSpoutsValue == null || mSpoutsValue!!.isEmpty()
@@ -172,27 +149,18 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
             }
             else -> {
                 CoroutineScope(Dispatchers.Main).launch {
-                    val successfullyAddedSource = if (existingSource != null) {
-                        repository.updateSource(
-                            existingSource!!.id,
-                            binding.nameInput.text.toString(),
-                            url,
-                            mSpoutsValue!!,
-                            binding.tags.text.toString()
-                        )
-                    } else {
-                        repository.createSource(
-                            binding.nameInput.text.toString(),
-                            url,
-                            mSpoutsValue!!,
-                            binding.tags.text.toString(),
-                        )
-                    }
+                    val successfullyAddedSource = repository.createSource(
+                        title,
+                        url,
+                        mSpoutsValue!!,
+                        tags.text.toString(),
+                        "",
+                    )
                     if (successfullyAddedSource) {
                         finish()
                     } else {
                         Toast.makeText(
-                            this@UpsertSourceActivity,
+                            this@AddSourceActivity,
                             R.string.cant_create_source,
                             Toast.LENGTH_SHORT
                         ).show()
@@ -201,9 +169,4 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware {
             }
         }
     }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        repository.unsetSelectedSource()
-    }
 }

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

@@ -603,10 +603,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                 settingsLauncher.launch(Intent(this, SettingsActivity::class.java))
                 return true
             }
-            R.id.action_sources -> {
-                startActivity(Intent(this, SourcesActivity::class.java))
-                return true
-            }
             else -> return super.onOptionsItemSelected(item)
         }
     }

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

@@ -73,7 +73,7 @@ class SourcesActivity : AppCompatActivity(), DIAware {
         }
 
         binding.fab.setOnClickListener {
-            startActivity(Intent(this@SourcesActivity, UpsertSourceActivity::class.java))
+            startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))
         }
     }
 }

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

@@ -2,14 +2,12 @@ package bou.amine.apps.readerforselfossv2.android.adapters
 
 import android.app.Activity
 import android.content.Context
-import android.content.Intent
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
-import bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.SourceListItemBinding
 import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
@@ -96,14 +94,6 @@ class SourcesListAdapter(
                     }
                 }
             }
-
-            mView.setOnClickListener {
-                val source = items[bindingAdapterPosition]
-
-                repository.setSelectedSource(source)
-                app.startActivity(Intent(app, UpsertSourceActivity::class.java))
-
-            }
         }
     }
 }

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity">
+    tools:context="bou.amine.apps.readerforselfossv2.android.AddSourceActivity">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -41,20 +41,36 @@
             app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintVertical_bias="0.0">
 
+            <TextView
+                android:text="@string/add_source"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/textView2"
+                android:textAppearance="@style/TextAppearance.AppCompat.Large"
+                android:textAlignment="center"
+                android:layout_marginTop="16dp"
+                app:layout_constraintTop_toTopOf="parent"
+                android:layout_marginEnd="16dp"
+                app:layout_constraintRight_toRightOf="parent"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:layout_marginLeft="16dp"
+                android:gravity="center_horizontal" />
 
             <EditText
-                android:id="@+id/nameInput"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:autofillHints="false"
                 android:ems="10"
-                android:hint="@string/add_source_hint_name"
-                android:inputType="text"
-                android:textColorHint="?android:textColorPrimary"
+                android:id="@+id/nameInput"
+                android:layout_marginTop="32dp"
+                app:layout_constraintTop_toBottomOf="@+id/textView2"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:inputType="text"
+                android:hint="@string/add_source_hint_name"
+                android:textColorHint="?android:textColorPrimary"
+                android:autofillHints="false" />
 
             <EditText
                 android:layout_width="match_parent"

androidApp/src/main/res/menu/home_menu.xml

@@ -20,11 +20,6 @@
           android:orderInCategory="2"
           app:showAsAction="ifRoom"/>
 
-    <item android:id="@+id/action_sources"
-        android:title="@string/menu_home_sources"
-        android:orderInCategory="97"
-        app:showAsAction="never"/>
-
     <item android:id="@+id/action_settings"
         android:title="@string/title_activity_settings"
         android:orderInCategory="98"

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -6,6 +6,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -126,6 +126,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

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

@@ -129,6 +129,4 @@
     <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>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
 </resources>

androidApp/src/test/kotlin/RepositoryTest.kt

@@ -231,8 +231,7 @@ class RepositoryTest {
             listOf("tags"),
             "spouts\\rss\\fulltextrss",
             "",
-            "b3aa8a664d08eb15d6ff1db2fa83e0d9.png",
-            SelfossModel.SourceParams("url")
+            "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
         ))
         runBlocking {
             repository.getNewerItems()
@@ -552,8 +551,7 @@ class RepositoryTest {
                 listOf("Test", "second"),
                 "spouts\\rss\\fulltextrss",
                 "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png",
-                SelfossModel.SourceParams("url")
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
             ),
             SelfossModel.Source(
                 2,
@@ -561,8 +559,7 @@ class RepositoryTest {
                 listOf("second"),
                 "spouts\\rss\\fulltextrss",
                 "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png",
-                SelfossModel.SourceParams("url")
+                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
             )
         )
         val sourcesDB = listOf(
@@ -572,8 +569,7 @@ class RepositoryTest {
                 "Test,second",
                 "spouts\\rss\\fulltextrss",
                 "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png",
-                "url"
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
             ),
             SOURCE(
                 "2",
@@ -581,8 +577,7 @@ class RepositoryTest {
                 "second",
                 "spouts\\rss\\fulltextrss",
                 "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png",
-                "url"
+                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
             )
         )
 
@@ -712,7 +707,7 @@ class RepositoryTest {
 
     @Test
     fun create_source() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
                 SuccessResponse(true)
 
         initializeRepository()
@@ -723,6 +718,7 @@ class RepositoryTest {
                 "https://test.com/feed",
                 "spouts\\rss\\fulltextrss",
                 "Test, New",
+                ""
             )
         }
 
@@ -732,6 +728,7 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
+                any(),
             )
         }
         assertSame(true, response)
@@ -739,7 +736,7 @@ class RepositoryTest {
 
     @Test
     fun create_source_but_response_fails() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
                 SuccessResponse(false)
 
         initializeRepository()
@@ -749,7 +746,8 @@ class RepositoryTest {
                 "test",
                 "https://test.com/feed",
                 "spouts\\rss\\fulltextrss",
-                "Test, New"
+                "Test, New",
+                ""
             )
         }
 
@@ -758,7 +756,8 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
-                any()
+                any(),
+                any(),
             )
         }
         assertSame(false, response)
@@ -766,7 +765,7 @@ class RepositoryTest {
 
     @Test
     fun create_source_without_connection() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
                 SuccessResponse(true)
 
         initializeRepository(MutableStateFlow(false))
@@ -776,7 +775,8 @@ class RepositoryTest {
                 "test",
                 "https://test.com/feed",
                 "spouts\\rss\\fulltextrss",
-                "Test, New"
+                "Test, New",
+                ""
             )
         }
 
@@ -786,6 +786,7 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
+                any()
             )
         }
         assertSame(false, response)
@@ -1033,8 +1034,7 @@ class RepositoryTest {
                 listOf("Test", "second"),
                 "spouts\\rss\\fulltextrss",
                 "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png",
-                SelfossModel.SourceParams("url")
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
             )
         )
         repository.searchFilter = "search"

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt

@@ -9,7 +9,6 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.encoding.encodeCollection
 import kotlinx.serialization.json.*
 
 class SelfossModel {
@@ -56,12 +55,7 @@ class SelfossModel {
         val tags: List<String>,
         val spout: String,
         val error: String,
-        val icon: String?,
-        val params: SourceParams?
-    )
-    @Serializable
-    data class SourceParams(
-        val url: String
+        val icon: String?
     )
     @Serializable
     data class Item(
@@ -128,7 +122,7 @@ class SelfossModel {
     object TagsListSerializer : KSerializer<List<String>> {
         override fun deserialize(decoder: Decoder): List<String> {
             return when(val json = ((decoder as JsonDecoder).decodeJsonElement())) {
-                is JsonArray -> json.toList().map { it.toString().replace("^\"|\"$".toRegex(), "") }
+                is JsonArray -> json.toList().map { it.toString() }
                 else -> json.toString().split(",")
             }
 
@@ -138,7 +132,7 @@ class SelfossModel {
             get() = PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING)
 
         override fun serialize(encoder: Encoder, value: List<String>) {
-            encoder.encodeCollection(PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING), value.size) { this.toString() }
+            TODO("Not yet implemented")
         }
     }
 

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

@@ -48,7 +48,6 @@ class Repository(
     private var fetchedTags = false
 
     private var _readerItems = ArrayList<SelfossModel.Item>()
-    private var _selectedSource: SelfossModel.Source? = null
 
     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
         // TODO: Use the updatedSince parameter
@@ -344,6 +343,7 @@ class Repository(
         url: String,
         spout: String,
         tags: String,
+        filter: String
     ): Boolean {
         var response = false
         if (isNetworkAvailable()) {
@@ -352,27 +352,13 @@ class Repository(
                 url,
                 spout,
                 tags,
+                filter
             ).isSuccess == true
         }
 
         return response
     }
 
-    suspend fun updateSource(
-        id: Int,
-        title: String,
-        url: String,
-        spout: String,
-        tags: String
-    ): Boolean {
-        var response = false
-        if (isNetworkAvailable()) {
-            response = api.updateSourceForVersion(id, title, url, spout, tags).isSuccess == true
-        }
-
-        return response
-    }
-
     suspend fun deleteSource(id: Int, title: String): Boolean {
         var success = false
         if (isNetworkAvailable()) {
@@ -594,16 +580,4 @@ class Repository(
     fun migrate(driverFactory: DriverFactory) {
         ReaderForSelfossDB.Schema.migrate(driverFactory.createDriver(), 0, 1)
     }
-
-    fun setSelectedSource(source: SelfossModel.Source) {
-        _selectedSource = source
-    }
-
-    fun unsetSelectedSource() {
-        _selectedSource = null
-    }
-
-    fun getSelectedSource(): SelfossModel.Source? {
-        return _selectedSource
-    }
 }

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

@@ -23,9 +23,6 @@ suspend fun maybeResponse(r: HttpResponse?): SuccessResponse {
     return if (r != null && r.status.isSuccess()) {
         r.body()
     } else {
-        if (r != null) {
-            Napier.i("Error ${r.status}", tag = "maybeResponse")
-        }
         SuccessResponse(false)
     }
 }

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

@@ -76,14 +76,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
 
     // Api version was introduces after the POST login, so when there is a version, it should be available
     private fun shouldHavePostLogin() = appSettingsService.getApiVersion() != -1
-    private fun hasLoginInfo() =
-        appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword()
-            .isNotEmpty()
+    private fun hasLoginInfo() = appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword().isNotEmpty()
 
     suspend fun login(): SuccessResponse =
-        if (appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword()
-                .isNotEmpty()
-        ) {
+        if (appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword().isNotEmpty()) {
             if (shouldHavePostLogin()) {
                 postLogin()
             } else {
@@ -103,9 +99,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         parameter("password", appSettingsService.getPassword())
     })
 
-    private fun shouldHaveNewLogout() =
-        appSettingsService.getApiVersion() >= 5 // We are missing 4.1.0
-
+    private fun shouldHaveNewLogout() = appSettingsService.getApiVersion() >= 5 // We are missing 4.1.0
     suspend fun logout(): SuccessResponse =
         if (shouldHaveNewLogout()) {
             doLogout()
@@ -113,8 +107,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             maybeLogoutIfAvailable()
         }
 
-    private suspend fun maybeLogoutIfAvailable() =
-        responseOrSuccessIf404(client.tryToGet(url("/logout")))
+    private suspend fun maybeLogoutIfAvailable() = responseOrSuccessIf404(client.tryToGet(url("/logout")))
 
     private suspend fun doLogout() = maybeResponse(client.tryToDelete(url("/api/session/current")))
 
@@ -243,12 +236,13 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         url: String,
         spout: String,
         tags: String,
+        filter: String
     ): SuccessResponse =
         maybeResponse(
             if (appSettingsService.getApiVersion() > 1) {
-                createSource("tags[]", title, url, spout, tags)
+                createSource("tags[]", title, url, spout, tags, filter)
             } else {
-                createSource("tags", title, url, spout, tags)
+                createSource("tags", title, url, spout, tags, filter)
             }
         )
 
@@ -257,7 +251,8 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         title: String,
         url: String,
         spout: String,
-        tags: String
+        tags: String,
+        filter: String
     ): HttpResponse? =
         client.tryToSubmitForm(
             url = url("/source"),
@@ -270,43 +265,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 append("url", url)
                 append("spout", spout)
                 append(tagsParamName, tags)
-            }
-        )
-
-    suspend fun updateSourceForVersion(
-        id: Int,
-        title: String,
-        url: String,
-        spout: String,
-        tags: String
-    ): SuccessResponse =
-        maybeResponse(
-            if (appSettingsService.getApiVersion() > 1) {
-                updateSource(id, "tags[]", title, url, spout, tags)
-            } else {
-                updateSource(id, "tags", title, url, spout, tags)
-            }
-        )
-
-    private suspend fun updateSource(
-        id: Int,
-        tagsParamName: String,
-        title: String,
-        url: String,
-        spout: String,
-        tags: String,
-    ): HttpResponse? =
-        client.tryToSubmitForm(
-            url = url("/source/$id"),
-            formParameters = Parameters.build {
-                if (!shouldHavePostLogin()) {
-                    append("username", appSettingsService.getUserName())
-                    append("password", appSettingsService.getPassword())
-                }
-                append("title", title)
-                append("url", url)
-                append("spout", spout)
-                append(tagsParamName, tags)
+                append("filter", filter)
             }
         )
 

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/utils/EntityUtils.kt

@@ -19,8 +19,7 @@ fun SOURCE.toView(): SelfossModel.Source =
         this.tags.split(","),
         this.spout,
         this.error,
-        this.icon,
-        if (this.url != null) SelfossModel.SourceParams(this.url) else null
+        this.icon
     )
 
 fun SelfossModel.Source.toEntity(): SOURCE =
@@ -30,8 +29,7 @@ fun SelfossModel.Source.toEntity(): SOURCE =
         this.tags.joinToString(","),
         this.spout,
         this.error,
-        this.icon.orEmpty(),
-        this.params?.url
+        this.icon.orEmpty()
     )
 
 fun SelfossModel.Tag.toEntity(): TAG =

shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/2.sqm

@@ -1 +0,0 @@
-ALTER TABLE SOURCE ADD COLUMN `url` TEXT;

shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/Sources.sq

@@ -5,7 +5,6 @@ CREATE TABLE SOURCE (
     `spout` TEXT NOT NULL,
     `error` TEXT NOT NULL,
     `icon` TEXT NOT NULL,
-    `url` TEXT,
     PRIMARY KEY(`id`)
 );