New release

CHANGELOG.md

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

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 27
-        versionName "2.6.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.6.1'
+    implementation 'net.moasdawiki:moasdawiki-server:3.1.0'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
     implementation 'androidx.preference:preference:1.1.1'
-    compileOnly 'org.jetbrains:annotations:21.0.1'
+    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,6 +1,6 @@
 /*
  * 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 version 3 as published

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

@@ -1,6 +1,6 @@
 /*
  * 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 version 3 as published

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

@@ -1,6 +1,6 @@
 /*
  * 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 version 3 as published

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

@@ -1,6 +1,6 @@
 /*
  * 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 version 3 as published

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

@@ -1,6 +1,6 @@
 /*
  * 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 version 3 as published

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

@@ -1,6 +1,6 @@
 /*
  * 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 version 3 as published

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

@@ -1,6 +1,6 @@
 /*
  * 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 version 3 as published

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

@@ -1,6 +1,6 @@
 /*
  * 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 version 3 as published
@@ -64,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;
@@ -171,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

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

@@ -1,6 +1,6 @@
 /*
  * 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 version 3 as published

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

@@ -1,6 +1,6 @@
 /*
  * 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 version 3 as published

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

@@ -1,6 +1,6 @@
 /*
  * 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 version 3 as published

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

@@ -1,6 +1,6 @@
 /*
  * 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 version 3 as published
@@ -28,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;
@@ -67,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

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        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

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

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.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip