Skip to content
Snippets Groups Projects
Commit 86798590 authored by Sebastian's avatar Sebastian
Browse files

Upgrade briar-core

Add jackson_version as this is now required by bramble-core's
build.gradle.

Extend feature flags implementations in our modules and disable private
groups, forums and blogs in core.
parent 26605a15
No related branches found
No related tags found
1 merge request!111Upgrade briar-core
Pipeline #9268 passed
Subproject commit 65be2d2b2655062c539d6b4ba931bfe730ece2e2
Subproject commit 24d058cdccc286b410f28a29642b4aff70fe1926
......@@ -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")
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment