New release

.gitattributes

@@ -0,0 +1,4 @@
+*.sh text eol=lf
+
+# Files with CRLF line endings
+gradlew.bat text eol=crlf

CHANGELOG.md

@@ -1,8 +1,116 @@
 # Changelog
 
+## 3.9.3.0 (versionCode 46, 2025-01-05)
+
+- Update to moasdawiki-server 3.9.3
+- Upgrade to Gradle 8.12
+- Upgrade library dependencies
+- Update copyright year
+
+## 3.9.1.1 (versionCode 45, 2024-11-02)
+
+- Update App sync description
+- Upgrade library dependencies
+
+## 3.9.1.0 (versionCode 44, 2024-10-04)
+
+- Update to moasdawiki-server 3.9.1
+- Upgrade to Gradle 8.10.2
+- Upgrade library dependencies
+
+## 3.7.1.1 (versionCode 43, 2024-05-10)
+
+- Upgrade to Gradle 8.7
+
+## 3.7.1.0 (versionCode 42, 2024-01-01)
+
+- Update to moasdawiki-server 3.7.1
+- Upgrade to Gradle 8.5
+- Update copyright year
+
+## 3.6.3.2 (versionCode 41, 2023-12-12)
+
+- Upgrade library dependencies
+
+## 3.6.3.1 (versionCode 40, 2023-11-15)
+
+- Fix Gradle build issue in fdroid build
+
+## 3.6.3.0 (versionCode 39, 2023-11-11)
+
+- Limit calendar import to 100 events as Android has a global limit of 500 events
+- Retry failed server sync requests
+- Update to moasdawiki-server 3.6.3
+- Upgrade library dependencies
+- Upgrade to Android API 34 (Android 14)
+
+## 3.6.2.1 (versionCode 38, 2023-08-07)
+
+- Fix Gradle build issue
+
+## 3.6.2.0 (versionCode 37, 2023-08-05)
+
+- Update to moasdawiki-server 3.6.2
+- Upgrade library dependencies
+
+## 3.6.1.0 (versionCode 36, 2023-04-29)
+
+- Update to moasdawiki-server 3.6.1
+- Upgrade library dependencies
+
+## 3.6.0.0 (versionCode 35, 2023-01-01)
+
+- Update to moasdawiki-server 3.6.0
+- Upgrade library dependencies
+- Update copyright year
+
+## 3.5.1.0 (versionCode 34, 2022-11-12)
+
+- Update to moasdawiki-server 3.5.1
+- Upgrade library dependencies
+
+## 3.5.0.1 (versionCode 33, 2022-10-15)
+
+- Add app icon to fastlane folder
+
+## 3.5.0.0 (versionCode 32, 2022-10-08)
+ 
+- Update to moasdawiki-server 3.5.0
+- Upgrade library dependencies
+
+## 3.4.5.0 (versionCode 31, 2022-09-05)
+
+- Update to moasdawiki-server 3.4.5
+- Upgrade library dependencies
+
+## 3.4.4.0 (versionCode 30, 2022-04-14)
+
+- Update to moasdawiki-server 3.4.4
+- Upgrade library dependencies
+
+## 3.2.1.0 (versionCode 29, 2021-12-29)
+
+- Update Gradle version in moasdawiki-server and in app to fix build issue
+- Update to moasdawiki-server 3.2.1
+
+## 3.1.0.0 (versionCode 28, 2021-12-25)
+
+- Small layout optimizations
+- Update to moasdawiki-server 3.1.0
+- Support for Android 12
+- Upgrade library dependencies
+- Update copyright year
+
+## 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)
 

README.md

@@ -12,6 +12,7 @@ For MoasdaWiki documentation see https://moasdawiki.net/.
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
     alt="Get it on F-Droid"
     height="80">](https://f-droid.org/packages/net.moasdawiki.app)
+or [Google Play](https://play.google.com/store/apps/details?id=net.moasdawiki.app)
 
 ## Features
 
@@ -32,16 +33,16 @@ For MoasdaWiki documentation see https://moasdawiki.net/.
 ## Synchronize content with a MoasdaWiki Server
 
 1. Download MoasdaWiki Server from https://gitlab.com/moasdawiki/moasdawiki-server.
-1. Set up a MoasdaWiki Server instance in your LAN.
-1. Install the MoasdaWiki App.
-1. In the app you can see a hint that it has to be configured first. Press on that hint.
-1. Press on "Host name" and enter the host name or IP address of the server instance, e.g. `192.168.1.101`. Press OK.
-1. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
-1. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
-1. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
-1. Back in the app press the back button (&larr;) on the upper left corner to get back to the main dialog.
-   Now you can see a hint that the app has to be synchronized. Press on that hint.
-1. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
+2. Set up a MoasdaWiki Server instance in your LAN.
+3. Enable LAN access to the server: Edit the repository file `config.txt` and change the setting `authentication.onlylocalhost = false`. Restart the server afterwards.
+4. Install the MoasdaWiki App.
+5. In the app you can see a hint that it has to be configured first. Press on that hint.
+6. Press on "Host name" and enter the host name or IP address of the server instance, e.g. `192.168.1.101`. Press OK.
+7. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
+8. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
+9. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
+10. Back in the app press the back button (&larr;) on the upper left corner to get back to the main dialog. Now you can see a hint that the app has to be synchronized. Press on that hint.
+11. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
 
 ## Support
 

app/build.gradle

@@ -1,33 +1,38 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30 // 30 = Android 11
+    namespace "net.moasdawiki.app"
+    compileSdk 34 // 34 = Android 14
     defaultConfig {
         applicationId "net.moasdawiki.app"
-        minSdkVersion 26 // 26 = Oreo 8.0
-        targetSdkVersion 30 // should be same as compileSdkVersion
-        versionCode 26
-        versionName "2.6.0.0"
-        archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
-    }
-    sourceSets {
-        main {
-            java {
-                exclude "net/moasdawiki/plugin/sync/SynchronizationPlugin*"
-            }
-        }
+        minSdk 28 // 28 = Android 9
+        targetSdk 34 // should be same as compileSdk
+        versionCode 46
+        versionName "3.9.3.0"
     }
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    buildFeatures {
+        buildConfig true
+    }
+    lintOptions {
+        // Workaround for NullPointerException in :app:lintVitalAnalyzeRelease in fdroid build
+        checkReleaseBuilds false
+    }
+    base {
+        archivesName = "moasdawiki-" + defaultConfig.versionName + "-" + defaultConfig.versionCode
     }
 }
 
 dependencies {
-    implementation 'net.moasdawiki:moasdawiki-server:2.6.0'
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.preference:preference:1.1.1'
-    compileOnly 'org.jetbrains:annotations:20.1.0'
-    testImplementation 'org.testng:testng:7.4.0'
+    api 'net.moasdawiki:moasdawiki-server:3.9.3'
+    api ('androidx.appcompat:appcompat:1.6.1') {
+        exclude group: 'org.jetbrains', module: 'annotations'
+    }
+    api ('androidx.preference:preference:1.2.1') {
+        exclude group: 'org.jetbrains', module: 'annotations'
+    }
+    compileOnly 'org.jetbrains:annotations:26.0.1'
 }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="net.moasdawiki.app">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
@@ -16,11 +15,13 @@
         android:name=".WikiEngineApplication"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        android:allowBackup="false">
+        android:allowBackup="false"
+        android:fullBackupContent="false"
+        android:dataExtractionRules="@xml/data_extraction_rules">
 
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -44,7 +45,8 @@
 
         <service
             android:name="net.moasdawiki.app.CalendarAccountAuthenticatorService"
-            tools:ignore="ExportedService">
+            tools:ignore="ExportedService"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator"/>
             </intent-filter>

app/src/main/java/net/moasdawiki/app/AndroidSettings.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/CalendarAccountAuthenticator.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/CalendarAccountAuthenticatorService.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/CalendarContentProvider.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/CalendarSyncAdapter.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published
@@ -48,8 +48,10 @@ import net.moasdawiki.util.PathUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.TimeZone;
 
@@ -71,8 +73,21 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
     private static final Uri EVENT_URI    = CalendarContract.Events.   CONTENT_URI;
     private static final Uri REMINDER_URI = CalendarContract.Reminders.CONTENT_URI;
 
+    /**
+     * Alert event 4h before it starts, i.e. at 8pm in the evening before the event day.
+     */
     private static final int REMINDER_BEFORE_EVENT_MINUTES = 4 * 60;
 
+    /**
+     * Import maximum 100 events. If there are more events found, take the 100 upcoming events
+     * sorted by date.
+     *
+     * Android has a global event limitation of 500 events. If more than 500 events are created,
+     * Android throws errors with message "Maximum limit of concurrent alarms 500 reached" and
+     * ignores some events.
+     */
+    private static final int MAX_EVENT_COUNT = 100;
+
     private final ContentResolver contentResolver;
 
     @SuppressWarnings("SameParameterValue")
@@ -84,13 +99,19 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
     @Override
     public void onPerformSync(Account account, Bundle extras, String authority, ContentProviderClient provider, SyncResult syncResult) {
         Log.d(TAG, "Begin of onPerformSync()");
-        List<TerminTransformer.Event> events = getWikiEvents();
+        // collect and filter events
+        List<TerminTransformer.Event> rawEvents = getWikiEvents();
+        fillEmptyDateFields(rawEvents);
+        List<TerminTransformer.Event> events = filterEvents(rawEvents);
+
+        // update Android calendar
         String calendarId = createCalendar();
         if (calendarId != null) {
             deleteAllEvents(calendarId);
             addEvents(calendarId, events);
         }
 
+        // inform user about completed update
         Handler handler = new Handler(Looper.getMainLooper());
         handler.post(() -> {
             Toast toast = Toast.makeText(getContext(), R.string.calendar_sync_finished, Toast.LENGTH_SHORT);
@@ -116,6 +137,65 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
         return events;
     }
 
+    /**
+     * Fills empty day, month, and year fields in all events.
+     */
+    private void fillEmptyDateFields(@NotNull List<TerminTransformer.Event> events) {
+        TimeZone utc = TimeZone.getTimeZone("UTC");
+        Calendar calendar = Calendar.getInstance(utc);
+        for (TerminTransformer.Event event : events) {
+            if (event.dateFields.day == null) {
+                event.dateFields.day = 1;
+            }
+            if (event.dateFields.month == null) {
+                event.dateFields.month = 1;
+            }
+            if (event.dateFields.year == null) {
+                event.dateFields.year = calendar.get(Calendar.YEAR);
+            }
+        }
+    }
+
+    /**
+     * Reduces the number of events if more than MAX_EVENT_COUNT, only keep events in the near future.
+     */
+    @NotNull
+    private List<TerminTransformer.Event> filterEvents(@NotNull List<TerminTransformer.Event> rawEvents) {
+        if (rawEvents.size() <= MAX_EVENT_COUNT) {
+            return rawEvents;
+        }
+
+        // sort by month and day;
+        // ignore year because events repeat every year
+        List<TerminTransformer.Event> sortedEvents = new ArrayList<>(rawEvents);
+        sortedEvents.sort(Comparator.comparingInt((TerminTransformer.Event event) -> event.dateFields.month).thenComparingInt(event -> event.dateFields.day));
+
+        // keep next MAX_EVENT_COUNT events from today onwards
+        List<TerminTransformer.Event> result = new ArrayList<>(MAX_EVENT_COUNT);
+        // find first event in future
+        TimeZone utc = TimeZone.getTimeZone("UTC");
+        Calendar calendar = Calendar.getInstance(utc);
+        int index = 0;
+        while (index < sortedEvents.size() - 1
+                && (sortedEvents.get(index).dateFields.month < calendar.get(Calendar.MONTH) + 1
+                    || sortedEvents.get(index).dateFields.month == calendar.get(Calendar.MONTH) + 1
+                        && sortedEvents.get(index).dateFields.day < calendar.get(Calendar.DAY_OF_MONTH))) {
+            index++;
+        }
+        // copy events until end of year
+        while (result.size() < MAX_EVENT_COUNT && index < sortedEvents.size() - 1) {
+            result.add(sortedEvents.get(index));
+            index++;
+        }
+        // copy events in new year
+        index = 0;
+        while (result.size() < MAX_EVENT_COUNT && index < sortedEvents.size() - 1) {
+            result.add(sortedEvents.get(index));
+            index++;
+        }
+        return result;
+    }
+
     @NotNull
     private Uri buildUri(@NotNull Uri uri) {
         return uri.buildUpon()
@@ -155,7 +235,6 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
         cv.put(CalendarContract.Calendars.NAME,                  CALENDAR_NAME);
         String displayName = getContext().getString(R.string.calendar_display_name);
         cv.put(CalendarContract.Calendars.CALENDAR_DISPLAY_NAME, displayName);
-        //cv.put(CalendarContract.Calendars.CALENDAR_COLOR,        0xEA8561);
         cv.put(CalendarContract.Calendars.CALENDAR_ACCESS_LEVEL, CalendarContract.Calendars.CAL_ACCESS_READ);
         cv.put(CalendarContract.Calendars.OWNER_ACCOUNT,         ACCOUNT_NAME);
         cv.put(CalendarContract.Calendars.VISIBLE,               1);
@@ -191,8 +270,8 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
     }
 
     /**
-     * Adds all events from the event list. The first occurrence is in the current year, the events
-     * are repeated every year.
+     * Adds up to 100 events from the event list.
+     * The first occurrence is in the current year, the events are repeated every year.
      */
     private void addEvents(@NotNull String calendarId, @NotNull List<TerminTransformer.Event> events) {
         Log.d(TAG, "Create calendar events");
@@ -214,7 +293,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
      * Adds a single event to the calendar.
      */
     @Nullable
-    private String addEvent(@NotNull String calendarId, @Nullable Integer day, @Nullable Integer month, @Nullable Integer year, @NotNull String title, @NotNull String description) {
+    private String addEvent(@NotNull String calendarId, int day, int month, int year, @NotNull String title, @NotNull String description) {
         Log.d(TAG, "Create calendar event: day=" + day + ", month=" + month + ", year=" + year
                 + ", title=" + title + ", description=" + description);
         ContentValues cv = new ContentValues();
@@ -224,18 +303,8 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
 
         TimeZone utc = TimeZone.getTimeZone("UTC");
         Calendar beginTime = Calendar.getInstance(utc);
-        if (day == null) {
-            day = 1;
-        }
-        if (month == null) {
-            month = 1;
-        }
-        if (year == null) {
-            year = beginTime.get(Calendar.YEAR);
-        }
         beginTime.clear();
         beginTime.set(year, month - 1, day);
-
         cv.put(CalendarContract.Events.DTSTART, beginTime.getTimeInMillis());
         cv.put(CalendarContract.Events.DURATION, "PT1D");
         cv.put(CalendarContract.Events.ALL_DAY, 1);

app/src/main/java/net/moasdawiki/app/CalendarSyncAdapterService.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/Constants.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published
@@ -18,7 +18,7 @@
 package net.moasdawiki.app;
 
 /**
- * Enthält zentrale Konstanten.
+ * Defines constants and settings.
  */
 public abstract class Constants {
     public static final String PREFERENCES_SYNC_SERVER_HOST = "sync_server_host";

app/src/main/java/net/moasdawiki/app/MainActivity.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published
@@ -52,7 +52,8 @@ import androidx.preference.PreferenceManager;
 
 import net.moasdawiki.base.ServiceException;
 import net.moasdawiki.base.Settings;
-import net.moasdawiki.server.HttpRequest;
+import net.moasdawiki.http.ContentType;
+import net.moasdawiki.http.HttpRequest;
 import net.moasdawiki.server.RequestDispatcher;
 import net.moasdawiki.service.HttpResponse;
 import net.moasdawiki.service.repository.RepositoryService;
@@ -64,7 +65,6 @@ import org.jetbrains.annotations.Nullable;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.InetAddress;
 import java.net.URLDecoder;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -88,7 +88,6 @@ public class MainActivity extends AppCompatActivity {
     private RequestDispatcher requestDispatcher;
 
     private WebView webview;
-    private long backButtonPressedTimestamp;
 
     private ExecutorService synchronizationExecutorService;
 
@@ -160,6 +159,7 @@ public class MainActivity extends AppCompatActivity {
                     // determine URL path
                     Uri uri = request.getUrl();
                     String encodedUrl = uri.toString();
+                    //noinspection CharsetObjectCanBeUsed
                     String url = URLDecoder.decode(encodedUrl, "UTF-8");
                     if (!url.startsWith(SERVER_BASE_URL)) {
                         return null;
@@ -172,20 +172,20 @@ public class MainActivity extends AppCompatActivity {
                     }
 
                     // dispatch URL path
-                    HttpRequest httpRequest = new HttpRequest();
-                    httpRequest.clientIP = InetAddress.getLocalHost();
-                    httpRequest.httpHeader = Collections.emptyMap();
-                    httpRequest.method = "GET";
-                    httpRequest.url = urlPath;
-                    httpRequest.urlPath = urlPath;
-                    httpRequest.urlParameters = convertParameters(uri);
-                    httpRequest.httpBody = new byte[0];
+                    HttpRequest httpRequest = new HttpRequest(Collections.emptyMap(),
+                            "GET", urlPath, urlPath, convertParameters(uri), new byte[0]);
                     HttpResponse response = requestDispatcher.handleRequest(httpRequest);
 
                     // send wiki content to browser
-                    InputStream responseData = new ByteArrayInputStream(response.content);
-                    return new WebResourceResponse(response.contentType, "UTF-8", responseData);
-                } catch (IOException e) {
+                    String mimeType;
+                    if (response.getContentType() != null) {
+                        mimeType = response.getContentType().getMediaType();
+                    } else {
+                        mimeType = ContentType.BINARY.getMediaType();
+                    }
+                    InputStream responseData = new ByteArrayInputStream(response.getContent());
+                    return new WebResourceResponse(mimeType, "UTF-8", responseData);
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
 
@@ -273,29 +273,20 @@ 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();
         }
     }
 
-    public void onConfigurationHintClicked(View view) {
+    public void onConfigurationHintClicked(@SuppressWarnings("unused") View view) {
         showSettingsDialog();
     }
 
-    public void onSynchronizeHintClicked(View view) {
+    public void onSynchronizeHintClicked(@SuppressWarnings("unused") View view) {
         synchronizeWithServer();
     }
 
-    public void onSearch(View view) {
+    public void onSearch(@SuppressWarnings("unused") View view) {
         EditText searchInput = findViewById(R.id.search_input);
         String query = searchInput.getText().toString();
         query = query.trim();
@@ -355,24 +346,33 @@ public class MainActivity extends AppCompatActivity {
      * This method is run in an asynchronous background thread.
      */
     private void runSynchronizationWithServer() {
-        int filesCount;
+        SynchronizeWikiClient.SyncResult syncResult;
         try {
-            filesCount = synchronizeWikiClient.synchronizeRepository(this::syncProgress);
+            syncResult = synchronizeWikiClient.synchronizeRepository(this::syncProgress);
         } catch (ServiceException e) {
             Log.e(TAG, "Error synchronizing repository with server", e);
-            runOnUiThread(() -> showToast(getString(R.string.settings_synchronize_failed)));
+            runOnUiThread(() -> showToast(getString(R.string.synchronize_failed)));
             return;
         }
 
-        if (filesCount > 0) {
-            runOnUiThread(() -> showToast(getString(R.string.settings_synchronize_successful, filesCount)));
+        if (!syncResult.isSessionValid()) {
+            runOnUiThread(() -> showToast(getString(R.string.synchronize_session_not_valid)));
+        }
+        else if (!syncResult.isSessionAuthorized()) {
+            runOnUiThread(() -> showToast(getString(R.string.synchronize_session_not_authorized)));
+        }
+        else if (syncResult.isSyncFailed()) {
+            runOnUiThread(() -> showToast(getString(R.string.synchronize_failed)));
+        }
+        else if (syncResult.getFileCount() > 0) {
+            runOnUiThread(() -> showToast(getString(R.string.synchronize_successful, syncResult.getFileCount())));
 
             WikiEngineApplication app = (WikiEngineApplication) getApplication();
             app.resetServices();
 
             CalendarSyncAdapter.requestCalendarSync(this);
         } else {
-            runOnUiThread(() -> showToast(getString(R.string.settings_synchronize_not_necessary)));
+            runOnUiThread(() -> showToast(getString(R.string.synchronize_not_necessary)));
         }
 
         runOnUiThread(this::hideProgressBar);

app/src/main/java/net/moasdawiki/app/SettingsActivity.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/SettingsFragment.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published
@@ -49,6 +49,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        //noinspection DataFlowIssue
         WikiEngineApplication app = (WikiEngineApplication) getContext().getApplicationContext();
         synchronizeWikiClient = app.getSynchronizeWikiClient();
         repositoryService = app.getRepositoryService();
@@ -184,10 +185,10 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
             return;
         }
 
-        boolean success = synchronizeWikiClient.createAndCheckSession();
+        SynchronizeWikiClient.SessionStatus sessionStatus = synchronizeWikiClient.createAndCheckSession();
         updateStatusText();
 
-        if (!success) {
+        if (!sessionStatus.isValid()) {
             showToast(getString(R.string.settings_search_failed));
         }
     }

app/src/main/java/net/moasdawiki/app/SynchronizeWikiClient.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published
@@ -39,6 +39,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.math.BigInteger;
@@ -47,14 +48,14 @@ import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.net.URI;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 import java.util.Date;
 import java.util.Enumeration;
 
 /**
- * Sucht einen Wikiserver in Netzwerk und synchronisiert alle Wikidateien
- * im eigenen Repository..
+ * Connects to the configured MoasdaWiki server and downloads the wiki files.
  */
 public class SynchronizeWikiClient {
 
@@ -62,6 +63,10 @@ public class SynchronizeWikiClient {
 
     private static final String PROTOCOL_VERSION = "2.0";
 
+    private static final int CONNECTION_CONNECT_TIMEOUT = 2_000; // 2 seconds
+    private static final int CONNECTION_READ_TIMEOUT = 120_000; // 2 minutes
+    private static final int CONNECTION_RETRIES = 3;
+
     @NotNull
     private final Context mContext;
     @NotNull
@@ -83,13 +88,13 @@ public class SynchronizeWikiClient {
     }
 
     /**
-     * Verbindet sich mit dem Wikiserver. Ist bereits eine Serversession vorhanden, wird diese
-     * weiter verwendet.
+     * Connects with the MoasdaWiki server.
+     * If there is already a valid server session, it is reused.
      */
-    public boolean createAndCheckSession() {
+    public SessionStatus createAndCheckSession() {
         String serverHostPort = getServerHostPort();
         if (serverHostPort == null) {
-            return false;
+            return new SessionStatus(false, false);
         }
 
         PreferenceManager.getDefaultSharedPreferences(mContext);
@@ -97,37 +102,39 @@ public class SynchronizeWikiClient {
         String serverSessionId = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID, null);
 
         try {
-            // Wenn noch keine Session vorhanden ist, eine erzeugen
+            // If there is no session yet, create a new session
             boolean createSessionCalled = false;
             if (serverSessionId == null) {
                 createSessionCalled = true;
                 createSession(serverHostPort);
             }
 
-            // Ist Session freigeschaltet zur Synchronisierung?
-            boolean[] checkResult = checkSession(serverHostPort);
-            if (checkResult[0]) {
-                return true;
+            // Check existing session if it's still valid
+            SessionStatus sessionStatus = checkSession(serverHostPort);
+            if (sessionStatus.isValid()) {
+                return sessionStatus;
             }
 
-            // Session ist ungültig --> neue Session holen
+            // If session ist invalid, create new session
             if (createSessionCalled) {
-                // createSession nicht erneut aufrufen
-                return false;
+                // don't call createSession() twice
+                return new SessionStatus(false, false);
             }
             createSession(serverHostPort);
 
-            // Session erneut prüfen
-            boolean[] checkResult2 = checkSession(serverHostPort);
-            return checkResult2[0];
+            // Check session again
+            return checkSession(serverHostPort);
         }
         catch (ServiceException e) {
-            return false;
+            return new SessionStatus(false, false);
         }
     }
 
+    /**
+     * Connects with the MoasdaWiki server and creates a new session.
+     */
     private void createSession(@NotNull String serverHostPort) throws ServiceException {
-        // Anfrage schicken
+        // send request
         CreateSessionXml createSessionXml = new CreateSessionXml();
         createSessionXml.version = PROTOCOL_VERSION;
         createSessionXml.clientSessionId = generateSessionId();
@@ -141,11 +148,11 @@ public class SynchronizeWikiClient {
         String requestXml = generateXml(createSessionXml);
         String responseXml = sendXmlRequest(serverHostPort, "/sync/create-session", requestXml);
 
-        // Antwort auswerten
+        // parse response
         CreateSessionResponseXml response = parseXml(responseXml, CreateSessionResponseXml.class);
         Log.d(TAG, "Current sync session ID '" + response.serverSessionId + "'");
 
-        // Session prüfen
+        // check for session id
         if (response.serverSessionId == null) {
             throw new ServiceException("Didn't get a server session ID");
         }
@@ -157,30 +164,34 @@ public class SynchronizeWikiClient {
         editor.putString(Constants.PREFERENCES_SYNC_SERVER_HOST_DISPLAYNAME, response.serverHost);
         editor.putString(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID, response.serverSessionId);
         editor.putString(Constants.PREFERENCES_SYNC_CLIENT_SESSION_ID, createSessionXml.clientSessionId);
-        // Synchronisierungszeiten können nicht mehr genutzt werden
+        // reset sync data
         editor.remove(Constants.PREFERENCES_SYNC_SERVER_TIME);
         editor.remove(Constants.PREFERENCES_SYNC_SERVER_SESSION_AUTHORIZED);
         editor.apply();
     }
 
+    @NotNull
     private String generateSessionId() {
         return new BigInteger(130, random).toString(32);
     }
 
+    /**
+     * Check if our MoasdaWiki server session is valid and authorized.
+     */
     @NotNull
-    private boolean[] checkSession(@NotNull String serverHostPort) throws ServiceException {
+    private SessionStatus checkSession(@NotNull String serverHostPort) throws ServiceException {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
         String serverSessionId = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID, null);
         String clientSessionId = preferences.getString(Constants.PREFERENCES_SYNC_CLIENT_SESSION_ID, null);
 
-        // Anfrage schicken
+        // Send request
         CheckSessionXml checkSessionXml = new CheckSessionXml();
         checkSessionXml.version = PROTOCOL_VERSION;
         checkSessionXml.serverSessionId = serverSessionId;
         String requestXml = generateXml(checkSessionXml);
         String responseXml = sendXmlRequest(serverHostPort, "/sync/check-session", requestXml);
 
-        // Antwort auswerten
+        // Parse response
         CheckSessionResponseXml response = parseXml(responseXml, CheckSessionResponseXml.class);
         if (response.valid == null || !response.valid) {
             Log.d(TAG, "Sync server session ID '" + serverSessionId + "' is not valid any more");
@@ -188,7 +199,7 @@ public class SynchronizeWikiClient {
             editor.remove(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID);
             editor.remove(Constants.PREFERENCES_SYNC_CLIENT_SESSION_ID);
             editor.apply();
-            return new boolean[]{ false, false };
+            return new SessionStatus(false, false);
         }
         if (clientSessionId != null && !clientSessionId.equals(response.clientSessionId)) {
             Log.d(TAG, "Sync server authentication failed, client session ID does not match");
@@ -196,37 +207,70 @@ public class SynchronizeWikiClient {
             editor.remove(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID);
             editor.remove(Constants.PREFERENCES_SYNC_CLIENT_SESSION_ID);
             editor.apply();
-            return new boolean[]{ false, false };
+            return new SessionStatus(false, false);
         }
 
         SharedPreferences.Editor editor = preferences.edit();
         boolean authorized = response.authorized != null && response.authorized;
         editor.putBoolean(Constants.PREFERENCES_SYNC_SERVER_SESSION_AUTHORIZED, authorized);
         editor.apply();
-        return new boolean[]{ true, authorized };
+        return new SessionStatus(true, authorized);
     }
 
     /**
-     * Synchronisiert alle Repository-Dateien mit dem Wikiserver. Vorher wird geprüft, ob
-     * die Server-Session noch gültig ist und wir mit demselben Server verbunden sind.
-     *
-     * @return Anzahl der synchronisierten Dateien.
+     * Contains the session status.
      */
-    public int synchronizeRepository(ProgressFeedback feedback) throws ServiceException {
-        boolean sessionValid = createAndCheckSession();
-        if (!sessionValid) {
-            throw new ServiceException("No valid server session found");
+    public static class SessionStatus {
+        /**
+         * Is the MoasdaWiki server session valid?
+         */
+        private final boolean valid;
+
+        /**
+         * Is the session authorized at server side?
+         */
+        private final boolean authorized;
+
+        public SessionStatus(boolean valid, boolean authorized) {
+            this.valid = valid;
+            this.authorized = authorized;
         }
 
+        public boolean isValid() {
+            return valid;
+        }
+
+        public boolean isAuthorized() {
+            return authorized;
+        }
+    }
+
+    /**
+     * Downloads the wiki files from the MoasdaWiki server.
+     * Checks if the session is still valid.
+     */
+    public SyncResult synchronizeRepository(ProgressFeedback feedback) throws ServiceException {
         String serverHostPort = getServerHostPort();
         if (serverHostPort == null) {
-            throw new ServiceException("No wiki server configured");
+            Log.w(TAG, "No server host name configured");
+            return new SyncResult(false, false, true, 0);
+        }
+
+        SessionStatus sessionStatus = createAndCheckSession();
+        if (!sessionStatus.isValid()) {
+            Log.w(TAG, "No valid server session");
+            return new SyncResult(false, false, true, 0);
+        }
+        if (!sessionStatus.isAuthorized()) {
+            Log.w(TAG, "Server session not authorized");
+            return new SyncResult(true, false, true, 0);
         }
 
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
         String serverSessionId = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID, null);
         if (serverSessionId == null) {
-            throw new ServiceException("Not server session ID found");
+            Log.w(TAG, "No server session available");
+            return new SyncResult(false, false, true, 0);
         }
         long lastSyncServerTimeMs = preferences.getLong(Constants.PREFERENCES_SYNC_SERVER_TIME, 0);
         Date lastSyncServerTime = null;
@@ -248,7 +292,7 @@ public class SynchronizeWikiClient {
         Log.d(TAG, "Downloading " + fileCount + " files from server");
         if (fileCount == 0) {
             // no files to download, cancel process
-            return 0;
+            return new SyncResult(true, true, false, 0);
         }
 
         for (int i = 0; i < fileCount; i++) {
@@ -275,7 +319,37 @@ public class SynchronizeWikiClient {
             editor.apply();
         }
 
-        return fileCount;
+        return new SyncResult(true, true, false, fileCount);
+    }
+
+    public static class SyncResult {
+        private final boolean sessionValid;
+        private final boolean sessionAuthorized;
+        private final boolean syncFailed;
+        private final int fileCount;
+
+        public SyncResult(boolean sessionValid, boolean sessionAuthorized, boolean syncFailed, int fileCount) {
+            this.sessionValid = sessionValid;
+            this.sessionAuthorized = sessionAuthorized;
+            this.syncFailed = syncFailed;
+            this.fileCount = fileCount;
+        }
+
+        public boolean isSessionValid() {
+            return sessionValid;
+        }
+
+        public boolean isSessionAuthorized() {
+            return sessionAuthorized;
+        }
+
+        public boolean isSyncFailed() {
+            return syncFailed;
+        }
+
+        public int getFileCount() {
+            return fileCount;
+        }
     }
 
     private void downloadFileFromServer(@NotNull String serverHostPort, @NotNull String serverSessionId, @NotNull String filePath) throws ServiceException {
@@ -373,11 +447,7 @@ public class SynchronizeWikiClient {
     }
 
     /**
-     * Schickt einen XML-Request und liest die XML-Antwort ein.
-     *
-     * @param urlPath    HTTP-URL, nicht null
-     * @param requestXml XML-Anfrage, nicht null.
-     * @return XML-Antwort, nicht null.
+     * Sends an XML request and reads the XML response.
      */
     @NotNull
     private String sendXmlRequest(@NotNull String serverHostPort, @NotNull String urlPath, @NotNull String requestXml) throws ServiceException {
@@ -386,33 +456,11 @@ public class SynchronizeWikiClient {
             Log.d(TAG, "Request to " + url + ": " + truncateLogText(requestXml, 200));
             byte[] requestBytes = requestXml.getBytes(StandardCharsets.UTF_8);
 
-            URI uri = new URI(url);
-            HttpURLConnection conn = (HttpURLConnection) uri.toURL().openConnection();
-            conn.setRequestMethod("POST");
-            conn.setRequestProperty("Content-Type", "text/xml");
-            conn.setRequestProperty("Content-Length", Integer.toString(requestBytes.length));
-            conn.setUseCaches(false);
-            conn.setDoOutput(true);
-            conn.setDoInput(true);
-            conn.setConnectTimeout(1000); // 1 Sekunde
-            conn.setReadTimeout(10000); // 10 Sekunden
-            conn.connect();
+            byte[] responseBytes = sendBinaryRequestWithRetries(new URI(url).toURL(), requestBytes);
 
-            OutputStream out = conn.getOutputStream();
-            out.write(requestBytes);
-            out.flush();
-
-            InputStream in = conn.getInputStream();
-            ByteArrayOutputStream byteStream = new ByteArrayOutputStream(in.available());
-            int bytesRead;
-            byte[] buffer = new byte[1024];
-            while ((bytesRead = in.read(buffer)) != -1) {
-                byteStream.write(buffer, 0, bytesRead);
-            }
-            byte[] responseBytes = byteStream.toByteArray();
-
-            String responseXml = new String(responseBytes, StandardCharsets.UTF_8);
-            Log.d(TAG, "Response: " + truncateLogText(responseXml, 400));
+            //noinspection CharsetObjectCanBeUsed
+            String responseXml = new String(responseBytes, "UTF-8");
+            Log.d(TAG, "Response: " + truncateLogText(responseXml, 100));
             return responseXml;
         } catch (Exception e) {
             Log.e(TAG, "Error sending XML request", e);
@@ -420,6 +468,44 @@ public class SynchronizeWikiClient {
         }
     }
 
+    private byte[] sendBinaryRequestWithRetries(@NotNull URL url, byte[] requestBytes) throws ServiceException {
+        for (int i = 1; i <= CONNECTION_RETRIES; i++) {
+            try {
+                return sendBinaryRequest(url, requestBytes);
+            }
+            catch (Exception e) {
+                Log.d(TAG, "Error sending request to MoasdaWiki server in attempt " + i + " of " + CONNECTION_RETRIES, e);
+            }
+        }
+        throw new ServiceException("Error sending request to MoasdaWiki server for " + CONNECTION_RETRIES + " times, failed");
+    }
+
+    private byte[] sendBinaryRequest(@NotNull URL url, byte[] requestBytes) throws IOException {
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        conn.setRequestMethod("POST");
+        conn.setRequestProperty("Content-Type", "text/xml");
+        conn.setRequestProperty("Content-Length", Integer.toString(requestBytes.length));
+        conn.setUseCaches(false);
+        conn.setDoOutput(true);
+        conn.setDoInput(true);
+        conn.setConnectTimeout(CONNECTION_CONNECT_TIMEOUT);
+        conn.setReadTimeout(CONNECTION_READ_TIMEOUT);
+        conn.connect();
+
+        OutputStream out = conn.getOutputStream();
+        out.write(requestBytes);
+        out.flush();
+
+        InputStream in = conn.getInputStream();
+        ByteArrayOutputStream byteStream = new ByteArrayOutputStream(in.available());
+        int bytesRead;
+        byte[] buffer = new byte[1024];
+        while ((bytesRead = in.read(buffer)) != -1) {
+            byteStream.write(buffer, 0, bytesRead);
+        }
+        return byteStream.toByteArray();
+    }
+
     private String truncateLogText(String logText, int maxLength) {
         if (logText.length() <= maxLength) {
             return logText;
@@ -432,7 +518,7 @@ public class SynchronizeWikiClient {
      */
     @NotNull
     private String generateXml(@NotNull AbstractSyncXml xmlBean) throws ServiceException {
-        XmlGenerator xmlGenerator = new XmlGenerator(logger);
+        XmlGenerator xmlGenerator = new XmlGenerator();
         return xmlGenerator.generate(xmlBean);
     }
 
@@ -445,7 +531,7 @@ public class SynchronizeWikiClient {
             XmlParser xmlParser = new XmlParser(logger);
             return xmlParser.parse(xml, xmlBeanType);
         } catch (ServiceException e) {
-            logger.write("Failed to parse XML for class " + xmlBeanType.getSimpleName() + ", try class ErrorResponseXml", e);
+            Log.d(TAG, "Failed to parse XML for class " + xmlBeanType.getSimpleName() + ", try class ErrorResponseXml", e);
             // Versuche eine Fehlerantwort zu parsen
             XmlParser xmlParser = new XmlParser(logger);
             ErrorResponseXml errorResponseXml = xmlParser.parse(xml, ErrorResponseXml.class);

app/src/main/java/net/moasdawiki/app/WikiEngineApplication.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published
@@ -28,6 +28,8 @@ import net.moasdawiki.service.handler.SearchHandler;
 import net.moasdawiki.service.handler.ViewPageHandler;
 import net.moasdawiki.service.render.HtmlService;
 import net.moasdawiki.service.repository.RepositoryService;
+import net.moasdawiki.service.search.SearchIgnoreList;
+import net.moasdawiki.service.search.SearchIndex;
 import net.moasdawiki.service.search.SearchService;
 import net.moasdawiki.service.transform.IncludePageTransformer;
 import net.moasdawiki.service.transform.KontaktseiteTransformer;
@@ -67,11 +69,13 @@ public class WikiEngineApplication extends Application {
         File internalStorageRepositoryRoot = new File(getFilesDir(), REPOSITORY_ROOT_PATH_DEFAULT);
 
         // basic services
-        repositoryService = new RepositoryService(logger, internalStorageRepositoryRoot, false);
+        repositoryService = new RepositoryService(logger, internalStorageRepositoryRoot, null, false);
         settings = new AndroidSettings(logger, repositoryService, Settings.getConfigFileApp());
         messages = new Messages(logger, settings, repositoryService);
         wikiService = new WikiService(logger, repositoryService, false);
-        searchService = new SearchService(logger, repositoryService, wikiService, false);
+        SearchIgnoreList searchIgnoreList = new SearchIgnoreList(logger, repositoryService);
+        SearchIndex searchIndex = new SearchIndex(logger, repositoryService, wikiService, searchIgnoreList, true);
+        searchService = new SearchService(logger, wikiService, searchIgnoreList, searchIndex, false);
 
         // App: use SynchronizeWikiClient instead of SynchronizationService
         synchronizeWikiClient = new SynchronizeWikiClient(this, logger, settings, repositoryService);

app/src/main/res/layout/main_layout.xml

@@ -16,13 +16,14 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:padding="20dp"
             android:orientation="horizontal">
 
             <View
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_gravity="center_vertical"
-                android:layout_margin="20dp"
+                android:layout_marginEnd="20dp"
                 android:background="@drawable/ic_info_outline_black" />
 
             <TextView
@@ -50,13 +51,14 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:padding="20dp"
             android:orientation="horizontal">
 
             <View
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_gravity="center_vertical"
-                android:layout_margin="20dp"
+                android:layout_marginEnd="20dp"
                 android:background="@drawable/ic_info_outline_black" />
 
             <TextView

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>
@@ -29,7 +28,9 @@
     <string name="settings_status_server_connected">Am Server angemeldet</string>
     <string name="settings_status_server_authorization_mission">Erfordert Berechtigung am Server</string>
     <string name="settings_search_failed">Keinen Wikiserver gefunden!</string>
-    <string name="settings_synchronize_successful">%1$d Dateien erfolgreich synchronisiert</string>
-    <string name="settings_synchronize_not_necessary">Dateien sind bereits aktuell</string>
-    <string name="settings_synchronize_failed">Synchronisierung nicht möglich, bitte überprüfen Sie die Einstellungen und den Status!</string>
+    <string name="synchronize_successful">%1$d Dateien erfolgreich synchronisiert</string>
+    <string name="synchronize_not_necessary">Dateien sind bereits aktuell</string>
+    <string name="synchronize_session_not_valid">Keine Verbindung zum MoasdaWiki-Server vorhanden! Bitte überprüfe die Einstellungen und den Status!</string>
+    <string name="synchronize_session_not_authorized">Fehlende Berechtigung beim MoasdaWiki-Server! Bitte schalte den Zugang für die App beim Server frei!</string>
+    <string name="synchronize_failed">Synchronisierung nicht möglich, bitte überprüfe die Einstellungen und den Status!</string>
 </resources>

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>
@@ -30,7 +29,9 @@
     <string name="settings_status_server_connected">Connected to server</string>
     <string name="settings_status_server_authorization_mission">Needs authorization at server</string>
     <string name="settings_search_failed">No Wiki server found!</string>
-    <string name="settings_synchronize_successful">Successfully synchronized %1$d files</string>
-    <string name="settings_synchronize_not_necessary">All files are up-to-date</string>
-    <string name="settings_synchronize_failed">Synchronization failed, please check settings and status!</string>
+    <string name="synchronize_successful">Successfully synchronized %1$d files</string>
+    <string name="synchronize_not_necessary">All files are up-to-date</string>
+    <string name="synchronize_session_not_valid">No connection to MoasdaWiki server available! Please check settings and status!</string>
+    <string name="synchronize_session_not_authorized">Connection to MoasdaWiki server not authorized! Please authorize at server side first!</string>
+    <string name="synchronize_failed">Synchronization failed, please check settings and status!</string>
 </resources>

app/src/main/res/xml/data_extraction_rules.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+        <exclude domain="root" />
+        <exclude domain="file" />
+        <exclude domain="database" />
+        <exclude domain="sharedpref" />
+        <exclude domain="external" />
+    </cloud-backup>
+    <device-transfer>
+        <exclude domain="root" />
+        <exclude domain="file" />
+        <exclude domain="database" />
+        <exclude domain="sharedpref" />
+        <exclude domain="external" />
+    </device-transfer>
+</data-extraction-rules>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
         // 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/de/changelogs/28.txt

@@ -0,0 +1,4 @@
+- Kleine Layoutverbesserungen
+- Auf moasdawiki-server 3.1.0 aktualisieren
+- Unterstützung für Android 12
+- Bibliotheks-Abhängigkeiten aktualisieren

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

@@ -0,0 +1,2 @@
+- Gradle-Version in moasdawiki-server und in der App aktualisieren um ein Build-Problem zu beheben
+- Auf moasdawiki-server 3.2.1 aktualisieren

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

@@ -0,0 +1,2 @@
+- Auf moasdawiki-server 3.4.4 aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren

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

@@ -0,0 +1,2 @@
+- Auf moasdawiki-server 3.4.5 aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren

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

@@ -0,0 +1,2 @@
+- Auf moasdawiki-server 3.5.0 aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren

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

@@ -0,0 +1 @@
+- App-Symbol im fastlane-Ordner hinzufügen

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

@@ -0,0 +1,2 @@
+- Auf moasdawiki-server 3.5.1 aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren

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

@@ -0,0 +1,3 @@
+- Auf moasdawiki-server 3.6.0 aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren
+- Copyright-Jahr aktualisieren

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

@@ -0,0 +1,2 @@
+- Auf moasdawiki-server 3.6.1 aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren

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

@@ -0,0 +1,2 @@
+- Auf moasdawiki-server 3.6.2 aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren

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

@@ -0,0 +1 @@
+- Gradle-Problem beheben

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

@@ -0,0 +1,5 @@
+- Anzahl Kalendereinträge auf 100 begrenzen, weil Android ein globales Limit von 500 Events hat
+- Synchronisationsverbindungen zum Server im Fehlerfall wiederholen
+- Auf moasdawiki-server 3.6.3 aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren
+- Unterstützung von Android API 34 (Android 14)

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

@@ -0,0 +1 @@
+- Gradle-Problem bei fdroid beheben

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

@@ -0,0 +1,3 @@
+- Auf moasdawiki-server 3.7.1 aktualisieren
+- Gradle-Upgrade auf 8.5
+- Copyright-Jahr aktualisieren

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

@@ -0,0 +1 @@
+- Upgrade to Gradle 8.7

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

@@ -0,0 +1,3 @@
+- Auf moasdawiki-server 3.9.1 aktualisieren
+- Gradle-Upgrade auf 8.10.2
+- Bibliotheks-Abhängigkeiten aktualisieren

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

@@ -0,0 +1,2 @@
+- Anleitung für App-Synchronisierung ergänzen
+- Bibliotheks-Abhängigkeiten aktualisieren

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

@@ -0,0 +1,4 @@
+- Auf moasdawiki-server 3.9.3 aktualisieren
+- Gradle-Upgrade auf 8.12
+- Bibliotheks-Abhängigkeiten aktualisieren
+- Copyright-Jahr aktualisieren

fastlane/metadata/android/de/full_description.txt

@@ -11,13 +11,14 @@ MoasdaWiki App ist eine datenschutzfreundliche Oberfläche der MoasdaWiki-Server
 
 1. Lade MoasdaWiki-Server von https://moasdawiki.net/ herunter.
 2. Setze eine MoasdaWiki-Server-Instance in deinem LAN auf.
-3. Installiere die MoasdaWiki-App.
-4. In der App kannst du einen Hinweis sehen, dass sie zunächst konfiguriert werden muss. Drücke auf den Hinweis.
-5. Drücke auf "Hostname" und gib den Hostnamen oder IP-Adresse der Server-Instanz ein, z.B. 192.168.1.101. Drücke OK.
-6. Im Statusbereich darunter solltest du nun "Erfordert Berechtigung am Server" sehen. Andernfalls prüfe erneut Hostname und Port.
-7. Öffne auf der Serverseite die Wikiseite im Browser, klicke auf "Hilfe" und "Synchronisierung".
-8. Du siehst eine Liste von Geräte und Synchronisierungs-Sitzungen. Überprüfe den Gerätenamen und klicke auf "Erlauben".
-9. Zurück in der App drücke den Zurück-Button in der Ecke links oben, um zum Hauptdialog zurückzukommen. Nun kannst du einen Hinweis sehen, dass die App synchronisiert werden muss. Drücke auf diesen Hinweis.
-10. Nun solltest du alle Inhalte des Servers auch in der App haben und die Wikiseite "Startseite-App" sehen.
+3. Erlaube LAN-Zugriff auf den Server: Editiere die Datei config.txt im Repository und ändere die Einstellung authentication.onlylocalhost = false. Anschließend den Server neu starten.
+4. Installiere die MoasdaWiki-App.
+5. In der App kannst du einen Hinweis sehen, dass sie zunächst konfiguriert werden muss. Drücke auf den Hinweis.
+6. Drücke auf "Hostname" und gib den Hostnamen oder IP-Adresse der Server-Instanz ein, z.B. 192.168.1.101. Drücke OK.
+7. Im Statusbereich darunter solltest du nun "Erfordert Berechtigung am Server" sehen. Andernfalls prüfe erneut Hostname und Port.
+8. Öffne auf der Serverseite die Wikiseite im Browser, klicke auf "Hilfe" und "Synchronisierung".
+9. Du siehst eine Liste von Geräte und Synchronisierungs-Sitzungen. Überprüfe den Gerätenamen und klicke auf "Erlauben".
+10. Zurück in der App drücke den Zurück-Button in der Ecke links oben, um zum Hauptdialog zurückzukommen. Nun kannst du einen Hinweis sehen, dass die App synchronisiert werden muss. Drücke auf diesen Hinweis.
+11. Nun solltest du alle Inhalte des Servers auch in der App haben und die Wikiseite "Startseite-App" sehen.
 
 Hinweis: Der Wikiinhalt kann nicht in der App modifiziert werden, da es keinen Spaß macht Wiki-Syntax auf dem Mobilgerät zu tippen. Änderungen müssen über den MoasdaWiki-Server erfolgen.

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

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

@@ -0,0 +1,4 @@
+- Small layout optimizations
+- Update to moasdawiki-server 3.1.0
+- Support for Android 12
+- Upgrade library dependencies

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

@@ -0,0 +1,2 @@
+- Update Gradle version in moasdawiki-server and in app to fix build issue
+- Update to moasdawiki-server 3.2.1

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

@@ -0,0 +1,2 @@
+- Update to moasdawiki-server 3.4.4
+- Upgrade library dependencies

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

@@ -0,0 +1,2 @@
+- Update to moasdawiki-server 3.4.5
+- Upgrade library dependencies

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

@@ -0,0 +1,2 @@
+- Update to moasdawiki-server 3.5.0
+- Upgrade library dependencies

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

@@ -0,0 +1 @@
+- Add app icon to fastlane folder

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

@@ -0,0 +1,2 @@
+- Update to moasdawiki-server 3.5.1
+- Upgrade library dependencies

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

@@ -0,0 +1,3 @@
+- Update to moasdawiki-server 3.6.0
+- Upgrade library dependencies
+- Update copyright year

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

@@ -0,0 +1,2 @@
+- Update to moasdawiki-server 3.6.1
+- Upgrade library dependencies

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

@@ -0,0 +1,2 @@
+- Update to moasdawiki-server 3.6.2
+- Upgrade library dependencies

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

@@ -0,0 +1 @@
+- Fix Gradle build issue

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

@@ -0,0 +1,5 @@
+- Limit calendar import to 100 events as Android has a global limit of 500 events
+- Retry failed server sync requests
+- Update to moasdawiki-server 3.6.3
+- Upgrade library dependencies
+- Upgrade to Android API 34 (Android 14)

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

@@ -0,0 +1 @@
+- Fix Gradle build issue in fdroid build

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

@@ -0,0 +1,3 @@
+- Update to moasdawiki-server 3.7.1
+- Upgrade to Gradle 8.5
+- Update copyright year

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

@@ -0,0 +1 @@
+- Upgrade to Gradle 8.7

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

@@ -0,0 +1,3 @@
+- Update to moasdawiki-server 3.9.1
+- Upgrade to Gradle 8.10.2
+- Upgrade library dependencies

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

@@ -0,0 +1,2 @@
+- Update App sync description
+- Upgrade library dependencies

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

@@ -0,0 +1,4 @@
+- Update to moasdawiki-server 3.9.3
+- Upgrade to Gradle 8.12
+- Upgrade library dependencies
+- Update copyright year

fastlane/metadata/android/en-US/full_description.txt

@@ -12,13 +12,14 @@ knowledge management tool. It mirrors the Wiki content on your mobile device.
 
 1. Download MoasdaWiki Server from https://moasdawiki.net/.
 2. Set up a MoasdaWiki Server instance in your LAN.
-3. Install the MoasdaWiki App.
-4. In the app you can see a hint that it has to be configured first. Press on that hint.
-5. Press on "Host name" and enter the host name or IP address of the server instance, e.g. 192.168.1.101. Press OK.
-6. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
-7. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
-8. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
-9. Back in the app press the back button on the upper left corner to get back to the main dialog. Now you can see a hint that the app has to be synchronized. Press on that hint.
-10. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
+3. Enable LAN access to the server: Edit the repository file config.txt and change the setting authentication.onlylocalhost = false. Restart the server afterwards.
+4. Install the MoasdaWiki App.
+5. In the app you can see a hint that it has to be configured first. Press on that hint.
+6. Press on "Host name" and enter the host name or IP address of the server instance, e.g. 192.168.1.101. Press OK.
+7. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
+8. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
+9. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
+10. Back in the app press the back button on the upper left corner to get back to the main dialog. Now you can see a hint that the app has to be synchronized. Press on that hint.
+11. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
 
 Hint: Content cannot be modified within the app as it is no fun to type Wiki syntax on the mobile device, changes have to be done via the MoasdaWiki Server.

gradle.properties

@@ -17,6 +17,5 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx3100M

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,8 @@
-#Sun Dec 27 12:01:31 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

gradlew

@@ -1,78 +1,130 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,92 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,4 +1,22 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -9,25 +27,29 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -35,48 +57,36 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal