diff --git a/briar b/briar index 65be2d2b2655062c539d6b4ba931bfe730ece2e2..24d058cdccc286b410f28a29642b4aff70fe1926 160000 --- a/briar +++ b/briar @@ -1 +1 @@ -Subproject commit 65be2d2b2655062c539d6b4ba931bfe730ece2e2 +Subproject commit 24d058cdccc286b410f28a29642b4aff70fe1926 diff --git a/build.gradle.kts b/build.gradle.kts index 6787df09a6910d8af96da44926faf1993f13d887..9645a34e9e5efa00c9e82a91e4dc00d356d1c993 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,6 +22,7 @@ buildscript { extra.apply { set("dagger_version", "2.33") set("okhttp_version", "3.12.13") + set("jackson_version", "2.13.0") set("tor_version", "0.3.5.17") set("obfs4proxy_version", "0.0.12-dev-40245c4a") set("junit_version", "4.13.2") diff --git a/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt b/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt index 9ec987d1ab42ad9c324b0cc14f2a78101c25b478..0fef13cee3d5867eb50951c04a945f8716c21049 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt @@ -124,17 +124,18 @@ internal class DesktopModule( } @Provides - internal fun provideFeatureFlags() = object : FeatureFlags { + internal fun provideFeatureFlags(desktopFeatureFlags: DesktopFeatureFlags) = object : FeatureFlags { override fun shouldEnableImageAttachments() = true override fun shouldEnableProfilePictures() = true override fun shouldEnableDisappearingMessages() = false + override fun shouldEnablePrivateGroupsInCore() = desktopFeatureFlags.shouldEnablePrivateGroups() + override fun shouldEnableForumsInCore() = desktopFeatureFlags.shouldEnableForums() + override fun shouldEnableBlogsInCore() = desktopFeatureFlags.shouldEnableBlogs() } @Provides @Singleton internal fun provideDesktopFeatureFlags() = object : DesktopFeatureFlags { - // TODO: once we have shouldEnableBlogsInCore() in briar core, wire them up with these here - // so that the value for shouldEnableBlogs() is always the same the respective core flag. override fun shouldEnablePrivateGroups() = false override fun shouldEnableForums() = false override fun shouldEnableBlogs() = false diff --git a/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt b/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt index dbe18201fc75fffa69bd5753948b949de51bd47a..cdb7c3ac198c2325e23f9d628d40096300526c75 100644 --- a/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt +++ b/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt @@ -130,17 +130,18 @@ internal class DesktopTestModule( } @Provides - internal fun provideFeatureFlags() = object : FeatureFlags { + internal fun provideFeatureFlags(desktopFeatureFlags: DesktopFeatureFlags) = object : FeatureFlags { override fun shouldEnableImageAttachments() = true override fun shouldEnableProfilePictures() = true override fun shouldEnableDisappearingMessages() = false + override fun shouldEnablePrivateGroupsInCore() = desktopFeatureFlags.shouldEnablePrivateGroups() + override fun shouldEnableForumsInCore() = desktopFeatureFlags.shouldEnableForums() + override fun shouldEnableBlogsInCore() = desktopFeatureFlags.shouldEnableBlogs() } @Provides @Singleton internal fun provideDesktopFeatureFlags() = object : DesktopFeatureFlags { - // TODO: once we have shouldEnableBlogsInCore() in briar core, wire them up with these here - // so that the value for shouldEnableBlogs() is always the same the respective core flag. override fun shouldEnablePrivateGroups() = false override fun shouldEnableForums() = false override fun shouldEnableBlogs() = false