Skip to content

Commit 2ce07aa

Browse files
bubelovbubelov
committed
Drop Nextcloud support
1 parent b5cd18c commit 2ce07aa

8 files changed

Lines changed: 52 additions & 384 deletions

File tree

‎app/src/main/kotlin/org/vestifeed/api/HotSwapApi.kt‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package org.vestifeed.api
22

33
import org.vestifeed.api.miniflux.MinifluxApiAdapter
44
import org.vestifeed.api.miniflux.MinifluxApiBuilder
5-
import org.vestifeed.api.nextcloud.NextcloudApiAdapter
6-
import org.vestifeed.api.nextcloud.NextcloudApiBuilder
75
import org.vestifeed.api.standalone.StandaloneNewsApi
86
import org.vestifeed.db.Database
97
import org.vestifeed.db.Entry
@@ -39,17 +37,6 @@ class HotSwapApi(private val db: Database) : Api {
3937
)
4038
}
4139

42-
ConfSchema.BACKEND_NEXTCLOUD -> {
43-
NextcloudApiAdapter(
44-
NextcloudApiBuilder().build(
45-
url = conf.nextcloudServerUrl,
46-
username = conf.nextcloudServerUsername,
47-
password = conf.nextcloudServerPassword,
48-
trustSelfSignedCerts = conf.nextcloudServerTrustSelfSignedCerts,
49-
)
50-
)
51-
}
52-
5340
else -> {
5441
StandaloneNewsApi(db)
5542
}

‎app/src/main/kotlin/org/vestifeed/auth/AuthFragment.kt‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,14 @@ class AuthFragment : AppFragment() {
4848
}
4949

5050
private fun FragmentAuthBinding.initButtons() {
51-
useStandaloneBackend.setOnClickListener {
51+
useMinifluxBackend.setOnClickListener {
52+
parentFragmentManager.commit {
53+
replace<MinifluxAuthFragment>(R.id.fragmentContainerView)
54+
addToBackStack(null)
55+
}
56+
}
57+
58+
useEmbeddedBackend.setOnClickListener {
5259
val db = (requireContext().applicationContext as App).db
5360
val syncScheduler = BackgroundSyncScheduler(requireContext())
5461

@@ -70,16 +77,5 @@ class AuthFragment : AppFragment() {
7077
)
7178
}
7279
}
73-
74-
useMinifluxBackend.setOnClickListener {
75-
parentFragmentManager.commit {
76-
replace<MinifluxAuthFragment>(R.id.fragmentContainerView)
77-
addToBackStack(null)
78-
}
79-
}
80-
81-
useNextcloudBackend.setOnClickListener {
82-
TODO()
83-
}
8480
}
8581
}

‎app/src/main/kotlin/org/vestifeed/auth/NextcloudAuthFragment.kt‎

Lines changed: 0 additions & 139 deletions
This file was deleted.

‎app/src/main/kotlin/org/vestifeed/db/table/Conf.kt‎

Lines changed: 27 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ object ConfSchema {
1414
${Columns.MinifluxServerUrl} TEXT NOT NULL,
1515
${Columns.MinifluxServerTrustSelfSignedCerts} INTEGER NOT NULL,
1616
${Columns.MinifluxServerToken} TEXT NOT NULL,
17-
${Columns.NextcloudServerUrl} TEXT NOT NULL,
18-
${Columns.NextcloudServerTrustSelfSignedCerts} INTEGER NOT NULL,
19-
${Columns.NextcloudServerUsername} TEXT NOT NULL,
20-
${Columns.NextcloudServerPassword} TEXT NOT NULL,
2117
${Columns.InitialSyncCompleted} INTEGER NOT NULL,
2218
${Columns.LastEntriesSyncDatetime} TEXT NOT NULL,
2319
${Columns.ShowReadEntries} INTEGER NOT NULL,
@@ -40,10 +36,6 @@ object ConfSchema {
4036
MinifluxServerUrl("miniflux_server_url"),
4137
MinifluxServerTrustSelfSignedCerts("miniflux_server_trust_self_signed_certs"),
4238
MinifluxServerToken("miniflux_server_token"),
43-
NextcloudServerUrl("nextcloud_server_url"),
44-
NextcloudServerTrustSelfSignedCerts("nextcloud_server_trust_self_signed_certs"),
45-
NextcloudServerUsername("nextcloud_server_username"),
46-
NextcloudServerPassword("nextcloud_server_password"),
4739
InitialSyncCompleted("initial_sync_completed"),
4840
LastEntriesSyncDatetime("last_entries_sync_datetime"),
4941
ShowReadEntries("show_read_entries"),
@@ -63,7 +55,6 @@ object ConfSchema {
6355

6456
const val BACKEND_STANDALONE = "standalone"
6557
const val BACKEND_MINIFLUX = "miniflux"
66-
const val BACKEND_NEXTCLOUD = "nextcloud"
6758

6859
const val SORT_ORDER_ASCENDING = "ascending"
6960
const val SORT_ORDER_DESCENDING = "descending"
@@ -79,10 +70,6 @@ data class ConfProjection(
7970
val minifluxServerUrl: String,
8071
val minifluxServerTrustSelfSignedCerts: Boolean,
8172
val minifluxServerToken: String,
82-
val nextcloudServerUrl: String,
83-
val nextcloudServerTrustSelfSignedCerts: Boolean,
84-
val nextcloudServerUsername: String,
85-
val nextcloudServerPassword: String,
8673
val initialSyncCompleted: Boolean,
8774
val lastEntriesSyncDatetime: String,
8875
val showReadEntries: Boolean,
@@ -103,10 +90,6 @@ object ConfDefaults {
10390
val minifluxServerUrl = ""
10491
val minifluxServerTrustSelfSignedCerts = false
10592
val minifluxServerToken = ""
106-
val nextcloudServerUrl = ""
107-
val nextcloudServerTrustSelfSignedCerts = false
108-
val nextcloudServerUsername = ""
109-
val nextcloudServerPassword = ""
11093
val initialSyncCompleted = false
11194
val lastEntriesSyncDatetime = ""
11295
val showReadEntries = false
@@ -127,10 +110,6 @@ fun confDefault(): Conf = Conf(
127110
minifluxServerUrl = ConfDefaults.minifluxServerUrl,
128111
minifluxServerTrustSelfSignedCerts = ConfDefaults.minifluxServerTrustSelfSignedCerts,
129112
minifluxServerToken = ConfDefaults.minifluxServerToken,
130-
nextcloudServerUrl = ConfDefaults.nextcloudServerUrl,
131-
nextcloudServerTrustSelfSignedCerts = ConfDefaults.nextcloudServerTrustSelfSignedCerts,
132-
nextcloudServerUsername = ConfDefaults.nextcloudServerUsername,
133-
nextcloudServerPassword = ConfDefaults.nextcloudServerPassword,
134113
initialSyncCompleted = ConfDefaults.initialSyncCompleted,
135114
lastEntriesSyncDatetime = ConfDefaults.lastEntriesSyncDatetime,
136115
showReadEntries = ConfDefaults.showReadEntries,
@@ -151,54 +130,46 @@ fun SQLiteStatement.toConf(): Conf = Conf(
151130
minifluxServerUrl = getText(1),
152131
minifluxServerTrustSelfSignedCerts = getInt(2) == 1,
153132
minifluxServerToken = getText(3),
154-
nextcloudServerUrl = getText(4),
155-
nextcloudServerTrustSelfSignedCerts = getInt(5) == 1,
156-
nextcloudServerUsername = getText(6),
157-
nextcloudServerPassword = getText(7),
158-
initialSyncCompleted = getInt(8) == 1,
159-
lastEntriesSyncDatetime = getText(9),
160-
showReadEntries = getInt(10) == 1,
161-
sortOrder = getText(11),
162-
showPreviewImages = getInt(12) == 1,
163-
cropPreviewImages = getInt(13) == 1,
164-
markScrolledEntriesAsRead = getInt(14) == 1,
165-
syncOnStartup = getInt(15) == 1,
166-
syncInBackground = getInt(16) == 1,
167-
backgroundSyncIntervalMillis = getLong(17),
168-
useBuiltInBrowser = getInt(18) == 1,
169-
showPreviewText = getInt(19) == 1,
170-
syncedOnStartup = getInt(20) == 1,
133+
initialSyncCompleted = getInt(4) == 1,
134+
lastEntriesSyncDatetime = getText(5),
135+
showReadEntries = getInt(6) == 1,
136+
sortOrder = getText(7),
137+
showPreviewImages = getInt(8) == 1,
138+
cropPreviewImages = getInt(9) == 1,
139+
markScrolledEntriesAsRead = getInt(10) == 1,
140+
syncOnStartup = getInt(11) == 1,
141+
syncInBackground = getInt(12) == 1,
142+
backgroundSyncIntervalMillis = getLong(13),
143+
useBuiltInBrowser = getInt(14) == 1,
144+
showPreviewText = getInt(15) == 1,
145+
syncedOnStartup = getInt(16) == 1,
171146
)
172147

173148
class ConfQueries(private val conn: SQLiteConnection) {
174149
fun insert(conf: Conf) {
175150
conn.prepare(
176151
"""
177152
INSERT OR REPLACE INTO ${ConfSchema.TABLE_NAME} (${ConfSchema.columns})
178-
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
153+
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
179154
"""
180155
).use { stmt ->
181156
stmt.bindText(1, conf.backend)
182157
stmt.bindText(2, conf.minifluxServerUrl)
183158
stmt.bindInt(3, if (conf.minifluxServerTrustSelfSignedCerts) 1 else 0)
184159
stmt.bindText(4, conf.minifluxServerToken)
185-
stmt.bindText(5, conf.nextcloudServerUrl)
186-
stmt.bindInt(6, if (conf.nextcloudServerTrustSelfSignedCerts) 1 else 0)
187-
stmt.bindText(7, conf.nextcloudServerUsername)
188-
stmt.bindText(8, conf.nextcloudServerPassword)
189-
stmt.bindInt(9, if (conf.initialSyncCompleted) 1 else 0)
190-
stmt.bindText(10, conf.lastEntriesSyncDatetime)
191-
stmt.bindInt(11, if (conf.showReadEntries) 1 else 0)
192-
stmt.bindText(12, conf.sortOrder)
193-
stmt.bindInt(13, if (conf.showPreviewImages) 1 else 0)
194-
stmt.bindInt(14, if (conf.cropPreviewImages) 1 else 0)
195-
stmt.bindInt(15, if (conf.markScrolledEntriesAsRead) 1 else 0)
196-
stmt.bindInt(16, if (conf.syncOnStartup) 1 else 0)
197-
stmt.bindInt(17, if (conf.syncInBackground) 1 else 0)
198-
stmt.bindLong(18, conf.backgroundSyncIntervalMillis)
199-
stmt.bindInt(19, if (conf.useBuiltInBrowser) 1 else 0)
200-
stmt.bindInt(20, if (conf.showPreviewText) 1 else 0)
201-
stmt.bindInt(21, if (conf.syncedOnStartup) 1 else 0)
160+
stmt.bindInt(5, if (conf.initialSyncCompleted) 1 else 0)
161+
stmt.bindText(6, conf.lastEntriesSyncDatetime)
162+
stmt.bindInt(7, if (conf.showReadEntries) 1 else 0)
163+
stmt.bindText(8, conf.sortOrder)
164+
stmt.bindInt(9, if (conf.showPreviewImages) 1 else 0)
165+
stmt.bindInt(10, if (conf.cropPreviewImages) 1 else 0)
166+
stmt.bindInt(11, if (conf.markScrolledEntriesAsRead) 1 else 0)
167+
stmt.bindInt(12, if (conf.syncOnStartup) 1 else 0)
168+
stmt.bindInt(13, if (conf.syncInBackground) 1 else 0)
169+
stmt.bindLong(14, conf.backgroundSyncIntervalMillis)
170+
stmt.bindInt(15, if (conf.useBuiltInBrowser) 1 else 0)
171+
stmt.bindInt(16, if (conf.showPreviewText) 1 else 0)
172+
stmt.bindInt(17, if (conf.syncedOnStartup) 1 else 0)
202173
stmt.step()
203174
}
204175
}

‎app/src/main/kotlin/org/vestifeed/settings/SettingsFragment.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,6 @@ class SettingsFragment : AppFragment() {
171171
minifluxServerUrl.extractDomain()
172172
}
173173

174-
ConfSchema.BACKEND_NEXTCLOUD -> {
175-
val username = nextcloudServerUsername
176-
"$username@${nextcloudServerUrl.extractDomain()}"
177-
}
178-
179174
else -> ""
180175
}
181176
}

‎app/src/main/res/layout/fragment_auth.xml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@
4747
app:layout_constraintBottom_toBottomOf="parent"
4848
app:layout_constraintTop_toBottomOf="@id/logo">
4949

50-
<Button
51-
android:id="@+id/useStandaloneBackend"
52-
android:layout_width="match_parent"
53-
android:layout_height="wrap_content"
54-
android:layout_marginStart="40dp"
55-
android:layout_marginEnd="40dp"
56-
android:text="@string/standalone_mode" />
57-
5850
<Button
5951
android:id="@+id/useMinifluxBackend"
6052
android:layout_width="match_parent"
@@ -64,13 +56,13 @@
6456
android:text="@string/connect_to_miniflux" />
6557

6658
<Button
67-
android:id="@+id/useNextcloudBackend"
59+
android:id="@+id/useEmbeddedBackend"
6860
style="?attr/materialButtonOutlinedStyle"
6961
android:layout_width="match_parent"
7062
android:layout_height="wrap_content"
7163
android:layout_marginStart="40dp"
7264
android:layout_marginEnd="40dp"
73-
android:text="@string/connect_to_nextcloud" />
65+
android:text="@string/standalone_mode" />
7466

7567
</LinearLayout>
7668

0 commit comments

Comments
 (0)