From 67aeb40d34cdef2739e5d5e2fb22d0c18b01d75b Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 26 Feb 2018 14:48:00 -0300
Subject: [PATCH] Backport ErrorFragment

---
 .../briar/android/fragment/ErrorFragment.java | 65 +++++++++++++++++++
 .../src/main/res/layout/fragment_error.xml    | 51 +++++++++++++++
 briar-android/src/main/res/values/strings.xml |  1 +
 3 files changed, 117 insertions(+)
 create mode 100644 briar-android/src/main/java/org/briarproject/briar/android/fragment/ErrorFragment.java
 create mode 100644 briar-android/src/main/res/layout/fragment_error.xml

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/fragment/ErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/fragment/ErrorFragment.java
new file mode 100644
index 000000000..81654e0aa
--- /dev/null
+++ b/briar-android/src/main/java/org/briarproject/briar/android/fragment/ErrorFragment.java
@@ -0,0 +1,65 @@
+package org.briarproject.briar.android.fragment;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class ErrorFragment extends BaseFragment {
+
+	private static final String TAG = ErrorFragment.class.getSimpleName();
+
+	private static final String ERROR_MSG = "errorMessage";
+
+	public static ErrorFragment newInstance(String message) {
+		ErrorFragment f = new ErrorFragment();
+		Bundle args = new Bundle();
+		args.putString(ERROR_MSG, message);
+		f.setArguments(args);
+		return f;
+	}
+
+	private String errorMessage;
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		Bundle args = getArguments();
+		if (args == null) throw new AssertionError();
+		errorMessage = args.getString(ERROR_MSG);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		View v = inflater
+				.inflate(R.layout.fragment_error, container, false);
+		TextView msg = v.findViewById(R.id.errorMessage);
+		msg.setText(errorMessage);
+		return v;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		// not necessary
+	}
+
+}
diff --git a/briar-android/src/main/res/layout/fragment_error.xml b/briar-android/src/main/res/layout/fragment_error.xml
new file mode 100644
index 000000000..ca0d029ce
--- /dev/null
+++ b/briar-android/src/main/res/layout/fragment_error.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<ImageView
+		android:id="@+id/errorIcon"
+		android:layout_width="128dp"
+		android:layout_height="128dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="8dp"
+		android:src="@drawable/alerts_and_states_error"
+		android:tint="?colorControlNormal"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:ignore="ContentDescription"/>
+
+	<TextView
+		android:id="@+id/errorTitle"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="8dp"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="8dp"
+		android:text="@string/sorry"
+		android:textSize="@dimen/text_size_xlarge"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/errorIcon"/>
+
+	<TextView
+		android:id="@+id/errorMessage"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="16dp"
+		android:layout_marginLeft="16dp"
+		android:layout_marginRight="16dp"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="8dp"
+		android:textSize="@dimen/text_size_medium"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/errorTitle"
+		tools:text="@string/startup_failed_db_error"/>
+
+</android.support.constraint.ConstraintLayout>
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 776df599d..6bebe2b83 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -101,6 +101,7 @@
 	<string name="show_onboarding">Show Help Dialog</string>
 	<string name="fix">Fix</string>
 	<string name="help">Help</string>
+	<string name="sorry">Sorry</string>
 
 	<!-- Contacts and Private Conversations-->
 	<string name="no_contacts">It seems that you are new here and have no contacts yet.\n\nTap the + icon at the top and follow the instructions to add some friends to your list.\n\nPlease remember: You can only add new contacts face-to-face to prevent anyone from impersonating you or reading your messages in the future.</string>