save feed group when it is changed

diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt
index ee91abea91bd3a4be6884fc92c77ad4eade07bae..5936a95b9b9ec7f1d6e43715d45d0f6a56561f75 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt
@@ -282,6 +282,7 @@ object Database {
             conn.prepareStatement("""
                 update feeds set
                     name = ?,
+                    group_id = ?,
                     url = ?,
                     auth_user = ?,
                     auth_password = ?,
@@ -292,14 +293,15 @@ object Database {
                 where feed_id = ?
             """.trimIndent()).use { stmt ->
                 stmt.setString(1, feed.name)
-                stmt.setString(2, feed.uri)
-                stmt.setString(3, feed.user)
-                stmt.setString(4, feed.password)
-                stmt.setBoolean(5, feed.internalBrowser)
-                stmt.setLong(6, feed.updateInterval)
-                stmt.setInt(7, feed.maxItemAge)
-                stmt.setInt(8, feed.itemStateMode)
-                stmt.setInt(9, feed.id)
+                stmt.setInt(2, feed.groupId)
+                stmt.setString(3, feed.uri)
+                stmt.setString(4, feed.user)
+                stmt.setString(5, feed.password)
+                stmt.setBoolean(6, feed.internalBrowser)
+                stmt.setLong(7, feed.updateInterval)
+                stmt.setInt(8, feed.maxItemAge)
+                stmt.setInt(9, feed.itemStateMode)
+                stmt.setInt(10, feed.id)
                 stmt.execute()
             }
         }

diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/Feed.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/Feed.kt
index 10fddfbb28f68bc07bf6794e77898b8913d336d3..3bdcb69ac038a58deaf2c0ea45fc374250b5bcc4 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/Feed.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/Feed.kt
@@ -3,9 +3,9 @@ package de.unixwork.rssreader
 import java.time.Instant
 
 
-class Feed(id: Int, groupId: Int?, name: String, uri: String) {
+class Feed(id: Int, groupId: Int, name: String, uri: String) {
     val id = id
-    val groupId = groupId
+    var groupId = groupId
     var name = name
     var uri = uri
     var user: String? = null

diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedConfig.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedConfig.kt
index d6d233823c5a2fd900b4be36dec8d5d7857861b5..de4ff7430c80bd5ce0014be594acfbad5fa405da 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedConfig.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedConfig.kt
@@ -257,6 +257,7 @@ class FeedConfig(obj: UiObject) {
 
     public fun updateFeed() {
         val feedName = name.toString()
+        val group = groups.selected;
         val urlStr = uri.toString()
         var itemStateMode = readstatus.selectedIndex
         val internalBrowser = itemContent.selectedIndex == 1
@@ -289,6 +290,9 @@ class FeedConfig(obj: UiObject) {
 
         feed?.let {
             it.name = feedName
+            if(group != null) {
+                it.groupId = group.id
+            }
             it.uri = urlStr
             it.updateInterval = updateIntv
             it.itemStateMode = itemStateMode

diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt
index 8c727d34f41e93a863b65d48fc1a4b2d74383ebf..b01d2759606e21d4994b1e8a3d22c16541377052 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt
@@ -116,7 +116,7 @@ class FeedList(window: MainWindow) : Document() {
             }
         }
 
-        val collection = Feed(group.id, null, "", "")
+        val collection = Feed(group.id, -1, "", "")
         collection.isGroup = true
 
         showFeed = collection