From 7ffcace228209a7352cedb9b1993b1b104bb5063 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 8 Aug 2018 16:52:28 -0300
Subject: [PATCH] Rename Main Flavor due to internal conflicts

---
 briar-android/build.gradle                                      | 2 +-
 .../org/briarproject/briar/android/BriarUiTestComponent.java    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index a39240a65..edfe7ba99 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -296,7 +296,7 @@ android {
 			minSdkVersion 18
 			applicationIdSuffix ".screenshot" // = org.briarproject.briar.android.screenshot.debug
 		}
-		main {
+		official {
 			dimension "version"
 		}
 	}
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarUiTestComponent.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarUiTestComponent.java
index af1cba5f0..f00200ac5 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarUiTestComponent.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarUiTestComponent.java
@@ -4,7 +4,6 @@ import org.briarproject.bramble.BrambleAndroidModule;
 import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.account.BriarAccountModule;
 import org.briarproject.briar.BriarCoreModule;
-import org.briarproject.briar.android.login.PasswordActivityTest;
 import org.briarproject.briar.android.login.SetupActivityScreenshotTest;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivityTest;
 import org.briarproject.briar.android.settings.SettingsActivityScreenshotTest;
@@ -24,7 +23,6 @@ import dagger.Component;
 public interface BriarUiTestComponent extends AndroidComponent {
 
 	void inject(SetupActivityScreenshotTest test);
-	void inject(PasswordActivityTest test);
 	void inject(NavDrawerActivityTest test);
 	void inject(SettingsActivityScreenshotTest test);