From ad727e8942c8b0833fa14b9664baee881d190790 Mon Sep 17 00:00:00 2001
From: Jannis Mattheis <contact@jmattheis.de>
Date: Mon, 12 Nov 2018 17:42:06 +0100
Subject: [PATCH 1/2] Add logs button to Login

---
 .../main/java/com/github/gotify/login/LoginActivity.java | 6 ++++++
 app/src/main/res/layout/activity_login.xml               | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/app/src/main/java/com/github/gotify/login/LoginActivity.java b/app/src/main/java/com/github/gotify/login/LoginActivity.java
index 2fce438b..329db433 100644
--- a/app/src/main/java/com/github/gotify/login/LoginActivity.java
+++ b/app/src/main/java/com/github/gotify/login/LoginActivity.java
@@ -34,6 +34,7 @@
 import com.github.gotify.client.model.VersionInfo;
 import com.github.gotify.init.InitializationActivity;
 import com.github.gotify.log.Log;
+import com.github.gotify.log.LogsActivity;
 import com.github.gotify.log.UncaughtExceptionHandler;
 import com.squareup.okhttp.HttpUrl;
 import java.io.InputStream;
@@ -118,6 +119,11 @@ public void doCheckUrl() {
                 .handleInUIThread(this, onValidUrl(fixedUrl), onInvalidUrl(fixedUrl));
     }
 
+    @OnClick(R.id.open_logs)
+    public void openLogs() {
+        startActivity(new Intent(this, LogsActivity.class));
+    }
+
     @OnClick(R.id.advanced_settings)
     void toggleShowAdvanced() {
         String selectedCertName =
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index a0906112..16565ace 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -16,6 +16,15 @@
         tools:context=".login.LoginActivity"
         tools:layout_editor_absoluteY="25dp">
 
+        <Button
+            android:id="@+id/open_logs"
+            android:layout_width="50dp"
+            android:layout_height="40dp"
+            android:background="@null"
+            android:text="@string/logs"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <ProgressBar
             android:id="@+id/checkurl_progress"
             android:layout_width="49dp"

From 047b201b1851132ad0b2c13aa81a00f01c53e6d5 Mon Sep 17 00:00:00 2001
From: Jannis Mattheis <contact@jmattheis.de>
Date: Mon, 12 Nov 2018 17:55:44 +0100
Subject: [PATCH 2/2] Use singleTask launch mode

New notifications created a new activity
even if the activity was already on top
---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c0fbff3..26f9b7c5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,6 +26,7 @@
         </activity>
         <activity
             android:name=".messages.MessagesActivity"
+            android:launchMode="singleTask"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity