New release

- new release

.gitignore

@@ -10,3 +10,6 @@ release/
 
 # Git
 local.properties
+
+# Project
+TODO.md

CHANGELOG.md

@@ -1,5 +1,91 @@
 # Changelog
 
+## 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
+- Upgrade library dependencies
+
+## 3.2.1.0 (versionCode 29, 2021-12-29)
+
+- Update Gradle version in moasdawiki-server and in app to fix build issue
+- Update to moasdawiki-server 3.2.1
+
+## 3.1.0.0 (versionCode 28, 2021-12-25)
+
+- Small layout optimizations
+- Update to moasdawiki-server 3.1.0
+- Support for Android 12
+- Upgrade library dependencies
+- Update copyright year
+
+## 2.6.1.0 (versionCode 27, 2021-06-09)
+
+- Remove double back key press to close the app
+- Update to moasdawiki-server 2.6.1
+- Upgrade library dependencies
+
+## 2.6.0.0 (versionCode 26, 2021-05-13)
+
+- Make GPL-3.0-only licensing more clear
+- Update to moasdawiki-server 2.6.0
+
+## 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
+- Upgrade library dependencies
+- Refactoring: Replace deprecated AsyncTask
+
+## 2.3.3.0 (versionCode 19, 2020-10-11)
+
+- Bugfix: Show start page on app startup
+- Bugfix: For searches only use the search index cache
+- Update to moasdawiki-server 2.3.3
+
+## 2.3.1.0 (versionCode 18, 2020-09-13)
+
+- Speed up full text search by a search index
+- Bugfix: Don't go back to start page after App restore
+- Update to moasdawiki-server 2.3.1
+
+## 2.2.1.1 (versionCode 17, 2020-09-08)
+
+- Add German fastlane metadata for F-Droid repository
+- Update library dependencies
+
 ## 2.2.1.0 (versionCode 16, 2020-03-15)
 
 - Add fastlane metadata for F-Droid repository

LICENSE

@@ -619,56 +619,3 @@ Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-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
-
-    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
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    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 <http://www.gnu.org/licenses/>.
-
-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
-    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.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -2,31 +2,46 @@
 
 ## Description
 
-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.
+
+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.
-- 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).
+- Synchronizes the content from your MoasdaWiki Server instance.
+- Fast full text search.
+- Calendar integration: Shows birthdays and events in the mobile calendar.
+- Data privacy by design: Directly connects to your server instance in your
+  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://moasdawiki.net/.
+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. You can see a hint that the App 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. Install the MoasdaWiki App.
+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 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
 
@@ -34,6 +49,7 @@ 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 GPL-3.0-only &ndash; see the
+[LICENSE](LICENSE) file for details.
 
 Copyright (C) Herbert Reiter

app/build.gradle

@@ -1,33 +1,33 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29 // 29 = Android 10
+    compileSdkVersion 33 // 33 = Android 13
     defaultConfig {
         applicationId "net.moasdawiki.app"
-        minSdkVersion 26 // 26 = Oreo 8.0
-        targetSdkVersion 29 // should be same as compileSdkVersion
-        versionCode 16
-        versionName "2.2.1.0"
+        minSdkVersion 28 // 28 = Android 9
+        targetSdkVersion 33 // should be same as compileSdkVersion
+        versionCode 30
+        versionName "3.4.5.0"
         archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
-    sourceSets {
-        main{
-            java {
-                exclude "net/moasdawiki/plugin/sync/SynchronizationPlugin*"
-            }
-        }
-    }
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    lint {
+        // Workaround for KotlinNullPointerException in :app:lintVitalAnalyzeRelease
+        checkReleaseBuilds false
     }
 }
 
 dependencies {
-    implementation 'net.moasdawiki:moasdawiki-server:2.2.0'
+    implementation 'net.moasdawiki:moasdawiki-server:3.4.5'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.preference:preference:1.1.0'
-    compileOnly 'org.jetbrains:annotations:18.0.0'
-    testImplementation 'org.testng:testng:6.14.3'
+    // androidx.appcompat:appcompat:1.5.0 causes dependency conflict, waiting for 1.5.1
+    // https://stackoverflow.com/questions/73406969/duplicate-class-androidx-lifecycle-viewmodellazy-found-in-modules-lifecycle-view
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    // androidx.preference 1.2.0 causes dependency conflict
+    implementation 'androidx.preference:preference:1.1.1'
+    compileOnly 'org.jetbrains:annotations:23.0.0'
+    testImplementation 'org.testng:testng:7.6.1'
 }

app/src/main/AndroidManifest.xml

@@ -16,11 +16,13 @@
         android:name=".WikiEngineApplication"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        android:allowBackup="false">
+        android:allowBackup="false"
+        android:fullBackupContent="false"
+        android:dataExtractionRules="@xml/data_extraction_rules">
 
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -44,7 +46,8 @@
 
         <service
             android:name="net.moasdawiki.app.CalendarAccountAuthenticatorService"
-            tools:ignore="ExportedService">
+            tools:ignore="ExportedService"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator"/>
             </intent-filter>

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

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2022 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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;
@@ -30,6 +29,7 @@ public class AndroidSettings extends Settings {
         super(logger, repositoryService, configFileName);
     }
 
+    @Override
     @NotNull
     public String getVersion() {
         return BuildConfig.VERSION_NAME;

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

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2022 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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;

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

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2022 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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;

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

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2022 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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;

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

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2022 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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;
@@ -43,9 +42,7 @@ import androidx.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
 
-import net.moasdawiki.plugin.Plugin;
-import net.moasdawiki.plugin.PluginService;
-import net.moasdawiki.plugin.TerminPlugin;
+import net.moasdawiki.service.transform.TerminTransformer;
 import net.moasdawiki.util.PathUtils;
 
 import org.jetbrains.annotations.NotNull;
@@ -87,7 +84,7 @@ 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<TerminPlugin.Event> events = getWikiEvents();
+        List<TerminTransformer.Event> events = getWikiEvents();
         String calendarId = createCalendar();
         if (calendarId != null) {
             deleteAllEvents(calendarId);
@@ -106,21 +103,15 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
      * Imports all events on Wiki pages to the Android calendar.
      */
     @NotNull
-    private List<TerminPlugin.Event> getWikiEvents() {
+    private List<TerminTransformer.Event> getWikiEvents() {
         Log.d(TAG, "Reading Wiki events");
         WikiEngineApplication app = (WikiEngineApplication) getContext();
-        PluginService pluginService = app.getServiceLocator().getPluginService();
-        TerminPlugin terminPlugin = null;
-        for (Plugin plugin : pluginService.getPlugins()) {
-            if (plugin instanceof TerminPlugin) {
-                terminPlugin = (TerminPlugin) plugin;
-            }
-        }
-        if (terminPlugin == null) {
-            Log.e(TAG, "TerminPlugin not found, cannot retrieve event list");
+        TerminTransformer terminTransformer = app.getTerminTransformer();
+        if (terminTransformer == null) {
+            Log.e(TAG, "TerminTransformer not initialized yet, cannot retrieve event list");
             return Collections.emptyList();
         }
-        List<TerminPlugin.Event> events = terminPlugin.getEvents();
+        List<TerminTransformer.Event> events = terminTransformer.getEvents();
         Log.d(TAG, "Wiki events found: " + events.size());
         return events;
     }
@@ -203,14 +194,14 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
      * Adds all 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<TerminPlugin.Event> events) {
+    private void addEvents(@NotNull String calendarId, @NotNull List<TerminTransformer.Event> events) {
         Log.d(TAG, "Create calendar events");
-        for (TerminPlugin.Event event : events) {
+        for (TerminTransformer.Event event : events) {
             String title = event.description;
             if (title == null) {
                 title = PathUtils.extractWebName(event.pagePath);
             }
-            String description = getContext().getString(R.string.calendar_date) + ": " + TerminPlugin.formatGermanDate(event.dateFields);
+            String description = getContext().getString(R.string.calendar_date) + ": " + TerminTransformer.formatGermanDate(event.dateFields);
             String eventId = addEvent(calendarId, event.dateFields.day, event.dateFields.month, event.dateFields.year, title, description);
             if (eventId != null) {
                 addReminder(eventId);
@@ -294,8 +285,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
                 if (!ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.WRITE_CALENDAR)) {
                     Log.d(TAG, "User has permanently denied permission WRITE_CALENDAR, informing him");
                     String hint = context.getString(R.string.calendar_permission_request, "WRITE_CALENDAR");
-                    Toast toast = Toast.makeText(context, hint, Toast.LENGTH_SHORT);
-                    toast.show();
+                    activity.runOnUiThread(() -> Toast.makeText(context, hint, Toast.LENGTH_SHORT).show());
                 }
                 Log.d(TAG, "Ask for permission WRITE_CALENDAR");
                 ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.WRITE_CALENDAR}, 0);
@@ -305,8 +295,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
                 if (!ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.READ_CALENDAR)) {
                     Log.d(TAG, "User has permanently denied permission READ_CALENDAR, informing him");
                     String hint = context.getString(R.string.calendar_permission_request, "READ_CALENDAR");
-                    Toast toast = Toast.makeText(context, hint, Toast.LENGTH_SHORT);
-                    toast.show();
+                    activity.runOnUiThread(() -> Toast.makeText(context, hint, Toast.LENGTH_SHORT).show());
                 }
                 Log.d(TAG, "Ask for permission READ_CALENDAR");
                 ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.READ_CALENDAR}, 0);

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

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2022 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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;

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

@@ -1,27 +1,24 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2022 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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;
 
 /**
  * Enthält zentrale Konstanten.
- *
- * @author Herbert Reiter
  */
 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,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2022 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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;
@@ -25,7 +24,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -47,17 +45,17 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.menu.MenuBuilder;
 import androidx.preference.PreferenceManager;
 
 import net.moasdawiki.base.ServiceException;
 import net.moasdawiki.base.Settings;
-import net.moasdawiki.plugin.Plugin;
-import net.moasdawiki.plugin.PluginService;
-import net.moasdawiki.server.HttpRequest;
-import net.moasdawiki.server.HttpResponse;
-import net.moasdawiki.service.render.HtmlService;
+import net.moasdawiki.http.ContentType;
+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;
 
@@ -67,48 +65,44 @@ import org.jetbrains.annotations.Nullable;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.InetAddress;
 import java.net.URLDecoder;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
- * Steuert das Verhalten des Hauptfensters inkl. eingebettetem Browser.
- *
- * @author Herbert Reiter
+ * Displays the main window with the embedded wiki browser.
  */
 public class MainActivity extends AppCompatActivity {
 
     private static final String TAG = "MainActivity";
     private static final String SERVER_BASE_URL = "http://localhost:1/";
 
-    private Settings settings;
     private RepositoryService repositoryService;
-    private PluginService pluginService;
-    private HtmlService htmlService;
+    private Settings settings;
     private SynchronizeWikiClient synchronizeWikiClient;
+    private RequestDispatcher requestDispatcher;
 
     private WebView webview;
 
-    private long backButtonPressedTimestamp;
+    private ExecutorService synchronizationExecutorService;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main_layout);
 
-        // AndroidMainService holen
         WikiEngineApplication app = (WikiEngineApplication) getApplication();
-        settings = app.getServiceLocator().getSettings();
-        repositoryService = app.getServiceLocator().getRepositoryService();
-        pluginService = app.getServiceLocator().getPluginService();
-        htmlService = app.getServiceLocator().getHtmlService();
+        repositoryService = app.getRepositoryService();
+        settings = app.getSettings();
         synchronizeWikiClient = app.getSynchronizeWikiClient();
+        requestDispatcher = app.getRequestDispatcher();
+        synchronizationExecutorService = Executors.newSingleThreadExecutor();
 
-        // eingebetteten Browser konfigurieren
         initWebView();
 
         EditText searchInput = findViewById(R.id.search_input);
@@ -125,31 +119,29 @@ public class MainActivity extends AppCompatActivity {
     }
 
     /**
-     * Konfiguriert den eingebetteten Browser.
+     * Configure the embedded web browser.
      */
     @SuppressLint("SetJavaScriptEnabled")
     private void initWebView() {
-        // Cookies deaktivieren
         CookieManager cookieManager = CookieManager.getInstance();
         cookieManager.setAcceptCookie(false);
 
-        // localhost-URLs in WebView anzeigen
         webview = findViewById(R.id.web_browser);
         webview.setWebChromeClient(new WebChromeClient());
         webview.setWebViewClient(new WebViewClient() {
             /**
-             * Steuert, welche Links im eingebetteten Browser und welche im externen Browser
-             * geöffnet werden sollen.
+             * Dispatch URLs the user clicks on.
+             * External URLs will be shown in an external browser.
              */
             @Override
             public boolean shouldOverrideUrlLoading(@NotNull WebView view, @NotNull WebResourceRequest webResourceRequest) {
                 Uri uri = webResourceRequest.getUrl();
                 String host = uri.getHost();
                 if ("localhost".equals(host)) {
-                    // lokale URL im eingebetteten Browser öffnen
+                    // wiki URL, show in embedded browser
                     return false;
                 } else {
-                    // externe Links im normalen Browser öffnen
+                    // external URL, show in external browser
                     Intent intent = new Intent(Intent.ACTION_VIEW, uri);
                     startActivity(intent);
                     return true;
@@ -157,57 +149,46 @@ public class MainActivity extends AppCompatActivity {
             }
 
             /**
-             * Emuliert den Wikiserver und zu vermeiden, dass ein TCP-Port geöffnet werden muss.
+             * Resolve internal URLs without running a real HTTP server,
+             * so we don't have to open a port.
              */
             @Override
             @Nullable
             public WebResourceResponse shouldInterceptRequest (@NotNull WebView view, @NotNull WebResourceRequest request) {
                 try {
-                    // URL-Pfad ermitteln
+                    // determine URL path
                     Uri uri = request.getUrl();
                     String encodedUrl = uri.toString();
                     String url = URLDecoder.decode(encodedUrl, "UTF-8");
                     if (!url.startsWith(SERVER_BASE_URL)) {
-                        return null; // Daten per HTTP laden
+                        return null;
                     }
-                    String urlPath = url.substring(SERVER_BASE_URL.length() - 1); // ersten "/" behalten
+                    String urlPath = url.substring(SERVER_BASE_URL.length() - 1); // extract URL path
                     int hashPos = urlPath.indexOf('#');
                     if (hashPos >= 0) {
                         // cut off anchor beginning with '#'
                         urlPath = urlPath.substring(0, hashPos);
                     }
 
-                    // per URL-Mapping das zuständige Plugin aufrufen
-                    HttpResponse response;
-                    Plugin plugin = pluginService.getPluginByUrl(urlPath);
-                    if (plugin != null) {
-                        HttpRequest httpRequest = new HttpRequest();
-                        httpRequest.clientIP = InetAddress.getLocalHost();
-                        httpRequest.httpHeader = Collections.emptyMap();
-                        httpRequest.method = "GET";
-                        httpRequest.url = urlPath;
-                        httpRequest.urlPath = urlPath;
-                        httpRequest.urlParameters = convertParameters(uri);
-                        httpRequest.httpBody = new byte[0];
+                    // dispatch URL path
+                    HttpRequest httpRequest = new HttpRequest(Collections.emptyMap(),
+                            "GET", urlPath, urlPath, convertParameters(uri), new byte[0]);
+                    HttpResponse response = requestDispatcher.handleRequest(httpRequest);
 
-                        response = plugin.handleRequest(httpRequest);
-                        if (response == null) {
-                            response = htmlService.generateErrorPage(404, "wiki.plugin.handleRequest.notsupported", plugin.getClass().getName());
-                        }
+                    // send wiki content to browser
+                    String mimeType;
+                    if (response.getContentType() != null) {
+                        mimeType = response.getContentType().getMediaType();
                     } else {
-                        // unbekannte URL
-                        response = htmlService.generateErrorPage(404, "wiki.server.url.unmapped", urlPath);
+                        mimeType = ContentType.BINARY.getMediaType();
                     }
-
-                    // Antwortdaten einspeisen
                     InputStream responseData = new ByteArrayInputStream(response.getContent());
-                    return new WebResourceResponse(response.getContentType(),
-                            "UTF-8", responseData);
+                    return new WebResourceResponse(mimeType, "UTF-8", responseData);
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
 
-                return null;  // Daten per HTTP laden
+                return null;  // load HTTP data
             }
 
             @Override
@@ -217,7 +198,6 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
-        // weitere Einstellungen
         WebSettings webSettings = webview.getSettings();
         webSettings.setAllowFileAccess(false);
         webSettings.setJavaScriptEnabled(true);
@@ -233,6 +213,7 @@ public class MainActivity extends AppCompatActivity {
         return result;
     }
 
+    @SuppressLint("RestrictedApi")
     @Override
     public boolean onCreateOptionsMenu(@NotNull Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
@@ -255,30 +236,29 @@ public class MainActivity extends AppCompatActivity {
         // automatically handle clicks on the Home/Up button, so long
         // as you specify a parent activity in AndroidManifest.xml.
 
-        switch (item.getItemId()) {
-            case R.id.action_synchronize:
-                synchronizeServer();
+        int itemId = item.getItemId();
+        if (itemId == R.id.action_synchronize) {
+            synchronizeWithServer();
             return true;
-            case R.id.action_startpage:
+        } else if (itemId == R.id.action_startpage) {
             loadUrl(SERVER_BASE_URL);
             return true;
-            case R.id.action_settings:
+        } else if (itemId == R.id.action_settings) {
             showSettingsDialog();
             return true;
-            case R.id.action_help:
+        } else if (itemId == R.id.action_help) {
             String pagePathHelp = getWikiserverHelpUrl();
             loadUrl(pagePathHelp);
             return true;
-            case R.id.action_about:
+        } else if (itemId == R.id.action_about) {
             showAboutDialog();
             return true;
-            default:
-                return super.onOptionsItemSelected(item);
         }
+        return super.onOptionsItemSelected(item);
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, @NotNull String[] permissions, @NotNull int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         Log.d(TAG, "Permission granted by user: requestCode=" + requestCode
             + ", permissions=" + Arrays.toString(permissions) + ", grantResults=" + Arrays.toString(grantResults));
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -286,32 +266,23 @@ public class MainActivity extends AppCompatActivity {
 
     @Override
     public void onBackPressed() {
-        // webview.canGoBack() liefert immer false
+        // webview.canGoBack() always returns false
         WebBackForwardList backForwardList = webview.copyBackForwardList();
         Log.d(TAG, "Back button pressed, backForwardList index == " + backForwardList.getCurrentIndex());
         if (backForwardList.getCurrentIndex() > 0) {
             webview.goBack();
         } else {
-            long currentTimeMillis = System.currentTimeMillis();
-            if (backButtonPressedTimestamp + 5000 < currentTimeMillis) {
-                // First click on back button or previous click was more than 5 seconds ago
-                Log.d(TAG, "Back button 1x, show close hint");
-                showToast(getString(R.string.action_back_close_hint));
-                backButtonPressedTimestamp = currentTimeMillis;
-            } else {
-                // Second click on back button within 5 seconds -> close app
-                Log.d(TAG, "Back button 2x, closing app");
+            // Close app
             finish();
         }
     }
-    }
 
     public void onConfigurationHintClicked(@SuppressWarnings("unused") View view) {
         showSettingsDialog();
     }
 
     public void onSynchronizeHintClicked(@SuppressWarnings("unused") View view) {
-        synchronizeServer();
+        synchronizeWithServer();
     }
 
     public void onSearch(@SuppressWarnings("unused") View view) {
@@ -334,8 +305,7 @@ public class MainActivity extends AppCompatActivity {
         String url = getWikiserverSearchUrl(query);
         loadUrl(url);
 
-        // Der Wartedialog wird nach dem Anzeigen der Suchergebnisse durch Aufruf von
-        // closeProgressDialog() geschlossen.
+        // The wait dialog is closed by closeProgressDialog() after the search result is shown
     }
 
     private void showSettingsDialog() {
@@ -344,7 +314,7 @@ public class MainActivity extends AppCompatActivity {
     }
 
     private void showAboutDialog() {
-        // Versionsnummer einsetzen
+        // insert version number
         @SuppressLint("InflateParams")
         View dialogView = getLayoutInflater().inflate(R.layout.about_layout, null);
         TextView versionText = dialogView.findViewById(R.id.label_version);
@@ -353,7 +323,7 @@ public class MainActivity extends AppCompatActivity {
         TextView copyrightText = dialogView.findViewById(R.id.label_copyright);
         copyrightText.setText(getString(R.string.about_copyright, year));
 
-        // Dialog anzeigen
+        // show dialog
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setView(dialogView);
         builder.setTitle(R.string.app_name);
@@ -363,13 +333,48 @@ public class MainActivity extends AppCompatActivity {
         dialog.show();
     }
 
-    private void synchronizeServer() {
-        SyncNowTask syncNowTask = new SyncNowTask();
-        syncNowTask.execute();
+    /**
+     * Called if user presses the synchronization button.
+     */
+    private void synchronizeWithServer() {
+        synchronizationExecutorService.submit(this::runSynchronizationWithServer);
     }
 
     /**
-     * Öffnet die angegebene URL im eingebetteten Browser.
+     * Run synchronization of wiki content with wiki server.
+     * This method is run in an asynchronous background thread.
+     */
+    private void runSynchronizationWithServer() {
+        int filesCount;
+        try {
+            filesCount = synchronizeWikiClient.synchronizeRepository(this::syncProgress);
+        } catch (ServiceException e) {
+            Log.e(TAG, "Error synchronizing repository with server", e);
+            runOnUiThread(() -> showToast(getString(R.string.settings_synchronize_failed)));
+            return;
+        }
+
+        if (filesCount > 0) {
+            runOnUiThread(() -> showToast(getString(R.string.settings_synchronize_successful, filesCount)));
+
+            WikiEngineApplication app = (WikiEngineApplication) getApplication();
+            app.resetServices();
+
+            CalendarSyncAdapter.requestCalendarSync(this);
+        } else {
+            runOnUiThread(() -> showToast(getString(R.string.settings_synchronize_not_necessary)));
+        }
+
+        runOnUiThread(this::hideProgressBar);
+        runOnUiThread(this::updateLayoutVisibility);
+    }
+
+    private void syncProgress(int progress, int max) {
+        runOnUiThread(() -> showProgressBar(progress, max));
+    }
+
+    /**
+     * Open a URL in the embedded browser.
      */
     private void loadUrl(@NotNull String url) {
         Log.d(TAG, "Open URL " + url);
@@ -413,11 +418,11 @@ public class MainActivity extends AppCompatActivity {
         boolean webViewVisible = !hostUnconfiguredHintVisible && !repositoryEmptyHintVisible;
         if (webViewVisible) {
             searchArea.setVisibility(View.VISIBLE);
-            boolean previousVisible = (webView.getVisibility() == View.INVISIBLE);
+            boolean previousVisible = (webView.getVisibility() == View.VISIBLE);
             webView.setVisibility(View.VISIBLE);
 
             // if WebView is shown the first time, go to start page
-            if (!previousVisible) {
+            if (!previousVisible || webView.getUrl() == null) {
                 loadUrl(SERVER_BASE_URL);
             }
         } else {
@@ -450,61 +455,4 @@ public class MainActivity extends AppCompatActivity {
         Toast toast = Toast.makeText(this, message, Toast.LENGTH_SHORT);
         toast.show();
     }
-
-    /**
-     * Synchronisiert mit dem Wikiserver in einem separaten Thread.
-     */
-    @SuppressLint("StaticFieldLeak")
-    @SuppressWarnings("NonStaticInnerClassInSecureContext")
-    private class SyncNowTask extends AsyncTask<Void, ProgressData, Integer> implements SynchronizeWikiClient.ProgressFeedback {
-
-        @Nullable
-        @Override
-        protected Integer doInBackground(Void... params) {
-            try {
-                return synchronizeWikiClient.synchronizeRepository(this);
-            } catch (ServiceException e) {
-                Log.e(TAG, "Error synchronizing repository", e);
-            }
-            return null;
-        }
-
-        @Override
-        public void progress(int step, int total) {
-            ProgressData progressData = new ProgressData();
-            progressData.step = step;
-            progressData.total = total;
-            publishProgress(progressData);
-        }
-
-        @Override
-        protected void onProgressUpdate(ProgressData... progressData) {
-            showProgressBar(progressData[0].step, progressData[0].total);
-        }
-
-        @Override
-        protected void onPostExecute(@Nullable Integer filesCount) {
-            CalendarSyncAdapter.requestCalendarSync(MainActivity.this);
-
-            if (filesCount == null) {
-                showToast(getString(R.string.settings_synchronize_failed));
-            } else if (filesCount > 0) {
-                showToast(getString(R.string.settings_synchronize_successful, filesCount));
-
-                // Reset internal file caches
-                WikiEngineApplication app = (WikiEngineApplication) getApplication();
-                app.resetServices();
-            } else {
-                showToast(getString(R.string.settings_synchronize_not_necessary));
-            }
-
-            hideProgressBar();
-            updateLayoutVisibility();
-        }
-    }
-
-    private static class ProgressData {
-        public int step;
-        public int total;
-    }
 }

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

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2022 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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;

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

@@ -1,26 +1,23 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2022 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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 android.annotation.SuppressLint;
 import android.content.SharedPreferences;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.InputFilter;
 import android.text.InputType;
@@ -35,11 +32,11 @@ import androidx.preference.PreferenceFragmentCompat;
 import net.moasdawiki.base.Settings;
 import net.moasdawiki.service.repository.RepositoryService;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class SettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
 
@@ -47,15 +44,17 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
     private SynchronizeWikiClient synchronizeWikiClient;
     private RepositoryService repositoryService;
     private Settings settings;
+    private ExecutorService synchronizationExecutorService;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        //noinspection ConstantConditions
+        @SuppressWarnings("ConstantConditions")
         WikiEngineApplication app = (WikiEngineApplication) getContext().getApplicationContext();
         synchronizeWikiClient = app.getSynchronizeWikiClient();
-        repositoryService = app.getServiceLocator().getRepositoryService();
-        settings = app.getServiceLocator().getSettings();
+        repositoryService = app.getRepositoryService();
+        settings = app.getSettings();
+        synchronizationExecutorService = Executors.newSingleThreadExecutor();
     }
 
     @Override
@@ -167,37 +166,30 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
         }
     }
 
+    /**
+     * Called if the user changes the connection settings to give fast feedback.
+     */
     private void checkServerConnection() {
-        new ConnectServerTask().execute();
+        synchronizationExecutorService.submit(this::runCheckServerConnection);
     }
 
     /**
-     * Checks the connection to the Wiki server.
+     * Run server connection check.
+     * This method is run in an asynchronous background thread.
      */
-    @SuppressLint("StaticFieldLeak")
-    @SuppressWarnings("NonStaticInnerClassInSecureContext")
-    private class ConnectServerTask extends AsyncTask<Void, Void, Boolean> {
-        @Override
-        @NotNull
-        protected Boolean doInBackground(Void... params) {
+    private void runCheckServerConnection() {
         SharedPreferences preferences = getPreferenceManager().getSharedPreferences();
         String host = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_HOST, null);
         if (host == null) {
             Log.d(TAG, "Cancel ConnectServerTask because server host is not configured");
-                return false;
+            return;
         }
 
-            // Connect with server
-            return synchronizeWikiClient.createAndCheckSession();
-        }
-
-        @Override
-        protected void onPostExecute(@NotNull Boolean success) {
+        boolean success = synchronizeWikiClient.createAndCheckSession();
         updateStatusText();
 
         if (!success) {
             showToast(getString(R.string.settings_search_failed));
         }
     }
-    }
 }

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

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2022 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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;
@@ -29,20 +28,9 @@ import androidx.preference.PreferenceManager;
 import net.moasdawiki.base.Logger;
 import net.moasdawiki.base.ServiceException;
 import net.moasdawiki.base.Settings;
-import net.moasdawiki.plugin.ServiceLocator;
-import net.moasdawiki.plugin.sync.AbstractSyncXml;
-import net.moasdawiki.plugin.sync.CheckSessionResponseXml;
-import net.moasdawiki.plugin.sync.CheckSessionXml;
-import net.moasdawiki.plugin.sync.CreateSessionResponseXml;
-import net.moasdawiki.plugin.sync.CreateSessionXml;
-import net.moasdawiki.plugin.sync.ErrorResponseXml;
-import net.moasdawiki.plugin.sync.ListModifiedFilesResponseXml;
-import net.moasdawiki.plugin.sync.ListModifiedFilesXml;
-import net.moasdawiki.plugin.sync.ReadFileResponseXml;
-import net.moasdawiki.plugin.sync.ReadFileXml;
-import net.moasdawiki.plugin.sync.SingleFileXml;
 import net.moasdawiki.service.repository.AnyFile;
 import net.moasdawiki.service.repository.RepositoryService;
+import net.moasdawiki.service.sync.*;
 import net.moasdawiki.util.DateUtils;
 import net.moasdawiki.util.xml.XmlGenerator;
 import net.moasdawiki.util.xml.XmlParser;
@@ -67,8 +55,6 @@ import java.util.Enumeration;
 /**
  * Sucht einen Wikiserver in Netzwerk und synchronisiert alle Wikidateien
  * im eigenen Repository..
- *
- * @author Herbert Reiter
  */
 public class SynchronizeWikiClient {
 
@@ -85,13 +71,15 @@ public class SynchronizeWikiClient {
     @NotNull
     private final RepositoryService repositoryService;
     @NotNull
-    private final SecureRandom random = new SecureRandom();
+    private final SecureRandom random;
 
-    public SynchronizeWikiClient(@NotNull Context mContext, @NotNull ServiceLocator serviceLocator) {
+    public SynchronizeWikiClient(@NotNull Context mContext, @NotNull Logger logger, @NotNull Settings settings,
+                                 @NotNull RepositoryService repositoryService) {
         this.mContext = mContext;
-        this.logger = serviceLocator.getLogger();
-        this.settings = serviceLocator.getSettings();
-        this.repositoryService = serviceLocator.getRepositoryService();
+        this.logger = logger;
+        this.settings = settings;
+        this.repositoryService = repositoryService;
+        this.random = new SecureRandom();
     }
 
     /**
@@ -179,7 +167,6 @@ public class SynchronizeWikiClient {
         return new BigInteger(130, random).toString(32);
     }
 
-    @NotNull
     private boolean[] checkSession(@NotNull String serverHostPort) throws ServiceException {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
         String serverSessionId = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID, null);
@@ -263,7 +250,7 @@ public class SynchronizeWikiClient {
             return 0;
         }
 
-        for (int i = 0; i < fileCount && !feedback.isCancelled(); i++) {
+        for (int i = 0; i < fileCount; i++) {
             feedback.progress(i, fileCount);
             SingleFileXml serverFile = response.fileList.get(i);
             try {
@@ -279,7 +266,6 @@ public class SynchronizeWikiClient {
         app.resetServices();
 
         // Update last sync time
-        if (!feedback.isCancelled()) {
         Date currentServerDate = DateUtils.parseUtcDate(response.currentServerTime);
         if (currentServerDate != null) {
             long newLastSyncServerTimeMs = currentServerDate.getTime();
@@ -287,7 +273,6 @@ public class SynchronizeWikiClient {
             editor.putLong(Constants.PREFERENCES_SYNC_SERVER_TIME, newLastSyncServerTimeMs);
             editor.apply();
         }
-        }
 
         return fileCount;
     }
@@ -423,9 +408,8 @@ public class SynchronizeWikiClient {
             while ((bytesRead = in.read(buffer)) != -1) {
                 byteStream.write(buffer, 0, bytesRead);
             }
-            byte[] responseBytes = byteStream.toByteArray();
 
-            String responseXml = new String(responseBytes, StandardCharsets.UTF_8);
+            String responseXml = byteStream.toString("UTF-8");
             Log.d(TAG, "Response: " + truncateLogText(responseXml, 400));
             return responseXml;
         } catch (Exception e) {
@@ -471,9 +455,8 @@ public class SynchronizeWikiClient {
      * Interface, um den Fortschritt während der Synchronisierung mit dem Server
      * zurückzuübermitteln.
      */
+    @FunctionalInterface
     public interface ProgressFeedback {
-        @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-        boolean isCancelled();
         void progress(int step, int total);
     }
 }

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

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2022 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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;
@@ -23,58 +22,93 @@ import android.app.Application;
 import net.moasdawiki.base.Logger;
 import net.moasdawiki.base.Messages;
 import net.moasdawiki.base.Settings;
-import net.moasdawiki.plugin.PluginService;
-import net.moasdawiki.plugin.ServiceLocator;
+import net.moasdawiki.server.RequestDispatcher;
+import net.moasdawiki.service.handler.FileDownloadHandler;
+import net.moasdawiki.service.handler.SearchHandler;
+import net.moasdawiki.service.handler.ViewPageHandler;
 import net.moasdawiki.service.render.HtmlService;
-import net.moasdawiki.service.repository.FilesystemRepositoryService;
 import net.moasdawiki.service.repository.RepositoryService;
+import net.moasdawiki.service.search.SearchIgnoreList;
+import net.moasdawiki.service.search.SearchIndex;
 import net.moasdawiki.service.search.SearchService;
+import net.moasdawiki.service.transform.IncludePageTransformer;
+import net.moasdawiki.service.transform.KontaktseiteTransformer;
+import net.moasdawiki.service.transform.TerminTransformer;
+import net.moasdawiki.service.transform.TransformWikiPage;
+import net.moasdawiki.service.transform.TransformerService;
+import net.moasdawiki.service.transform.WikiTagsTransformer;
 import net.moasdawiki.service.wiki.WikiService;
-import net.moasdawiki.service.wiki.WikiServiceImpl;
 
 import java.io.File;
 
 /**
- * Verwaltet den Lebenszyklus der Wiki Engine. Muss außerhalb der Activities erfolgen, weil diese
- * z.B. beim Drehen des Bildschirm neu erzeugt werden.
+ * Main control of the wiki App.
  *
- * @author Herbert Reiter
+ * Must be run globally for the App, i.e. outside of an activity.
  */
 public class WikiEngineApplication extends Application {
+    private static final String REPOSITORY_ROOT_PATH_DEFAULT = "repository";
 
     private Logger logger;
-    private ServiceLocator serviceLocator;
+    private RepositoryService repositoryService;
+    private Settings settings;
+    private Messages messages;
+    private WikiService wikiService;
+    private SearchService searchService;
     private SynchronizeWikiClient synchronizeWikiClient;
+    private TerminTransformer terminTransformer;
+    private RequestDispatcher requestDispatcher;
 
     @Override
     public void onCreate() {
         super.onCreate();
 
         logger = new Logger(System.out);
-        logger.write("MoasdaWiki app starting");
+        logger.write("MoasdaWiki App starting");
 
-        File internalStorageRepositoryRoot = new File(getFilesDir(), "repository");
-        RepositoryService repositoryService = new FilesystemRepositoryService(logger, internalStorageRepositoryRoot);
-        repositoryService.init();
-        WikiService wikiService = new WikiServiceImpl(logger, repositoryService);
-        SearchService searchService = new SearchService(logger, wikiService);
-        Settings settings = new AndroidSettings(logger, repositoryService, AndroidSettings.getConfigFileApp());
-        Messages messages = new Messages(logger, settings, repositoryService);
-        PluginService pluginService = new PluginService(logger, settings);
-        HtmlService htmlService = new HtmlService(logger, settings, messages, wikiService, pluginService);
-        serviceLocator = new ServiceLocator(logger, settings, messages, repositoryService, wikiService, htmlService, searchService, pluginService);
+        File internalStorageRepositoryRoot = new File(getFilesDir(), REPOSITORY_ROOT_PATH_DEFAULT);
 
-        pluginService.loadPlugins(serviceLocator);
+        // basic services
+        repositoryService = new RepositoryService(logger, internalStorageRepositoryRoot, null, false);
+        settings = new AndroidSettings(logger, repositoryService, Settings.getConfigFileApp());
+        messages = new Messages(logger, settings, repositoryService);
+        wikiService = new WikiService(logger, repositoryService, false);
+        SearchIgnoreList searchIgnoreList = new SearchIgnoreList(logger, repositoryService);
+        SearchIndex searchIndex = new SearchIndex(logger, repositoryService, wikiService, searchIgnoreList, true);
+        searchService = new SearchService(logger, wikiService, searchIgnoreList, searchIndex, false);
 
-        synchronizeWikiClient = new SynchronizeWikiClient(this, serviceLocator);
+        // App: use SynchronizeWikiClient instead of SynchronizationService
+        synchronizeWikiClient = new SynchronizeWikiClient(this, logger, settings, repositoryService);
+
+        // transformers
+        // do not run the SynchronizationPageTransformer
+        IncludePageTransformer includePageTransformer = new IncludePageTransformer(logger, wikiService);
+        KontaktseiteTransformer kontaktseiteTransformer = new KontaktseiteTransformer();
+        terminTransformer = new TerminTransformer(logger, messages, repositoryService, wikiService, false);
+        WikiTagsTransformer wikiTagsTransformer = new WikiTagsTransformer(logger, settings, messages, wikiService);
+        // list of transformers, the order matters
+        TransformWikiPage[] transformers = {includePageTransformer, kontaktseiteTransformer, terminTransformer, wikiTagsTransformer};
+        TransformerService transformerService = new TransformerService(transformers);
+
+        // more services
+        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);
+        FileDownloadHandler fileDownloadHandler = new FileDownloadHandler(logger, settings, repositoryService, htmlService);
+        requestDispatcher = new RequestDispatcher(htmlService, viewPageHandler,
+                searchHandler, null, fileDownloadHandler, null);
     }
 
     public void resetServices() {
-        serviceLocator.getRepositoryService().rebuildCache();
-        serviceLocator.getWikiService().reset();
-        serviceLocator.getSettings().reset();
-        serviceLocator.getMessages().reset();
-        serviceLocator.getPluginService().loadPlugins(serviceLocator);
+        repositoryService.reset();
+        settings.reset();
+        messages.reset();
+        wikiService.reset();
+        searchService.reset();
+        terminTransformer.reset();
     }
 
     @Override
@@ -83,11 +117,23 @@ public class WikiEngineApplication extends Application {
         super.onTerminate();
     }
 
-    public ServiceLocator getServiceLocator() {
-        return serviceLocator;
+    public RepositoryService getRepositoryService() {
+        return repositoryService;
+    }
+
+    public Settings getSettings() {
+        return settings;
+    }
+
+    public TerminTransformer getTerminTransformer() {
+        return terminTransformer;
     }
 
     public SynchronizeWikiClient getSynchronizeWikiClient() {
         return synchronizeWikiClient;
     }
+
+    public RequestDispatcher getRequestDispatcher() {
+        return requestDispatcher;
+    }
 }

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

@@ -16,13 +16,14 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:padding="20dp"
             android:orientation="horizontal">
 
             <View
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_gravity="center_vertical"
-                android:layout_margin="20dp"
+                android:layout_marginEnd="20dp"
                 android:background="@drawable/ic_info_outline_black" />
 
             <TextView
@@ -50,13 +51,14 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:padding="20dp"
             android:orientation="horizontal">
 
             <View
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_gravity="center_vertical"
-                android:layout_margin="20dp"
+                android:layout_marginEnd="20dp"
                 android:background="@drawable/ic_info_outline_black" />
 
             <TextView

app/src/main/res/values-de/strings.xml

@@ -4,7 +4,6 @@
     <string name="about_version">Version %1$s</string>
     <string name="action_help">Hilfe</string>
     <string name="action_about">Über</string>
-    <string name="action_back_close_hint">Erneut drücken um die App zu beenden.</string>
     <string name="action_settings">Einstellungen</string>
     <string name="action_startpage">Startseite</string>
     <string name="action_synchronize">Synchronisieren</string>

app/src/main/res/values/strings.xml

@@ -4,7 +4,6 @@
     <string name="about_homepage_url" translatable="false">https://www.moasdawiki.net/</string>
     <string name="about_version">Version %1$s</string>
     <string name="action_about">About</string>
-    <string name="action_back_close_hint">Press again to exit the app.</string>
     <string name="action_help">Help</string>
     <string name="action_settings">Settings</string>
     <string name="action_startpage">Start page</string>

app/src/main/res/xml/data_extraction_rules.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+        <exclude domain="root" />
+        <exclude domain="file" />
+        <exclude domain="database" />
+        <exclude domain="sharedpref" />
+        <exclude domain="external" />
+    </cloud-backup>
+    <device-transfer>
+        <exclude domain="root" />
+        <exclude domain="file" />
+        <exclude domain="database" />
+        <exclude domain="sharedpref" />
+        <exclude domain="external" />
+    </device-transfer>
+</data-extraction-rules>

build.gradle

@@ -2,11 +2,11 @@
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:7.2.2'
 
         // 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/15.txt

@@ -0,0 +1 @@
+- Volltextsuche beschleunigen, indem im ersten Schritt nur noch in den Seitentiteln gesucht wird.

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

@@ -0,0 +1 @@
+- Fastlane Metadaten für das F-Droid-Repository hinzufügen

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

@@ -0,0 +1,2 @@
+- Deutsche Fastlane Metadaten für das F-Droid-Repository hinzufügen
+- Versionen der verwendeten Bibliotheken aktualisieren

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

@@ -0,0 +1,3 @@
+- Volltextsuche beschleunigen durch einen Suchindex
+- Bugfix: Nicht zur Wiki-Startseite wechseln wenn die App wieder geöffnet wird
+- Auf moasdawiki-server 2.3.1 aktualisieren

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

@@ -0,0 +1,3 @@
+- Bugfix: Zeige Startseite beim App-Start
+- Bugfix: Bei der Suche ausschließlich den Suchindex-Cache verwenden
+- Auf moasdawiki-server 2.3.3 aktualisieren

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

@@ -0,0 +1,3 @@
+- Auf moasdawiki-server 2.4.2 aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren
+- Refaktorierung: Überholtes AsyncTask ersetzen

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

@@ -0,0 +1 @@
+- Lizenz GPL-3.0-only klarer herausstellen

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

@@ -0,0 +1,3 @@
+- Entferne doppeltes Drücken der Rückwärtstaste zum Schließen der App
+- Auf moasdawiki-server 2.6.1 aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren

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

@@ -0,0 +1,4 @@
+- Kleine Layoutverbesserungen
+- Auf moasdawiki-server 3.1.0 aktualisieren
+- Unterstützung für Android 12
+- Bibliotheks-Abhängigkeiten aktualisieren

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

@@ -0,0 +1,2 @@
+- Gradle-Version in moasdawiki-server und in der App aktualisieren um ein Build-Problem zu beheben
+- Auf moasdawiki-server 3.2.1 aktualisieren

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

@@ -0,0 +1,2 @@
+- Auf moasdawiki-server 3.4.4 aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren

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

@@ -0,0 +1,23 @@
+MoasdaWiki App ist eine datenschutzfreundliche Oberfläche der MoasdaWiki-Server-Wissensverwaltung. Sie ist eine Kopie deiner Wikiinhalte auf deinem Mobilgerät.
+
+<b>Funktionen:</b>
+
+- Synchronisiert die Inhalte von deiner MoasdaWiki-Server-Instanz.
+- Schnelle Volltextsuche
+- Kalender-Integration: Zeigt Geburtstage und Termine im Kalender des Mobilgeräts.
+- Datenschutz: Verbindet sich direkt mit dem Server in deinem privaten Netzwerk. Keine Tracker. Keine Cloud-Verbindung.
+
+<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 die MoasdaWiki-App.
+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 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 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

@@ -0,0 +1 @@
+Datenschutzfreundliche Wissensverwaltung

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

@@ -0,0 +1,2 @@
+- Add German fastlane metadata for F-Droid repository
+- Update library dependencies

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

@@ -0,0 +1,3 @@
+- Speed up full text search by a search index
+- Bugfix: Don't go back to start page after App restore
+- Update to moasdawiki-server 2.3.1

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

@@ -0,0 +1,3 @@
+- Bugfix: Show start page on app startup
+- Bugfix: For searches only use the search index cache
+- Update to moasdawiki-server 2.3.3

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

@@ -0,0 +1,3 @@
+- Update to moasdawiki-server 2.4.2
+- Upgrade library dependencies
+- Refactoring: Replace deprecated AsyncTask

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

@@ -0,0 +1 @@
+- Make GPL-3.0-only licensing more clear

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

@@ -0,0 +1,3 @@
+- Remove double back key press to close the app
+- Update to moasdawiki-server 2.6.1
+- Upgrade library dependencies

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

@@ -0,0 +1,4 @@
+- Small layout optimizations
+- Update to moasdawiki-server 3.1.0
+- Support for Android 12
+- Upgrade library dependencies

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

@@ -0,0 +1,2 @@
+- Update Gradle version in moasdawiki-server and in app to fix build issue
+- Update to moasdawiki-server 3.2.1

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

@@ -0,0 +1,2 @@
+- Update to moasdawiki-server 3.4.4
+- Upgrade library dependencies

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/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.
-- 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).
+- Synchronizes the content from your MoasdaWiki Server instance.
+- Fast full text search.
+- Calendar integration: Shows birthdays and events in the mobile calendar.
+- Data privacy by design: Directly connects to your server instance in your private network. No trackers, never establishes a cloud connection.
 
-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.
-4. You can see a hint that the App 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.
+3. Install the MoasdaWiki App.
+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 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.
-10. Now you should have all the server content also in the app and you can see the "Home" wiki page.
+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

@@ -1,6 +1,5 @@
-#Sun Mar 15 11:51:27 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

gradlew

@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       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
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    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.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -89,84 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell