New release

CHANGELOG.md

@@ -1,8 +1,15 @@
 # Changelog
 
+## 2.6.1.0 (versionCode 27, 2021-06-09)
+
+- Remove double back key press to close the app
+- Update to moasdawiki-server 2.6.1
+- Upgrade library dependencies
+
 ## 2.6.0.0 (versionCode 26, 2021-05-13)
 
 - Make GPL-3.0-only licensing more clear
+- Update to moasdawiki-server 2.6.0
 
 ## 2.5.2.1 (versionCode 25, 2021-05-08)
 

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "net.moasdawiki.app"
         minSdkVersion 26 // 26 = Oreo 8.0
         targetSdkVersion 30 // should be same as compileSdkVersion
-        versionCode 26
+        versionCode 27
-        versionName "2.6.0.0"
+        versionName "2.6.1.0"
         archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
     sourceSets {
@@ -24,10 +24,10 @@ android {
 }
 
 dependencies {
-    implementation 'net.moasdawiki:moasdawiki-server:2.6.0'
+    implementation 'net.moasdawiki:moasdawiki-server:2.6.1'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.preference:preference:1.1.1'
-    compileOnly 'org.jetbrains:annotations:20.1.0'
+    compileOnly 'org.jetbrains:annotations:21.0.1'
     testImplementation 'org.testng:testng:7.4.0'
 }

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,19 +272,10 @@ public class MainActivity extends AppCompatActivity {
         if (backForwardList.getCurrentIndex() > 0) {
             webview.goBack();
         } 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();
         }
     }
-    }
 
     public void onConfigurationHintClicked(View view) {
         showSettingsDialog();

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>

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>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:4.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

fastlane/metadata/android/de/changelogs/27.txt

@@ -0,0 +1,3 @@
+- Entferne doppeltes Drücken der Rückwärtstaste zum Schließen der App
+- Auf moasdawiki-server 2.6.1 aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren

fastlane/metadata/android/en-US/changelogs/27.txt

@@ -0,0 +1,3 @@
+- Remove double back key press to close the app
+- Update to moasdawiki-server 2.6.1
+- Upgrade library dependencies