New release

- new release

.gitignore

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

CHANGELOG.md

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

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

@@ -6,12 +6,12 @@ android {
         applicationId "net.moasdawiki.app"
         minSdkVersion 26 // 26 = Oreo 8.0
         targetSdkVersion 29 // should be same as compileSdkVersion
-        versionCode 17
-        versionName "2.2.1.1"
+        versionCode 19
+        versionName "2.3.3.0"
         archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
     sourceSets {
-        main{
+        main {
             java {
                 exclude "net/moasdawiki/plugin/sync/SynchronizationPlugin*"
             }
@@ -24,7 +24,7 @@ android {
 }
 
 dependencies {
-    implementation 'net.moasdawiki:moasdawiki-server:2.2.0'
+    implementation 'net.moasdawiki:moasdawiki-server:2.3.3'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.preference:preference:1.1.1'

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

@@ -414,11 +414,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 {

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

@@ -57,7 +57,7 @@ public class WikiEngineApplication extends Application {
         RepositoryService repositoryService = new FilesystemRepositoryService(logger, internalStorageRepositoryRoot);
         repositoryService.init();
         WikiService wikiService = new WikiServiceImpl(logger, repositoryService);
-        SearchService searchService = new SearchService(logger, wikiService);
+        SearchService searchService = new SearchService(logger, repositoryService, wikiService, true);
         Settings settings = new AndroidSettings(logger, repositoryService, AndroidSettings.getConfigFileApp());
         Messages messages = new Messages(logger, settings, repositoryService);
         PluginService pluginService = new PluginService(logger, settings);

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.0.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

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/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