New release

.gitattributes

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

CHANGELOG.md

@@ -1,5 +1,51 @@
 # Changelog
 
+## 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

README.md

@@ -32,16 +32,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.
+2. Set up a MoasdaWiki Server instance in your LAN.
-1. Install the MoasdaWiki App.
+3. Install the MoasdaWiki App.
-1. In the app you can see a hint that it has to be configured first. Press on that hint.
+4. 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.
+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.
-1. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
+6. 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".
+7. 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".
+8. 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 (←) on the upper left corner to get back to the main dialog.
+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.
-1. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
+10. 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

@@ -2,33 +2,37 @@ apply plugin: 'com.android.application'
 
 android {
     namespace "net.moasdawiki.app"
-    compileSdkVersion 33 // 33 = Android 13
+    compileSdk 34 // 34 = Android 14
     defaultConfig {
         applicationId "net.moasdawiki.app"
-        minSdkVersion 28 // 28 = Android 9
+        minSdk 28 // 28 = Android 9
-        targetSdkVersion 33 // should be same as compileSdkVersion
+        targetSdk 34 // should be same as compileSdk
-        versionCode 35
+        versionCode 44
-        versionName "3.6.0.0"
+        versionName "3.9.1.0"
-        archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
-    lint {
+    buildFeatures {
-        // Workaround for KotlinNullPointerException in :app:lintVitalAnalyzeRelease
+        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:3.6.0'
+    api 'net.moasdawiki:moasdawiki-server:3.9.1'
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    api ('androidx.appcompat:appcompat:1.6.1') {
-    // androidx.appcompat:appcompat:1.5.0 causes dependency conflict, waiting for 1.6
+        exclude group: 'org.jetbrains', module: 'annotations'
-    // https://stackoverflow.com/questions/73406969/duplicate-class-androidx-lifecycle-viewmodellazy-found-in-modules-lifecycle-view
+    }
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    api ('androidx.preference:preference:1.2.1') {
-    // androidx.preference 1.2.0 causes dependency conflict
+        exclude group: 'org.jetbrains', module: 'annotations'
-    implementation 'androidx.preference:preference:1.1.1'
+    }
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:25.0.0'
-    testImplementation 'org.testng:testng:7.7.1'
 }

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2023 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2024 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
+     * Adds up to 100 events from the event list.
-     * are repeated every year.
+     * 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2024 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
@@ -159,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;
@@ -184,7 +185,7 @@ public class MainActivity extends AppCompatActivity {
                     }
                     InputStream responseData = new ByteArrayInputStream(response.getContent());
                     return new WebResourceResponse(mimeType, "UTF-8", responseData);
-                } catch (IOException e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
 
@@ -345,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) {
+        if (!syncResult.isSessionValid()) {
-            runOnUiThread(() -> showToast(getString(R.string.settings_synchronize_successful, filesCount)));
+            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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2024 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,7 +49,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        @SuppressWarnings("ConstantConditions")
+        //noinspection DataFlowIssue
         WikiEngineApplication app = (WikiEngineApplication) getContext().getApplicationContext();
         synchronizeWikiClient = app.getSynchronizeWikiClient();
         repositoryService = app.getRepositoryService();
@@ -185,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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2024 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
+ * Connects to the configured MoasdaWiki server and downloads the wiki files.
- * im eigenen Repository..
  */
 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
+     * Connects with the MoasdaWiki server.
-     * weiter verwendet.
+     * 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?
+            // Check existing session if it's still valid
-            boolean[] checkResult = checkSession(serverHostPort);
+            SessionStatus sessionStatus = checkSession(serverHostPort);
-            if (checkResult[0]) {
+            if (sessionStatus.isValid()) {
-                return true;
+                return sessionStatus;
             }
 
-            // Session ist ungültig --> neue Session holen
+            // If session ist invalid, create new session
             if (createSessionCalled) {
-                // createSession nicht erneut aufrufen
+                // don't call createSession() twice
-                return false;
+                return new SessionStatus(false, false);
             }
             createSession(serverHostPort);
 
-            // Session erneut prüfen
+            // Check session again
-            boolean[] checkResult2 = checkSession(serverHostPort);
+            return checkSession(serverHostPort);
-            return checkResult2[0];
         }
         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,29 +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);
     }
 
-    private boolean[] checkSession(@NotNull String serverHostPort) throws ServiceException {
+    /**
+     * Check if our MoasdaWiki server session is valid and authorized.
+     */
+    @NotNull
+    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");
@@ -187,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");
@@ -195,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
+     * Contains the session status.
-     * die Server-Session noch gültig ist und wir mit demselben Server verbunden sind.
-     *
-     * @return Anzahl der synchronisierten Dateien.
      */
-    public int synchronizeRepository(ProgressFeedback feedback) throws ServiceException {
+    public static class SessionStatus {
-        boolean sessionValid = createAndCheckSession();
+        /**
-        if (!sessionValid) {
+         * Is the MoasdaWiki server session valid?
-            throw new ServiceException("No valid server session found");
+         */
+        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;
@@ -247,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++) {
@@ -274,8 +319,38 @@ public class SynchronizeWikiClient {
             editor.apply();
         }
 
+        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 {
         // Anfrage schicken
@@ -372,11 +447,7 @@ public class SynchronizeWikiClient {
     }
 
     /**
-     * Schickt einen XML-Request und liest die XML-Antwort ein.
+     * Sends an XML request and reads the XML response.
-     *
-     * @param urlPath    HTTP-URL, nicht null
-     * @param requestXml XML-Anfrage, nicht null.
-     * @return XML-Antwort, nicht null.
      */
     @NotNull
     private String sendXmlRequest(@NotNull String serverHostPort, @NotNull String urlPath, @NotNull String requestXml) throws ServiceException {
@@ -385,16 +456,40 @@ public class SynchronizeWikiClient {
             Log.d(TAG, "Request to " + url + ": " + truncateLogText(requestXml, 200));
             byte[] requestBytes = requestXml.getBytes(StandardCharsets.UTF_8);
 
-            URI uri = new URI(url);
+            byte[] responseBytes = sendBinaryRequestWithRetries(new URI(url).toURL(), requestBytes);
-            HttpURLConnection conn = (HttpURLConnection) uri.toURL().openConnection();
+
+            //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);
+            throw new ServiceException("Error sending XML request", e);
+        }
+    }
+
+    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(1000); // 1 Sekunde
+        conn.setConnectTimeout(CONNECTION_CONNECT_TIMEOUT);
-            conn.setReadTimeout(10000); // 10 Sekunden
+        conn.setReadTimeout(CONNECTION_READ_TIMEOUT);
         conn.connect();
 
         OutputStream out = conn.getOutputStream();
@@ -408,14 +503,7 @@ public class SynchronizeWikiClient {
         while ((bytesRead = in.read(buffer)) != -1) {
             byteStream.write(buffer, 0, bytesRead);
         }
-
+        return byteStream.toByteArray();
-            String responseXml = byteStream.toString("UTF-8");
-            Log.d(TAG, "Response: " + truncateLogText(responseXml, 400));
-            return responseXml;
-        } catch (Exception e) {
-            Log.e(TAG, "Error sending XML request", e);
-            throw new ServiceException("Error sending XML request", e);
-        }
     }
 
     private String truncateLogText(String logText, int maxLength) {
@@ -443,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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2024 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/res/values-de/strings.xml

@@ -28,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="synchronize_successful">%1$d Dateien erfolgreich synchronisiert</string>
-    <string name="settings_synchronize_not_necessary">Dateien sind bereits aktuell</string>
+    <string name="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_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

@@ -29,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="synchronize_successful">Successfully synchronized %1$d files</string>
-    <string name="settings_synchronize_not_necessary">All files are up-to-date</string>
+    <string name="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_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>

build.gradle

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

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/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

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,5 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ 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.
+    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" && ! "$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
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
+
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-#     shell script including quotes and variable substitutions, so put them in
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-#     double quotes to make sure that they get re-expanded; and
+
-#   * put everything else in single quotes, so that it's not re-expanded.
+# 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" \
@@ -205,6 +214,12 @@ set -- \
         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.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 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%
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :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
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+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