New release

CHANGELOG.md

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

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 - 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
-    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 - 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.
-
-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,37 +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.
+- Synchronizes the content from your MoasdaWiki Server instance.
 - 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).
+- 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://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
 
@@ -40,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,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30 // 30 = Android 11
+    compileSdkVersion 31 // 31 = Android 12
     defaultConfig {
         applicationId "net.moasdawiki.app"
-        minSdkVersion 26 // 26 = Oreo 8.0
-        targetSdkVersion 30 // should be same as compileSdkVersion
-        versionCode 23
-        versionName "2.5.1.0"
+        minSdkVersion 28 // 28 = Android 9
+        targetSdkVersion 31 // should be same as compileSdkVersion
+        versionCode 28
+        versionName "3.1.0.0"
         archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
     sourceSets {
@@ -18,16 +18,16 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 }
 
 dependencies {
-    implementation 'net.moasdawiki:moasdawiki-server:2.5.1'
+    implementation 'net.moasdawiki:moasdawiki-server:3.1.0'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
     implementation 'androidx.preference:preference:1.1.1'
-    compileOnly 'org.jetbrains:annotations:20.1.0'
-    testImplementation 'org.testng:testng:7.3.0'
+    compileOnly 'org.jetbrains:annotations:22.0.0'
+    testImplementation 'org.testng:testng:7.4.0'
 }

app/src/main/AndroidManifest.xml

@@ -20,7 +20,8 @@
 
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name">
+            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 +45,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 - 2021 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/CalendarAccountAuthenticator.java

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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 - 2021 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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 - 2021 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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 - 2021 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/CalendarSyncAdapterService.java

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/MainActivity.java

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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;
@@ -65,7 +64,6 @@ 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;
@@ -89,7 +87,6 @@ public class MainActivity extends AppCompatActivity {
     private RequestDispatcher requestDispatcher;
 
     private WebView webview;
-    private long backButtonPressedTimestamp;
 
     private ExecutorService synchronizationExecutorService;
 
@@ -173,14 +170,8 @@ public class MainActivity extends AppCompatActivity {
                     }
 
                     // dispatch URL path
-                    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];
+                    HttpRequest httpRequest = new HttpRequest(Collections.emptyMap(),
+                            "GET", urlPath, urlPath, convertParameters(uri), new byte[0]);
                     HttpResponse response = requestDispatcher.handleRequest(httpRequest);
 
                     // send wiki content to browser
@@ -274,17 +265,8 @@ public class MainActivity extends AppCompatActivity {
         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");
-                finish();
-            }
+            // Close app
+            finish();
         }
     }
 

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

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/SynchronizeWikiClient.java

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/WikiEngineApplication.java

@@ -1,19 +1,18 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2021 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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,6 +28,8 @@ import net.moasdawiki.service.handler.SearchHandler;
 import net.moasdawiki.service.handler.ViewPageHandler;
 import net.moasdawiki.service.render.HtmlService;
 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;
@@ -68,11 +69,13 @@ public class WikiEngineApplication extends Application {
         File internalStorageRepositoryRoot = new File(getFilesDir(), REPOSITORY_ROOT_PATH_DEFAULT);
 
         // basic services
-        repositoryService = new RepositoryService(logger, internalStorageRepositoryRoot, false);
+        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);
-        searchService = new SearchService(logger, repositoryService, wikiService, false);
+        SearchIgnoreList searchIgnoreList = new SearchIgnoreList(logger, repositoryService);
+        SearchIndex searchIndex = new SearchIndex(logger, repositoryService, wikiService, searchIgnoreList, true);
+        searchService = new SearchService(logger, wikiService, searchIgnoreList, searchIndex, false);
 
         // App: use SynchronizeWikiClient instead of SynchronizationService
         synchronizeWikiClient = new SynchronizeWikiClient(this, logger, settings, repositoryService);

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>

build.gradle

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

@@ -1,22 +1,23 @@
-MoasdaWiki App ist eine Erweiterung zum MoasdaWiki-Server, um eine Kopie deiner Wikiinhalte auf deinem Mobilgerät zu haben.
+MoasdaWiki App ist eine datenschutzfreundliche Oberfläche der MoasdaWiki-Server-Wissensverwaltung. Sie ist eine Kopie deiner Wikiinhalte auf deinem Mobilgerät.
 
-Funkionalitäten:
+<b>Funktionen:</b>
 
-- Synchronisiert die Inhalte von einer MoasdaWiki-Server-Instanz.
-- Datenschutz: Es wird keine Cloud-Verbindung hergestellt, verbindet sich direkt mit dem Server in deinem privaten Netzwerk.
-- Kalender-Integration, zeigt Geburtstage und Termine im Kalender des Mobilgeräts (nur in der deutschen Version).
+- 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.
 
-Synchronisieren des Inhalts mit einem MoasdaWiki-Server:
+<b>Synchronisieren des Inhalts mit einem MoasdaWiki-Server:</b>
 
 1. Lade MoasdaWiki-Server von https://moasdawiki.net/ herunter.
 2. Setze eine MoasdaWiki-Server-Instance in deinem LAN auf.
-3. Installiere und öffne die MoasdaWiki-App.
-4. Du kannst einen Hinweis sehen, dass die App zunächst konfiguriert werden muss. Drücke auf den Hinweis.
-5. Drücke auf "Hostname" und gib den Hostnamen der Server-Instanz ein, z.B. `192.168.1.101`. Drücke OK.
+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 (&larr;) in der Ecke links oben, um zum Hauptdialog zurückzukommen. Nun kannst du einen Hinweis sehen, dass die App synchronisiert werden muss. Drücke auf diesen Hinweis.
+9. Zurück in der App drücke den Zurück-Button in der Ecke links oben, um zum Hauptdialog zurückzukommen. Nun kannst du einen Hinweis sehen, dass die App synchronisiert werden muss. Drücke auf diesen Hinweis.
 10. Nun solltest du alle Inhalte des Servers auch in der App haben und die Wikiseite "Startseite-App" sehen.
 
 Hinweis: Der Wikiinhalt kann nicht in der App modifiziert werden, da es keinen Spaß macht Wiki-Syntax auf dem Mobilgerät zu tippen. Änderungen müssen über den MoasdaWiki-Server erfolgen.

fastlane/metadata/android/de/short_description.txt

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

fastlane/metadata/android/en-US/changelogs/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/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.
-- 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.
+9. Back in the app press the back button on the upper left corner to get back to the main dialog. Now you can see a hint that the app has to be synchronized. Press on that hint.
 10. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
 
 Hint: Content cannot be modified within the app as it is no fun to type Wiki syntax on the mobile device, changes have to be done via the MoasdaWiki Server.

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

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

gradle/wrapper/gradle-wrapper.properties

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