diff --git a/briar-android/src/net/sf/briar/android/invitation/BluetoothStatusView.java b/briar-android/src/net/sf/briar/android/invitation/BluetoothStatusView.java
index 1cec858cbcb2f67c7997a757736b321f14845c16..d07d63d181e9496931c04be154f1d798f342882d 100644
--- a/briar-android/src/net/sf/briar/android/invitation/BluetoothStatusView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/BluetoothStatusView.java
@@ -15,8 +15,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-public class BluetoothStatusView extends LinearLayout
-implements OnClickListener {
+class BluetoothStatusView extends LinearLayout implements OnClickListener {
 
 	public BluetoothStatusView(Context ctx) {
 		super(ctx);
diff --git a/briar-android/src/net/sf/briar/android/invitation/CodeEntryView.java b/briar-android/src/net/sf/briar/android/invitation/CodeEntryView.java
index bafcba55d70744e42e2adbcbca94a62eeb8a3813..fd287dfa1bb444fb715d36bfbd144fd87d2fdf42 100644
--- a/briar-android/src/net/sf/briar/android/invitation/CodeEntryView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/CodeEntryView.java
@@ -18,7 +18,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-public class CodeEntryView extends LinearLayout
+class CodeEntryView extends LinearLayout
 implements OnEditorActionListener, OnClickListener {
 
 	private CodeEntryListener listener = null;
diff --git a/briar-android/src/net/sf/briar/android/invitation/CodesDoNotMatchView.java b/briar-android/src/net/sf/briar/android/invitation/CodesDoNotMatchView.java
index ca8d119e8d67601846384e2a7d47582d9233bc3f..6691e97d77e20065cdbdd88625daf3e48a00937b 100644
--- a/briar-android/src/net/sf/briar/android/invitation/CodesDoNotMatchView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/CodesDoNotMatchView.java
@@ -11,8 +11,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-public class CodesDoNotMatchView extends AddContactView
-implements OnClickListener {
+class CodesDoNotMatchView extends AddContactView implements OnClickListener {
 
 	CodesDoNotMatchView(Context ctx) {
 		super(ctx);
diff --git a/briar-android/src/net/sf/briar/android/invitation/ConfirmationCodeView.java b/briar-android/src/net/sf/briar/android/invitation/ConfirmationCodeView.java
index 0e5caf53f23d98dbef9265c6a559b8b4f1413350..664ab8c336bdba744b82e676fc2f8f0f67305854 100644
--- a/briar-android/src/net/sf/briar/android/invitation/ConfirmationCodeView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/ConfirmationCodeView.java
@@ -9,8 +9,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-public class ConfirmationCodeView extends AddContactView
-implements CodeEntryListener {
+class ConfirmationCodeView extends AddContactView implements CodeEntryListener {
 
 	ConfirmationCodeView(Context ctx) {
 		super(ctx);
diff --git a/briar-android/src/net/sf/briar/android/invitation/ConnectedView.java b/briar-android/src/net/sf/briar/android/invitation/ConnectedView.java
index ba73343fb10f61a5ae044f072ce58e5e5909695b..17c56ee8dc49300ad50f31783ab972ec21c8146f 100644
--- a/briar-android/src/net/sf/briar/android/invitation/ConnectedView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/ConnectedView.java
@@ -7,7 +7,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-public class ConnectedView extends AddContactView {
+class ConnectedView extends AddContactView {
 
 	ConnectedView(Context ctx) {
 		super(ctx);
diff --git a/briar-android/src/net/sf/briar/android/invitation/ConnectionFailedView.java b/briar-android/src/net/sf/briar/android/invitation/ConnectionFailedView.java
index f3c5bf42f6daf75c9e5f5cbaf32dde4745265d66..81e0f03d3a106c7b40671722be6c8806dcfe7272 100644
--- a/briar-android/src/net/sf/briar/android/invitation/ConnectionFailedView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/ConnectionFailedView.java
@@ -11,8 +11,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-public class ConnectionFailedView extends AddContactView
-implements OnClickListener {
+class ConnectionFailedView extends AddContactView implements OnClickListener {
 
 	private WifiStatusView wifi = null;
 	private BluetoothStatusView bluetooth = null;
diff --git a/briar-android/src/net/sf/briar/android/invitation/ConnectionView.java b/briar-android/src/net/sf/briar/android/invitation/ConnectionView.java
index 6b137c4a534b85e1c17614392245c6ac91f359bb..05f557a704b7b22da65ebf6ae3135015b761f28d 100644
--- a/briar-android/src/net/sf/briar/android/invitation/ConnectionView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/ConnectionView.java
@@ -8,7 +8,7 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-public class ConnectionView extends AddContactView {
+class ConnectionView extends AddContactView {
 
 	ConnectionView(Context ctx) {
 		super(ctx);
diff --git a/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java b/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java
index dfb2d0103475c9366f7f9b170d674ffa153a1bb6..30890a554e58cca37e998f8b956d1516fcf7cdc5 100644
--- a/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java
@@ -11,8 +11,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-public class ContactAddedView extends AddContactView
-implements OnClickListener {
+class ContactAddedView extends AddContactView implements OnClickListener {
 
 	ContactAddedView(Context ctx) {
 		super(ctx);
diff --git a/briar-android/src/net/sf/briar/android/invitation/InvitationCodeView.java b/briar-android/src/net/sf/briar/android/invitation/InvitationCodeView.java
index 262b0ae94c9bac9629f21e671ce2c2d57c8e34a4..c109fb1051091a70469f2040735c9a4c0285ad91 100644
--- a/briar-android/src/net/sf/briar/android/invitation/InvitationCodeView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/InvitationCodeView.java
@@ -6,8 +6,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.widget.TextView;
 
-public class InvitationCodeView extends AddContactView
-implements CodeEntryListener {
+class InvitationCodeView extends AddContactView implements CodeEntryListener {
 
 	InvitationCodeView(Context ctx) {
 		super(ctx);
diff --git a/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java b/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java
index 5756fb30b376c9bb7500de649217eada989c3898..57c4d046809a75ce40b27996980a2591f81fb258 100644
--- a/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java
@@ -20,7 +20,7 @@ import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-public class NetworkSetupView extends AddContactView
+class NetworkSetupView extends AddContactView
 implements OnItemSelectedListener, OnClickListener {
 
 	private LocalAuthorSpinnerAdapter adapter = null;
diff --git a/briar-android/src/net/sf/briar/android/invitation/WaitForContactView.java b/briar-android/src/net/sf/briar/android/invitation/WaitForContactView.java
index c4df2de2317abaeb5a2c0b87bbba36a1aaad9d66..22e2e04c9704cc97f7490ebd69f59184b61a3813 100644
--- a/briar-android/src/net/sf/briar/android/invitation/WaitForContactView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/WaitForContactView.java
@@ -9,7 +9,7 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-public class WaitForContactView extends AddContactView {
+class WaitForContactView extends AddContactView {
 
 	WaitForContactView(Context ctx) {
 		super(ctx);
diff --git a/briar-android/src/net/sf/briar/android/invitation/WifiStatusView.java b/briar-android/src/net/sf/briar/android/invitation/WifiStatusView.java
index 2f88acffc0b94fd3520f992ccfe8cff8d4b58476..c46d281d50a4d153cd12c81568fbb8fdcabe4004 100644
--- a/briar-android/src/net/sf/briar/android/invitation/WifiStatusView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/WifiStatusView.java
@@ -16,7 +16,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-public class WifiStatusView extends LinearLayout implements OnClickListener {
+class WifiStatusView extends LinearLayout implements OnClickListener {
 
 	public WifiStatusView(Context ctx) {
 		super(ctx);