New release

CHANGELOG.md

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

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
-        versionName "2.4.2.0"
+        versionCode 21
+        versionName "2.4.3.0"
         archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
     sourceSets {
@@ -24,7 +24,7 @@ android {
 }
 
 dependencies {
-    implementation 'net.moasdawiki:moasdawiki-server:2.4.2'
+    implementation 'net.moasdawiki:moasdawiki-server:2.4.3'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.preference:preference:1.1.1'

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() {

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/full_description.txt

@@ -4,8 +4,6 @@ Funkionalitäten:
 
 - Synchronisiert die Inhalte von einer MoasdaWiki-Server-Instanz.
 - Datenschutz: Es wird keine Cloud-Verbindung hergestellt, verbindet sich direkt mit dem Server in deinem privaten Netzwerk.
-- Flexible Volltextsuche, unterstützt reguläre Ausdrücke.
-- 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.
 - Kalender-Integration, zeigt Geburtstage und Termine im Kalender des Mobilgeräts (nur in der deutschen Version).
 
 Synchronisieren des Inhalts mit einem MoasdaWiki-Server:
@@ -20,3 +18,5 @@ Synchronisieren des Inhalts mit einem MoasdaWiki-Server:
 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 (←) 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/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/full_description.txt

@@ -4,8 +4,6 @@ Features:
 
 - Synchronizes the data from a MoasdaWiki Server instance.
 - Data privacy: No cloud connection established, directly connects to the server inside your private network.
-- Powerful full text search, supports regular expressions.
-- 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.
 - Calendar integration, shows birthdays and events in the mobile calendar (German version only).
 
 Synchronize content with a MoasdaWiki Server:
@@ -20,3 +18,5 @@ Synchronize content with a MoasdaWiki Server:
 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 (←) 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.