Allow actual QR code scanning and use dedicated contact alias fragment

briar-android/src/main/AndroidManifest.xml

@@ -415,12 +415,12 @@
 
 		<!-- Prototype -->
 		<activity
-			android:name=".android.contact.ContactLinkOutputActivity"
+			android:name=".android.contact.ContactInviteOutputActivity"
 			android:theme="@style/BriarTheme"
 			android:label="@string/send_link_title"/>
 
 		<activity
-			android:name=".android.contact.ContactLinkInputActivity"
+			android:name=".android.contact.ContactInviteInputActivity"
 			android:theme="@style/BriarTheme"
 			android:label="@string/open_link_title"
 			android:windowSoftInputMode="stateHidden|adjustResize">

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

@@ -15,12 +15,14 @@ import org.briarproject.briar.android.blog.ReblogFragment;
 import org.briarproject.briar.android.blog.RssFeedImportActivity;
 import org.briarproject.briar.android.blog.RssFeedManageActivity;
 import org.briarproject.briar.android.blog.WriteBlogPostActivity;
-import org.briarproject.briar.android.contact.ContactLinkInputActivity;
+import org.briarproject.briar.android.contact.ContactAliasInputFragment;
+import org.briarproject.briar.android.contact.ContactInviteInputActivity;
+import org.briarproject.briar.android.contact.ContactInviteOutputActivity;
 import org.briarproject.briar.android.contact.ContactLinkInputFragment;
-import org.briarproject.briar.android.contact.ContactLinkOutputActivity;
 import org.briarproject.briar.android.contact.ContactLinkOutputFragment;
 import org.briarproject.briar.android.contact.ContactListFragment;
 import org.briarproject.briar.android.contact.ContactModule;
+import org.briarproject.briar.android.contact.ContactQrCodeInputFragment;
 import org.briarproject.briar.android.contact.ContactQrCodeOutputFragment;
 import org.briarproject.briar.android.contact.ConversationActivity;
 import org.briarproject.briar.android.contact.PendingRequestsActivity;
@@ -173,12 +175,14 @@ public interface ActivityComponent {
 
 	void inject(UnlockActivity activity);
 
-	void inject(ContactLinkOutputActivity activity);
-	void inject(ContactLinkInputActivity activity);
+	void inject(ContactInviteOutputActivity activity);
+	void inject(ContactInviteInputActivity activity);
 	void inject(PendingRequestsActivity activity);
 	void inject(ContactLinkOutputFragment activity);
 	void inject(ContactQrCodeOutputFragment activity);
 	void inject(ContactLinkInputFragment activity);
+	void inject(ContactQrCodeInputFragment activity);
+	void inject(ContactAliasInputFragment activity);
 
 	// Fragments
 	void inject(AuthorNameFragment fragment);

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactAliasInputFragment.java

@@ -0,0 +1,112 @@
+package org.briarproject.briar.android.contact;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
+
+import javax.annotation.Nullable;
+
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+@NotNullByDefault
+public class ContactAliasInputFragment extends BaseFragment
+		implements TextWatcher {
+
+	private EditText contactNameInput;
+	private Button addButton;
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+
+		getActivity().setTitle("Enter Contact Name");
+
+		View v = inflater.inflate(R.layout.fragment_contact_alias_input,
+				container, false);
+
+		contactNameInput = v.findViewById(R.id.contactNameInput);
+		contactNameInput.addTextChangedListener(this);
+
+		addButton = v.findViewById(R.id.addButton);
+		addButton.setOnClickListener(view -> onAddButtonClicked());
+
+		return v;
+	}
+
+	public static final String TAG = ContactAliasInputFragment.class.getName();
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public void beforeTextChanged(CharSequence s, int start, int count,
+			int after) {
+	}
+
+	@Override
+	public void onTextChanged(CharSequence s, int start, int before,
+			int count) {
+		updateAddButtonState();
+	}
+
+	@Override
+	public void afterTextChanged(Editable s) {
+	}
+
+	private boolean isBriarLink(CharSequence s) {
+		return getActivity() != null &&
+				((ContactInviteInputActivity) getActivity()).isBriarLink(s);
+	}
+
+	private void updateAddButtonState() {
+		addButton.setEnabled(contactNameInput.getText().length() > 0);
+	}
+
+	private void onAddButtonClicked() {
+		if (getActivity() == null || getContext() == null) return;;
+
+		((ContactInviteInputActivity) getActivity())
+				.addFakeRequest(contactNameInput.getText().toString());
+
+		AlertDialog.Builder builder = new AlertDialog.Builder(getContext(), R.style.BriarDialogTheme_Neutral);
+		builder.setTitle("Contact requested");
+		builder.setMessage(getString(R.string.add_contact_link_question));
+		builder.setPositiveButton(R.string.yes, (dialog, which) -> {
+			Intent intent = new Intent(getContext(), NavDrawerActivity.class);
+			intent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP);
+			startActivity(intent);
+			finish();
+		});
+		builder.setNegativeButton(R.string.no, (dialog, which) -> {
+			startActivity(
+					new Intent(getContext(), ContactInviteOutputActivity.class));
+			finish();
+		});
+		builder.show();
+	}
+
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactInviteInputActivity.java

@@ -32,7 +32,7 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.RUNNING;
 
-public class ContactLinkInputActivity extends BriarActivity implements
+public class ContactInviteInputActivity extends BriarActivity implements
 		BaseFragmentListener {
 
 	@Inject
@@ -76,6 +76,7 @@ public class ContactLinkInputActivity extends BriarActivity implements
 			} else if ("addContact".equals(action)) {
 				removeFakeRequest(i.getStringExtra("name"),
 						i.getLongExtra("timestamp", 0));
+				setIntent(null);
 				finish();
 			}
 		}
@@ -95,6 +96,23 @@ public class ContactLinkInputActivity extends BriarActivity implements
 		}
 	}
 
+	boolean isBriarLink(CharSequence s) {
+		String link = s.toString().trim();
+		return link.matches("^(briar://)?[A-Z2-7]{64}$");
+	}
+
+	void showLink() {
+		showInitialFragment(ContactLinkInputFragment.newInstance(null));
+	}
+
+	void showCode() {
+		showInitialFragment(new ContactQrCodeInputFragment());
+	}
+
+	void showAlias() {
+		showNextFragment(new ContactAliasInputFragment());
+	}
+
 	void addFakeRequest(String name) {
 		long timestamp = clock.currentTimeMillis();
 		try {
@@ -109,7 +127,7 @@ public class ContactLinkInputActivity extends BriarActivity implements
 		long fromNow = (long) (-m * Math.log(new Random().nextDouble()));
 		long triggerAt = elapsedRealtime() + fromNow;
 
-		Intent i = new Intent(this, ContactLinkInputActivity.class);
+		Intent i = new Intent(this, ContactInviteInputActivity.class);
 		i.setAction("addContact");
 		i.putExtra("name", name);
 		i.putExtra("timestamp", timestamp);

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactInviteOutputActivity.java

@@ -11,7 +11,7 @@ import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener
 
 import javax.annotation.Nullable;
 
-public class ContactLinkOutputActivity extends BriarActivity implements
+public class ContactInviteOutputActivity extends BriarActivity implements
 		BaseFragmentListener {
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactLinkInputFragment.java

@@ -11,7 +11,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.Toast;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
@@ -73,9 +72,8 @@ public class ContactLinkInputFragment extends BaseFragment
 		addButton.setOnClickListener(view -> onAddButtonClicked());
 
 		Button scanCodeButton = v.findViewById(R.id.scanCodeButton);
-		scanCodeButton.setOnClickListener(view -> Toast
-				.makeText(getContext(), "Not implemented!", Toast.LENGTH_SHORT)
-				.show());
+		scanCodeButton.setOnClickListener(view ->
+				((ContactInviteInputActivity) getActivity()).showCode());
 
 		linkInput.setText(getArguments().getString("link"));
 
@@ -93,6 +91,7 @@ public class ContactLinkInputFragment extends BaseFragment
 	public void injectFragment(ActivityComponent component) {
 		component.inject(this);
 	}
+
 	@Override
 	public void onResume() {
 		super.onResume();
@@ -115,17 +114,19 @@ public class ContactLinkInputFragment extends BaseFragment
 	@Override
 	public void onTextChanged(CharSequence s, int start, int before,
 			int count) {
-		updateAddButtonState();
+		if (isBriarLink(linkInput.getText()) && getActivity() != null) {
+			linkInput.setText(null);
+			((ContactInviteInputActivity) getActivity()).showAlias();
+		}
 	}
 
 	@Override
 	public void afterTextChanged(Editable s) {
 	}
 
-
 	private boolean isBriarLink(CharSequence s) {
-		String link = s.toString().trim();
-		return link.matches("^(briar://)?[A-Z2-7]{64}$");
+		return getActivity() != null &&
+				((ContactInviteInputActivity) getActivity()).isBriarLink(s);
 	}
 
 	private void updateAddButtonState() {
@@ -134,12 +135,14 @@ public class ContactLinkInputFragment extends BaseFragment
 	}
 
 	private void onAddButtonClicked() {
-		if (getActivity() == null || getContext() == null) return;;
+		if (getActivity() == null || getContext() == null) return;
+		;
 
-		((ContactLinkInputActivity) getActivity())
+		((ContactInviteInputActivity) getActivity())
 				.addFakeRequest(contactNameInput.getText().toString());
 
-		AlertDialog.Builder builder = new AlertDialog.Builder(getContext(), R.style.BriarDialogTheme_Neutral);
+		AlertDialog.Builder builder = new AlertDialog.Builder(getContext(),
+				R.style.BriarDialogTheme_Neutral);
 		builder.setMessage(getString(R.string.add_contact_link_question));
 		builder.setPositiveButton(R.string.yes, (dialog, which) -> {
 			Intent intent = new Intent(getContext(), NavDrawerActivity.class);
@@ -149,7 +152,8 @@ public class ContactLinkInputFragment extends BaseFragment
 		});
 		builder.setNegativeButton(R.string.no, (dialog, which) -> {
 			startActivity(
-					new Intent(getContext(), ContactLinkOutputActivity.class));
+					new Intent(getContext(),
+							ContactInviteOutputActivity.class));
 			finish();
 		});
 		builder.show();

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactLinkOutputFragment.java

@@ -66,7 +66,7 @@ public class ContactLinkOutputFragment extends BaseFragment {
 
 		Button showCodeButton = v.findViewById(R.id.showCodeButton);
 		showCodeButton.setOnClickListener(
-				view -> ((ContactLinkOutputActivity) getActivity()).showCode());
+				view -> ((ContactInviteOutputActivity) getActivity()).showCode());
 		return v;
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java

@@ -204,11 +204,11 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 				return false;
 			case R.id.action_open_link:
 				startActivity(new Intent(getContext(),
-						ContactLinkInputActivity.class));
+						ContactInviteInputActivity.class));
 				return false;
 			case R.id.action_send_link:
 				startActivity(new Intent(getContext(),
-						ContactLinkOutputActivity.class));
+						ContactInviteOutputActivity.class));
 				return false;
 			default:
 				return false;

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactQrCodeInputFragment.java

@@ -0,0 +1,182 @@
+package org.briarproject.briar.android.contact;
+
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
+import android.support.v7.app.AlertDialog;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.google.zxing.Result;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+import org.briarproject.briar.android.keyagreement.CameraException;
+import org.briarproject.briar.android.keyagreement.CameraView;
+import org.briarproject.briar.android.keyagreement.QrCodeDecoder;
+import org.briarproject.briar.android.util.UiUtils;
+
+import javax.annotation.Nullable;
+
+import static android.Manifest.permission.CAMERA;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
+import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+import static android.widget.Toast.LENGTH_LONG;
+import static android.widget.Toast.LENGTH_SHORT;
+import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_PERMISSION_CAMERA;
+
+@NotNullByDefault
+public class ContactQrCodeInputFragment extends BaseFragment
+		implements QrCodeDecoder.ResultCallback {
+
+	private CameraView cameraView;
+
+	@Override
+	public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+		super.onActivityCreated(savedInstanceState);
+		getActivity().setRequestedOrientation(SCREEN_ORIENTATION_NOSENSOR);
+		cameraView.setPreviewConsumer(new QrCodeDecoder(this));
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+
+		getActivity().setTitle(R.string.open_link_title);
+
+		View v = inflater.inflate(R.layout.fragment_contact_qr_code_input,
+				container, false);
+
+		cameraView = v.findViewById(R.id.camera_view);
+
+
+		Button enterLinkButton = v.findViewById(R.id.enterLinkButton);
+		enterLinkButton.setOnClickListener(view ->
+				((ContactInviteInputActivity) getActivity()).showLink());
+
+		return v;
+	}
+
+	public static final String TAG = ContactQrCodeInputFragment.class.getName();
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		if (checkPermissions()) {
+			startCamera();
+		}
+	}
+
+	@Override
+	public void onStop() {
+		super.onStop();
+		try {
+			cameraView.stop();
+		} catch (CameraException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void startCamera() {
+		try {
+			cameraView.start();
+		} catch (CameraException e) {
+			e.printStackTrace();
+			Toast.makeText(getContext(), "Camera Error", LENGTH_SHORT)
+					.show();
+		}
+	}
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	private boolean checkPermissions() {
+		if (ActivityCompat.checkSelfPermission(getContext(), CAMERA) !=
+				PERMISSION_GRANTED) {
+			// Should we show an explanation?
+			if (shouldShowRequestPermissionRationale(CAMERA)) {
+				DialogInterface.OnClickListener continueListener =
+						(dialog, which) -> requestPermission();
+				AlertDialog.Builder
+						builder = new AlertDialog.Builder(getContext(), R.style.BriarDialogTheme);
+				builder.setTitle(R.string.permission_camera_title);
+				builder.setMessage(R.string.permission_camera_request_body);
+				builder.setNeutralButton(R.string.continue_button,
+						continueListener);
+				builder.show();
+			} else {
+				requestPermission();
+			}
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	@Override
+	public void onRequestPermissionsResult(int requestCode,
+			@NonNull String[] permissions, @NonNull int[] grantResults) {
+		if (requestCode == REQUEST_PERMISSION_CAMERA) {
+			// If request is cancelled, the result arrays are empty.
+			if (grantResults.length > 0 &&
+					grantResults[0] == PERMISSION_GRANTED) {
+				startCamera();
+			} else {
+				if (!shouldShowRequestPermissionRationale(CAMERA)) {
+					// The user has permanently denied the request
+					AlertDialog.Builder
+							builder = new AlertDialog.Builder(getContext(),
+							R.style.BriarDialogTheme);
+					builder.setTitle(R.string.permission_camera_title);
+					builder.setMessage(R.string.permission_camera_denied_body);
+					builder.setPositiveButton(R.string.ok,
+							UiUtils.getGoToSettingsListener(getContext()));
+					builder.setNegativeButton(R.string.cancel,
+							(dialog, which) -> showLink());
+					builder.show();
+				} else {
+					Toast.makeText(getContext(),
+							R.string.permission_camera_denied_toast,
+							LENGTH_LONG).show();
+					showLink();
+				}
+			}
+		}
+	}
+
+	private void requestPermission() {
+		requestPermissions(new String[] {CAMERA}, REQUEST_PERMISSION_CAMERA);
+	}
+
+	private void showLink() {
+		if (getActivity() != null)
+			((ContactInviteInputActivity) getActivity()).showLink();
+	}
+
+	@Override
+	public void handleResult(Result result) {
+		Log.e("TEST", result.toString());
+		if (getActivity() != null &&
+				((ContactInviteInputActivity) getActivity())
+						.isBriarLink(result.getText())) {
+			((ContactInviteInputActivity) getActivity()).showAlias();
+		}
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactQrCodeOutputFragment.java

@@ -48,7 +48,7 @@ public class ContactQrCodeOutputFragment extends BaseFragment
 
 		Button showLinkButton = v.findViewById(R.id.showLinkButton);
 		showLinkButton.setOnClickListener(
-				view -> ((ContactLinkOutputActivity) getActivity()).showLink());
+				view -> ((ContactInviteOutputActivity) getActivity()).showLink());
 
 		return v;
 	}

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraException.java

@@ -2,7 +2,7 @@ package org.briarproject.briar.android.keyagreement;
 
 import java.io.IOException;
 
-class CameraException extends IOException {
+public class CameraException extends IOException {
 
 	CameraException(String message) {
 		super(message);

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/PreviewConsumer.java

@@ -7,7 +7,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 @SuppressWarnings("deprecation")
 @NotNullByDefault
-interface PreviewConsumer {
+public interface PreviewConsumer {
 
 	@UiThread
 	void start(Camera camera, int cameraIndex);

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeDecoder.java

@@ -29,7 +29,7 @@ import static java.util.logging.Level.WARNING;
 @SuppressWarnings("deprecation")
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
+public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 
 	private static final Logger LOG =
 			Logger.getLogger(QrCodeDecoder.class.getName());
@@ -40,7 +40,7 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 	private Camera camera = null;
 	private int cameraIndex = 0;
 
-	QrCodeDecoder(ResultCallback callback) {
+	public QrCodeDecoder(ResultCallback callback) {
 		this.callback = callback;
 	}
 
@@ -141,7 +141,7 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 	}
 
 	@NotNullByDefault
-	interface ResultCallback {
+	public interface ResultCallback {
 
 		void handleResult(Result result);
 	}

briar-android/src/main/res/drawable/ic_content_paste.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,2h-4.18C14.4,0.84 13.3,0 12,0c-1.3,0 -2.4,0.84 -2.82,2L5,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,2c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM19,20L5,20L5,4h2v3h10L17,4h2v16z"/>
+</vector>

briar-android/src/main/res/layout/fragment_contact_alias_input.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<EditText
+		android:id="@+id/contactNameInput"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/margin_large"
+		android:hint="@string/contact_name_hint"
+		android:importantForAutofill="no"
+		android:inputType="text|textCapWords"
+		app:layout_constraintBottom_toTopOf="@id/linkInput"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_chainStyle="packed"/>
+
+	<Button
+		android:id="@+id/addButton"
+		style="@style/BriarButton"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/margin_large"
+		android:layout_marginTop="8dp"
+		android:enabled="false"
+		android:text="@string/add_contact_button"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/contactNameInput"
+		tools:enabled="true"/>
+
+</android.support.constraint.ConstraintLayout>

briar-android/src/main/res/layout/fragment_contact_link_input.xml

@@ -14,6 +14,7 @@
 		android:hint="@string/contact_name_hint"
 		android:importantForAutofill="no"
 		android:inputType="text|textCapWords"
+		android:visibility="gone"
 		app:layout_constraintBottom_toTopOf="@id/linkInput"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
@@ -26,6 +27,7 @@
 		android:layout_height="wrap_content"
 		android:layout_marginLeft="@dimen/margin_large"
 		android:layout_marginStart="@dimen/margin_large"
+		android:layout_marginTop="16dp"
 		android:hint="@string/contact_link_hint"
 		android:importantForAutofill="no"
 		android:inputType="textUri"
@@ -40,7 +42,11 @@
 		style="@style/BriarButtonFlat.Positive"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_margin="@dimen/margin_large"
+		android:layout_marginEnd="8dp"
+		android:layout_marginRight="8dp"
+		android:drawableLeft="@drawable/ic_content_paste"
+		android:drawablePadding="8dp"
+		android:drawableTint="@color/briar_text_link"
 		android:text="@string/paste_button"
 		app:layout_constraintBottom_toBottomOf="@id/linkInput"
 		app:layout_constraintEnd_toEndOf="parent"
@@ -55,6 +61,8 @@
 		android:layout_margin="@dimen/margin_large"
 		android:enabled="false"
 		android:text="@string/add_contact_button"
+
+		android:visibility="gone"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@id/linkInput"

briar-android/src/main/res/layout/fragment_contact_qr_code_input.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<org.briarproject.briar.android.keyagreement.CameraView
+		android:id="@+id/camera_view"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintBottom_toTopOf="@+id/textView3"
+		app:layout_constraintTop_toTopOf="parent"/>
+
+	<TextView
+		android:id="@+id/textView3"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="8dp"
+		android:layout_marginLeft="8dp"
+		android:layout_marginRight="8dp"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="16dp"
+		android:text="or"
+		android:textSize="18sp"
+		app:layout_constraintBottom_toTopOf="@+id/enterLinkButton"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/camera_view"/>
+
+	<Button
+		android:id="@+id/enterLinkButton"
+		style="@style/BriarButton"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="16dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="16dp"
+		android:drawableLeft="@drawable/ic_link"
+		android:drawablePadding="8dp"
+		android:text="Enter Link"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/textView3"/>
+
+</android.support.constraint.ConstraintLayout>

briar-android/src/main/res/layout/fragment_contact_qr_code_output.xml

@@ -58,9 +58,9 @@
 		style="@style/BriarButton"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="8dp"
-		android:layout_marginEnd="8dp"
-		android:layout_marginStart="8dp"
+		android:layout_marginBottom="16dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginStart="16dp"
 		android:layout_marginTop="8dp"
 		android:drawableLeft="@drawable/ic_link"
 		android:drawablePadding="8dp"

briar-android/src/main/res/values/strings.xml

@@ -161,7 +161,7 @@
 	<string name="contact_name_hint">Contact name</string>
 	<string name="contact_link_hint">Contact link</string>
 	<string name="paste_button">Paste</string>
-	<string name="add_contact_button">Add Contact</string>
+	<string name="add_contact_button">Request Contact</string>
 	<string name="share_button">Share</string>
 	<string name="copy_button">Copy</string>
 	<string name="send_link_instructions">Send this link to your contact:</string>