address reviews

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

@@ -144,7 +144,7 @@ public class KeyAgreementFragment extends BaseEventFragment
 	}
 
 	@Override
-	public void toggleFullscreen(boolean fullscreen) {
+	public void setFullscreen(boolean fullscreen) {
 		LinearLayout.LayoutParams statusParams, qrCodeParams;
 		if (fullscreen) {
 			// Grow the QR code view to fill its parent
@@ -278,6 +278,11 @@ public class KeyAgreementFragment extends BaseEventFragment
 		});
 	}
 
+	private void keyAgreementWaiting() {
+		runOnUiThreadUnlessDestroyed(
+				() -> status.setText(R.string.waiting_for_contact_to_scan));
+	}
+
 	private void keyAgreementStarted() {
 		runOnUiThreadUnlessDestroyed(() -> {
 			qrCodeView.setVisibility(INVISIBLE);
@@ -286,11 +291,6 @@ public class KeyAgreementFragment extends BaseEventFragment
 		});
 	}
 
-	private void keyAgreementWaiting() {
-		runOnUiThreadUnlessDestroyed(
-				() -> status.setText(R.string.waiting_for_contact_to_scan));
-	}
-
 	private void keyAgreementAborted(boolean remoteAborted) {
 		runOnUiThreadUnlessDestroyed(() -> {
 			reset();

briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java

@@ -29,18 +29,20 @@ public class QrCodeView extends FrameLayout {
         ImageView fullscreenButton = findViewById(R.id.fullscreen_button);
         fullscreenButton.setOnClickListener(v -> {
                     fullscreen = !fullscreen;
-					if (!fullscreen)
+                    if (!fullscreen) {
                         fullscreenButton.setImageResource(
                                 R.drawable.ic_fullscreen_black_48dp);
-					else
+                    } else {
                         fullscreenButton.setImageResource(
                                 R.drawable.ic_fullscreen_exit_black_48dp);
+                    }
                     if (listener != null)
-						listener.toggleFullscreen(fullscreen);
+                        listener.setFullscreen(fullscreen);
                 }
         );
     }
 
+    @UiThread
     public void setQrCode(Bitmap qrCode) {
         qrCodeImageView.setImageBitmap(qrCode);
         // Simple fade-in animation
@@ -55,7 +57,7 @@ public class QrCodeView extends FrameLayout {
     }
 
     public interface FullscreenListener {
-		void toggleFullscreen(boolean isFullscreen);
+        void setFullscreen(boolean fullscreen);
     }
 
 }

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

@@ -3,7 +3,7 @@
 	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"
-	tools:showIn="@layout/list_item_forum">
+	tools:showIn="@layout/fragment_keyagreement_qr">
 
 	<ProgressBar
 		style="?android:attr/progressBarStyleLarge"
@@ -20,12 +20,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:contentDescription="@string/qr_code"
-			android:scaleType="fitCenter"
+			android:scaleType="fitCenter"/>
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintLeft_toLeftOf="parent"
-			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
-			tools:src="@drawable/startup_lock"/>
 
 		<ImageView
 			android:id="@+id/fullscreen_button"
@@ -39,5 +34,6 @@
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintRight_toRightOf="parent"/>
+
 	</android.support.constraint.ConstraintLayout>
 </merge>