From e8833dd11b0fb674e9804d13ef5d97f984f0a086 Mon Sep 17 00:00:00 2001
From: Herbert Reiter <4941275-moasda@users.noreply.gitlab.com>
Date: Wed, 9 Jun 2021 22:09:22 +0200
Subject: [PATCH] Remove double back key press to close the app

---
 .../main/java/net/moasdawiki/app/MainActivity.java | 14 ++------------
 app/src/main/res/values-de/strings.xml             |  1 -
 app/src/main/res/values/strings.xml                |  1 -
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/net/moasdawiki/app/MainActivity.java b/app/src/main/java/net/moasdawiki/app/MainActivity.java
index 6075225..4174053 100644
--- a/app/src/main/java/net/moasdawiki/app/MainActivity.java
+++ b/app/src/main/java/net/moasdawiki/app/MainActivity.java
@@ -88,7 +88,6 @@ public class MainActivity extends AppCompatActivity {
     private RequestDispatcher requestDispatcher;
 
     private WebView webview;
-    private long backButtonPressedTimestamp;
 
     private ExecutorService synchronizationExecutorService;
 
@@ -273,17 +272,8 @@ public class MainActivity extends AppCompatActivity {
         if (backForwardList.getCurrentIndex() > 0) {
             webview.goBack();
         } else {
-            long currentTimeMillis = System.currentTimeMillis();
-            if (backButtonPressedTimestamp + 5000 < currentTimeMillis) {
-                // First click on back button or previous click was more than 5 seconds ago
-                Log.d(TAG, "Back button 1x, show close hint");
-                showToast(getString(R.string.action_back_close_hint));
-                backButtonPressedTimestamp = currentTimeMillis;
-            } else {
-                // Second click on back button within 5 seconds -> close app
-                Log.d(TAG, "Back button 2x, closing app");
-                finish();
-            }
+            // Close app
+            finish();
         }
     }
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b8cb154..64e1c3c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -4,7 +4,6 @@
     <string name="about_version">Version %1$s</string>
     <string name="action_help">Hilfe</string>
     <string name="action_about">Über</string>
-    <string name="action_back_close_hint">Erneut drücken um die App zu beenden.</string>
     <string name="action_settings">Einstellungen</string>
     <string name="action_startpage">Startseite</string>
     <string name="action_synchronize">Synchronisieren</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7442c59..57ae670 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,7 +4,6 @@
     <string name="about_homepage_url" translatable="false">https://www.moasdawiki.net/</string>
     <string name="about_version">Version %1$s</string>
     <string name="action_about">About</string>
-    <string name="action_back_close_hint">Press again to exit the app.</string>
     <string name="action_help">Help</string>
     <string name="action_settings">Settings</string>
     <string name="action_startpage">Start page</string>