New release

.gitattributes

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

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 3.9.3.0 (versionCode 46, 2025-01-05)
+
+- Update to moasdawiki-server 3.9.3
+- Upgrade to Gradle 8.12
+- Upgrade library dependencies
+- Update copyright year
+
+## 3.9.1.1 (versionCode 45, 2024-11-02)
+
+- Update App sync description
+- Upgrade library dependencies
+
+## 3.9.1.0 (versionCode 44, 2024-10-04)
+
+- Update to moasdawiki-server 3.9.1
+- Upgrade to Gradle 8.10.2
+- Upgrade library dependencies
+
+## 3.7.1.1 (versionCode 43, 2024-05-10)
+
+- Upgrade to Gradle 8.7
+
 ## 3.7.1.0 (versionCode 42, 2024-01-01)
 
 - Update to moasdawiki-server 3.7.1

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
 
@@ -33,15 +34,15 @@ For MoasdaWiki documentation see https://moasdawiki.net/.
 
 1. Download MoasdaWiki Server from https://gitlab.com/moasdawiki/moasdawiki-server.
 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 (&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.
-10. 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

@@ -7,8 +7,8 @@ android {
         applicationId "net.moasdawiki.app"
         minSdk 28 // 28 = Android 9
         targetSdk 34 // should be same as compileSdk
-        versionCode 42
+        versionCode 46
-        versionName "3.7.1.0"
+        versionName "3.9.3.0"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
@@ -27,12 +27,12 @@ android {
 }
 
 dependencies {
-    api 'net.moasdawiki:moasdawiki-server:3.7.1'
+    api 'net.moasdawiki:moasdawiki-server:3.9.3'
     api ('androidx.appcompat:appcompat:1.6.1') {
         exclude group: 'org.jetbrains', module: 'annotations'
     }
     api ('androidx.preference:preference:1.2.1') {
         exclude group: 'org.jetbrains', module: 'annotations'
     }
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.0.1'
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

build.gradle

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

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

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

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

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

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

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

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

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

fastlane/metadata/android/de/full_description.txt

@@ -11,13 +11,14 @@ MoasdaWiki App ist eine datenschutzfreundliche Oberfläche der MoasdaWiki-Server
 
 1. Lade MoasdaWiki-Server von https://moasdawiki.net/ herunter.
 2. Setze eine MoasdaWiki-Server-Instance in deinem LAN auf.
-3. Installiere die MoasdaWiki-App.
+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/43.txt

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

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

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

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

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

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

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

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

@@ -12,13 +12,14 @@ knowledge management tool. It mirrors the Wiki content on your mobile device.
 
 1. Download MoasdaWiki Server from https://moasdawiki.net/.
 2. Set up a MoasdaWiki Server instance in your LAN.
-3. Install the MoasdaWiki App.
+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/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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/HEAD/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/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 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
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail