Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 03:39:05 +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

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.util.AndroidUtils;
import org.briarproject.bramble.util.StringUtils;
import org.briarproject.briar.BuildConfig;
import org.briarproject.briar.android.account.DozeHelperModule;
import org.briarproject.briar.android.account.LockManagerImpl;
import org.briarproject.briar.android.account.SetupModule;
@@ -212,7 +211,7 @@ public class AppModule {
@Override
public Collection<SimplexPluginFactory> getSimplexFactories() {
List<SimplexPluginFactory> simplex = new ArrayList<>();
if (featureFlags.shouldEnableMailbox()) simplex.add(mailbox);
if (featureFlags.shouldEnableMailboxInCore()) simplex.add(mailbox);
if (SDK_INT >= 19) simplex.add(drive);
return simplex;
}
@@ -354,8 +353,8 @@ public class AppModule {
}
@Override
public boolean shouldEnableMailbox() {
return BuildConfig.DEBUG;
public boolean shouldEnableMailboxInCore() {
return true;
}
@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 =
requireNonNull(findPreference(PREF_KEY_MAILBOX));
if (viewModel.shouldEnableMailbox()) {
prefMailbox.setOnPreferenceClickListener(preference -> {
Intent i = new Intent(requireContext(), MailboxActivity.class);
startActivity(i);
return true;
});
} else {
prefMailbox.setVisible(false);
}
prefMailbox.setOnPreferenceClickListener(preference -> {
Intent i = new Intent(requireContext(), MailboxActivity.class);
startActivity(i);
return true;
});
Preference prefFeedback =
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();
}
boolean shouldEnableMailbox() {
return featureFlags.shouldEnableMailbox();
}
private void loadOwnIdentityInfo() {
runOnDbThread(() -> {
try {