New release

CHANGELOG.md

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

app/build.gradle

@@ -2,17 +2,17 @@ apply plugin: 'com.android.application'
 
 android {
     namespace = "net.moasdawiki.app"
-    compileSdk = 36 // 36 = Android 16
+    compileSdk = 36 // 36 = Android 16 Baklava
     defaultConfig {
         applicationId "net.moasdawiki.app"
-        minSdk = 28 // 28 = Android 9
+        minSdk = 33 // 33 = Android 13 Tiramisu
         targetSdk = 36 // should be same as compileSdk
-        versionCode = 47
-        versionName = "3.9.5.0"
+        versionCode = 50
+        versionName = "3.9.7.0"
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     buildFeatures {
         buildConfig = true
@@ -27,12 +27,11 @@ android {
 }
 
 dependencies {
-    api 'net.moasdawiki:moasdawiki-server:3.9.5'
-    api ('androidx.appcompat:appcompat:1.6.1') {
-        exclude group: 'org.jetbrains', module: 'annotations'
-    }
-    api ('androidx.preference:preference:1.2.1') {
-        exclude group: 'org.jetbrains', module: 'annotations'
-    }
-    compileOnly 'org.jetbrains:annotations:26.0.2'
+    api 'net.moasdawiki:moasdawiki-server:3.9.7'
+
+    compileOnly 'androidx.annotation:annotation:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'androidx.preference:preference:1.2.1'
+    // Fix duplicate class error
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.0"
 }

app/src/main/AndroidManifest.xml

@@ -17,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"

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2025 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 - 2025 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 - 2025 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 - 2025 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 - 2025 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,9 +48,6 @@ import android.widget.Toast;
 import net.moasdawiki.service.transform.TerminTransformer;
 import net.moasdawiki.util.PathUtils;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
@@ -123,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();
@@ -140,7 +140,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
     /**
      * Fills empty day, month, and year fields in all events.
      */
-    private void fillEmptyDateFields(@NotNull List<TerminTransformer.Event> events) {
+    private void fillEmptyDateFields(@NonNull List<TerminTransformer.Event> events) {
         TimeZone utc = TimeZone.getTimeZone("UTC");
         Calendar calendar = Calendar.getInstance(utc);
         for (TerminTransformer.Event event : events) {
@@ -159,8 +159,8 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
     /**
      * Reduces the number of events if more than MAX_EVENT_COUNT, only keep events in the near future.
      */
-    @NotNull
-    private List<TerminTransformer.Event> filterEvents(@NotNull List<TerminTransformer.Event> rawEvents) {
+    @NonNull
+    private List<TerminTransformer.Event> filterEvents(@NonNull List<TerminTransformer.Event> rawEvents) {
         if (rawEvents.size() <= MAX_EVENT_COUNT) {
             return rawEvents;
         }
@@ -196,8 +196,8 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
         return result;
     }
 
-    @NotNull
-    private Uri buildUri(@NotNull Uri uri) {
+    @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)
@@ -251,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,
@@ -273,7 +273,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
      * Adds up to 100 events from the event list.
      * The first occurrence is in the current year, the events are repeated every year.
      */
-    private void addEvents(@NotNull String calendarId, @NotNull List<TerminTransformer.Event> events) {
+    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;
@@ -293,7 +293,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
      * Adds a single event to the calendar.
      */
     @Nullable
-    private String addEvent(@NotNull String calendarId, int day, int month, int 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();
@@ -324,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);
@@ -338,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 - 2025 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 - 2025 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/java/net/moasdawiki/app/MainActivity.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2025 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
@@ -44,8 +44,11 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.window.OnBackInvokedCallback;
+import android.window.OnBackInvokedDispatcher;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.menu.MenuBuilder;
 import androidx.preference.PreferenceManager;
@@ -59,11 +62,7 @@ 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;
@@ -77,7 +76,7 @@ import java.util.concurrent.Executors;
 /**
  * Displays the main window with the embedded wiki browser.
  */
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends AppCompatActivity implements OnBackInvokedCallback {
 
     private static final String TAG = "MainActivity";
     private static final String SERVER_BASE_URL = "http://localhost:1/";
@@ -116,6 +115,8 @@ public class MainActivity extends AppCompatActivity {
                 return false;
             }
         });
+
+        getOnBackInvokedDispatcher().registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT, this);
     }
 
     /**
@@ -134,7 +135,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,7 +155,7 @@ 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();
@@ -204,8 +205,8 @@ public class MainActivity extends AppCompatActivity {
         webSettings.setJavaScriptEnabled(true);
     }
 
-    @NotNull
-    private Map<String, String> convertParameters(@NotNull Uri uri) {
+    @NonNull
+    private Map<String, String> convertParameters(@NonNull Uri uri) {
         Map<String, String> result = new HashMap<>();
         for (String name : uri.getQueryParameterNames()) {
             String value = uri.getQueryParameter(name);
@@ -216,7 +217,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){
@@ -232,7 +233,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.
@@ -265,9 +266,7 @@ public class MainActivity extends AppCompatActivity {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
-    @Override
-    public void onBackPressed() {
-        // webview.canGoBack() always returns false
+    public void onBackInvoked() {
         WebBackForwardList backForwardList = webview.copyBackForwardList();
         Log.d(TAG, "Back button pressed, backForwardList index == " + backForwardList.getCurrentIndex());
         if (backForwardList.getCurrentIndex() > 0) {
@@ -276,7 +275,6 @@ public class MainActivity extends AppCompatActivity {
             // Close app
             finish();
         }
-        super.onBackPressed();
     }
 
     public void onConfigurationHintClicked(@SuppressWarnings("unused") View view) {
@@ -387,17 +385,17 @@ 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
-    private String getWikiserverSearchUrl(@NotNull String query) {
+    @NonNull
+    private String getWikiserverSearchUrl(@NonNull String query) {
         return SERVER_BASE_URL + "search/?text=" + EscapeUtils.encodeUrlParameter(query);
     }
 
-    @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 - 2025 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 - 2025 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/java/net/moasdawiki/app/SynchronizeWikiClient.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2025 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,9 +37,6 @@ 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;
@@ -67,19 +66,19 @@ public class SynchronizeWikiClient {
     private static final int CONNECTION_READ_TIMEOUT = 120_000; // 2 minutes
     private static final int CONNECTION_RETRIES = 3;
 
-    @NotNull
+    @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,
-                                 @NotNull RepositoryService repositoryService) {
+    public SynchronizeWikiClient(@NonNull Context mContext, @NonNull Logger logger, @NonNull Settings settings,
+                                 @NonNull RepositoryService repositoryService) {
         this.mContext = mContext;
         this.logger = logger;
         this.settings = settings;
@@ -133,7 +132,7 @@ public class SynchronizeWikiClient {
     /**
      * Connects with the MoasdaWiki server and creates a new session.
      */
-    private void createSession(@NotNull String serverHostPort) throws ServiceException {
+    private void createSession(@NonNull String serverHostPort) throws ServiceException {
         // send request
         CreateSessionXml createSessionXml = new CreateSessionXml();
         createSessionXml.version = PROTOCOL_VERSION;
@@ -170,7 +169,7 @@ public class SynchronizeWikiClient {
         editor.apply();
     }
 
-    @NotNull
+    @NonNull
     private String generateSessionId() {
         return new BigInteger(130, random).toString(32);
     }
@@ -178,8 +177,8 @@ public class SynchronizeWikiClient {
     /**
      * Check if our MoasdaWiki server session is valid and authorized.
      */
-    @NotNull
-    private SessionStatus checkSession(@NotNull String serverHostPort) throws ServiceException {
+    @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);
@@ -352,7 +351,7 @@ public class SynchronizeWikiClient {
         }
     }
 
-    private void downloadFileFromServer(@NotNull String serverHostPort, @NotNull String serverSessionId, @NotNull String filePath) throws ServiceException {
+    private void downloadFileFromServer(@NonNull String serverHostPort, @NonNull String serverSessionId, @NonNull String filePath) throws ServiceException {
         // Anfrage schicken
         ReadFileXml readFileXml = new ReadFileXml();
         readFileXml.version = PROTOCOL_VERSION;
@@ -428,7 +427,7 @@ public class SynchronizeWikiClient {
         return null;
     }
 
-    @NotNull
+    @NonNull
     private String getDeviceName() {
         String manufacturer = Build.MANUFACTURER;
         String model = Build.MODEL;
@@ -449,8 +448,8 @@ public class SynchronizeWikiClient {
     /**
      * Sends an XML request and reads the XML response.
      */
-    @NotNull
-    private String sendXmlRequest(@NotNull String serverHostPort, @NotNull String urlPath, @NotNull String requestXml) throws ServiceException {
+    @NonNull
+    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));
@@ -468,7 +467,7 @@ public class SynchronizeWikiClient {
         }
     }
 
-    private byte[] sendBinaryRequestWithRetries(@NotNull URL url, byte[] requestBytes) throws ServiceException {
+    private byte[] sendBinaryRequestWithRetries(@NonNull URL url, byte[] requestBytes) throws ServiceException {
         for (int i = 1; i <= CONNECTION_RETRIES; i++) {
             try {
                 return sendBinaryRequest(url, requestBytes);
@@ -480,7 +479,7 @@ public class SynchronizeWikiClient {
         throw new ServiceException("Error sending request to MoasdaWiki server for " + CONNECTION_RETRIES + " times, failed");
     }
 
-    private byte[] sendBinaryRequest(@NotNull URL url, byte[] requestBytes) throws IOException {
+    private byte[] sendBinaryRequest(@NonNull URL url, byte[] requestBytes) throws IOException {
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
         conn.setRequestMethod("POST");
         conn.setRequestProperty("Content-Type", "text/xml");
@@ -516,8 +515,8 @@ public class SynchronizeWikiClient {
     /**
      * Wandelt eine JAXB-Bean in einen XML-Strom um.
      */
-    @NotNull
-    private String generateXml(@NotNull AbstractSyncXml xmlBean) throws ServiceException {
+    @NonNull
+    private String generateXml(@NonNull AbstractSyncXml xmlBean) throws ServiceException {
         XmlGenerator xmlGenerator = new XmlGenerator();
         return xmlGenerator.generate(xmlBean);
     }
@@ -525,8 +524,8 @@ public class SynchronizeWikiClient {
     /**
      * Wandelt einen XML-Strom in eine JAXB-Bean um.
      */
-    @NotNull
-    private <T extends AbstractSyncXml> T parseXml(@NotNull String xml, @NotNull Class<T> xmlBeanType) throws ServiceException {
+    @NonNull
+    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);

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2025 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/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>

build.gradle

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

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -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.
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * 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.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 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.

gradlew.bat

@@ -70,11 +70,11 @@ 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