fix search URL encoding crash on Android

.gitattributes

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

AGENTS.md

@@ -0,0 +1,173 @@
+# AGENTS.md
+
+Guidance for agentic coding tools working in `moasdawiki-app`.
+
+## Project Snapshot
+
+- Android app module: `:app`
+- Language: Java 17 (no Kotlin sources currently)
+- Build system: Gradle wrapper (`./gradlew`) + Android Gradle Plugin
+- Main package: `net.moasdawiki.app`
+- App depends on MoasdaWiki server module artifact: `net.moasdawiki:moasdawiki-server`
+
+## Environment And Baseline
+
+- Use the wrapper, not a globally installed Gradle: `./gradlew ...`
+- Run commands from repository root.
+- Keep changes scoped; do not refactor unrelated files.
+- Preserve license headers in Java files.
+- Prefer additive, minimal-risk edits.
+
+## Build / Lint / Test Commands
+
+### Common Lifecycle Commands
+
+- Clean: `./gradlew clean`
+- Build everything (assemble + checks): `./gradlew :app:build`
+- Assemble debug APK: `./gradlew :app:assembleDebug`
+- Assemble release APK: `./gradlew :app:assembleRelease`
+- Install debug on connected device: `./gradlew :app:installDebug`
+
+### Lint Commands
+
+- Run lint (default variant): `./gradlew :app:lint`
+- Run debug lint only: `./gradlew :app:lintDebug`
+- Run release lint only: `./gradlew :app:lintRelease`
+- Apply safe lint fixes: `./gradlew :app:lintFix`
+
+### Unit Test Commands
+
+- Run all unit tests: `./gradlew :app:test`
+- Run debug unit tests: `./gradlew :app:testDebugUnitTest`
+- Run release unit tests: `./gradlew :app:testReleaseUnitTest`
+
+### Run A Single Unit Test (Important)
+
+- Single test class:
+  `./gradlew :app:testDebugUnitTest --tests "net.moasdawiki.app.YourTestClass"`
+- Single test method:
+  `./gradlew :app:testDebugUnitTest --tests "net.moasdawiki.app.YourTestClass.yourTestMethod"`
+- Wildcard match:
+  `./gradlew :app:testDebugUnitTest --tests "*YourTestClass*"`
+
+Notes:
+
+- Use fully-qualified class names for reliable filtering.
+- If the filter reports no tests found, verify package + method names.
+- Keep `Debug` test task unless you specifically need release behavior.
+
+### Instrumentation Test Commands
+
+- Run all connected instrumentation tests:
+  `./gradlew :app:connectedDebugAndroidTest`
+- Run one instrumentation class:
+  `./gradlew :app:connectedDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=net.moasdawiki.app.YourAndroidTestClass`
+- Run one instrumentation method:
+  `./gradlew :app:connectedDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=net.moasdawiki.app.YourAndroidTestClass#yourTestMethod`
+
+## High-Value Working Agreement
+
+- Before editing, inspect nearby code and follow existing patterns.
+- After editing, run the narrowest meaningful verification first.
+- For behavior changes, prefer adding/updating tests when test infra exists.
+- Do not introduce new build tools or formatting frameworks unless asked.
+
+## Source Layout (Current)
+
+- App code: `app/src/main/java/net/moasdawiki/app/`
+- Resources: `app/src/main/res/`
+- Manifest: `app/src/main/AndroidManifest.xml`
+- Gradle module config: `app/build.gradle`
+- Root build config: `build.gradle`, `settings.gradle`, `gradle.properties`
+
+There are currently no `app/src/test` or `app/src/androidTest` files in this repository snapshot.
+
+## Java Style Conventions To Follow
+
+### Formatting
+
+- 4-space indentation, no tabs.
+- Opening brace on same line for classes/methods/control blocks.
+- Keep methods reasonably focused; avoid large unrelated rewrites.
+- Prefer one statement per line for readability.
+- Preserve existing block comments and Javadoc style.
+
+### Imports
+
+- Use explicit imports; avoid wildcard imports.
+- Group imports with blank lines by domain:
+  1) `android.*`
+  2) `androidx.*`
+  3) `net.moasdawiki.*`
+  4) `java.*`
+- Keep import order stable and consistent within each group.
+
+### Types And Nullability
+
+- Use concrete types unless abstraction improves clarity.
+- Follow existing nullability annotations (`@NonNull`, `@Nullable`).
+- Annotate parameters/returns where null-safety is non-obvious.
+- Prefer immutable locals/fields (`final`) where practical.
+- Use boxed types only when null is a real state.
+
+### Naming
+
+- Classes: `PascalCase` (`MainActivity`, `SynchronizeWikiClient`).
+- Methods/fields/local variables: `camelCase`.
+- Constants: `UPPER_SNAKE_CASE`.
+- Android log tags: short static constant named `TAG`.
+- Preference keys/constants belong in `Constants`-style central locations.
+
+### Control Flow And Readability
+
+- Prefer early returns for invalid preconditions.
+- Keep nesting shallow when possible.
+- Extract helper methods for repeated logic.
+- Use descriptive method names that reflect side effects.
+
+### Error Handling And Logging
+
+- Catch specific exceptions whenever practical.
+- Log with Android `Log` at appropriate level (`d`, `i`, `w`, `e`).
+- Include exception object when logging failures.
+- Convert low-level failures into domain-friendly outcomes for callers.
+- For user-visible failures, pair logs with UI feedback (`Toast`/status text).
+- Avoid swallowing exceptions silently.
+
+### Threading / Android Behavior
+
+- Keep network and disk work off the UI thread.
+- UI updates must run on UI thread (`runOnUiThread(...)` pattern).
+- Continue using executor-based async style already present.
+- Preserve lifecycle-safe behavior in `Activity`/`Fragment` methods.
+
+## Testing Expectations For Agents
+
+- If you change pure logic, add or update a unit test.
+- If you change Android component behavior, prefer instrumentation tests when feasible.
+- For low-risk refactors, run at least targeted lint + targeted tests.
+- For broader edits, run `:app:lint` and `:app:testDebugUnitTest`.
+
+## Dependency And Build File Edits
+
+- Keep dependency changes minimal and justified.
+- Match existing dependency declaration style in touched file.
+- Do not upgrade AGP/Gradle/SDK versions unless explicitly requested.
+- Call out deprecation warnings you encounter during Gradle runs.
+
+## Commit And PR Hygiene (For Agents)
+
+- Make small, reviewable commits with clear intent.
+- In commit messages, explain why the change is needed.
+- Include verification commands run and their outcome in PR notes.
+- Do not include unrelated formatting churn.
+
+## Cursor/Copilot Rule Ingestion
+
+Checked in this repository:
+
+- `.cursorrules`: not present
+- `.cursor/rules/`: not present
+- `.github/copilot-instructions.md`: not present
+
+If these files are added later, agents should treat them as higher-priority repository instructions and merge them into this guidance.

CHANGELOG.md

@@ -1,5 +1,112 @@
 # Changelog
 
+## 3.9.7.0 (versionCode 50, 2026-01-02)
+
+- Bugfix: Use back gesture for browser back
+- Upgrade to moasdawiki-server 3.9.7
+- Upgrade to Java 17
+- Upgrade library dependencies
+- Update copyright year
+
+## 3.9.5.1 (versionCode 48 + 49, 2025-08-30)
+
+- Bugfix: Searchbar not visible on newer Android versions
+- Shortened app name
+- Update minimum supported Android API to 33 (Android 13)
+- Use Nullable annotations from Android package
+- Upgrade library dependencies
+
+## 3.9.5.0 (versionCode 47, 2025-07-06)
+
+- Update to moasdawiki-server 3.9.5
+- Upgrade to Android API 36 (Android 16)
+- Upgrade to Gradle 8.14.3
+- Upgrade library dependencies
+- Fix warning
+
+## 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

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.
+2. Set up a MoasdaWiki Server instance in your LAN.
-1. Install the MoasdaWiki App.
+3. Enable LAN access to the server: Edit the repository file `config.txt` and change the setting `authentication.onlylocalhost = false`. Restart the server afterwards.
-1. In the app you can see a hint that it has to be configured first. Press on that hint.
+4. Install the MoasdaWiki App.
-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. In the app you can see a hint that it has to be configured first. Press on that hint.
-1. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
+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.
-1. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
+7. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
-1. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
+8. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
-1. Back in the app press the back button (&larr;) on the upper left corner to get back to the main dialog.
+9. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
-   Now you can see a hint that the app has to be synchronized. Press on that hint.
+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.
-1. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
+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,31 +1,39 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31 // 31 = Android 12
+    namespace = "net.moasdawiki.app"
+    compileSdk = 36 // 36 = Android 16 Baklava
     defaultConfig {
-        applicationId "net.moasdawiki.app"
+        applicationId "space.hackenslacker.moasdawiki.app"
-        minSdkVersion 28 // 28 = Android 9
+        minSdk = 29 // 29 = Android 10 Q
-        targetSdkVersion 31 // should be same as compileSdkVersion
+        targetSdk = 36 // should be same as compileSdk
-        versionCode 30
+        versionCode = 50
-        versionName "3.4.4.0"
+        versionName = "3.9.7.0"
-        archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_17
     }
-    lint {
+    buildFeatures {
-        // Workaround for KotlinNullPointerException in :app:lintVitalAnalyzeRelease
+        buildConfig = true
-        checkReleaseBuilds false
+    }
+    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.4.4'
+    api 'net.moasdawiki:moasdawiki-server:3.9.7'
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
+
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    compileOnly 'androidx.annotation:annotation:1.3.0'
-    // androidx.preference 1.2.0 causes dependency conflict
+    implementation 'androidx.appcompat:appcompat:1.7.1'
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.preference:preference:1.2.1'
-    compileOnly 'org.jetbrains:annotations:23.0.0'
+    // Fix duplicate class error
-    testImplementation 'org.testng:testng:7.5'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.0"
+
+    testImplementation 'junit:junit:4.13.2'
 }

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"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="net.moasdawiki.app">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
@@ -18,7 +17,8 @@
         android:usesCleartextTraffic="true"
         android:allowBackup="false"
         android:fullBackupContent="false"
-        android:dataExtractionRules="@xml/data_extraction_rules">
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:enableOnBackInvokedCallback="true">
 
         <activity
             android:name=".MainActivity"
@@ -40,7 +40,7 @@
 
         <provider
             android:name="net.moasdawiki.app.CalendarContentProvider"
-            android:authorities="net.moasdawiki.app.provider"
+            android:authorities="space.hackenslacker.moasdawiki.app.provider"
             android:exported="false"
             android:syncable="true"/>
 

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2026 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
@@ -17,20 +17,20 @@
 
 package net.moasdawiki.app;
 
+import androidx.annotation.NonNull;
+
 import net.moasdawiki.base.Logger;
 import net.moasdawiki.base.Settings;
 import net.moasdawiki.service.repository.RepositoryService;
 
-import org.jetbrains.annotations.NotNull;
-
 public class AndroidSettings extends Settings {
 
-    public AndroidSettings(@NotNull Logger logger, @NotNull RepositoryService repositoryService, @NotNull String configFileName) {
+    public AndroidSettings(@NonNull Logger logger, @NonNull RepositoryService repositoryService, @NonNull String configFileName) {
         super(logger, repositoryService, configFileName);
     }
 
     @Override
-    @NotNull
+    @NonNull
     public String getVersion() {
         return BuildConfig.VERSION_NAME;
     }

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2026 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
@@ -23,7 +23,7 @@ import android.accounts.AccountAuthenticatorResponse;
 import android.content.Context;
 import android.os.Bundle;
 
-import org.jetbrains.annotations.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Stub authenticator, required for calendar sync adapter.

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2026 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
@@ -21,7 +21,7 @@ import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
 
-import org.jetbrains.annotations.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Service to bind the CalendarAccountAuthenticator.

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2026 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
@@ -21,8 +21,9 @@ import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
-import org.jetbrains.annotations.NotNull;
+
-import org.jetbrains.annotations.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Stub content provider, necessary for sync adapter.
@@ -36,33 +37,33 @@ public class CalendarContentProvider extends ContentProvider {
 
     @Nullable
     @Override
-    public String getType(@NotNull Uri uri) {
+    public String getType(@NonNull Uri uri) {
         // Return no type for MIME type
         return null;
     }
 
     @Nullable
     @Override
-    public Cursor query(@NotNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder) {
+    public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder) {
         // query() always returns no results
         return null;
     }
 
     @Nullable
     @Override
-    public Uri insert(@NotNull Uri uri, @Nullable ContentValues contentValues) {
+    public Uri insert(@NonNull Uri uri, @Nullable ContentValues contentValues) {
         // Provider doesn't support changes from outside
         return null;
     }
 
     @Override
-    public int delete(@NotNull Uri uri, @Nullable String s, @Nullable String[] strings) {
+    public int delete(@NonNull Uri uri, @Nullable String s, @Nullable String[] strings) {
         // Provider doesn't support changes from outside
         return 0;
     }
 
     @Override
-    public int update(@NotNull Uri uri, @Nullable ContentValues contentValues, @Nullable String s, @Nullable String[] strings) {
+    public int update(@NonNull Uri uri, @Nullable ContentValues contentValues, @Nullable String s, @Nullable String[] strings) {
         // Provider doesn't support changes from outside
         return 0;
     }

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2026 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
@@ -36,6 +36,9 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.CalendarContract;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.preference.PreferenceManager;
 
@@ -45,11 +48,10 @@ import android.widget.Toast;
 import net.moasdawiki.service.transform.TerminTransformer;
 import net.moasdawiki.util.PathUtils;
 
-import org.jetbrains.annotations.NotNull;
+import java.util.ArrayList;
-import org.jetbrains.annotations.Nullable;
-
 import java.util.Calendar;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.TimeZone;
 
@@ -64,15 +66,28 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
 
     static final String ACCOUNT_NAME = "MoasdaWiki";
     static final String ACCOUNT_TYPE = "net.moasdawiki";
-    static final String PROVIDER_NAME = "net.moasdawiki.app.provider";
+    static final String PROVIDER_NAME = "space.hackenslacker.moasdawiki.app.provider";
 
     private static final String CALENDAR_NAME = "MoasdaWiki Events";
     private static final Uri CALENDAR_URI = CalendarContract.Calendars.CONTENT_URI;
     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);
@@ -102,7 +123,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
     /**
      * Imports all events on Wiki pages to the Android calendar.
      */
-    @NotNull
+    @NonNull
     private List<TerminTransformer.Event> getWikiEvents() {
         Log.d(TAG, "Reading Wiki events");
         WikiEngineApplication app = (WikiEngineApplication) getContext();
@@ -116,8 +137,67 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
         return events;
     }
 
-    @NotNull
+    /**
-    private Uri buildUri(@NotNull Uri uri) {
+     * Fills empty day, month, and year fields in all events.
+     */
+    private void fillEmptyDateFields(@NonNull 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.
+     */
+    @NonNull
+    private List<TerminTransformer.Event> filterEvents(@NonNull 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;
+    }
+
+    @NonNull
+    private Uri buildUri(@NonNull Uri uri) {
         return uri.buildUpon()
                 .appendQueryParameter(android.provider.CalendarContract.CALLER_IS_SYNCADAPTER, "true")
                 .appendQueryParameter(CalendarContract.Calendars.ACCOUNT_NAME, ACCOUNT_NAME)
@@ -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);
@@ -172,7 +251,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
     /**
      * Clears the calendar. This is necessary if e.g. a birthday has been changed or removed.
      */
-    private void deleteAllEvents(@NotNull String calendarId) {
+    private void deleteAllEvents(@NonNull String calendarId) {
         Log.d(TAG, "Delete all events from calendar");
         Uri eventUri = buildUri(EVENT_URI);
         try (Cursor cursor = contentResolver.query(eventUri,
@@ -191,10 +270,10 @@ 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) {
+    private void addEvents(@NonNull String calendarId, @NonNull List<TerminTransformer.Event> events) {
         Log.d(TAG, "Create calendar events");
         for (TerminTransformer.Event event : events) {
             String title = event.description;
@@ -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(@NonNull String calendarId, int day, int month, int year, @NonNull String title, @NonNull 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);
@@ -255,7 +324,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
     /**
      * Add a reminder to the given event.
      */
-    private void addReminder(@NotNull String eventId) {
+    private void addReminder(@NonNull String eventId) {
         Log.d(TAG, "Add reminder to eventId=" + eventId);
         ContentValues cv = new ContentValues();
         cv.put(CalendarContract.Reminders.EVENT_ID, eventId);
@@ -269,7 +338,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
     /**
      * Initiates the calendar sync.
      */
-    public static void requestCalendarSync(@NotNull Activity activity) {
+    public static void requestCalendarSync(@NonNull Activity activity) {
         Log.d(TAG, "Requesting calendar synchronization");
         Context context = activity.getApplicationContext();
 

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2026 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
@@ -21,7 +21,7 @@ import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
 
-import org.jetbrains.annotations.Nullable;
+import androidx.annotation.Nullable;
 
 public class CalendarSyncAdapterService extends Service {
 

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2026 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 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2026 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
@@ -46,8 +46,10 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.menu.MenuBuilder;
+import androidx.activity.OnBackPressedCallback;
 import androidx.preference.PreferenceManager;
 
 import net.moasdawiki.base.ServiceException;
@@ -57,13 +59,8 @@ import net.moasdawiki.http.HttpRequest;
 import net.moasdawiki.server.RequestDispatcher;
 import net.moasdawiki.service.HttpResponse;
 import net.moasdawiki.service.repository.RepositoryService;
-import net.moasdawiki.util.EscapeUtils;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLDecoder;
 import java.util.Arrays;
@@ -116,6 +113,13 @@ public class MainActivity extends AppCompatActivity {
                 return false;
             }
         });
+
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                MainActivity.this.onBackInvoked();
+            }
+        });
     }
 
     /**
@@ -134,7 +138,7 @@ public class MainActivity extends AppCompatActivity {
              * External URLs will be shown in an external browser.
              */
             @Override
-            public boolean shouldOverrideUrlLoading(@NotNull WebView view, @NotNull WebResourceRequest webResourceRequest) {
+            public boolean shouldOverrideUrlLoading(@NonNull WebView view, @NonNull WebResourceRequest webResourceRequest) {
                 Uri uri = webResourceRequest.getUrl();
                 String host = uri.getHost();
                 if ("localhost".equals(host)) {
@@ -154,11 +158,12 @@ public class MainActivity extends AppCompatActivity {
              */
             @Override
             @Nullable
-            public WebResourceResponse shouldInterceptRequest (@NotNull WebView view, @NotNull WebResourceRequest request) {
+            public WebResourceResponse shouldInterceptRequest (@NonNull WebView view, @NonNull WebResourceRequest request) {
                 try {
                     // 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 +189,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();
                 }
 
@@ -203,8 +208,8 @@ public class MainActivity extends AppCompatActivity {
         webSettings.setJavaScriptEnabled(true);
     }
 
-    @NotNull
+    @NonNull
-    private Map<String, String> convertParameters(@NotNull Uri uri) {
+    private Map<String, String> convertParameters(@NonNull Uri uri) {
         Map<String, String> result = new HashMap<>();
         for (String name : uri.getQueryParameterNames()) {
             String value = uri.getQueryParameter(name);
@@ -215,7 +220,7 @@ public class MainActivity extends AppCompatActivity {
 
     @SuppressLint("RestrictedApi")
     @Override
-    public boolean onCreateOptionsMenu(@NotNull Menu menu) {
+    public boolean onCreateOptionsMenu(@NonNull Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.menu_layout, menu);
         if(menu instanceof MenuBuilder){
@@ -231,7 +236,7 @@ public class MainActivity extends AppCompatActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(@NotNull MenuItem item) {
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         // Handle action bar item clicks here. The action bar will
         // automatically handle clicks on the Home/Up button, so long
         // as you specify a parent activity in AndroidManifest.xml.
@@ -264,9 +269,7 @@ public class MainActivity extends AppCompatActivity {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
-    @Override
+    public void onBackInvoked() {
-    public void onBackPressed() {
-        // webview.canGoBack() always returns false
         WebBackForwardList backForwardList = webview.copyBackForwardList();
         Log.d(TAG, "Back button pressed, backForwardList index == " + backForwardList.getCurrentIndex());
         if (backForwardList.getCurrentIndex() > 0) {
@@ -345,24 +348,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);
@@ -376,17 +388,21 @@ public class MainActivity extends AppCompatActivity {
     /**
      * Open a URL in the embedded browser.
      */
-    private void loadUrl(@NotNull String url) {
+    private void loadUrl(@NonNull String url) {
         Log.d(TAG, "Open URL " + url);
         webview.loadUrl(url);
     }
 
-    @NotNull
+    @NonNull
-    private String getWikiserverSearchUrl(@NotNull String query) {
+    private String getWikiserverSearchUrl(@NonNull String query) {
-        return SERVER_BASE_URL + "search/?text=" + EscapeUtils.encodeUrlParameter(query);
+        return Uri.parse(SERVER_BASE_URL + "search/")
+                .buildUpon()
+                .appendQueryParameter("text", query)
+                .build()
+                .toString();
     }
 
-    @NotNull
+    @NonNull
     private String getWikiserverHelpUrl() {
         return SERVER_BASE_URL + "view/wiki/";
     }

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2026 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
@@ -20,10 +20,9 @@ package net.moasdawiki.app;
 
 import android.os.Bundle;
 
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import org.jetbrains.annotations.Nullable;
-
 /**
  * Settings dialog
  */

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2026 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 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2026 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
@@ -23,6 +23,8 @@ import android.os.Build;
 import android.util.Base64;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.preference.PreferenceManager;
 
 import net.moasdawiki.base.Logger;
@@ -35,10 +37,8 @@ import net.moasdawiki.util.DateUtils;
 import net.moasdawiki.util.xml.XmlGenerator;
 import net.moasdawiki.util.xml.XmlParser;
 
-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 +47,16 @@ 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.ArrayList;
 import java.util.Date;
 import java.util.Enumeration;
+import java.util.List;
 
 /**
- * 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,19 +64,23 @@ public class SynchronizeWikiClient {
 
     private static final String PROTOCOL_VERSION = "2.0";
 
-    @NotNull
+    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;
+
+    @NonNull
     private final Context mContext;
-    @NotNull
+    @NonNull
     private final Logger logger;
-    @NotNull
+    @NonNull
     private final Settings settings;
-    @NotNull
+    @NonNull
     private final RepositoryService repositoryService;
-    @NotNull
+    @NonNull
     private final SecureRandom random;
 
-    public SynchronizeWikiClient(@NotNull Context mContext, @NotNull Logger logger, @NotNull Settings settings,
+    public SynchronizeWikiClient(@NonNull Context mContext, @NonNull Logger logger, @NonNull Settings settings,
-                                 @NotNull RepositoryService repositoryService) {
+                                 @NonNull RepositoryService repositoryService) {
         this.mContext = mContext;
         this.logger = logger;
         this.settings = settings;
@@ -83,13 +89,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 +103,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);
         }
     }
 
-    private void createSession(@NotNull String serverHostPort) throws ServiceException {
+    /**
-        // Anfrage schicken
+     * Connects with the MoasdaWiki server and creates a new session.
+     */
+    private void createSession(@NonNull String serverHostPort) throws ServiceException {
+        // send request
         CreateSessionXml createSessionXml = new CreateSessionXml();
         createSessionXml.version = PROTOCOL_VERSION;
         createSessionXml.clientSessionId = generateSessionId();
@@ -141,11 +149,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 +165,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();
     }
 
+    @NonNull
     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.
+     */
+    @NonNull
+    private SessionStatus checkSession(@NonNull 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 +200,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 +208,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;
@@ -243,18 +289,19 @@ public class SynchronizeWikiClient {
 
         // Antwort auswerten
         ListModifiedFilesResponseXml response = parseXml(responseXml, ListModifiedFilesResponseXml.class);
-        int fileCount = response.fileList.size();
+        List<String> filePathsToDownload = determineFilesToDownload(response.fileList);
+        int fileCount = filePathsToDownload.size();
         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++) {
             feedback.progress(i, fileCount);
-            SingleFileXml serverFile = response.fileList.get(i);
+            String filePath = filePathsToDownload.get(i);
             try {
-                downloadFileFromServer(serverHostPort, serverSessionId, serverFile.filePath);
+                downloadFileFromServer(serverHostPort, serverSessionId, filePath);
             }
             catch (ServiceException e) {
                 Log.w(TAG, "Error reading file from server, ignoring it", e);
@@ -274,10 +321,58 @@ public class SynchronizeWikiClient {
             editor.apply();
         }
 
-        return fileCount;
+        return new SyncResult(true, true, false, fileCount);
     }
 
-    private void downloadFileFromServer(@NotNull String serverHostPort, @NotNull String serverSessionId, @NotNull String filePath) throws ServiceException {
+    @NonNull
+    static List<String> determineFilesToDownload(@NonNull List<SingleFileXml> modifiedFiles) {
+        List<String> filePathsToDownload = new ArrayList<>();
+        for (SingleFileXml modifiedFile : modifiedFiles) {
+            String filePath = modifiedFile.filePath;
+            if (filePath != null && !filePathsToDownload.contains(filePath)) {
+                filePathsToDownload.add(filePath);
+            }
+        }
+
+        String appConfigFilePath = Settings.getConfigFileApp();
+        if (!filePathsToDownload.contains(appConfigFilePath)) {
+            filePathsToDownload.add(appConfigFilePath);
+        }
+
+        return filePathsToDownload;
+    }
+
+    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(@NonNull String serverHostPort, @NonNull String serverSessionId, @NonNull String filePath) throws ServiceException {
         // Anfrage schicken
         ReadFileXml readFileXml = new ReadFileXml();
         readFileXml.version = PROTOCOL_VERSION;
@@ -353,7 +448,7 @@ public class SynchronizeWikiClient {
         return null;
     }
 
-    @NotNull
+    @NonNull
     private String getDeviceName() {
         String manufacturer = Build.MANUFACTURER;
         String model = Build.MODEL;
@@ -372,45 +467,20 @@ 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
+    @NonNull
-    private String sendXmlRequest(@NotNull String serverHostPort, @NotNull String urlPath, @NotNull String requestXml) throws ServiceException {
+    private String sendXmlRequest(@NonNull String serverHostPort, @NonNull String urlPath, @NonNull String requestXml) throws ServiceException {
         try {
             String url = "http://" + serverHostPort + urlPath;
             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();
-            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();
 
-            OutputStream out = conn.getOutputStream();
+            //noinspection CharsetObjectCanBeUsed
-            out.write(requestBytes);
+            String responseXml = new String(responseBytes, "UTF-8");
-            out.flush();
+            Log.d(TAG, "Response: " + truncateLogText(responseXml, 100));
-
-            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);
-            }
-
-            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);
@@ -418,6 +488,44 @@ public class SynchronizeWikiClient {
         }
     }
 
+    private byte[] sendBinaryRequestWithRetries(@NonNull 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(@NonNull 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;
@@ -428,22 +536,22 @@ public class SynchronizeWikiClient {
     /**
      * Wandelt eine JAXB-Bean in einen XML-Strom um.
      */
-    @NotNull
+    @NonNull
-    private String generateXml(@NotNull AbstractSyncXml xmlBean) throws ServiceException {
+    private String generateXml(@NonNull AbstractSyncXml xmlBean) throws ServiceException {
-        XmlGenerator xmlGenerator = new XmlGenerator(logger);
+        XmlGenerator xmlGenerator = new XmlGenerator();
         return xmlGenerator.generate(xmlBean);
     }
 
     /**
      * Wandelt einen XML-Strom in eine JAXB-Bean um.
      */
-    @NotNull
+    @NonNull
-    private <T extends AbstractSyncXml> T parseXml(@NotNull String xml, @NotNull Class<T> xmlBeanType) throws ServiceException {
+    private <T extends AbstractSyncXml> T parseXml(@NonNull String xml, @NonNull Class<T> xmlBeanType) throws ServiceException {
         try {
             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 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2026 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/layout/main_layout.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical"
     tools:context=".MainActivity">
 

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

@@ -2,6 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
+    android:fitsSystemWindows="true"
     android:id="@+id/settings_layout">
 
 </FrameLayout>

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name" translatable="false">MoasdaWiki App</string>
+    <string name="app_name" translatable="false">MoasdaWiki</string>
     <string name="about_copyright">Copyright %1$d © Herbert Reiter</string>
     <string name="about_homepage_url" translatable="false">https://www.moasdawiki.net/</string>
     <string name="about_version">Version %1$s</string>
@@ -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>

app/src/main/res/xml/syncadapter.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="net.moasdawiki.app.provider"
+    android:contentAuthority="space.hackenslacker.moasdawiki.app.provider"
     android:accountType="net.moasdawiki"
     android:userVisible="false"
     android:supportsUploading="false"

app/src/test/java/net/moasdawiki/app/SynchronizeWikiClientTest.java

@@ -0,0 +1,81 @@
+/*
+ * MoasdaWiki App
+ * Copyright (C) 2008 - 2026 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
+ * by the Free Software Foundation (GPL-3.0-only).
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/gpl-3.0.html>.
+ */
+
+package net.moasdawiki.app;
+
+import net.moasdawiki.service.sync.SingleFileXml;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SynchronizeWikiClientTest {
+
+    @Test
+    public void determineFilesToDownloadAddsConfigFileAppWhenMissing() {
+        List<SingleFileXml> modifiedFiles = new ArrayList<>();
+        modifiedFiles.add(file("/wiki/Home-App.txt"));
+
+        List<String> result = SynchronizeWikiClient.determineFilesToDownload(modifiedFiles);
+
+        Assert.assertTrue(result.contains("/wiki/Home-App.txt"));
+        Assert.assertTrue(result.contains("/config-app.txt"));
+    }
+
+    @Test
+    public void determineFilesToDownloadDoesNotDuplicateConfigFileApp() {
+        List<SingleFileXml> modifiedFiles = new ArrayList<>();
+        modifiedFiles.add(file("/config-app.txt"));
+
+        List<String> result = SynchronizeWikiClient.determineFilesToDownload(modifiedFiles);
+
+        int count = 0;
+        for (String filePath : result) {
+            if ("/config-app.txt".equals(filePath)) {
+                count++;
+            }
+        }
+        Assert.assertEquals(1, count);
+    }
+
+    @Test
+    public void determineFilesToDownloadRemovesDuplicatesAndNullValues() {
+        List<SingleFileXml> modifiedFiles = new ArrayList<>();
+        modifiedFiles.add(file("/wiki/PageA.txt"));
+        modifiedFiles.add(file("/wiki/PageA.txt"));
+        modifiedFiles.add(file(null));
+
+        List<String> result = SynchronizeWikiClient.determineFilesToDownload(modifiedFiles);
+
+        int pageACount = 0;
+        for (String filePath : result) {
+            if ("/wiki/PageA.txt".equals(filePath)) {
+                pageACount++;
+            }
+            Assert.assertNotNull(filePath);
+        }
+        Assert.assertEquals(1, pageACount);
+    }
+
+    private static SingleFileXml file(String filePath) {
+        SingleFileXml xml = new SingleFileXml();
+        xml.filePath = filePath;
+        return xml;
+    }
+}

build.gradle

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

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/changelogs/47.txt

@@ -0,0 +1,5 @@
+- Auf moasdawiki-server 3.9.5 aktualisieren
+- Android API 36 (Android 16) unterstützen
+- Gradle-Upgrade auf 8.14.3
+- Bibliotheks-Abhängigkeiten aktualisieren
+- Warnung beheben

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

@@ -0,0 +1,5 @@
+- Bugfix: Suchleiste nicht sichtbar auf neueren Androidversionen
+- Appname gekürzt
+- Minimalanforderung auf Android API to 33 (Android 13) erhöht
+- Nullable-Annotation auf Android-Paket umstellen
+- Bibliotheks-Abhängigkeiten aktualisieren

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

@@ -0,0 +1,5 @@
+- Bugfix: Zurück-Button hat App geschlossen
+- Auf moasdawiki-server 3.9.7 aktualisieren
+- Auf Java 17 aktualisieren
+- 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.
+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. In der App kannst du einen Hinweis sehen, dass sie zunächst konfiguriert werden muss. Drücke auf den Hinweis.
+4. Installiere die MoasdaWiki-App.
-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.
+5. In der App kannst du einen Hinweis sehen, dass sie zunächst konfiguriert werden muss. Drücke auf den Hinweis.
-6. Im Statusbereich darunter solltest du nun "Erfordert Berechtigung am Server" sehen. Andernfalls prüfe erneut Hostname und Port.
+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. Öffne auf der Serverseite die Wikiseite im Browser, klicke auf "Hilfe" und "Synchronisierung".
+7. Im Statusbereich darunter solltest du nun "Erfordert Berechtigung am Server" sehen. Andernfalls prüfe erneut Hostname und Port.
-8. Du siehst eine Liste von Geräte und Synchronisierungs-Sitzungen. Überprüfe den Gerätenamen und klicke auf "Erlauben".
+8. Öffne auf der Serverseite die Wikiseite im Browser, klicke auf "Hilfe" und "Synchronisierung".
-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.
+9. Du siehst eine Liste von Geräte und Synchronisierungs-Sitzungen. Überprüfe den Gerätenamen und klicke auf "Erlauben".
-10. Nun solltest du alle Inhalte des Servers auch in der App haben und die Wikiseite "Startseite-App" sehen.
+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/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/changelogs/47.txt

@@ -0,0 +1,5 @@
+- Update to moasdawiki-server 3.9.5
+- Upgrade to Android API 36 (Android 16)
+- Upgrade to Gradle 8.14.3
+- Upgrade library dependencies
+- Fix warning

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

@@ -0,0 +1,5 @@
+- Bugfix: Searchbar not visible on newer Android versions
+- Shortened app name
+- Update minimum supported Android API to 33 (Android 13)
+- Use Nullable annotations from Android package
+- Upgrade library dependencies

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

@@ -0,0 +1,5 @@
+- Bugfix: Use back gesture for browser back
+- Upgrade to moasdawiki-server 3.9.7
+- Upgrade to Java 17
+- 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.
+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. In the app you can see a hint that it has to be configured first. Press on that hint.
+4. Install the MoasdaWiki App.
-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.
+5. In the app you can see a hint that it has to be configured first. Press on that hint.
-6. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
+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. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
+7. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
-8. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
+8. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
-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.
+9. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
-10. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
+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

@@ -1,22 +1,3 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# 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
+org.gradle.warning.mode=all

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,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/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/.
@@ -80,13 +82,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 -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,22 +133,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,18 +200,28 @@ 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, 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 \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
+# 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

@@ -13,8 +13,10 @@
 @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
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,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 +43,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,32 +59,34 @@ 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
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%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