Skip to content

Commit f70aa04

Browse files
committed
Remove unused config variable
1 parent 6b64a9f commit f70aa04

3 files changed

Lines changed: 4 additions & 15 deletions

File tree

app/src/main/kotlin/org/vestifeed/db/table/ConfTable.kt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ class ConfTable(private val conn: SQLiteConnection) {
2121
sync_in_background INTEGER NOT NULL,
2222
background_sync_interval_millis INTEGER NOT NULL,
2323
use_built_in_browser INTEGER NOT NULL,
24-
show_preview_text INTEGER NOT NULL,
25-
synced_on_startup INTEGER NOT NULL
24+
show_preview_text INTEGER NOT NULL
2625
) STRICT;
2726
"""
2827

@@ -38,7 +37,6 @@ class ConfTable(private val conn: SQLiteConnection) {
3837
backgroundSyncIntervalMillis = 10800000L,
3938
useBuiltInBrowser = true,
4039
showPreviewText = true,
41-
syncedOnStartup = false,
4240
)
4341
}
4442

@@ -64,7 +62,6 @@ class ConfTable(private val conn: SQLiteConnection) {
6462
val backgroundSyncIntervalMillis: Long,
6563
val useBuiltInBrowser: Boolean,
6664
val showPreviewText: Boolean,
67-
val syncedOnStartup: Boolean,
6865
)
6966

7067
fun SQLiteStatement.toConf(): Conf = Conf(
@@ -79,14 +76,13 @@ class ConfTable(private val conn: SQLiteConnection) {
7976
backgroundSyncIntervalMillis = getLong(8),
8077
useBuiltInBrowser = getInt(9) == 1,
8178
showPreviewText = getInt(10) == 1,
82-
syncedOnStartup = getInt(11) == 1,
8379
)
8480

8581
fun insert(conf: Conf) {
8682
conn.prepare(
8783
"""
88-
INSERT OR REPLACE INTO conf (backend, miniflux_url, miniflux_token, minifluxIncrementalSyncTimestamp, show_preview_images, crop_preview_images, sync_on_startup, sync_in_background, background_sync_interval_millis, use_built_in_browser, show_preview_text, synced_on_startup)
89-
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
84+
INSERT OR REPLACE INTO conf (backend, miniflux_url, miniflux_token, minifluxIncrementalSyncTimestamp, show_preview_images, crop_preview_images, sync_on_startup, sync_in_background, background_sync_interval_millis, use_built_in_browser, show_preview_text)
85+
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
9086
"""
9187
).use { stmt ->
9288
stmt.bindTextOrNull(1, conf.backend?.name?.lowercase())
@@ -100,15 +96,14 @@ class ConfTable(private val conn: SQLiteConnection) {
10096
stmt.bindLong(9, conf.backgroundSyncIntervalMillis)
10197
stmt.bindInt(10, if (conf.useBuiltInBrowser) 1 else 0)
10298
stmt.bindInt(11, if (conf.showPreviewText) 1 else 0)
103-
stmt.bindInt(12, if (conf.syncedOnStartup) 1 else 0)
10499
stmt.step()
105100
}
106101
}
107102

108103
fun select(): Conf {
109104
conn.prepare(
110105
"""
111-
SELECT backend, miniflux_url, miniflux_token, minifluxIncrementalSyncTimestamp, show_preview_images, crop_preview_images, sync_on_startup, sync_in_background, background_sync_interval_millis, use_built_in_browser, show_preview_text, synced_on_startup
106+
SELECT backend, miniflux_url, miniflux_token, minifluxIncrementalSyncTimestamp, show_preview_images, crop_preview_images, sync_on_startup, sync_in_background, background_sync_interval_millis, use_built_in_browser, show_preview_text
112107
FROM conf
113108
"""
114109
).use { stmt ->

app/src/main/kotlin/org/vestifeed/navigation/Activity.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ class Activity : AppCompatActivity() {
4646
insets
4747
}
4848

49-
db().conf.update { it.copy(syncedOnStartup = false) }
50-
5149
lifecycleScope.launch {
5250
val conf = db().conf.select()
5351

app/src/test/kotlin/org/vestifeed/db/table/ConfTest.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ class ConfTest {
4646
assertEquals(10800000L, defaultConf.backgroundSyncIntervalMillis)
4747
assertTrue(defaultConf.useBuiltInBrowser)
4848
assertTrue(defaultConf.showPreviewText)
49-
assertFalse(defaultConf.syncedOnStartup)
5049
}
5150

5251
@Test
@@ -74,7 +73,6 @@ class ConfTest {
7473
assertEquals(conf.backgroundSyncIntervalMillis, result.backgroundSyncIntervalMillis)
7574
assertEquals(conf.useBuiltInBrowser, result.useBuiltInBrowser)
7675
assertEquals(conf.showPreviewText, result.showPreviewText)
77-
assertEquals(conf.syncedOnStartup, result.syncedOnStartup)
7876
}
7977

8078
@Test
@@ -138,7 +136,6 @@ class ConfTest {
138136
backgroundSyncIntervalMillis: Long = 3600000L,
139137
useBuiltInBrowser: Boolean = false,
140138
showPreviewText: Boolean = false,
141-
syncedOnStartup: Boolean = true,
142139
) = ConfTable.Conf(
143140
backend = backend,
144141
minifluxUrl = minifluxUrl,
@@ -151,6 +148,5 @@ class ConfTest {
151148
backgroundSyncIntervalMillis = backgroundSyncIntervalMillis,
152149
useBuiltInBrowser = useBuiltInBrowser,
153150
showPreviewText = showPreviewText,
154-
syncedOnStartup = syncedOnStartup,
155151
)
156152
}

0 commit comments

Comments
 (0)