New release

CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## 2.5.2.1 (versionCode 25, 2021-05-08)
+
+- Update documentation
+- Update library dependencies
+
+## 2.5.2.0 (versionCode 24, 2021-02-28)
+
+- Find also words that start with the search string
+- Update to moasdawiki-server 2.5.2
+
+## 2.5.1.0 (versionCode 23, 2021-01-31)
+
+- Enhance search index to full words
+- Introduce search ignore list
+- Add support for SVG images
+- Update to moasdawiki-server 2.5.1
+
+## 2.4.4.0 (versionCode 22, 2021-01-23)
+
+- Speed up search
+- Update to moasdawiki-server 2.4.4
+
+## 2.4.3.0 (versionCode 21, 2021-01-04)
+
+- Update descriptions for F-Droid
+- Update copyright year
+- Bugfix: Disable wiki editor handler
+- Update to moasdawiki-server 2.4.3
+
 ## 2.4.2.0 (versionCode 20, 2020-12-28)
 
 - Update to moasdawiki-server 2.4.2

LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     MoasdaWiki Server
-    Copyright (C) 2008 - 2020 Herbert Reiter
+    Copyright (C) 2008 - 2021 Herbert Reiter
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    MoasdaWiki Server  Copyright (C) 2008 - 2020 Herbert Reiter
+    MoasdaWiki Server  Copyright (C) 2008 - 2021 Herbert Reiter
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

README.md

@@ -2,37 +2,46 @@
 
 ## Description
 
-MoasdaWiki App is an extension of the MoasdaWiki Server to have a copy of
+MoasdaWiki App is a privacy-friendly frontend for the MoasdaWiki Server
-your Wiki content on your mobile device.
+knowledge management tool. It mirrors the Wiki content on your mobile device.
 
 For MoasdaWiki documentation see https://moasdawiki.net/.
 
+## Download
+
 [<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)
 
 ## Features
 
-- Synchronizes the data from a MoasdaWiki Server instance.
+- Synchronizes the content from your MoasdaWiki Server instance.
-- Data privacy: No cloud connection established, directly connects to the server inside your private network.
 - Fast full text search.
-- Content cannot be modified within the app as it is no fun to type Wiki syntax on the mobile device,
+- Calendar integration: Shows birthdays and events in the mobile calendar.
-  changes have to be done via the MoasdaWiki Server.
+- Data privacy by design: Directly connects to your server instance in your
-- Calendar integration, shows birthdays and events in the mobile calendar (German version only).
+  private network. No trackers, never establishes a cloud connection.
+- Wiki content cannot be modified within the app as it is no fun to type Wiki
+  syntax on a mobile device, changes have to be done via the MoasdaWiki Server.
+
+## Screenshots
+
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="250" height="500" />
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="250" height="500" />
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" width="250" height="500" />
 
 ## Synchronize content with a MoasdaWiki Server
 
 1. Download MoasdaWiki Server from https://gitlab.com/moasdawiki/moasdawiki-server.
 1. Set up a MoasdaWiki Server instance in your LAN.
-1. Install and open the MoasdaWiki App.
+1. Install the MoasdaWiki App.
-1. You can see a hint that the App has to be configured first. Press on that hint.
+1. In the app you can see a hint that it has to be configured first. Press on that hint.
-1. Press on "Host name" and enter the host name of the server instance, e.g. `192.168.1.101`. Press OK.
+1. Press on "Host name" and enter the host name or IP address of the server instance, e.g. `192.168.1.101`. Press OK.
 1. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
 1. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
 1. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
 1. Back in the app press the back button (&larr;) on the upper left corner to get back to the main dialog.
    Now you can see a hint that the app has to be synchronized. Press on that hint.
-1. Now you should have all the server content also in the app and you can see the "Home" wiki page.
+1. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
 
 ## Support
 
@@ -40,6 +49,8 @@ If you have questions or any problems you can contact me via [support@moasdawiki
 
 ## License
 
-MoasdaWiki server is licensed under the GPL 3 license - see the LICENSE file for details.
+MoasdaWiki server is licensed under the GPL 3 license &ndash; see the
+[LICENSE](https://gitlab.com/moasdawiki/moasdawiki-app/-/blob/master/LICENSE)
+file for details.
 
 Copyright (C) Herbert Reiter

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "net.moasdawiki.app"
         minSdkVersion 26 // 26 = Oreo 8.0
         targetSdkVersion 30 // should be same as compileSdkVersion
-        versionCode 20
+        versionCode 25
-        versionName "2.4.2.0"
+        versionName "2.5.2.1"
         archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
     sourceSets {
@@ -24,10 +24,10 @@ android {
 }
 
 dependencies {
-    implementation 'net.moasdawiki:moasdawiki-server:2.4.2'
+    implementation 'net.moasdawiki:moasdawiki-server:2.5.2'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.preference:preference:1.1.1'
     compileOnly 'org.jetbrains:annotations:20.1.0'
-    testImplementation 'org.testng:testng:7.3.0'
+    testImplementation 'org.testng:testng:7.4.0'
 }

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 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 as published by

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 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 as published by

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 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 as published by

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 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 as published by

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 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 as published by

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 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 as published by

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 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 as published by

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 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 as published by

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 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 as published by

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 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 as published by

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 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 as published by

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 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 as published by
@@ -24,7 +24,6 @@ import net.moasdawiki.base.Logger;
 import net.moasdawiki.base.Messages;
 import net.moasdawiki.base.Settings;
 import net.moasdawiki.server.RequestDispatcher;
-import net.moasdawiki.service.handler.EditorHandler;
 import net.moasdawiki.service.handler.FileDownloadHandler;
 import net.moasdawiki.service.handler.SearchHandler;
 import net.moasdawiki.service.handler.ViewPageHandler;
@@ -92,12 +91,12 @@ public class WikiEngineApplication extends Application {
         HtmlService htmlService = new HtmlService(logger, settings, messages, wikiService, transformerService);
 
         // HTTP handlers
+        // do not run the EditorHandler
         ViewPageHandler viewPageHandler = new ViewPageHandler(logger, settings, wikiService, htmlService);
         SearchHandler searchHandler = new SearchHandler(logger, settings, messages, wikiService, searchService, htmlService);
-        EditorHandler editorHandler = new EditorHandler(logger, settings, messages, repositoryService, wikiService, transformerService, htmlService);
         FileDownloadHandler fileDownloadHandler = new FileDownloadHandler(logger, settings, repositoryService, htmlService);
         requestDispatcher = new RequestDispatcher(htmlService, viewPageHandler,
-                searchHandler, editorHandler, fileDownloadHandler, null);
+                searchHandler, null, fileDownloadHandler, null);
     }
 
     public void resetServices() {

build.gradle

@@ -2,11 +2,11 @@
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,7 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
 }

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

@@ -0,0 +1,4 @@
+- Beschreibung für F-Droid aktualisieren
+- Copyright-Jahr aktualisieren
+- Bugfix: Wiki-Editor deaktivieren
+- Auf moasdawiki-server 2.4.3 aktualisieren

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

@@ -0,0 +1,2 @@
+- Suche beschleunigen
+- Auf moasdawiki-server 2.4.4 aktualisieren

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

@@ -0,0 +1,4 @@
+- Suchindex auf ganze Wörter erweitern
+- Ignorierliste für Suchwörter einführen
+- Unterstützung für SVG-Grafiken hinzufügen
+- Auf moasdawiki-server 2.5.1 aktualisieren

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

@@ -0,0 +1,2 @@
+- Auch Wörter, die mit dem Suchtext beginnen, finden
+- Auf moasdawiki-server 2.5.2 aktualisieren

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

@@ -0,0 +1,2 @@
+- Documentation aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren

fastlane/metadata/android/de/full_description.txt

@@ -1,22 +1,23 @@
-MoasdaWiki App ist eine Erweiterung zum MoasdaWiki-Server, um eine Kopie deiner Wikiinhalte auf deinem Mobilgerät zu haben.
+MoasdaWiki App ist eine datenschutzfreundliche Oberfläche der MoasdaWiki-Server-Wissensverwaltung. Sie ist eine Kopie deiner Wikiinhalte auf deinem Mobilgerät.
 
-Funkionalitäten:
+<b>Funktionen:</b>
 
-- Synchronisiert die Inhalte von einer MoasdaWiki-Server-Instanz.
+- Synchronisiert die Inhalte von deiner MoasdaWiki-Server-Instanz.
-- Datenschutz: Es wird keine Cloud-Verbindung hergestellt, verbindet sich direkt mit dem Server in deinem privaten Netzwerk.
+- Schnelle Volltextsuche
-- Flexible Volltextsuche, unterstützt reguläre Ausdrücke.
+- Kalender-Integration: Zeigt Geburtstage und Termine im Kalender des Mobilgeräts.
-- 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.
+- Datenschutz: Verbindet sich direkt mit dem Server in deinem privaten Netzwerk. Keine Tracker. Keine Cloud-Verbindung.
-- Kalender-Integration, zeigt Geburtstage und Termine im Kalender des Mobilgeräts (nur in der deutschen Version).
 
-Synchronisieren des Inhalts mit einem MoasdaWiki-Server:
+<b>Synchronisieren des Inhalts mit einem MoasdaWiki-Server:</b>
 
 1. Lade MoasdaWiki-Server von https://moasdawiki.net/ herunter.
 2. Setze eine MoasdaWiki-Server-Instance in deinem LAN auf.
-3. Installiere und öffne die MoasdaWiki-App.
+3. Installiere die MoasdaWiki-App.
-4. Du kannst einen Hinweis sehen, dass die App zunächst konfiguriert werden muss. Drücke auf den Hinweis.
+4. In der App kannst du einen Hinweis sehen, dass sie zunächst konfiguriert werden muss. Drücke auf den Hinweis.
-5. Drücke auf "Hostname" und gib den Hostnamen der Server-Instanz ein, z.B. `192.168.1.101`. Drücke OK.
+5. Drücke auf "Hostname" und gib den Hostnamen oder IP-Adresse der Server-Instanz ein, z.B. 192.168.1.101. Drücke OK.
 6. Im Statusbereich darunter solltest du nun "Erfordert Berechtigung am Server" sehen. Andernfalls prüfe erneut Hostname und Port.
 7. Öffne auf der Serverseite die Wikiseite im Browser, klicke auf "Hilfe" und "Synchronisierung".
 8. Du siehst eine Liste von Geräte und Synchronisierungs-Sitzungen. Überprüfe den Gerätenamen und klicke auf "Erlauben".
-9. Zurück in der App drücke den Zurück-Button (&larr;) 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. Zurück in der App drücke den Zurück-Button in der Ecke links oben, um zum Hauptdialog zurückzukommen. Nun kannst du einen Hinweis sehen, dass die App synchronisiert werden muss. Drücke auf diesen Hinweis.
 10. Nun solltest du alle Inhalte des Servers auch in der App haben und die Wikiseite "Startseite-App" sehen.
+
+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/de/short_description.txt

@@ -1 +1 @@
-App zum Synchronizieren der Inhalte vom MoasdaWiki-Server.
+Datenschutzfreundliche Wissensverwaltung

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

@@ -0,0 +1,4 @@
+- Update descriptions for F-Droid
+- Update copyright year
+- Bugfix: Disable wiki editor handler
+- Update to moasdawiki-server 2.4.3

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

@@ -0,0 +1,2 @@
+- Speed up search
+- Update to moasdawiki-server 2.4.4

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

@@ -0,0 +1,4 @@
+- Enhance search index to full words
+- Introduce search ignore list
+- Add support for SVG images
+- Update to moasdawiki-server 2.5.1

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

@@ -0,0 +1,2 @@
+- Find also words that start with the search string
+- Update to moasdawiki-server 2.5.2

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

@@ -0,0 +1,2 @@
+- Update documentation
+- Update library dependencies

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

@@ -1,22 +1,24 @@
-MoasdaWiki App is an extension of the MoasdaWiki Server to have a copy of your Wiki content on your mobile device.
+MoasdaWiki App is a privacy-friendly frontend for the MoasdaWiki Server
+knowledge management tool. It mirrors the Wiki content on your mobile device.
 
-Features:
+<b>Features:</b>
 
-- Synchronizes the data from a MoasdaWiki Server instance.
+- Synchronizes the content from your MoasdaWiki Server instance.
-- Data privacy: No cloud connection established, directly connects to the server inside your private network.
+- Fast full text search.
-- Powerful full text search, supports regular expressions.
+- Calendar integration: Shows birthdays and events in the mobile calendar.
-- 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.
+- Data privacy by design: Directly connects to your server instance in your private network. No trackers, never establishes a cloud connection.
-- Calendar integration, shows birthdays and events in the mobile calendar (German version only).
 
-Synchronize content with a MoasdaWiki Server:
+<b>Synchronize content with a MoasdaWiki Server:</b>
 
 1. Download MoasdaWiki Server from https://moasdawiki.net/.
 2. Set up a MoasdaWiki Server instance in your LAN.
-3. Install and open the MoasdaWiki App.
+3. Install the MoasdaWiki App.
-4. You can see a hint that the App has to be configured first. Press on that hint.
+4. In the app you can see a hint that it has to be configured first. Press on that hint.
-5. Press on "Host name" and enter the host name of the server instance, e.g. `192.168.1.101`. Press OK.
+5. Press on "Host name" and enter the host name or IP address of the server instance, e.g. 192.168.1.101. Press OK.
 6. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
 7. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
 8. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
-9. Back in the app press the back button (&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.
+9. Back in the app press the back button on the upper left corner to get back to the main dialog. Now you can see a hint that the app has to be synchronized. Press on that hint.
 10. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
+
+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.

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

@@ -1 +1 @@
-App to synchronize data from MoasdaWiki Server.
+Privacy-Friendly Knowledge Management App

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip