From 5e3650bcd982a5293e4c4b8dbc087aa259e0d582 Mon Sep 17 00:00:00 2001
From: Felix Prahl-Kamps <felixpk@outlook.de>
Date: Thu, 11 Jul 2019 16:22:58 +0200
Subject: [PATCH 1/3] add new exchange activity

---
 .idea/misc.xml                                |   2 +-
 app/src/main/AndroidManifest.xml              |   6 +
 .../activities/ExchangeActivity2.java         | 117 ++++++++
 .../mispbump/activities/StartUpActivity.java  |  17 +-
 .../FixedAspectRatioFrameLayout.java          |  59 ++++
 .../main/res/drawable/ic_camera_border.xml    |   7 +
 .../main/res/drawable/ic_verified_user.xml    |   2 +-
 .../res/drawable/rect_rounded_inverse.xml     |  13 +
 app/src/main/res/layout/activity_exchange.xml |  12 +-
 .../main/res/layout/activity_exchange_2.xml   | 264 ++++++++++++++++++
 app/src/main/res/values/attrs.xml             |   5 +
 app/src/main/res/values/colors.xml            |   1 +
 build.gradle                                  |   2 +-
 13 files changed, 491 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity2.java
 create mode 100644 app/src/main/java/lu/circl/mispbump/customViews/FixedAspectRatioFrameLayout.java
 create mode 100644 app/src/main/res/drawable/ic_camera_border.xml
 create mode 100644 app/src/main/res/drawable/rect_rounded_inverse.xml
 create mode 100644 app/src/main/res/layout/activity_exchange_2.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index da7759f..93a9df2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -38,7 +38,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9dde01d..8e65ec5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,6 +28,12 @@
         <activity
             android:name=".activities.HomeActivity"
             android:label="@string/app_name" />
+        <activity
+            android:name=".activities.ExchangeActivity2"
+            android:configChanges="orientation|screenSize"
+            android:parentActivityName=".activities.HomeActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.Translucent" />
         <activity
             android:name=".activities.ExchangeActivity"
             android:configChanges="orientation|screenSize"
diff --git a/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity2.java b/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity2.java
new file mode 100644
index 0000000..ee6b280
--- /dev/null
+++ b/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity2.java
@@ -0,0 +1,117 @@
+package lu.circl.mispbump.activities;
+
+import android.content.res.ColorStateList;
+import android.os.Bundle;
+import android.view.View;
+import android.view.animation.AnticipateOvershootInterpolator;
+import android.view.animation.DecelerateInterpolator;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
+import lu.circl.mispbump.R;
+import lu.circl.mispbump.auxiliary.QrCodeGenerator;
+import lu.circl.mispbump.fragments.CameraFragment;
+
+public class ExchangeActivity2 extends AppCompatActivity {
+
+    private QrCodeGenerator qrCodeGenerator;
+
+    private TextView titleView, hintView;
+    private View fragmentContainer;
+    private ImageView qrCode;
+    private ImageButton prevButton, nextButton, qrInfoButton;
+
+    private CameraFragment cameraFragment;
+    private boolean isDone = false;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_exchange_2);
+
+        qrCodeGenerator = new QrCodeGenerator(ExchangeActivity2.this);
+
+        initViews();
+        initCamera();
+    }
+
+    private void initViews() {
+        titleView = findViewById(R.id.title);
+        fragmentContainer = findViewById(R.id.fragmentContainer);
+        qrCode = findViewById(R.id.qrCode);
+        qrCode.setImageBitmap(qrCodeGenerator.generateQrCode("Huhu hier steht nix aber auch nicht so wenig denn hier soll mal ein bisschen content im qr code stehen damit es auch realistisch ist...."));
+
+        prevButton = findViewById(R.id.prevButton);
+        prevButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                isDone = !isDone;
+                toggleLayoutChange(isDone);
+            }
+        });
+
+        nextButton = findViewById(R.id.nextButton);
+        qrInfoButton = findViewById(R.id.qrInfoButton);
+    }
+
+    private void initCamera() {
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+
+        cameraFragment = new CameraFragment();
+
+        fragmentTransaction.add(R.id.fragmentContainer, cameraFragment, CameraFragment.class.getSimpleName());
+        fragmentTransaction.commit();
+    }
+
+
+    private void toggleLayoutChange(final boolean done) {
+
+        final View doneText = findViewById(R.id.doneText);
+        View constraintLayout = findViewById(R.id.constraintLayout);
+
+        if (done) {
+            fragmentContainer.animate().alpha(0f).setDuration(250).start();
+            doneText.setVisibility(View.VISIBLE);
+            doneText.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white)));
+
+//            doneText.setAlpha(0);
+//            doneText.setTranslationY(100);
+//            doneText.animate()
+//                    .alpha(1)
+//                    .translationY(0)
+//                    .setInterpolator(new DecelerateInterpolator())
+//                    .start();
+//
+//            constraintLayout.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white)));
+//            constraintLayout.animate().translationY(-50).setDuration(250).start();
+
+            nextButton.setTranslationX(200);
+            nextButton.animate()
+                    .translationX(0)
+                    .setInterpolator(new AnticipateOvershootInterpolator())
+                    .setDuration(250).start();
+        } else {
+            fragmentContainer.animate().alpha(1f).setDuration(250).start();
+            doneText.setVisibility(View.GONE);
+            doneText.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white_80)));
+
+//            doneText.animate()
+//                    .alpha(0)
+//                    .translationY(100)
+//                    .start();
+//
+//            constraintLayout.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white_80)));
+//            constraintLayout.animate().translationY(0).setDuration(250).start();
+
+            nextButton.setTranslationX(0);
+            nextButton.animate().translationX(200).setDuration(250).start();
+        }
+    }
+}
diff --git a/app/src/main/java/lu/circl/mispbump/activities/StartUpActivity.java b/app/src/main/java/lu/circl/mispbump/activities/StartUpActivity.java
index 3eda757..e38133a 100644
--- a/app/src/main/java/lu/circl/mispbump/activities/StartUpActivity.java
+++ b/app/src/main/java/lu/circl/mispbump/activities/StartUpActivity.java
@@ -17,13 +17,16 @@ public class StartUpActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (isUserLoggedIn()) {
-            Intent home = new Intent(this, HomeActivity.class);
-            startActivity(home);
-        } else {
-            Intent login = new Intent(this, LoginActivity.class);
-            startActivity(login);
-        }
+//        if (isUserLoggedIn()) {
+//            Intent home = new Intent(this, HomeActivity.class);
+//            startActivity(home);
+//        } else {
+//            Intent login = new Intent(this, LoginActivity.class);
+//            startActivity(login);
+//        }
+
+        Intent i = new Intent(this, ExchangeActivity2.class);
+        startActivity(i);
 
         // closes the activity to prevent going back to this (empty) activity
         finish();
diff --git a/app/src/main/java/lu/circl/mispbump/customViews/FixedAspectRatioFrameLayout.java b/app/src/main/java/lu/circl/mispbump/customViews/FixedAspectRatioFrameLayout.java
new file mode 100644
index 0000000..a9fbe20
--- /dev/null
+++ b/app/src/main/java/lu/circl/mispbump/customViews/FixedAspectRatioFrameLayout.java
@@ -0,0 +1,59 @@
+package lu.circl.mispbump.customViews;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+import lu.circl.mispbump.R;
+
+public class FixedAspectRatioFrameLayout extends FrameLayout {
+    private int mAspectRatioWidth;
+    private int mAspectRatioHeight;
+
+    public FixedAspectRatioFrameLayout(Context context) {
+        super(context);
+    }
+
+    public FixedAspectRatioFrameLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public FixedAspectRatioFrameLayout(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.FixedAspectRatioFrameLayout);
+
+        mAspectRatioWidth = a.getInt(R.styleable.FixedAspectRatioFrameLayout_aspectRatioWidth, 1);
+        mAspectRatioHeight = a.getInt(R.styleable.FixedAspectRatioFrameLayout_aspectRatioHeight, 1);
+
+        a.recycle();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int originalWidth = MeasureSpec.getSize(widthMeasureSpec);
+
+        int originalHeight = MeasureSpec.getSize(heightMeasureSpec);
+
+        int calculatedHeight = originalWidth * mAspectRatioHeight / mAspectRatioWidth;
+
+        int finalWidth, finalHeight;
+
+        if (calculatedHeight > originalHeight) {
+            finalWidth = originalHeight * mAspectRatioWidth / mAspectRatioHeight;
+            finalHeight = originalHeight;
+        } else {
+            finalWidth = originalWidth;
+            finalHeight = calculatedHeight;
+        }
+
+        super.onMeasure(
+                MeasureSpec.makeMeasureSpec(finalWidth, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(finalHeight, MeasureSpec.EXACTLY));
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_camera_border.xml b/app/src/main/res/drawable/ic_camera_border.xml
new file mode 100644
index 0000000..440c1d2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_camera_border.xml
@@ -0,0 +1,7 @@
+<vector android:height="100dp" android:viewportHeight="100.00009"
+    android:viewportWidth="100.00009" android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:fillType="nonZero"
+        android:pathData="m0,0v4.233c0,-2.345 1.888,-4.233 4.233,-4.233zM95.767,0c2.345,0 4.233,1.888 4.233,4.233L100,0ZM0,95.767v4.233h4.233c-2.345,0 -4.233,-1.888 -4.233,-4.233zM100,95.767c0,2.345 -1.888,4.233 -4.233,4.233h4.233z"
+        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_verified_user.xml b/app/src/main/res/drawable/ic_verified_user.xml
index d42b282..baa8aa7 100644
--- a/app/src/main/res/drawable/ic_verified_user.xml
+++ b/app/src/main/res/drawable/ic_verified_user.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFF"
       android:pathData="M11.19,1.36l-7,3.11C3.47,4.79 3,5.51 3,6.3L3,11c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,6.3c0,-0.79 -0.47,-1.51 -1.19,-1.83l-7,-3.11c-0.51,-0.23 -1.11,-0.23 -1.62,0zM9.29,16.29L6.7,13.7c-0.39,-0.39 -0.39,-1.02 0,-1.41 0.39,-0.39 1.02,-0.39 1.41,0L10,14.17l5.88,-5.88c0.39,-0.39 1.02,-0.39 1.41,0 0.39,0.39 0.39,1.02 0,1.41l-6.59,6.59c-0.38,0.39 -1.02,0.39 -1.41,0z"/>
 </vector>
diff --git a/app/src/main/res/drawable/rect_rounded_inverse.xml b/app/src/main/res/drawable/rect_rounded_inverse.xml
new file mode 100644
index 0000000..b60c00b
--- /dev/null
+++ b/app/src/main/res/drawable/rect_rounded_inverse.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <size android:width="256dp" android:height="256dp"/>
+            
+            <corners android:radius="12dp"/>
+            <solid android:color="@color/white"/>
+            <!--<corners android:radius="12dp"/>-->
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_exchange.xml b/app/src/main/res/layout/activity_exchange.xml
index 3ed9bbd..4c21d25 100644
--- a/app/src/main/res/layout/activity_exchange.xml
+++ b/app/src/main/res/layout/activity_exchange.xml
@@ -21,14 +21,14 @@
         android:backgroundTint="#99FFFFFF"
         android:gravity="center_vertical"
         android:orientation="vertical"
-        android:padding="8dp"
-        tools:layout_height="256dp"
-        tools:layout_width="256dp">
+        android:padding="8dp">
 
         <ImageView
             android:id="@+id/qrCode"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:src="@drawable/rect_rounded"
+            android:tint="@color/colorIconDark"
+            android:layout_width="match_parent"
+            android:layout_height="256dp"
             android:contentDescription="@string/qr_code" />
 
         <TextView
@@ -58,7 +58,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/bottom"
+        android:id="@+id/navbar_bottom"
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:layout_gravity="bottom"
diff --git a/app/src/main/res/layout/activity_exchange_2.xml b/app/src/main/res/layout/activity_exchange_2.xml
new file mode 100644
index 0000000..17ca16b
--- /dev/null
+++ b/app/src/main/res/layout/activity_exchange_2.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.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:id="@+id/rootLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/colorPrimaryDark">
+
+    <FrameLayout
+        android:id="@+id/fragmentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:animateLayoutChanges="true"
+        android:orientation="vertical"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:gravity="center"
+        app:layout_constraintBottom_toTopOf="@id/navbar_bottom">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/constraintLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="32dp"
+            android:layout_marginTop="8dp"
+            android:background="@drawable/rect_rounded"
+            android:backgroundTint="@color/white_80"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/navbar_bottom">
+
+            <TextView
+                android:id="@+id/qrInfoText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Public Key"
+                android:textAlignment="center"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                android:textColor="@color/black"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/qrCode" />
+
+            <ImageButton
+                android:id="@+id/qrInfoButton"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:src="@drawable/ic_info_outline"
+                android:tint="@color/black"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <ImageView
+                android:id="@+id/qrCode"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="12dp"
+                android:src="@color/white"
+                app:layout_constraintBottom_toTopOf="@+id/qrInfoButton"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:visibility="gone"
+                android:id="@+id/qrCodeInfo"
+                android:background="@color/white"
+                android:text="This is what the qr code looks like in text, mayber there is much more but I dont know about this shit."
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="12dp"
+                app:layout_constraintBottom_toTopOf="@+id/qrInfoButton"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <LinearLayout
+            android:id="@+id/doneText"
+            android:alpha="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:background="@drawable/rect_rounded"
+            android:backgroundTint="@color/white_80">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="16dp"
+                android:drawableStart="@drawable/ic_check_outline"
+                android:drawableTint="@color/status_green"
+                android:drawablePadding="8dp"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+                android:gravity="center_vertical"
+                android:text="Public key received"/>
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <!--<androidx.constraintlayout.widget.ConstraintLayout-->
+        <!--android:id="@+id/constraintLayout"-->
+        <!--android:layout_width="0dp"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_margin="32dp"-->
+        <!--android:layout_marginTop="8dp"-->
+        <!--android:background="@drawable/rect_rounded"-->
+        <!--android:backgroundTint="@color/white_80"-->
+        <!--app:layout_constraintEnd_toEndOf="parent"-->
+        <!--app:layout_constraintStart_toStartOf="parent"-->
+        <!--app:layout_constraintTop_toTopOf="parent"-->
+        <!--app:layout_constraintBottom_toTopOf="@id/navbar_bottom">-->
+
+        <!--<TextView-->
+            <!--android:id="@+id/qrInfoText"-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:text="Public Key"-->
+            <!--android:textAlignment="center"-->
+            <!--android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"-->
+            <!--android:textColor="@color/black"-->
+            <!--app:layout_constraintBottom_toBottomOf="parent"-->
+            <!--app:layout_constraintEnd_toEndOf="parent"-->
+            <!--app:layout_constraintStart_toStartOf="parent"-->
+            <!--app:layout_constraintTop_toBottomOf="@id/qrCode" />-->
+
+        <!--<ImageButton-->
+            <!--android:id="@+id/qrInfoButton"-->
+            <!--android:layout_width="48dp"-->
+            <!--android:layout_height="48dp"-->
+            <!--android:background="?attr/selectableItemBackgroundBorderless"-->
+            <!--android:src="@drawable/ic_info_outline"-->
+            <!--android:tint="@color/black"-->
+            <!--app:layout_constraintBottom_toBottomOf="parent"-->
+            <!--app:layout_constraintEnd_toEndOf="parent" />-->
+
+        <!--<ImageView-->
+            <!--android:id="@+id/qrCode"-->
+            <!--android:layout_width="0dp"-->
+            <!--android:layout_height="0dp"-->
+            <!--android:layout_marginStart="12dp"-->
+            <!--android:layout_marginTop="12dp"-->
+            <!--android:layout_marginEnd="12dp"-->
+            <!--android:src="@color/white"-->
+            <!--app:layout_constraintBottom_toTopOf="@+id/qrInfoButton"-->
+            <!--app:layout_constraintDimensionRatio="1:1"-->
+            <!--app:layout_constraintEnd_toEndOf="parent"-->
+            <!--app:layout_constraintStart_toStartOf="parent"-->
+            <!--app:layout_constraintTop_toTopOf="parent" />-->
+
+        <!--<TextView-->
+            <!--android:visibility="gone"-->
+            <!--android:id="@+id/qrCodeInfo"-->
+            <!--android:background="@color/white"-->
+            <!--android:text="This is what the qr code looks like in text, mayber there is much more but I dont know about this shit."-->
+            <!--android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"-->
+            <!--android:layout_width="0dp"-->
+            <!--android:layout_height="0dp"-->
+            <!--android:layout_marginStart="12dp"-->
+            <!--android:layout_marginTop="12dp"-->
+            <!--android:layout_marginEnd="12dp"-->
+            <!--app:layout_constraintBottom_toTopOf="@+id/qrInfoButton"-->
+            <!--app:layout_constraintDimensionRatio="1:1"-->
+            <!--app:layout_constraintEnd_toEndOf="parent"-->
+            <!--app:layout_constraintStart_toStartOf="parent"-->
+            <!--app:layout_constraintTop_toTopOf="parent" />-->
+
+    <!--</androidx.constraintlayout.widget.ConstraintLayout>-->
+
+    <!--<LinearLayout-->
+        <!--android:alpha="0"-->
+        <!--android:id="@+id/doneText"-->
+        <!--android:layout_width="0dp"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_marginTop="0dp"-->
+        <!--app:layout_constraintBottom_toTopOf="@id/navbar_bottom"-->
+        <!--app:layout_constraintEnd_toEndOf="parent"-->
+        <!--app:layout_constraintStart_toStartOf="parent"-->
+        <!--android:background="@drawable/rect_rounded"-->
+        <!--android:backgroundTint="@color/white_80">-->
+
+        <!--<TextView-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="match_parent"-->
+            <!--android:padding="16dp"-->
+            <!--android:drawableStart="@drawable/ic_check_outline"-->
+            <!--android:drawableTint="@color/status_green"-->
+            <!--android:drawablePadding="8dp"-->
+            <!--android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"-->
+            <!--android:gravity="center_vertical"-->
+            <!--android:text="Public key received"/>-->
+    <!--</LinearLayout>-->
+
+    <LinearLayout
+        android:id="@+id/navbar_bottom"
+        android:layout_width="0dp"
+        android:layout_height="56dp"
+        android:background="@drawable/rect_rounded_top"
+        android:backgroundTint="@color/colorPrimary"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <ImageButton
+            android:id="@+id/prevButton"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/button_prev"
+            android:padding="8dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_arrow_back" />
+
+        <TextView
+            android:id="@+id/hint"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_weight="1"
+            android:text="Scan each others QR codes"
+            android:textAlignment="center"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+            android:textColor="@color/white" />
+
+        <ImageButton
+            android:id="@+id/nextButton"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/button_continue"
+            android:padding="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_arrow_forward" />
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d9cf405..26e9864 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -24,4 +24,9 @@
     <declare-styleable name="UploadAction">
         <attr name="description" format="string"/>
     </declare-styleable>
+    
+    <declare-styleable name="FixedAspectRatioFrameLayout">
+        <attr name="aspectRatioWidth" format="integer"/>
+        <attr name="aspectRatioHeight" format="integer"/>
+    </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 34b2256..8d311f4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,6 +10,7 @@
     <color name="dividerColor">#33000000</color>
 
     <color name="white">#FFFFFF</color>
+    <color name="white_80">#CCFFFFFF</color>
     <color name="white_50">#80FFFFFF</color>
 
     <color name="grey">#BDBDBD</color>
diff --git a/build.gradle b/build.gradle
index e0e9fa2..76d59b3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

From 66d586a5469b9dbbff682bedc46319ca8476351b Mon Sep 17 00:00:00 2001
From: Felix Prahl-Kamps <felixpk@outlook.de>
Date: Sun, 14 Jul 2019 18:18:54 +0200
Subject: [PATCH 2/3] improve login url and authkey handling

---
 .idea/inspectionProfiles/Project_Default.xml  |   1 +
 .../mispbump/activities/ExchangeActivity.java |  35 +++-
 .../activities/ExchangeActivity2.java         |  22 ++-
 .../mispbump/activities/LoginActivity.java    |   5 +-
 .../mispbump/activities/ProfileActivity.java  |   2 +-
 .../mispbump/activities/StartUpActivity.java  |  22 +--
 .../mispbump/activities/UploadActivity.java   |   2 +-
 .../mispbump/auxiliary/MispRestClient.java    | 176 ++++++++----------
 .../mispbump/auxiliary/PreferenceManager.java |   8 +-
 .../main/res/layout/activity_exchange_2.xml   | 145 +++------------
 10 files changed, 165 insertions(+), 253 deletions(-)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 25c2334..d13e225 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="JavadocReference" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SuspiciousNameCombination" enabled="false" level="WARNING" enabled_by_default="false">
       <group names="x,width,left,right" />
       <group names="y,height,top,bottom" />
diff --git a/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java b/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java
index 7c55170..28184a4 100644
--- a/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java
+++ b/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java
@@ -44,8 +44,8 @@ public class ExchangeActivity extends AppCompatActivity {
     private CameraFragment cameraFragment;
 
     private CoordinatorLayout rootLayout;
-    private View qrFrame;
-    private TextView qrInfo;
+    private View qrFrame, scanFeedbackView, continueHintView, fragmentContainer;
+    private TextView scanFeedbackText;
     private ImageView qrCode;
     private ImageButton prevButton, nextButton;
 
@@ -57,7 +57,7 @@ public class ExchangeActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_exchange);
+        setContentView(R.layout.activity_exchange_2);
 
         preferenceManager = PreferenceManager.getInstance(ExchangeActivity.this);
         qrCodeGenerator = new QrCodeGenerator(ExchangeActivity.this);
@@ -76,10 +76,14 @@ public class ExchangeActivity extends AppCompatActivity {
 
     private void initViews() {
         rootLayout = findViewById(R.id.rootLayout);
+        fragmentContainer = findViewById(R.id.fragmentContainer);
 
         qrFrame = findViewById(R.id.qrFrame);
         qrCode = findViewById(R.id.qrCode);
-        qrInfo = findViewById(R.id.qrInfo);
+
+        scanFeedbackView = findViewById(R.id.scanFeedbackView);
+        scanFeedbackText = findViewById(R.id.scanFeedbackText);
+        continueHintView = findViewById(R.id.continueHint);
 
         prevButton = findViewById(R.id.prevButton);
         prevButton.setOnClickListener(onPrevClicked());
@@ -185,7 +189,6 @@ public class ExchangeActivity extends AppCompatActivity {
     }
 
     private void setReadQrStatus(ReadQrStatus status) {
-
         currentReadQrStatus = status;
 
         final Drawable drawable;
@@ -206,15 +209,31 @@ public class ExchangeActivity extends AppCompatActivity {
                 break;
             default:
                 drawable = getDrawable(R.drawable.ic_info_outline);
-                color = getColor(R.color.status_green);
+                color = getColor(R.color.status_amber);
                 break;
         }
 
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                qrInfo.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
-                qrInfo.setCompoundDrawableTintList(ColorStateList.valueOf(color));
+                scanFeedbackText.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
+                scanFeedbackText.setCompoundDrawableTintList(ColorStateList.valueOf(color));
+
+                if (currentReadQrStatus == ReadQrStatus.SUCCESS) {
+                    continueHintView.setVisibility(View.VISIBLE);
+
+                    continueHintView.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white)));
+                    scanFeedbackView.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white)));
+                    qrFrame.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white)));
+
+                    fragmentContainer.animate().alpha(0).setDuration(250).start();
+                } else {
+                    fragmentContainer.animate().alpha(1).setDuration(250).start();
+
+                    continueHintView.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white_80)));
+                    scanFeedbackView.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white_80)));
+                    qrFrame.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white_80)));
+                }
             }
         });
     }
diff --git a/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity2.java b/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity2.java
index ee6b280..624c2f3 100644
--- a/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity2.java
+++ b/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity2.java
@@ -1,10 +1,10 @@
 package lu.circl.mispbump.activities;
 
 import android.content.res.ColorStateList;
+import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.view.View;
 import android.view.animation.AnticipateOvershootInterpolator;
-import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -14,19 +14,28 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
 import lu.circl.mispbump.R;
+import lu.circl.mispbump.auxiliary.PreferenceManager;
 import lu.circl.mispbump.auxiliary.QrCodeGenerator;
 import lu.circl.mispbump.fragments.CameraFragment;
+import lu.circl.mispbump.models.UploadInformation;
+import lu.circl.mispbump.security.DiffieHellman;
 
 public class ExchangeActivity2 extends AppCompatActivity {
 
+    private PreferenceManager preferenceManager;
     private QrCodeGenerator qrCodeGenerator;
+    private DiffieHellman diffieHellman;
+    private UploadInformation uploadInformation;
+
+    private CameraFragment cameraFragment;
+
+    private Bitmap publicKeyQr, dataQr;
 
     private TextView titleView, hintView;
     private View fragmentContainer;
     private ImageView qrCode;
     private ImageButton prevButton, nextButton, qrInfoButton;
 
-    private CameraFragment cameraFragment;
     private boolean isDone = false;
 
 
@@ -39,13 +48,16 @@ public class ExchangeActivity2 extends AppCompatActivity {
 
         initViews();
         initCamera();
+
+
     }
 
+
     private void initViews() {
         titleView = findViewById(R.id.title);
         fragmentContainer = findViewById(R.id.fragmentContainer);
         qrCode = findViewById(R.id.qrCode);
-        qrCode.setImageBitmap(qrCodeGenerator.generateQrCode("Huhu hier steht nix aber auch nicht so wenig denn hier soll mal ein bisschen content im qr code stehen damit es auch realistisch ist...."));
+        qrCode.setImageBitmap(qrCodeGenerator.generateQrCode("Sample content"));
 
         prevButton = findViewById(R.id.prevButton);
         prevButton.setOnClickListener(new View.OnClickListener() {
@@ -73,8 +85,8 @@ public class ExchangeActivity2 extends AppCompatActivity {
 
     private void toggleLayoutChange(final boolean done) {
 
-        final View doneText = findViewById(R.id.doneText);
-        View constraintLayout = findViewById(R.id.constraintLayout);
+        final View doneText = findViewById(R.id.scanFeedbackView);
+        View constraintLayout = findViewById(R.id.qrFrame);
 
         if (done) {
             fragmentContainer.animate().alpha(0f).setDuration(250).start();
diff --git a/app/src/main/java/lu/circl/mispbump/activities/LoginActivity.java b/app/src/main/java/lu/circl/mispbump/activities/LoginActivity.java
index b53a874..0ad59a1 100644
--- a/app/src/main/java/lu/circl/mispbump/activities/LoginActivity.java
+++ b/app/src/main/java/lu/circl/mispbump/activities/LoginActivity.java
@@ -33,7 +33,6 @@ import lu.circl.mispbump.models.restModels.User;
 public class LoginActivity extends AppCompatActivity {
 
     private PreferenceManager preferenceManager;
-    private MispRestClient mispRestClient;
 
     private ConstraintLayout constraintLayout;
     private TextInputLayout serverAutomationKey;
@@ -46,7 +45,6 @@ public class LoginActivity extends AppCompatActivity {
         setContentView(R.layout.activity_login);
 
         preferenceManager = PreferenceManager.getInstance(this);
-        mispRestClient = MispRestClient.getInstance(LoginActivity.this);
 
         getWindow().setStatusBarColor(getColor(R.color.colorPrimary));
 
@@ -97,7 +95,6 @@ public class LoginActivity extends AppCompatActivity {
     private View.OnClickListener onClickDownload = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
-
             final String url = Objects.requireNonNull(serverUrl.getEditText()).getText().toString();
             final String authkey = Objects.requireNonNull(serverAutomationKey.getEditText()).getText().toString();
 
@@ -120,7 +117,7 @@ public class LoginActivity extends AppCompatActivity {
                 return;
             }
 
-            mispRestClient.initMispRestInterface(url);
+            final MispRestClient mispRestClient = MispRestClient.getInstance(url, authkey);
 
             // display progress bar
             progressBar.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/lu/circl/mispbump/activities/ProfileActivity.java b/app/src/main/java/lu/circl/mispbump/activities/ProfileActivity.java
index f509ceb..2543a37 100644
--- a/app/src/main/java/lu/circl/mispbump/activities/ProfileActivity.java
+++ b/app/src/main/java/lu/circl/mispbump/activities/ProfileActivity.java
@@ -46,8 +46,8 @@ public class ProfileActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_profile);
 
-        mispRestClient = MispRestClient.getInstance(this);
         preferenceManager = PreferenceManager.getInstance(this);
+        mispRestClient = MispRestClient.getInstance(preferenceManager.getServerUrl(), preferenceManager.getAuthKey());
 
         init();
         populateInformationViews();
diff --git a/app/src/main/java/lu/circl/mispbump/activities/StartUpActivity.java b/app/src/main/java/lu/circl/mispbump/activities/StartUpActivity.java
index e38133a..f09df57 100644
--- a/app/src/main/java/lu/circl/mispbump/activities/StartUpActivity.java
+++ b/app/src/main/java/lu/circl/mispbump/activities/StartUpActivity.java
@@ -2,14 +2,15 @@ package lu.circl.mispbump.activities;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
+
 import androidx.appcompat.app.AppCompatActivity;
 
 import lu.circl.mispbump.auxiliary.PreferenceManager;
 import lu.circl.mispbump.models.restModels.User;
 
 /**
- * This activity navigates to the next activity base on the user status.
- * This is the first activity that gets loaded when the user starts the app.
+ * Starts either the login or home activity.
  */
 public class StartUpActivity extends AppCompatActivity {
 
@@ -17,16 +18,13 @@ public class StartUpActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-//        if (isUserLoggedIn()) {
-//            Intent home = new Intent(this, HomeActivity.class);
-//            startActivity(home);
-//        } else {
-//            Intent login = new Intent(this, LoginActivity.class);
-//            startActivity(login);
-//        }
-
-        Intent i = new Intent(this, ExchangeActivity2.class);
-        startActivity(i);
+        if (isUserLoggedIn()) {
+            Intent home = new Intent(this, HomeActivity.class);
+            startActivity(home);
+        } else {
+            Intent login = new Intent(this, LoginActivity.class);
+            startActivity(login);
+        }
 
         // closes the activity to prevent going back to this (empty) activity
         finish();
diff --git a/app/src/main/java/lu/circl/mispbump/activities/UploadActivity.java b/app/src/main/java/lu/circl/mispbump/activities/UploadActivity.java
index 813aded..02e9796 100644
--- a/app/src/main/java/lu/circl/mispbump/activities/UploadActivity.java
+++ b/app/src/main/java/lu/circl/mispbump/activities/UploadActivity.java
@@ -99,7 +99,7 @@ public class UploadActivity extends AppCompatActivity {
         setContentView(R.layout.activity_upload);
 
         preferenceManager = PreferenceManager.getInstance(UploadActivity.this);
-        restClient = MispRestClient.getInstance(this);
+        restClient = MispRestClient.getInstance(preferenceManager.getServerUrl(), preferenceManager.getAuthKey());
 
         parseExtra();
         initViews();
diff --git a/app/src/main/java/lu/circl/mispbump/auxiliary/MispRestClient.java b/app/src/main/java/lu/circl/mispbump/auxiliary/MispRestClient.java
index c72257e..ed16be6 100644
--- a/app/src/main/java/lu/circl/mispbump/auxiliary/MispRestClient.java
+++ b/app/src/main/java/lu/circl/mispbump/auxiliary/MispRestClient.java
@@ -1,7 +1,8 @@
 package lu.circl.mispbump.auxiliary;
 
 import android.annotation.SuppressLint;
-import android.content.Context;
+
+import androidx.annotation.NonNull;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -45,98 +46,25 @@ import retrofit2.converter.gson.GsonConverterFactory;
 public class MispRestClient {
 
 
-    public interface AvailableCallback {
-        void available();
-
-        void unavailable(String error);
-    }
-
-    public interface UserCallback {
-        void success(User user);
-
-        void failure(String error);
-    }
-
-    public interface AllUsersCallback {
-        void success(User[] users);
-
-        void failure(String error);
-    }
-
-    public interface OrganisationCallback {
-        void success(Organisation organisation);
-
-        void failure(String error);
-    }
-
-    public interface AllOrganisationsCallback {
-        void success(Organisation[] organisations);
-
-        void failure(String error);
-    }
-
-    public interface ServerCallback {
-        void success(Server server);
-
-        void failure(String error);
-    }
-
-    public interface AllServersCallback {
-        void success(Server[] servers);
-
-        void failure(String error);
-    }
-
-
     private static MispRestClient instance;
-
-    private PreferenceManager preferenceManager;
     private MispRestInterface mispRestInterface;
 
-
-    public static MispRestClient getInstance(Context context) {
+    public static MispRestClient getInstance(String url, String authkey) {
         if (instance == null) {
-            instance = new MispRestClient(context);
+            instance = new MispRestClient();
         }
 
+        instance.initMispRestInterface(url, authkey);
+
         return instance;
     }
 
-    public static MispRestClient getInstance(Context context, String url) {
-        if (instance == null) {
-            instance = new MispRestClient(context, url);
-        }
-
-        return instance;
-    }
-
-
-    private MispRestClient(Context context) {
-        this(context, null);
-    }
-
-    /**
-     * Initializes the rest client to communicate with a MISP instance.
-     *
-     * @param context needed to access the preferences for loading credentials
-     */
-    private MispRestClient(Context context, String url) {
-
-        preferenceManager = PreferenceManager.getInstance(context);
-
-        if (url == null) {
-            url = preferenceManager.getServerUrl();
-        }
-
-        initMispRestInterface(url);
-    }
-
-    public void initMispRestInterface(String url) {
+    public void initMispRestInterface(String url, String authkey) {
         try {
             Retrofit retrofit = new Retrofit.Builder()
                     .baseUrl(url)
                     .addConverterFactory(GsonConverterFactory.create())
-                    .client(getCustomClient(true, false))
+                    .client(getCustomClient(true, false, authkey))
                     .build();
 
             mispRestInterface = retrofit.create(MispRestInterface.class);
@@ -151,7 +79,7 @@ public class MispRestClient {
      * @param logging whether to log Retrofit calls (for debugging)
      * @return {@link OkHttpClient}
      */
-    private OkHttpClient getCustomClient(boolean unsafe, boolean logging) {
+    private OkHttpClient getCustomClient(boolean unsafe, boolean logging, final String authkey) {
         try {
 
             OkHttpClient.Builder builder = new OkHttpClient.Builder();
@@ -206,7 +134,7 @@ public class MispRestClient {
                     Request.Builder ongoing = chain.request().newBuilder();
                     ongoing.addHeader("Accept", "application/json");
                     ongoing.addHeader("Content-Type", "application/json");
-                    ongoing.addHeader("Authorization", preferenceManager.getAutomationKey());
+                    ongoing.addHeader("Authorization", authkey);
                     return chain.proceed(ongoing.build());
                 }
             });
@@ -228,7 +156,7 @@ public class MispRestClient {
         Call<Version> call = mispRestInterface.pyMispVersion();
         call.enqueue(new Callback<Version>() {
             @Override
-            public void onResponse(Call<Version> call, Response<Version> response) {
+            public void onResponse(@NonNull Call<Version> call, @NonNull Response<Version> response) {
                 if (!response.isSuccessful()) {
                     if (response.code() == 403) {
                         callback.available();
@@ -242,7 +170,7 @@ public class MispRestClient {
             }
 
             @Override
-            public void onFailure(Call<Version> call, Throwable t) {
+            public void onFailure(@NonNull Call<Version> call, @NonNull Throwable t) {
                 callback.unavailable(extractError(t));
             }
         });
@@ -259,7 +187,7 @@ public class MispRestClient {
 
         call.enqueue(new Callback<MispUser>() {
             @Override
-            public void onResponse(Call<MispUser> call, Response<MispUser> response) {
+            public void onResponse(@NonNull Call<MispUser> call, @NonNull Response<MispUser> response) {
                 if (!response.isSuccessful()) {
                     callback.failure(extractError(response));
                 } else {
@@ -272,7 +200,7 @@ public class MispRestClient {
             }
 
             @Override
-            public void onFailure(Call<MispUser> call, Throwable t) {
+            public void onFailure(@NonNull Call<MispUser> call, @NonNull Throwable t) {
                 t.printStackTrace();
                 callback.failure(t.getMessage());
             }
@@ -291,7 +219,7 @@ public class MispRestClient {
 
         call.enqueue(new Callback<MispUser>() {
             @Override
-            public void onResponse(Call<MispUser> call, Response<MispUser> response) {
+            public void onResponse(@NonNull Call<MispUser> call, @NonNull Response<MispUser> response) {
                 if (!response.isSuccessful()) {
                     callback.failure(extractError(response));
                 } else {
@@ -304,7 +232,7 @@ public class MispRestClient {
             }
 
             @Override
-            public void onFailure(Call<MispUser> call, Throwable t) {
+            public void onFailure(@NonNull Call<MispUser> call, @NonNull Throwable t) {
                 t.printStackTrace();
                 callback.failure(t.getMessage());
             }
@@ -337,7 +265,7 @@ public class MispRestClient {
 
         call.enqueue(new Callback<List<MispUser>>() {
             @Override
-            public void onResponse(Call<List<MispUser>> call, Response<List<MispUser>> response) {
+            public void onResponse(@NonNull Call<List<MispUser>> call, @NonNull Response<List<MispUser>> response) {
                 if (!response.isSuccessful()) {
                     callback.failure("Failed onResponse");
                     return;
@@ -356,7 +284,7 @@ public class MispRestClient {
             }
 
             @Override
-            public void onFailure(Call<List<MispUser>> call, Throwable t) {
+            public void onFailure(@NonNull Call<List<MispUser>> call, @NonNull Throwable t) {
                 callback.failure(extractError(t));
             }
         });
@@ -373,7 +301,7 @@ public class MispRestClient {
 
         call.enqueue(new Callback<MispUser>() {
             @Override
-            public void onResponse(Call<MispUser> call, Response<MispUser> response) {
+            public void onResponse(@NonNull Call<MispUser> call, @NonNull Response<MispUser> response) {
                 if (!response.isSuccessful()) {
                     callback.failure(extractError(response));
                 } else {
@@ -383,7 +311,7 @@ public class MispRestClient {
             }
 
             @Override
-            public void onFailure(Call<MispUser> call, Throwable t) {
+            public void onFailure(@NonNull Call<MispUser> call, @NonNull Throwable t) {
                 callback.failure(t.getMessage());
             }
         });
@@ -403,7 +331,7 @@ public class MispRestClient {
 
         call.enqueue(new Callback<MispOrganisation>() {
             @Override
-            public void onResponse(Call<MispOrganisation> call, Response<MispOrganisation> response) {
+            public void onResponse(@NonNull Call<MispOrganisation> call, @NonNull Response<MispOrganisation> response) {
                 if (!response.isSuccessful()) {
                     callback.failure(extractError(response));
                 } else {
@@ -416,7 +344,7 @@ public class MispRestClient {
             }
 
             @Override
-            public void onFailure(Call<MispOrganisation> call, Throwable t) {
+            public void onFailure(@NonNull Call<MispOrganisation> call, @NonNull Throwable t) {
                 callback.failure(t.getMessage());
             }
         });
@@ -448,7 +376,7 @@ public class MispRestClient {
 
         call.enqueue(new Callback<List<MispOrganisation>>() {
             @Override
-            public void onResponse(Call<List<MispOrganisation>> call, Response<List<MispOrganisation>> response) {
+            public void onResponse(@NonNull Call<List<MispOrganisation>> call, @NonNull Response<List<MispOrganisation>> response) {
                 if (!response.isSuccessful()) {
                     // TODO handle
                     return;
@@ -468,7 +396,7 @@ public class MispRestClient {
             }
 
             @Override
-            public void onFailure(Call<List<MispOrganisation>> call, Throwable t) {
+            public void onFailure(@NonNull Call<List<MispOrganisation>> call, @NonNull Throwable t) {
                 callback.failure(extractError(t));
             }
         });
@@ -485,7 +413,7 @@ public class MispRestClient {
 
         call.enqueue(new Callback<MispOrganisation>() {
             @Override
-            public void onResponse(Call<MispOrganisation> call, Response<MispOrganisation> response) {
+            public void onResponse(@NonNull Call<MispOrganisation> call, @NonNull Response<MispOrganisation> response) {
                 if (!response.isSuccessful()) {
                     callback.failure(extractError(response));
                 } else {
@@ -495,7 +423,7 @@ public class MispRestClient {
             }
 
             @Override
-            public void onFailure(Call<MispOrganisation> call, Throwable t) {
+            public void onFailure(@NonNull Call<MispOrganisation> call, @NonNull Throwable t) {
                 callback.failure(t.getMessage());
             }
         });
@@ -517,7 +445,7 @@ public class MispRestClient {
 
         call.enqueue(new Callback<List<MispServer>>() {
             @Override
-            public void onResponse(Call<List<MispServer>> call, Response<List<MispServer>> response) {
+            public void onResponse(@NonNull Call<List<MispServer>> call, @NonNull Response<List<MispServer>> response) {
                 if (!response.isSuccessful()) {
                     callback.failure(extractError(response));
                 } else {
@@ -536,7 +464,7 @@ public class MispRestClient {
             }
 
             @Override
-            public void onFailure(Call<List<MispServer>> call, Throwable t) {
+            public void onFailure(@NonNull Call<List<MispServer>> call, @NonNull Throwable t) {
                 callback.failure(t.getMessage());
             }
         });
@@ -553,7 +481,7 @@ public class MispRestClient {
 
         call.enqueue(new Callback<Server>() {
             @Override
-            public void onResponse(Call<Server> call, Response<Server> response) {
+            public void onResponse(@NonNull Call<Server> call, @NonNull Response<Server> response) {
                 if (!response.isSuccessful()) {
                     callback.failure(extractError(response));
                 } else {
@@ -562,7 +490,7 @@ public class MispRestClient {
             }
 
             @Override
-            public void onFailure(Call<Server> call, Throwable t) {
+            public void onFailure(@NonNull Call<Server> call, @NonNull Throwable t) {
                 callback.failure(t.getMessage());
                 throw new RuntimeException(t);
             }
@@ -648,4 +576,48 @@ public class MispRestClient {
 
         return t.getMessage();
     }
+
+    // interfaces
+
+    public interface AvailableCallback {
+        void available();
+
+        void unavailable(String error);
+    }
+
+    public interface UserCallback {
+        void success(User user);
+
+        void failure(String error);
+    }
+
+    public interface AllUsersCallback {
+        void success(User[] users);
+
+        void failure(String error);
+    }
+
+    public interface OrganisationCallback {
+        void success(Organisation organisation);
+
+        void failure(String error);
+    }
+
+    public interface AllOrganisationsCallback {
+        void success(Organisation[] organisations);
+
+        void failure(String error);
+    }
+
+    public interface ServerCallback {
+        void success(Server server);
+
+        void failure(String error);
+    }
+
+    public interface AllServersCallback {
+        void success(Server[] servers);
+
+        void failure(String error);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/lu/circl/mispbump/auxiliary/PreferenceManager.java b/app/src/main/java/lu/circl/mispbump/auxiliary/PreferenceManager.java
index 5590077..65f4541 100644
--- a/app/src/main/java/lu/circl/mispbump/auxiliary/PreferenceManager.java
+++ b/app/src/main/java/lu/circl/mispbump/auxiliary/PreferenceManager.java
@@ -210,7 +210,7 @@ public class PreferenceManager {
      * @return decrypted automation key associated with the current user. If no user exists an empty
      * String is returned.
      */
-    public String getAutomationKey() {
+    public String getAuthKey() {
 
         if (!preferences.contains(AUTOMATION_KEY)) {
             return "";
@@ -284,12 +284,12 @@ public class PreferenceManager {
     public String getServerUrl() {
 
         if (!preferences.contains(SERVER_URL)) {
-            return "";
+            return null;
         }
 
         try {
             KeyStoreWrapper keyStoreWrapper = new KeyStoreWrapper(KeyStoreWrapper.SERVER_URL_ALIAS);
-            return keyStoreWrapper.decrypt(preferences.getString(SERVER_URL, ""));
+            return keyStoreWrapper.decrypt(preferences.getString(SERVER_URL, null));
 
         } catch (NoSuchPaddingException e) {
             e.printStackTrace();
@@ -305,7 +305,7 @@ public class PreferenceManager {
             e.printStackTrace();
         }
 
-        return "";
+        return null;
     }
 
     /**
diff --git a/app/src/main/res/layout/activity_exchange_2.xml b/app/src/main/res/layout/activity_exchange_2.xml
index 17ca16b..05583ff 100644
--- a/app/src/main/res/layout/activity_exchange_2.xml
+++ b/app/src/main/res/layout/activity_exchange_2.xml
@@ -29,11 +29,12 @@
         app:layout_constraintBottom_toTopOf="@id/navbar_bottom">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraintLayout"
+            android:id="@+id/qrFrame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="32dp"
-            android:layout_marginTop="8dp"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginBottom="16dp"
             android:background="@drawable/rect_rounded"
             android:backgroundTint="@color/white_80"
             app:layout_constraintEnd_toEndOf="parent"
@@ -77,37 +78,20 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:visibility="gone"
-                android:id="@+id/qrCodeInfo"
-                android:background="@color/white"
-                android:text="This is what the qr code looks like in text, mayber there is much more but I dont know about this shit."
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
-                app:layout_constraintBottom_toTopOf="@+id/qrInfoButton"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <LinearLayout
-            android:id="@+id/doneText"
-            android:alpha="1"
+            android:id="@+id/scanFeedbackView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginEnd="32dp"
+            android:layout_marginBottom="16dp"
             android:background="@drawable/rect_rounded"
             android:backgroundTint="@color/white_80">
 
             <TextView
+                android:id="@+id/scanFeedbackText"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:padding="16dp"
@@ -119,101 +103,29 @@
                 android:text="Public key received"/>
         </LinearLayout>
 
+        <LinearLayout
+            android:visibility="gone"
+            android:id="@+id/continueHint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:background="@drawable/rect_rounded"
+            android:backgroundTint="@color/white_80">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="16dp"
+                android:drawableStart="@drawable/ic_info_outline"
+                android:drawableTint="@color/status_amber"
+                android:drawablePadding="8dp"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+                android:gravity="center_vertical"
+                android:text="Continue if your partner scanned this QR code"/>
+        </LinearLayout>
     </LinearLayout>
 
-    <!--<androidx.constraintlayout.widget.ConstraintLayout-->
-        <!--android:id="@+id/constraintLayout"-->
-        <!--android:layout_width="0dp"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_margin="32dp"-->
-        <!--android:layout_marginTop="8dp"-->
-        <!--android:background="@drawable/rect_rounded"-->
-        <!--android:backgroundTint="@color/white_80"-->
-        <!--app:layout_constraintEnd_toEndOf="parent"-->
-        <!--app:layout_constraintStart_toStartOf="parent"-->
-        <!--app:layout_constraintTop_toTopOf="parent"-->
-        <!--app:layout_constraintBottom_toTopOf="@id/navbar_bottom">-->
-
-        <!--<TextView-->
-            <!--android:id="@+id/qrInfoText"-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:text="Public Key"-->
-            <!--android:textAlignment="center"-->
-            <!--android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"-->
-            <!--android:textColor="@color/black"-->
-            <!--app:layout_constraintBottom_toBottomOf="parent"-->
-            <!--app:layout_constraintEnd_toEndOf="parent"-->
-            <!--app:layout_constraintStart_toStartOf="parent"-->
-            <!--app:layout_constraintTop_toBottomOf="@id/qrCode" />-->
-
-        <!--<ImageButton-->
-            <!--android:id="@+id/qrInfoButton"-->
-            <!--android:layout_width="48dp"-->
-            <!--android:layout_height="48dp"-->
-            <!--android:background="?attr/selectableItemBackgroundBorderless"-->
-            <!--android:src="@drawable/ic_info_outline"-->
-            <!--android:tint="@color/black"-->
-            <!--app:layout_constraintBottom_toBottomOf="parent"-->
-            <!--app:layout_constraintEnd_toEndOf="parent" />-->
-
-        <!--<ImageView-->
-            <!--android:id="@+id/qrCode"-->
-            <!--android:layout_width="0dp"-->
-            <!--android:layout_height="0dp"-->
-            <!--android:layout_marginStart="12dp"-->
-            <!--android:layout_marginTop="12dp"-->
-            <!--android:layout_marginEnd="12dp"-->
-            <!--android:src="@color/white"-->
-            <!--app:layout_constraintBottom_toTopOf="@+id/qrInfoButton"-->
-            <!--app:layout_constraintDimensionRatio="1:1"-->
-            <!--app:layout_constraintEnd_toEndOf="parent"-->
-            <!--app:layout_constraintStart_toStartOf="parent"-->
-            <!--app:layout_constraintTop_toTopOf="parent" />-->
-
-        <!--<TextView-->
-            <!--android:visibility="gone"-->
-            <!--android:id="@+id/qrCodeInfo"-->
-            <!--android:background="@color/white"-->
-            <!--android:text="This is what the qr code looks like in text, mayber there is much more but I dont know about this shit."-->
-            <!--android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"-->
-            <!--android:layout_width="0dp"-->
-            <!--android:layout_height="0dp"-->
-            <!--android:layout_marginStart="12dp"-->
-            <!--android:layout_marginTop="12dp"-->
-            <!--android:layout_marginEnd="12dp"-->
-            <!--app:layout_constraintBottom_toTopOf="@+id/qrInfoButton"-->
-            <!--app:layout_constraintDimensionRatio="1:1"-->
-            <!--app:layout_constraintEnd_toEndOf="parent"-->
-            <!--app:layout_constraintStart_toStartOf="parent"-->
-            <!--app:layout_constraintTop_toTopOf="parent" />-->
-
-    <!--</androidx.constraintlayout.widget.ConstraintLayout>-->
-
-    <!--<LinearLayout-->
-        <!--android:alpha="0"-->
-        <!--android:id="@+id/doneText"-->
-        <!--android:layout_width="0dp"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_marginTop="0dp"-->
-        <!--app:layout_constraintBottom_toTopOf="@id/navbar_bottom"-->
-        <!--app:layout_constraintEnd_toEndOf="parent"-->
-        <!--app:layout_constraintStart_toStartOf="parent"-->
-        <!--android:background="@drawable/rect_rounded"-->
-        <!--android:backgroundTint="@color/white_80">-->
-
-        <!--<TextView-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="match_parent"-->
-            <!--android:padding="16dp"-->
-            <!--android:drawableStart="@drawable/ic_check_outline"-->
-            <!--android:drawableTint="@color/status_green"-->
-            <!--android:drawablePadding="8dp"-->
-            <!--android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"-->
-            <!--android:gravity="center_vertical"-->
-            <!--android:text="Public key received"/>-->
-    <!--</LinearLayout>-->
-
     <LinearLayout
         android:id="@+id/navbar_bottom"
         android:layout_width="0dp"
@@ -237,6 +149,7 @@
             app:srcCompat="@drawable/ic_arrow_back" />
 
         <TextView
+            android:visibility="invisible"
             android:id="@+id/hint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"

From ef37517d2053f926c17fa04fa4f53e4d31eb45bb Mon Sep 17 00:00:00 2001
From: Felix Prahl-Kamps <felixpk@outlook.de>
Date: Sun, 14 Jul 2019 19:17:32 +0200
Subject: [PATCH 3/3] improve exchange activity layout and functionality

---
 .idea/misc.xml                                |   2 +-
 app/build.gradle                              |   2 +-
 app/src/main/AndroidManifest.xml              |   6 -
 .../mispbump/activities/ExchangeActivity.java |  67 ++++---
 .../activities/ExchangeActivity2.java         | 129 ------------
 app/src/main/res/layout/activity_exchange.xml | 184 +++++++++++++-----
 .../main/res/layout/activity_exchange_2.xml   | 177 -----------------
 app/src/main/res/values-de/strings.xml        |   5 +
 app/src/main/res/values/strings.xml           |   5 +
 9 files changed, 179 insertions(+), 398 deletions(-)
 delete mode 100644 app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity2.java
 delete mode 100644 app/src/main/res/layout/activity_exchange_2.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 93a9df2..da7759f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -38,7 +38,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index ad28876..631627d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     // android
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
+    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8e65ec5..9dde01d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,12 +28,6 @@
         <activity
             android:name=".activities.HomeActivity"
             android:label="@string/app_name" />
-        <activity
-            android:name=".activities.ExchangeActivity2"
-            android:configChanges="orientation|screenSize"
-            android:parentActivityName=".activities.HomeActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.Translucent" />
         <activity
             android:name=".activities.ExchangeActivity"
             android:configChanges="orientation|screenSize"
diff --git a/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java b/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java
index 28184a4..21ea9cc 100644
--- a/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java
+++ b/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java
@@ -12,7 +12,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
@@ -43,9 +43,9 @@ public class ExchangeActivity extends AppCompatActivity {
 
     private CameraFragment cameraFragment;
 
-    private CoordinatorLayout rootLayout;
+    private ConstraintLayout rootLayout;
     private View qrFrame, scanFeedbackView, continueHintView, fragmentContainer;
-    private TextView scanFeedbackText;
+    private TextView scanFeedbackText, qrContentInfo;
     private ImageView qrCode;
     private ImageButton prevButton, nextButton;
 
@@ -57,7 +57,7 @@ public class ExchangeActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_exchange_2);
+        setContentView(R.layout.activity_exchange);
 
         preferenceManager = PreferenceManager.getInstance(ExchangeActivity.this);
         qrCodeGenerator = new QrCodeGenerator(ExchangeActivity.this);
@@ -84,6 +84,7 @@ public class ExchangeActivity extends AppCompatActivity {
         scanFeedbackView = findViewById(R.id.scanFeedbackView);
         scanFeedbackText = findViewById(R.id.scanFeedbackText);
         continueHintView = findViewById(R.id.continueHint);
+        qrContentInfo = findViewById(R.id.qrContentInfo);
 
         prevButton = findViewById(R.id.prevButton);
         prevButton.setOnClickListener(onPrevClicked());
@@ -130,15 +131,12 @@ public class ExchangeActivity extends AppCompatActivity {
             @Override
             public void run() {
                 qrCode.setImageBitmap(bitmap);
-                qrFrame.setVisibility(View.VISIBLE);  // TODO animate
+                qrFrame.setVisibility(View.VISIBLE);
             }
         });
     }
 
     private void setSyncState(SyncState state) {
-
-        Log.d("DEBUG", "current sync state: " + state);
-
         currentSyncState = state;
 
         runOnUiThread(new Runnable() {
@@ -151,8 +149,11 @@ public class ExchangeActivity extends AppCompatActivity {
                         nextButton.setVisibility(View.GONE);
 
                         setCameraPreviewEnabled(true);
-                        setReadQrStatus(ReadQrStatus.PENDING);
                         showQrCode(publicKeyQr);
+
+                        setReadQrStatus(ReadQrStatus.PENDING);
+                        scanFeedbackText.setText(R.string.scan_qr_hint);
+                        qrContentInfo.setText(R.string.public_key);
                         break;
                     case KEY_EXCHANGE_DONE:
                         prevButton.setImageDrawable(getDrawable(R.drawable.ic_close));
@@ -161,8 +162,11 @@ public class ExchangeActivity extends AppCompatActivity {
                         nextButton.setVisibility(View.VISIBLE);
 
                         setCameraPreviewEnabled(false);
-                        setReadQrStatus(ReadQrStatus.SUCCESS);
                         showQrCode(publicKeyQr);
+
+                        setReadQrStatus(ReadQrStatus.SUCCESS);
+                        scanFeedbackText.setText(R.string.public_key_received_hint);
+                        qrContentInfo.setText(R.string.public_key);
                         break;
                     case DATA_EXCHANGE:
                         prevButton.setImageDrawable(getDrawable(R.drawable.ic_arrow_back));
@@ -170,8 +174,11 @@ public class ExchangeActivity extends AppCompatActivity {
                         nextButton.setVisibility(View.GONE);
 
                         setCameraPreviewEnabled(true);
-                        setReadQrStatus(ReadQrStatus.PENDING);
                         showQrCode(dataQr);
+
+                        setReadQrStatus(ReadQrStatus.PENDING);
+                        scanFeedbackText.setText(R.string.scan_qr_hint);
+                        qrContentInfo.setText(R.string.sync_information);
                         break;
                     case DATA_EXCHANGE_DONE:
                         prevButton.setImageDrawable(getDrawable(R.drawable.ic_arrow_back));
@@ -180,8 +187,11 @@ public class ExchangeActivity extends AppCompatActivity {
                         nextButton.setVisibility(View.VISIBLE);
 
                         setCameraPreviewEnabled(false);
-                        setReadQrStatus(ReadQrStatus.SUCCESS);
                         showQrCode(dataQr);
+
+                        setReadQrStatus(ReadQrStatus.SUCCESS);
+                        scanFeedbackText.setText(R.string.sync_info_received_hint);
+                        qrContentInfo.setText(R.string.public_key);
                         break;
                 }
             }
@@ -213,29 +223,22 @@ public class ExchangeActivity extends AppCompatActivity {
                 break;
         }
 
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                scanFeedbackText.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
-                scanFeedbackText.setCompoundDrawableTintList(ColorStateList.valueOf(color));
+        scanFeedbackText.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
+        scanFeedbackText.setCompoundDrawableTintList(ColorStateList.valueOf(color));
 
-                if (currentReadQrStatus == ReadQrStatus.SUCCESS) {
-                    continueHintView.setVisibility(View.VISIBLE);
+        if (currentReadQrStatus == ReadQrStatus.SUCCESS) {
+            continueHintView.setVisibility(View.VISIBLE);
+            scanFeedbackView.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white)));
+            qrFrame.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white)));
 
-                    continueHintView.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white)));
-                    scanFeedbackView.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white)));
-                    qrFrame.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white)));
+            fragmentContainer.animate().alpha(0).setDuration(250).start();
+        } else {
+            continueHintView.setVisibility(View.GONE);
+            scanFeedbackView.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white_80)));
+            qrFrame.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white_80)));
 
-                    fragmentContainer.animate().alpha(0).setDuration(250).start();
-                } else {
-                    fragmentContainer.animate().alpha(1).setDuration(250).start();
-
-                    continueHintView.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white_80)));
-                    scanFeedbackView.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white_80)));
-                    qrFrame.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white_80)));
-                }
-            }
-        });
+            fragmentContainer.animate().alpha(1).setDuration(250).start();
+        }
     }
 
     private void setCameraPreviewEnabled(boolean enabled) {
diff --git a/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity2.java b/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity2.java
deleted file mode 100644
index 624c2f3..0000000
--- a/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity2.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package lu.circl.mispbump.activities;
-
-import android.content.res.ColorStateList;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.view.View;
-import android.view.animation.AnticipateOvershootInterpolator;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-
-import lu.circl.mispbump.R;
-import lu.circl.mispbump.auxiliary.PreferenceManager;
-import lu.circl.mispbump.auxiliary.QrCodeGenerator;
-import lu.circl.mispbump.fragments.CameraFragment;
-import lu.circl.mispbump.models.UploadInformation;
-import lu.circl.mispbump.security.DiffieHellman;
-
-public class ExchangeActivity2 extends AppCompatActivity {
-
-    private PreferenceManager preferenceManager;
-    private QrCodeGenerator qrCodeGenerator;
-    private DiffieHellman diffieHellman;
-    private UploadInformation uploadInformation;
-
-    private CameraFragment cameraFragment;
-
-    private Bitmap publicKeyQr, dataQr;
-
-    private TextView titleView, hintView;
-    private View fragmentContainer;
-    private ImageView qrCode;
-    private ImageButton prevButton, nextButton, qrInfoButton;
-
-    private boolean isDone = false;
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_exchange_2);
-
-        qrCodeGenerator = new QrCodeGenerator(ExchangeActivity2.this);
-
-        initViews();
-        initCamera();
-
-
-    }
-
-
-    private void initViews() {
-        titleView = findViewById(R.id.title);
-        fragmentContainer = findViewById(R.id.fragmentContainer);
-        qrCode = findViewById(R.id.qrCode);
-        qrCode.setImageBitmap(qrCodeGenerator.generateQrCode("Sample content"));
-
-        prevButton = findViewById(R.id.prevButton);
-        prevButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                isDone = !isDone;
-                toggleLayoutChange(isDone);
-            }
-        });
-
-        nextButton = findViewById(R.id.nextButton);
-        qrInfoButton = findViewById(R.id.qrInfoButton);
-    }
-
-    private void initCamera() {
-        FragmentManager fragmentManager = getSupportFragmentManager();
-        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
-
-        cameraFragment = new CameraFragment();
-
-        fragmentTransaction.add(R.id.fragmentContainer, cameraFragment, CameraFragment.class.getSimpleName());
-        fragmentTransaction.commit();
-    }
-
-
-    private void toggleLayoutChange(final boolean done) {
-
-        final View doneText = findViewById(R.id.scanFeedbackView);
-        View constraintLayout = findViewById(R.id.qrFrame);
-
-        if (done) {
-            fragmentContainer.animate().alpha(0f).setDuration(250).start();
-            doneText.setVisibility(View.VISIBLE);
-            doneText.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white)));
-
-//            doneText.setAlpha(0);
-//            doneText.setTranslationY(100);
-//            doneText.animate()
-//                    .alpha(1)
-//                    .translationY(0)
-//                    .setInterpolator(new DecelerateInterpolator())
-//                    .start();
-//
-//            constraintLayout.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white)));
-//            constraintLayout.animate().translationY(-50).setDuration(250).start();
-
-            nextButton.setTranslationX(200);
-            nextButton.animate()
-                    .translationX(0)
-                    .setInterpolator(new AnticipateOvershootInterpolator())
-                    .setDuration(250).start();
-        } else {
-            fragmentContainer.animate().alpha(1f).setDuration(250).start();
-            doneText.setVisibility(View.GONE);
-            doneText.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white_80)));
-
-//            doneText.animate()
-//                    .alpha(0)
-//                    .translationY(100)
-//                    .start();
-//
-//            constraintLayout.setBackgroundTintList(ColorStateList.valueOf(getColor(R.color.white_80)));
-//            constraintLayout.animate().translationY(0).setDuration(250).start();
-
-            nextButton.setTranslationX(0);
-            nextButton.animate().translationX(200).setDuration(250).start();
-        }
-    }
-}
diff --git a/app/src/main/res/layout/activity_exchange.xml b/app/src/main/res/layout/activity_exchange.xml
index 4c21d25..33317d7 100644
--- a/app/src/main/res/layout/activity_exchange.xml
+++ b/app/src/main/res/layout/activity_exchange.xml
@@ -1,98 +1,178 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<androidx.constraintlayout.widget.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:id="@+id/rootLayout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/colorPrimaryDark">
 
     <FrameLayout
         android:id="@+id/fragmentContainer"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <LinearLayout
-        android:id="@+id/qrFrame"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="@drawable/rect_rounded"
-        android:backgroundTint="#99FFFFFF"
-        android:gravity="center_vertical"
+        android:animateLayoutChanges="true"
         android:orientation="vertical"
-        android:padding="8dp">
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="25dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:gravity="center"
+        app:layout_constraintBottom_toTopOf="@id/navbar_bottom">
 
-        <ImageView
-            android:id="@+id/qrCode"
-            android:src="@drawable/rect_rounded"
-            android:tint="@color/colorIconDark"
-            android:layout_width="match_parent"
-            android:layout_height="256dp"
-            android:contentDescription="@string/qr_code" />
-
-        <TextView
-            android:id="@+id/qrInfo"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/qrFrame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/ic_info_outline"
-            android:drawablePadding="8dp"
-            android:drawableTint="@color/status_amber"
-            android:gravity="center_vertical"
-            android:padding="8dp"
-            android:text="@string/activity_exchange_scan_partner_qr_hint"
-            android:textColor="@color/black" />
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginBottom="16dp"
+            android:background="@drawable/rect_rounded"
+            android:backgroundTint="@color/white_80"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/navbar_bottom">
 
-        <TextView
-            android:id="@+id/qrInfoStatic"
+            <TextView
+                android:id="@+id/qrContentInfo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/public_key"
+                android:textAlignment="center"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                android:textColor="@color/black"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/qrCode" />
+
+            <ImageButton
+                android:id="@+id/qrInfoButton"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:src="@drawable/ic_info_outline"
+                android:tint="@color/black"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <ImageView
+                android:id="@+id/qrCode"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="12dp"
+                android:src="@color/white"
+                app:layout_constraintBottom_toTopOf="@+id/qrInfoButton"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <LinearLayout
+            android:id="@+id/scanFeedbackView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/ic_info_outline"
-            android:drawablePadding="8dp"
-            android:drawableTint="@color/colorIconDark"
-            android:gravity="center_vertical"
-            android:lines="2"
-            android:padding="8dp"
-            android:text="@string/activity_exchange_continue_if_scanned"
-            android:textColor="@color/black" />
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginBottom="16dp"
+            android:background="@drawable/rect_rounded"
+            android:backgroundTint="@color/white_80">
+
+            <TextView
+                android:id="@+id/scanFeedbackText"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="16dp"
+                android:drawableStart="@drawable/ic_check_outline"
+                android:drawableTint="@color/status_green"
+                android:drawablePadding="8dp"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+                android:gravity="center_vertical"
+                tools:text="Public key received"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:visibility="gone"
+            android:id="@+id/continueHint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:background="@drawable/rect_rounded"
+            android:backgroundTint="@color/white">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="16dp"
+                android:drawableStart="@drawable/ic_info_outline"
+                android:drawableTint="@color/status_amber"
+                android:drawablePadding="8dp"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+                android:gravity="center_vertical"
+                android:text="Continue if your partner scanned this QR code"/>
+        </LinearLayout>
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/navbar_bottom"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="56dp"
-        android:layout_gravity="bottom"
         android:background="@drawable/rect_rounded_top"
         android:backgroundTint="@color/colorPrimary"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <ImageButton
             android:id="@+id/prevButton"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:background="?attr/selectableItemBackground"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/button_prev"
             android:padding="8dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_arrow_back"
-            android:contentDescription="@string/button_prev" />
+            app:srcCompat="@drawable/ic_arrow_back" />
 
-        <View
+        <TextView
+            android:visibility="invisible"
+            android:id="@+id/hint"
             android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_weight="1"
+            android:text="Scan each others QR codes"
+            android:textAlignment="center"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+            android:textColor="@color/white" />
 
         <ImageButton
             android:id="@+id/nextButton"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:background="?attr/selectableItemBackground"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/button_continue"
             android:padding="8dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_arrow_forward"
-            android:contentDescription="@string/button_continue" />
-
+            app:srcCompat="@drawable/ic_arrow_forward" />
     </LinearLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_exchange_2.xml b/app/src/main/res/layout/activity_exchange_2.xml
deleted file mode 100644
index 05583ff..0000000
--- a/app/src/main/res/layout/activity_exchange_2.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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:id="@+id/rootLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/colorPrimaryDark">
-
-    <FrameLayout
-        android:id="@+id/fragmentContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <LinearLayout
-        android:animateLayoutChanges="true"
-        android:orientation="vertical"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:gravity="center"
-        app:layout_constraintBottom_toTopOf="@id/navbar_bottom">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/qrFrame"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:layout_marginEnd="32dp"
-            android:layout_marginBottom="16dp"
-            android:background="@drawable/rect_rounded"
-            android:backgroundTint="@color/white_80"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/navbar_bottom">
-
-            <TextView
-                android:id="@+id/qrInfoText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Public Key"
-                android:textAlignment="center"
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-                android:textColor="@color/black"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/qrCode" />
-
-            <ImageButton
-                android:id="@+id/qrInfoButton"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_info_outline"
-                android:tint="@color/black"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
-
-            <ImageView
-                android:id="@+id/qrCode"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
-                android:src="@color/white"
-                app:layout_constraintBottom_toTopOf="@+id/qrInfoButton"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <LinearLayout
-            android:id="@+id/scanFeedbackView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:layout_marginEnd="32dp"
-            android:layout_marginBottom="16dp"
-            android:background="@drawable/rect_rounded"
-            android:backgroundTint="@color/white_80">
-
-            <TextView
-                android:id="@+id/scanFeedbackText"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:padding="16dp"
-                android:drawableStart="@drawable/ic_check_outline"
-                android:drawableTint="@color/status_green"
-                android:drawablePadding="8dp"
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
-                android:gravity="center_vertical"
-                android:text="Public key received"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:visibility="gone"
-            android:id="@+id/continueHint"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:layout_marginEnd="32dp"
-            android:background="@drawable/rect_rounded"
-            android:backgroundTint="@color/white_80">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:padding="16dp"
-                android:drawableStart="@drawable/ic_info_outline"
-                android:drawableTint="@color/status_amber"
-                android:drawablePadding="8dp"
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
-                android:gravity="center_vertical"
-                android:text="Continue if your partner scanned this QR code"/>
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/navbar_bottom"
-        android:layout_width="0dp"
-        android:layout_height="56dp"
-        android:background="@drawable/rect_rounded_top"
-        android:backgroundTint="@color/colorPrimary"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
-
-        <ImageButton
-            android:id="@+id/prevButton"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/button_prev"
-            android:padding="8dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_arrow_back" />
-
-        <TextView
-            android:visibility="invisible"
-            android:id="@+id/hint"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_weight="1"
-            android:text="Scan each others QR codes"
-            android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-            android:textColor="@color/white" />
-
-        <ImageButton
-            android:id="@+id/nextButton"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/button_continue"
-            android:padding="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_arrow_forward" />
-    </LinearLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index bf0e8df..dfe9f9a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -39,4 +39,9 @@
     <string name="upload_action_add_org">Organisation hinzufügen</string>
     <string name="upload_action_add_server">Server hinzufügen</string>
     <string name="upload_action_add_user">Benutzer hinzufügen</string>
+    <string name="public_key">Öffentlicher Schlüssel</string>
+    <string name="scan_qr_hint">Scannen Sie den QR code ihres Partners</string>
+    <string name="public_key_received_hint">Öffentlicher Schlüssel empfangen</string>
+    <string name="sync_info_received_hint">Synchronisations-Informationen empfangen</string>
+    <string name="sync_information">Synchronisations-Informationen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5688842..f3ff326 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -45,4 +45,9 @@
     <string name="upload_action_add_org">Add organisation</string>
     <string name="upload_action_add_user">Add sync user</string>
     <string name="upload_action_add_server">Add sync server</string>
+    <string name="public_key">Public Key</string>
+    <string name="scan_qr_hint">Scan your partners QR code</string>
+    <string name="public_key_received_hint">Received public key</string>
+    <string name="sync_info_received_hint">Received sync information</string>
+    <string name="sync_information">Sync Information</string>
 </resources>