Remove J-Server code

README.md

@@ -25,7 +25,6 @@ Synchronization options:
 
 * Google Drive: Easy to use if all devices use the same account.
 * [K-Server](https://github.com/d4rken/octi-sync-server-kotlin): End-To-End encrypted server that doesn't require a Google account.
-* [J-Server](https://github.com/jakobmoellerdev/octi-sync-server): End-To-End encrypted server if you don't want to use Google Drive (deprecated).
 
 Hungry for details? [Check the wiki](https://github.com/d4rken-org/octi/wiki). Still have
 questions? [Join us on discord](https://discord.gg/s7V4C6zuVy)!
@@ -56,7 +55,7 @@ If you like the app, consider:
 
 ## Thanks
 
-* Huge thanks to [@jakmoe](https://github.com/jakmoe) for writing Octi's open source sync
+* Huge thanks to [@jakmoe](https://github.com/jakmoe) for writing Octi's first open source sync
   server [J-Server](https://github.com/jakob-moeller-cloud/octi-sync-server)
 
 ## Screenshots

app/build.gradle.kts

@@ -131,7 +131,6 @@ dependencies {
     testImplementation(project(":app-common-test"))
     implementation(project(":sync-core"))
     implementation(project(":syncs-gdrive"))
-    implementation(project(":syncs-jserver"))
     implementation(project(":syncs-kserver"))
     implementation(project(":module-core"))
     implementation(project(":modules-meta"))

app/src/main/java/eu/darken/octi/sync/ui/add/SyncAddAdapter.kt

@@ -12,7 +12,6 @@ import eu.darken.octi.common.lists.modular.ModularAdapter
 import eu.darken.octi.common.lists.modular.mods.DataBinderMod
 import eu.darken.octi.common.lists.modular.mods.TypedVHCreatorMod
 import eu.darken.octi.syncs.gdrive.ui.add.AddGDriveVH
-import eu.darken.octi.syncs.jserver.ui.add.AddJServerDataVH
 import eu.darken.octi.syncs.kserver.ui.add.AddKServerDataVH
 import javax.inject.Inject
 
@@ -28,7 +27,6 @@ class SyncAddAdapter @Inject constructor() :
     init {
         modules.add(DataBinderMod(data))
         modules.add(TypedVHCreatorMod({ data[it] is AddGDriveVH.Item }) { AddGDriveVH(it) })
-        modules.add(TypedVHCreatorMod({ data[it] is AddJServerDataVH.Item }) { AddJServerDataVH(it) })
         modules.add(TypedVHCreatorMod({ data[it] is AddKServerDataVH.Item }) { AddKServerDataVH(it) })
     }
 

app/src/main/java/eu/darken/octi/sync/ui/add/SyncAddVM.kt

@@ -23,9 +23,6 @@ class SyncAddVM @Inject constructor(
         AddGDriveVH.Item {
             SyncAddFragmentDirections.actionSyncAddFragmentToGDriveAddFragment().navigate()
         }.run { items.add(this) }
-//        AddJServerDataVH.Item {
-//            SyncAddFragmentDirections.actionSyncAddFragmentToAddJServerFragment().navigate()
-//        }.run { items.add(this) }
         AddKServerDataVH.Item {
             SyncAddFragmentDirections.actionSyncAddFragmentToAddKServerFragment().navigate()
         }.run { items.add(this) }

app/src/main/java/eu/darken/octi/sync/ui/list/SyncListAdapter.kt

@@ -12,7 +12,6 @@ import eu.darken.octi.common.lists.modular.ModularAdapter
 import eu.darken.octi.common.lists.modular.mods.DataBinderMod
 import eu.darken.octi.common.lists.modular.mods.TypedVHCreatorMod
 import eu.darken.octi.syncs.gdrive.ui.GDriveStateVH
-import eu.darken.octi.syncs.jserver.ui.JServerStateVH
 import eu.darken.octi.syncs.kserver.ui.KServerStateVH
 import javax.inject.Inject
 
@@ -28,7 +27,6 @@ class SyncListAdapter @Inject constructor() :
     init {
         modules.add(DataBinderMod(data))
         modules.add(TypedVHCreatorMod({ data[it] is GDriveStateVH.Item }) { GDriveStateVH(it) })
-        modules.add(TypedVHCreatorMod({ data[it] is JServerStateVH.Item }) { JServerStateVH(it) })
         modules.add(TypedVHCreatorMod({ data[it] is KServerStateVH.Item }) { KServerStateVH(it) })
     }
 

app/src/main/java/eu/darken/octi/sync/ui/list/SyncListVM.kt

@@ -11,8 +11,6 @@ import eu.darken.octi.sync.core.SyncManager
 import eu.darken.octi.sync.core.SyncSettings
 import eu.darken.octi.syncs.gdrive.core.GDriveAppDataConnector
 import eu.darken.octi.syncs.gdrive.ui.GDriveStateVH
-import eu.darken.octi.syncs.jserver.core.JServerConnector
-import eu.darken.octi.syncs.jserver.ui.JServerStateVH
 import eu.darken.octi.syncs.kserver.core.KServerConnector
 import eu.darken.octi.syncs.kserver.ui.KServerStateVH
 import kotlinx.coroutines.flow.combine
@@ -62,17 +60,6 @@ class SyncListVM @Inject constructor(
                             }
                         )
 
-                        is JServerConnector -> JServerStateVH.Item(
-                            credentials = connector.credentials,
-                            ourState = state,
-                            otherStates = (connectors - connector).map { it.state.first() },
-                            onManage = {
-                                SyncListFragmentDirections.actionSyncListFragmentToJServerActionsFragment(
-                                    connector.identifier
-                                ).navigate()
-                            }
-                        )
-
                         is KServerConnector -> KServerStateVH.Item(
                             credentials = connector.credentials,
                             ourState = state,