narvey
/
anytype-kotlin-wild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DROID-1602 Self hosting | Fix | Network mode config (#719)

This commit is contained in:
Konstantin Ivanov 2023-12-19 15:54:46 +01:00 committed by konstantiniiv
parent 96617d68b6
commit e43e9d50f0
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -19,5 +19,4 @@
.externalNativeBuild
ktlint
.idea/*.xml
signing.properties
network.properties
signing.properties

4
core-models/src/main/java/com/anytypeio/anytype/core_models/NetworkMode.kt
View File

@ -9,3 +9,7 @@ data class NetworkModeConfig(
val userFilePath: String? = null,
val storedFilePath: String? = null
)
object NetworkModeConst {
const val NODE_STAGING_ID = "N9DU6hLkTAbvcpji3TCKPPd3UQWKGyzUxGmgJEyvhByqAjfD"
}

1
presentation/build.gradle
View File

@ -18,7 +18,6 @@ android {
buildConfigField "boolean", "USE_SIMPLE_TABLES_IN_EDITOR_EDDITING", "true"
buildConfigField "boolean", "ENABLE_WIDGETS", "false"
buildConfigField "boolean", "ENABLE_VIEWS_MENU", "true"
buildConfigField("String", "STAGING_NETWORK_ID", networkConfigProps.getProperty('staging_network_id', 'null'))
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_17

4
presentation/src/main/java/com/anytypeio/anytype/presentation/sync/SyncStatusView.kt
View File

@ -3,7 +3,7 @@ package com.anytypeio.anytype.presentation.sync
import com.anytypeio.anytype.core_models.Id
import com.anytypeio.anytype.core_models.NetworkMode
import com.anytypeio.anytype.core_models.SyncStatus
import com.anytypeio.anytype.presentation.BuildConfig
import com.anytypeio.anytype.core_models.NetworkModeConst.NODE_STAGING_ID
sealed class SyncStatusView {
object Unknown : SyncStatusView()
@ -48,7 +48,7 @@ fun NetworkMode.syncedStatusToView(networkId: String?): SyncStatusView {
}
}
NetworkMode.CUSTOM -> {
return if (networkId == BuildConfig.STAGING_NETWORK_ID) {
return if (networkId == NODE_STAGING_ID) {
SyncStatusView.Synced.StagingNetwork
} else {
SyncStatusView.Synced.SelfHostedNetwork