New release

- new release

.gitignore

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

CHANGELOG.md

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

LICENSE

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

README.md

@@ -15,7 +15,7 @@ For MoasdaWiki documentation see https://moasdawiki.net/.
 
 - 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.
+- Fast full text search.
 - 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).

app/build.gradle

@@ -1,17 +1,17 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29 // 29 = Android 10
+    compileSdkVersion 30 // 30 = Android 11
     defaultConfig {
         applicationId "net.moasdawiki.app"
         minSdkVersion 26 // 26 = Oreo 8.0
-        targetSdkVersion 29 // should be same as compileSdkVersion
-        versionCode 18
-        versionName "2.3.1.0"
+        targetSdkVersion 30 // should be same as compileSdkVersion
+        versionCode 23
+        versionName "2.5.1.0"
         archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
     sourceSets {
-        main{
+        main {
             java {
                 exclude "net/moasdawiki/plugin/sync/SynchronizationPlugin*"
             }
@@ -24,10 +24,10 @@ android {
 }
 
 dependencies {
-    implementation 'net.moasdawiki:moasdawiki-server:2.3.1'
+    implementation 'net.moasdawiki:moasdawiki-server:2.5.1'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.preference:preference:1.1.1'
-    compileOnly 'org.jetbrains:annotations:19.0.0'
-    testImplementation 'org.testng:testng:6.14.3'
+    compileOnly 'org.jetbrains:annotations:20.1.0'
+    testImplementation 'org.testng:testng:7.3.0'
 }

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +30,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,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,9 +43,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 +85,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 +104,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 +195,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 +286,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 +296,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,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,8 +20,6 @@ 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,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,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 +46,16 @@ 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.server.RequestDispatcher;
+import net.moasdawiki.service.HttpResponse;
 import net.moasdawiki.service.repository.RepositoryService;
 import net.moasdawiki.util.EscapeUtils;
 
@@ -74,41 +72,39 @@ 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 +121,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,30 +151,28 @@ 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) {
+                    // dispatch URL path
                     HttpRequest httpRequest = new HttpRequest();
                     httpRequest.clientIP = InetAddress.getLocalHost();
                     httpRequest.httpHeader = Collections.emptyMap();
@@ -189,25 +181,16 @@ public class MainActivity extends AppCompatActivity {
                     httpRequest.urlPath = urlPath;
                     httpRequest.urlParameters = convertParameters(uri);
                     httpRequest.httpBody = 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());
-                        }
-                    } else {
-                        // unbekannte URL
-                        response = htmlService.generateErrorPage(404, "wiki.server.url.unmapped", urlPath);
-                    }
-
-                    // Antwortdaten einspeisen
-                    InputStream responseData = new ByteArrayInputStream(response.getContent());
-                    return new WebResourceResponse(response.getContentType(),
-                            "UTF-8", responseData);
+                    // send wiki content to browser
+                    InputStream responseData = new ByteArrayInputStream(response.content);
+                    return new WebResourceResponse(response.contentType, "UTF-8", responseData);
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
 
-                return null;  // Daten per HTTP laden
+                return null;  // load HTTP data
             }
 
             @Override
@@ -217,7 +200,6 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
-        // weitere Einstellungen
         WebSettings webSettings = webview.getSettings();
         webSettings.setAllowFileAccess(false);
         webSettings.setJavaScriptEnabled(true);
@@ -256,30 +238,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);
@@ -287,7 +268,7 @@ 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) {
@@ -307,15 +288,15 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
-    public void onConfigurationHintClicked(@SuppressWarnings("unused") View view) {
+    public void onConfigurationHintClicked(View view) {
         showSettingsDialog();
     }
 
-    public void onSynchronizeHintClicked(@SuppressWarnings("unused") View view) {
-        synchronizeServer();
+    public void onSynchronizeHintClicked(View view) {
+        synchronizeWithServer();
     }
 
-    public void onSearch(@SuppressWarnings("unused") View view) {
+    public void onSearch(View view) {
         EditText searchInput = findViewById(R.id.search_input);
         String query = searchInput.getText().toString();
         query = query.trim();
@@ -335,8 +316,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() {
@@ -345,7 +325,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);
@@ -354,7 +334,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);
@@ -364,13 +344,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);
@@ -418,7 +433,7 @@ public class MainActivity extends AppCompatActivity {
             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 {
@@ -451,61 +466,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,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

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

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
 
 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 +33,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 +45,16 @@ 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
         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,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,20 +29,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 +56,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 +72,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();
     }
 
     /**
@@ -263,7 +252,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 +268,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 +275,6 @@ public class SynchronizeWikiClient {
             editor.putLong(Constants.PREFERENCES_SYNC_SERVER_TIME, newLastSyncServerTimeMs);
             editor.apply();
         }
-        }
 
         return fileCount;
     }
@@ -471,9 +458,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,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2020 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,58 +23,89 @@ 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.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, repositoryService, 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, false);
+        settings = new AndroidSettings(logger, repositoryService, Settings.getConfigFileApp());
+        messages = new Messages(logger, settings, repositoryService);
+        wikiService = new WikiService(logger, repositoryService, false);
+        searchService = new SearchService(logger, repositoryService, wikiService, 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 +114,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;
+    }
 }

build.gradle

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

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

@@ -4,8 +4,6 @@ Funkionalitäten:
 
 - Synchronisiert die Inhalte von einer MoasdaWiki-Server-Instanz.
 - Datenschutz: Es wird keine Cloud-Verbindung hergestellt, verbindet sich direkt mit dem Server in deinem privaten Netzwerk.
-- Flexible Volltextsuche, unterstützt reguläre Ausdrücke.
-- Der Wikiinhalt kann nicht in der App modifiziert werden, da es keinen Spaß macht Wiki-Syntax auf dem Mobilgerät zu tippen. Änderungen müssen über den MoasdaWiki-Server erfolgen.
 - Kalender-Integration, zeigt Geburtstage und Termine im Kalender des Mobilgeräts (nur in der deutschen Version).
 
 Synchronisieren des Inhalts mit einem MoasdaWiki-Server:
@@ -20,3 +18,5 @@ Synchronisieren des Inhalts mit einem MoasdaWiki-Server:
 8. Du siehst eine Liste von Geräte und Synchronisierungs-Sitzungen. Überprüfe den Gerätenamen und klicke auf "Erlauben".
 9. Zurück in der App drücke den Zurück-Button (←) in der Ecke links oben, um zum Hauptdialog zurückzukommen. Nun kannst du einen Hinweis sehen, dass die App synchronisiert werden muss. Drücke auf diesen Hinweis.
 10. Nun solltest du alle Inhalte des Servers auch in der App haben und die Wikiseite "Startseite-App" sehen.
+
+Hinweis: Der Wikiinhalt kann nicht in der App modifiziert werden, da es keinen Spaß macht Wiki-Syntax auf dem Mobilgerät zu tippen. Änderungen müssen über den MoasdaWiki-Server erfolgen.

fastlane/metadata/android/en-US/changelogs/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/full_description.txt

@@ -4,8 +4,6 @@ Features:
 
 - Synchronizes the data from a MoasdaWiki Server instance.
 - Data privacy: No cloud connection established, directly connects to the server inside your private network.
-- Powerful full text search, supports regular expressions.
-- Content cannot be modified within the app as it is no fun to type Wiki syntax on the mobile device, changes have to be done via the MoasdaWiki Server.
 - Calendar integration, shows birthdays and events in the mobile calendar (German version only).
 
 Synchronize content with a MoasdaWiki Server:
@@ -20,3 +18,5 @@ Synchronize content with a MoasdaWiki Server:
 8. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
 9. Back in the app press the back button (←) on the upper left corner to get back to the main dialog. Now you can see a hint that the app has to be synchronized. Press on that hint.
 10. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
+
+Hint: Content cannot be modified within the app as it is no fun to type Wiki syntax on the mobile device, changes have to be done via the MoasdaWiki Server.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Sep 08 22:17:23 CEST 2020
+#Sun Dec 27 12:01:31 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip