Add an option to debug builds to create fake test data

briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java

@@ -26,7 +26,6 @@ import org.briarproject.briar.BriarCoreEagerSingletons;
 import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.reporting.BriarReportSender;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
-import org.briarproject.briar.api.android.ReferenceManager;
 import org.briarproject.briar.api.android.ScreenFilterMonitor;
 import org.briarproject.briar.api.blog.BlogManager;
 import org.briarproject.briar.api.blog.BlogPostFactory;
@@ -44,6 +43,7 @@ import org.briarproject.briar.api.privategroup.PrivateGroupFactory;
 import org.briarproject.briar.api.privategroup.PrivateGroupManager;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationFactory;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager;
+import org.briarproject.briar.api.test.TestDataCreator;
 import org.thoughtcrime.securesms.components.emoji.EmojiProvider;
 import org.thoughtcrime.securesms.components.emoji.RecentEmojiPageModel;
 
@@ -73,8 +73,6 @@ public interface AndroidComponent
 
 	DatabaseConfig databaseConfig();
 
-	ReferenceManager referenceMangager();
-
 	@DatabaseExecutor
 	Executor databaseExecutor();
 
@@ -140,6 +138,8 @@ public interface AndroidComponent
 
 	Clock clock();
 
+	TestDataCreator testDataCreator();
+
 	@IoExecutor
 	Executor ioExecutor();
 

briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java

@@ -51,6 +51,7 @@ import org.briarproject.briar.android.privategroup.reveal.GroupRevealModule;
 import org.briarproject.briar.android.privategroup.reveal.RevealContactsActivity;
 import org.briarproject.briar.android.privategroup.reveal.RevealContactsFragment;
 import org.briarproject.briar.android.settings.SettingsActivity;
+import org.briarproject.briar.android.settings.SettingsFragment;
 import org.briarproject.briar.android.sharing.BlogInvitationActivity;
 import org.briarproject.briar.android.sharing.BlogSharingStatusActivity;
 import org.briarproject.briar.android.sharing.ForumInvitationActivity;
@@ -179,4 +180,6 @@ public interface ActivityComponent {
 
 	void inject(IntroductionMessageFragment fragment);
 
+	void inject(SettingsFragment fragment);
+
 }

briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java

@@ -4,24 +4,12 @@ import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.view.MenuItem;
 
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.settings.SettingsManager;
-import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
 
-import javax.inject.Inject;
-
 public class SettingsActivity extends BriarActivity {
 
-	@Inject
-	protected AndroidExecutor androidExecutor;
-	@Inject
-	protected SettingsManager settingsManager;
-	@Inject
-	protected EventBus eventBus;
-
 	@Override
 	public void onCreate(Bundle bundle) {
 		super.onCreate(bundle);
@@ -40,18 +28,6 @@ public class SettingsActivity extends BriarActivity {
 		component.inject(this);
 	}
 
-	public AndroidExecutor getAndroidExecutor() {
-		return androidExecutor;
-	}
-
-	public SettingsManager getSettingsManager() {
-		return settingsManager;
-	}
-
-	public EventBus getEventBus() {
-		return eventBus;
-	}
-
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		if (item.getItemId() == android.R.id.home) {

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

@@ -34,9 +34,12 @@ import org.briarproject.bramble.util.StringUtils;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.util.UserFeedback;
 import org.briarproject.briar.android.widget.PreferenceDividerDecoration;
+import org.briarproject.briar.api.test.TestDataCreator;
 
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import static android.app.Activity.RESULT_OK;
 import static android.media.RingtoneManager.ACTION_RINGTONE_PICKER;
 import static android.media.RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI;
@@ -53,6 +56,7 @@ import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.PREF_BT_ENABLE;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_ALWAYS;
+import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_RINGTONE;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_BLOG;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_FORUM;
@@ -77,7 +81,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
 			Logger.getLogger(SettingsFragment.class.getName());
 
 	private SettingsActivity listener;
-	private AndroidExecutor androidExecutor;
 	private ListPreference enableBluetooth;
 	private ListPreference torNetwork;
 	private CheckBoxPreference notifyPrivateMessages;
@@ -90,18 +93,24 @@ public class SettingsFragment extends PreferenceFragmentCompat
 	private Preference notifySound;
 
 	// Fields that are accessed from background threads must be volatile
-	private volatile SettingsManager settingsManager;
-	private volatile EventBus eventBus;
-	private volatile Settings settings;
+	volatile Settings settings;
+	@Inject
+	volatile SettingsManager settingsManager;
+	@Inject
+	volatile EventBus eventBus;
+
+	@Inject
+	AndroidExecutor androidExecutor;
+	@Inject
+	TestDataCreator testDataCreator;
 
 	@Override
 	public void onAttach(Context context) {
 		super.onAttach(context);
-
 		listener = (SettingsActivity) context;
-		androidExecutor = listener.getAndroidExecutor();
-		settingsManager = listener.getSettingsManager();
-		eventBus = listener.getEventBus();
+		// we need to inject here,
+		// because onActivityCreated() is called after onCreatePreferences()
+		listener.getActivityComponent().inject(this);
 	}
 
 	@Override
@@ -170,6 +179,23 @@ public class SettingsFragment extends PreferenceFragmentCompat
 					}
 				});
 
+		Preference testData = findPreference("pref_key_test_data");
+		if (IS_DEBUG_BUILD) {
+			testData.setOnPreferenceClickListener(
+					new Preference.OnPreferenceClickListener() {
+						@Override
+						public boolean onPreferenceClick(
+								Preference preference) {
+							LOG.info("Creating test data");
+							testDataCreator.createTestData();
+							getActivity().finish();
+							return true;
+						}
+					});
+		} else {
+			testData.setVisible(false);
+		}
+
 		loadSettings();
 	}
 
@@ -428,4 +454,5 @@ public class SettingsFragment extends PreferenceFragmentCompat
 			}
 		}
 	}
+
 }

briar-android/src/main/res/xml/settings.xml

@@ -114,4 +114,8 @@
 
 	</PreferenceCategory>
 
+	<Preference
+		android:key="pref_key_test_data"
+		android:title="Create Test Data"/>
+
 </PreferenceScreen>