Remove double back key press to close the app
This commit is contained in:
@@ -88,7 +88,6 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
private RequestDispatcher requestDispatcher;
|
private RequestDispatcher requestDispatcher;
|
||||||
|
|
||||||
private WebView webview;
|
private WebView webview;
|
||||||
private long backButtonPressedTimestamp;
|
|
||||||
|
|
||||||
private ExecutorService synchronizationExecutorService;
|
private ExecutorService synchronizationExecutorService;
|
||||||
|
|
||||||
@@ -273,19 +272,10 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
if (backForwardList.getCurrentIndex() > 0) {
|
if (backForwardList.getCurrentIndex() > 0) {
|
||||||
webview.goBack();
|
webview.goBack();
|
||||||
} else {
|
} else {
|
||||||
long currentTimeMillis = System.currentTimeMillis();
|
// Close app
|
||||||
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();
|
finish();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public void onConfigurationHintClicked(View view) {
|
public void onConfigurationHintClicked(View view) {
|
||||||
showSettingsDialog();
|
showSettingsDialog();
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
<string name="about_version">Version %1$s</string>
|
<string name="about_version">Version %1$s</string>
|
||||||
<string name="action_help">Hilfe</string>
|
<string name="action_help">Hilfe</string>
|
||||||
<string name="action_about">Über</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_settings">Einstellungen</string>
|
||||||
<string name="action_startpage">Startseite</string>
|
<string name="action_startpage">Startseite</string>
|
||||||
<string name="action_synchronize">Synchronisieren</string>
|
<string name="action_synchronize">Synchronisieren</string>
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
<string name="about_homepage_url" translatable="false">https://www.moasdawiki.net/</string>
|
<string name="about_homepage_url" translatable="false">https://www.moasdawiki.net/</string>
|
||||||
<string name="about_version">Version %1$s</string>
|
<string name="about_version">Version %1$s</string>
|
||||||
<string name="action_about">About</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_help">Help</string>
|
||||||
<string name="action_settings">Settings</string>
|
<string name="action_settings">Settings</string>
|
||||||
<string name="action_startpage">Start page</string>
|
<string name="action_startpage">Start page</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user