Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Enable mailbox support in release builds.

Browse Source
This commit is contained in:
akwizgran
2023-04-18 12:37:33 +01:00
parent 2566105f13
commit 7810e7e848
7 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java
View File

@@ -11,7 +11,7 @@ public interface FeatureFlags {
boolean shouldEnableDisappearingMessages(); boolean shouldEnableDisappearingMessages();
boolean shouldEnableMailbox(); boolean shouldEnableMailboxInCore();
boolean shouldEnablePrivateGroupsInCore(); boolean shouldEnablePrivateGroupsInCore();

8
bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java
View File

@@ -80,7 +80,7 @@ public class MailboxModule {
FeatureFlags featureFlags) { FeatureFlags featureFlags) {
MailboxUpdateValidator validator = new MailboxUpdateValidator( MailboxUpdateValidator validator = new MailboxUpdateValidator(
clientHelper, metadataEncoder, clock); clientHelper, metadataEncoder, clock);
if (featureFlags.shouldEnableMailbox()) { if (featureFlags.shouldEnableMailboxInCore()) {
validationManager.registerMessageValidator(CLIENT_ID, validationManager.registerMessageValidator(CLIENT_ID,
MAJOR_VERSION, validator); MAJOR_VERSION, validator);
} }
@@ -101,7 +101,7 @@ public class MailboxModule {
ClientVersioningManager clientVersioningManager, ClientVersioningManager clientVersioningManager,
MailboxSettingsManager mailboxSettingsManager, MailboxSettingsManager mailboxSettingsManager,
MailboxUpdateManagerImpl mailboxUpdateManager) { MailboxUpdateManagerImpl mailboxUpdateManager) {
if (featureFlags.shouldEnableMailbox()) { if (featureFlags.shouldEnableMailboxInCore()) {
lifecycleManager.registerOpenDatabaseHook(mailboxUpdateManager); lifecycleManager.registerOpenDatabaseHook(mailboxUpdateManager);
validationManager.registerIncomingMessageHook(CLIENT_ID, validationManager.registerIncomingMessageHook(CLIENT_ID,
MAJOR_VERSION, mailboxUpdateManager); MAJOR_VERSION, mailboxUpdateManager);
@@ -117,7 +117,7 @@ public class MailboxModule {
@Singleton @Singleton
MailboxFileManager provideMailboxFileManager(FeatureFlags featureFlags, MailboxFileManager provideMailboxFileManager(FeatureFlags featureFlags,
EventBus eventBus, MailboxFileManagerImpl mailboxFileManager) { EventBus eventBus, MailboxFileManagerImpl mailboxFileManager) {
if (featureFlags.shouldEnableMailbox()) { if (featureFlags.shouldEnableMailboxInCore()) {
eventBus.addListener(mailboxFileManager); eventBus.addListener(mailboxFileManager);
} }
return mailboxFileManager; return mailboxFileManager;
@@ -167,7 +167,7 @@ public class MailboxModule {
dbExecutor, db, contactManager, pluginManager, dbExecutor, db, contactManager, pluginManager,
mailboxSettingsManager, mailboxUpdateManager, mailboxSettingsManager, mailboxUpdateManager,
mailboxClientFactory, reachabilityMonitor); mailboxClientFactory, reachabilityMonitor);
if (featureFlags.shouldEnableMailbox()) { if (featureFlags.shouldEnableMailboxInCore()) {
lifecycleManager.registerService(manager); lifecycleManager.registerService(manager);
eventBus.addListener(manager); eventBus.addListener(manager);
} }

2
bramble-core/src/test/java/org/briarproject/bramble/test/TestFeatureFlagModule.java
View File

@@ -26,7 +26,7 @@ public class TestFeatureFlagModule {
} }
@Override @Override
public boolean shouldEnableMailbox() { public boolean shouldEnableMailboxInCore() {
return true; return true;
} }

7
briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
View File

@@ -33,7 +33,6 @@ import org.briarproject.bramble.plugin.tcp.AndroidLanTcpPluginFactory;
import org.briarproject.bramble.plugin.tor.AndroidTorPluginFactory; import org.briarproject.bramble.plugin.tor.AndroidTorPluginFactory;
import org.briarproject.bramble.util.AndroidUtils; import org.briarproject.bramble.util.AndroidUtils;
import org.briarproject.bramble.util.StringUtils; import org.briarproject.bramble.util.StringUtils;
import org.briarproject.briar.BuildConfig;
import org.briarproject.briar.android.account.DozeHelperModule; import org.briarproject.briar.android.account.DozeHelperModule;
import org.briarproject.briar.android.account.LockManagerImpl; import org.briarproject.briar.android.account.LockManagerImpl;
import org.briarproject.briar.android.account.SetupModule; import org.briarproject.briar.android.account.SetupModule;
@@ -212,7 +211,7 @@ public class AppModule {
@Override @Override
public Collection<SimplexPluginFactory> getSimplexFactories() { public Collection<SimplexPluginFactory> getSimplexFactories() {
List<SimplexPluginFactory> simplex = new ArrayList<>(); List<SimplexPluginFactory> simplex = new ArrayList<>();
if (featureFlags.shouldEnableMailbox()) simplex.add(mailbox); if (featureFlags.shouldEnableMailboxInCore()) simplex.add(mailbox);
if (SDK_INT >= 19) simplex.add(drive); if (SDK_INT >= 19) simplex.add(drive);
return simplex; return simplex;
} }
@@ -354,8 +353,8 @@ public class AppModule {
} }
@Override @Override
public boolean shouldEnableMailbox() { public boolean shouldEnableMailboxInCore() {
return BuildConfig.DEBUG; return true;
} }
@Override @Override

14
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
View File

@@ -83,15 +83,11 @@ public class SettingsFragment extends PreferenceFragmentCompat {
Preference prefMailbox = Preference prefMailbox =
requireNonNull(findPreference(PREF_KEY_MAILBOX)); requireNonNull(findPreference(PREF_KEY_MAILBOX));
if (viewModel.shouldEnableMailbox()) { prefMailbox.setOnPreferenceClickListener(preference -> {
prefMailbox.setOnPreferenceClickListener(preference -> { Intent i = new Intent(requireContext(), MailboxActivity.class);
Intent i = new Intent(requireContext(), MailboxActivity.class); startActivity(i);
startActivity(i); return true;
return true; });
});
} else {
prefMailbox.setVisible(false);
}
Preference prefFeedback = Preference prefFeedback =
requireNonNull(findPreference(PREF_KEY_FEEDBACK)); requireNonNull(findPreference(PREF_KEY_FEEDBACK));

4
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java
View File

@@ -161,10 +161,6 @@ class SettingsViewModel extends DbViewModel implements EventListener {
return featureFlags.shouldEnableProfilePictures(); return featureFlags.shouldEnableProfilePictures();
} }
boolean shouldEnableMailbox() {
return featureFlags.shouldEnableMailbox();
}
private void loadOwnIdentityInfo() { private void loadOwnIdentityInfo() {
runOnDbThread(() -> { runOnDbThread(() -> {
try { try {

2
briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
View File

@@ -116,7 +116,7 @@ internal class HeadlessModule(private val appDir: File) {
override fun shouldEnableImageAttachments() = false override fun shouldEnableImageAttachments() = false
override fun shouldEnableProfilePictures() = false override fun shouldEnableProfilePictures() = false
override fun shouldEnableDisappearingMessages() = false override fun shouldEnableDisappearingMessages() = false
override fun shouldEnableMailbox() = false override fun shouldEnableMailboxInCore() = true
override fun shouldEnablePrivateGroupsInCore() = false override fun shouldEnablePrivateGroupsInCore() = false
override fun shouldEnableForumsInCore() = true override fun shouldEnableForumsInCore() = true
override fun shouldEnableBlogsInCore() = true override fun shouldEnableBlogsInCore() = true