Compare commits

..

119 Commits

Author SHA1 Message Date
Herbert Reiter a4590e4b35 Neues Release 2025-08-30 16:28:39 +02:00
Herbert Reiter c6f942b6df Shortened app name 2025-08-30 15:46:47 +02:00
Herbert Reiter d11478d92c Update minimum supported Android API to 33 2025-08-30 15:36:20 +02:00
Herbert Reiter 016a20dca8 Upgrade library dependencies 2025-08-30 15:35:22 +02:00
Herbert Reiter afe3d5712d Bugfix: Searchbar not visible on newer Android versions 2025-08-30 15:30:51 +02:00
Herbert Reiter d48f50c15a Use Nullable annotations from Android package 2025-08-30 15:30:18 +02:00
Herbert Reiter 009c1e5131 New release 2025-07-06 20:31:20 +02:00
Herbert Reiter 3839ad430c Upgrade library dependencies 2025-07-06 20:28:44 +02:00
Herbert Reiter 5b60b46676 Update Gradle 2025-07-06 20:28:18 +02:00
Herbert Reiter cfe89ec716 Fix warning 2025-07-06 20:28:01 +02:00
Herbert Reiter 766326d170 Update to moasdawiki-server 3.9.5 2025-07-06 20:11:20 +02:00
Herbert Reiter 9d281ebde9 Upgrade to Android API 36 (Android 16) 2025-07-06 20:10:27 +02:00
Herbert Reiter 8959fdaa99 Show Gradle warnings 2025-07-06 20:09:02 +02:00
Herbert Reiter fbed0a15dc Upgrade to Gradle 8.14.3 2025-07-06 20:08:01 +02:00
Herbert Reiter 562d3662da New release 2025-01-05 22:02:02 +01:00
Herbert Reiter c97656a5d0 Update to moasdawiki-server 3.9.3 2025-01-05 21:59:04 +01:00
Herbert Reiter 1b5f7918ce Upgrade library dependencies 2025-01-05 21:58:19 +01:00
Herbert Reiter 49e575e462 Update copyright year 2025-01-05 21:57:45 +01:00
Herbert Reiter ddc5cea6bd Upgrade to Gradle 8.12 2025-01-05 21:57:23 +01:00
Herbert Reiter 52ecbeb7d7 Add Google Play link 2024-11-02 18:39:45 +01:00
Herbert Reiter d021267fcd New release 2024-11-02 18:00:32 +01:00
Herbert Reiter 6cb3e218c4 Upgrade library dependencies 2024-11-02 17:57:58 +01:00
Herbert Reiter 7b3aa69732 New release 2024-11-02 17:37:09 +01:00
Herbert Reiter 9f2c84d673 New release 2024-10-04 10:00:30 +02:00
Herbert Reiter 0ba9bfda35 Update to moasdawiki-server 3.9.1 2024-10-04 09:58:04 +02:00
Herbert Reiter dcbfc23070 Upgrade library dependencies 2024-10-04 09:56:45 +02:00
Herbert Reiter 42d01a9abe Upgrade to Gradle 8.10.2 2024-10-04 09:33:30 +02:00
Herbert Reiter 67e30728f0 New release 2024-05-10 23:08:45 +02:00
Herbert Reiter 75a186f37c Upgrade to Gradle 8.7 2024-05-10 22:26:04 +02:00
Herbert Reiter 74c539c1de New release 2024-01-01 12:35:31 +01:00
Herbert Reiter 7a9626e860 Update copyright year 2024-01-01 12:05:11 +01:00
Herbert Reiter 63d4dc289e Upgrade to Gradle 8.5 2024-01-01 12:03:22 +01:00
Herbert Reiter 742770826e Update to moasdawiki-server 3.7.1 2024-01-01 12:02:36 +01:00
Herbert Reiter 9887622c75 Upgrade library dependencies 2023-12-12 20:18:38 +01:00
Herbert Reiter c159f7b654 Upgrade library dependencies 2023-12-12 20:15:09 +01:00
Herbert Reiter a5b1d6ab98 New release 2023-11-15 21:16:06 +01:00
Herbert Reiter 0761586405 Fix Gradle build issue in fdroid build 2023-11-15 21:13:49 +01:00
Herbert Reiter 10e8c2a1e6 New release 2023-11-11 20:19:46 +01:00
Herbert Reiter eaaa2fe9e6 Fix warning 2023-11-11 20:15:30 +01:00
Herbert Reiter d3e678ef27 Limit calendar import to 100 events 2023-11-11 20:15:07 +01:00
Herbert Reiter ce344ba55b Retry failed server sync requests 2023-11-11 20:14:38 +01:00
Herbert Reiter 11fa2d784f Translate comment 2023-11-11 15:56:27 +01:00
Herbert Reiter 8c179f3ccb Fix warning 2023-11-11 15:56:07 +01:00
Herbert Reiter 4bd99cc3e6 Upgrade library dependencies 2023-11-11 13:17:16 +01:00
Herbert Reiter adca61deaf New release 2023-11-01 21:18:52 +01:00
Herbert Reiter 18683636b2 Upgrade to Android API 34 2023-11-01 21:18:04 +01:00
Herbert Reiter fac9d1d58a Remove linter workaround 2023-11-01 21:12:11 +01:00
Herbert Reiter 17d3e4da98 Update to moasdawiki-server 3.6.3 2023-11-01 21:11:40 +01:00
Herbert Reiter c0cb48078d Upgrade library dependencies 2023-11-01 21:11:03 +01:00
Herbert Reiter 8c0326cebb New release 2023-08-07 20:53:01 +02:00
Herbert Reiter f3c444c025 New release 2023-08-07 20:51:36 +02:00
Herbert Reiter 1f4ae087d1 Fix Gradle build issue 2023-08-07 20:51:04 +02:00
Herbert Reiter 1aa4382529 Upgrade to Gradle 8.2.1 2023-08-07 20:49:26 +02:00
Herbert Reiter 3827ac802c New release 2023-08-05 22:10:42 +02:00
Herbert Reiter 93232a5a26 New release 2023-08-05 22:08:56 +02:00
Herbert Reiter b9e823ff8f Update to moasdawiki-server 3.6.2 2023-08-05 22:06:15 +02:00
Herbert Reiter 6c47546d8e Upgrade dependencies 2023-08-05 22:04:17 +02:00
Herbert Reiter 1ebbe18252 Remove old workaround 2023-08-05 22:02:25 +02:00
Herbert Reiter 32e75598cd Replace deprecated Gradle settings 2023-08-05 22:01:20 +02:00
Herbert Reiter efff4078ab Upgrade Gradle plugin 2023-08-05 21:58:42 +02:00
Herbert Reiter c4122bcf1a Upgrade to Gradle 8.2.1 2023-08-05 21:58:16 +02:00
Herbert Reiter 0138b6c40d New release 2023-04-29 16:16:01 +02:00
Herbert Reiter 81b1a80622 New release 2023-04-29 16:14:47 +02:00
Herbert Reiter bfe63b9577 Update to moasdawiki-server 3.6.1 2023-04-29 16:14:38 +02:00
Herbert Reiter 42489f019d Upgrade library dependencies 2023-04-29 16:14:10 +02:00
Herbert Reiter 9a967c58eb New release 2023-01-01 12:09:34 +01:00
Herbert Reiter d0afd9bd8a Update copyright year 2023-01-01 12:07:18 +01:00
Herbert Reiter 3fd1567ccf New release 2023-01-01 12:04:49 +01:00
Herbert Reiter 7d14124bde Update to moasdawiki-server 3.6.0 2023-01-01 12:04:00 +01:00
Herbert Reiter 84bef6b9c1 Upgrade library dependencies 2023-01-01 12:03:14 +01:00
Herbert Reiter 976317437e Upgrade Gradle 2023-01-01 12:02:42 +01:00
Herbert Reiter f529528145 New release 2022-11-12 13:10:56 +01:00
Herbert Reiter cb9b235b30 New release 2022-11-12 13:09:20 +01:00
Herbert Reiter 0c183df154 Update to moasdawiki-server 3.5.1 2022-11-12 13:08:33 +01:00
Herbert Reiter 7dff72bd0f Upgrade library dependencies 2022-11-12 11:14:39 +01:00
Herbert Reiter 0011124c76 New release 2022-10-15 12:36:47 +02:00
Herbert Reiter e08ba7e27c Add app icon to fastlane folder 2022-10-15 12:36:19 +02:00
Herbert Reiter ae6de92387 New release 2022-10-08 20:46:25 +02:00
Herbert Reiter 0bec9f2848 New release 2022-10-08 20:44:35 +02:00
Herbert Reiter cc8116c10b Upgrade library dependencies 2022-10-08 20:44:06 +02:00
Herbert Reiter 7d18b4bd59 Update to moasdawiki-server 3.5.0 2022-10-08 20:42:57 +02:00
Herbert Reiter 46be7f77e5 New release 2022-09-05 13:22:46 +02:00
Herbert Reiter 8db8e05f4d New release 2022-09-05 13:21:01 +02:00
Herbert Reiter 40a1662797 Update to moasdawiki-server 3.4.5 2022-09-05 13:20:35 +02:00
Herbert Reiter 60e54ae92a Upgrade library dependencies 2022-09-05 13:19:28 +02:00
Herbert Reiter 8f0d07b299 New release 2022-04-14 19:52:41 +02:00
Herbert Reiter 13fea74597 New release 2022-04-14 19:50:20 +02:00
Herbert Reiter 2014c0509b Update to moasdawiki-server 3.4.4 2022-04-14 19:49:49 +02:00
Herbert Reiter 3cfe7a5a79 Upgrade library dependencies 2022-04-14 19:49:03 +02:00
Herbert Reiter e0399f7075 New release 2021-12-29 22:29:49 +01:00
Herbert Reiter b49f2d5427 Update Gradle version in moasdawiki-server and in app to fix build issue 2021-12-29 22:29:31 +01:00
Herbert Reiter 19717b6bef Update to moasdawiki-server 3.2.1 2021-12-29 22:28:58 +01:00
Herbert Reiter 81c00ef2da New release 2021-12-25 16:01:44 +01:00
Herbert Reiter 54456f9629 New release 2021-12-25 15:55:55 +01:00
Herbert Reiter da2bab9db5 Small layout optimizations 2021-12-25 15:55:19 +01:00
Herbert Reiter 37e92222d5 Update to moasdawiki-server 3.1.0 2021-12-25 15:54:35 +01:00
Herbert Reiter e2cda6afb1 Upgrade library dependencies 2021-12-25 15:53:55 +01:00
Herbert Reiter bb52a69ff7 Support for Android 12 2021-12-25 15:53:27 +01:00
Herbert Reiter ce33ef40d6 Update copyright year 2021-12-25 15:51:36 +01:00
Herbert Reiter e27651e9dd New release 2021-06-09 22:15:10 +02:00
Herbert Reiter cd01a5390d New release 2021-06-09 22:11:55 +02:00
Herbert Reiter 1597613f72 Upgrade library dependencies 2021-06-09 22:11:17 +02:00
Herbert Reiter ec78f31ce5 Update to moasdawiki-server 2.6.1 2021-06-09 22:10:53 +02:00
Herbert Reiter e8833dd11b Remove double back key press to close the app 2021-06-09 22:09:22 +02:00
Herbert Reiter 07a9fa630c New release 2021-05-13 10:34:12 +02:00
Herbert Reiter 96623d73a0 Make GPL-3.0-only licensing more clear 2021-05-13 10:31:18 +02:00
Herbert Reiter 58ba5f48c5 New release 2021-05-08 22:44:55 +02:00
Herbert Reiter 51a34e4463 Update documentation 2021-05-08 22:44:27 +02:00
Herbert Reiter c3b1c53622 Update library dependencies 2021-05-08 22:37:11 +02:00
Herbert Reiter 5f1ed57f42 Show screenshots in README 2021-04-05 10:38:56 +00:00
Herbert Reiter c77845abf5 Update documentation for F-Droid 2021-03-06 18:26:51 +01:00
Herbert Reiter cb128311c7 Update README.md 2021-03-06 18:26:27 +01:00
Herbert Reiter 7b3a8780f6 Update README.md 2021-03-06 16:00:54 +01:00
Herbert Reiter a7a05cc5fa Update README.md 2021-03-06 15:59:42 +01:00
Herbert Reiter 80af757d4d New release 2021-02-28 21:32:21 +01:00
Herbert Reiter d243402082 New release 2021-01-31 16:21:45 +01:00
Herbert Reiter 297df3da1a New release 2021-01-31 16:15:43 +01:00
Herbert Reiter a0a77f6311 New release 2021-01-31 16:15:19 +01:00
Herbert Reiter db66908534 New release 2021-01-31 15:42:58 +01:00
85 changed files with 1160 additions and 674 deletions
+4
View File
@@ -0,0 +1,4 @@
*.sh text eol=lf
# Files with CRLF line endings
gradlew.bat text eol=crlf
+145
View File
@@ -1,5 +1,150 @@
# Changelog
## 3.9.5.1 (versionCode 48, 2025-08-30)
- Bugfix: Searchbar not visible on newer Android versions
- Shortened app name
- Update minimum supported Android API to 33 (Android 13)
- Use Nullable annotations from Android package
- Upgrade library dependencies
## 3.9.5.0 (versionCode 47, 2025-07-06)
- Update to moasdawiki-server 3.9.5
- Upgrade to Android API 36 (Android 16)
- Upgrade to Gradle 8.14.3
- Upgrade library dependencies
- Fix warning
## 3.9.3.0 (versionCode 46, 2025-01-05)
- Update to moasdawiki-server 3.9.3
- Upgrade to Gradle 8.12
- Upgrade library dependencies
- Update copyright year
## 3.9.1.1 (versionCode 45, 2024-11-02)
- Update App sync description
- Upgrade library dependencies
## 3.9.1.0 (versionCode 44, 2024-10-04)
- Update to moasdawiki-server 3.9.1
- Upgrade to Gradle 8.10.2
- Upgrade library dependencies
## 3.7.1.1 (versionCode 43, 2024-05-10)
- Upgrade to Gradle 8.7
## 3.7.1.0 (versionCode 42, 2024-01-01)
- Update to moasdawiki-server 3.7.1
- Upgrade to Gradle 8.5
- Update copyright year
## 3.6.3.2 (versionCode 41, 2023-12-12)
- Upgrade library dependencies
## 3.6.3.1 (versionCode 40, 2023-11-15)
- Fix Gradle build issue in fdroid build
## 3.6.3.0 (versionCode 39, 2023-11-11)
- Limit calendar import to 100 events as Android has a global limit of 500 events
- Retry failed server sync requests
- Update to moasdawiki-server 3.6.3
- Upgrade library dependencies
- Upgrade to Android API 34 (Android 14)
## 3.6.2.1 (versionCode 38, 2023-08-07)
- Fix Gradle build issue
## 3.6.2.0 (versionCode 37, 2023-08-05)
- Update to moasdawiki-server 3.6.2
- Upgrade library dependencies
## 3.6.1.0 (versionCode 36, 2023-04-29)
- Update to moasdawiki-server 3.6.1
- Upgrade library dependencies
## 3.6.0.0 (versionCode 35, 2023-01-01)
- Update to moasdawiki-server 3.6.0
- Upgrade library dependencies
- Update copyright year
## 3.5.1.0 (versionCode 34, 2022-11-12)
- Update to moasdawiki-server 3.5.1
- Upgrade library dependencies
## 3.5.0.1 (versionCode 33, 2022-10-15)
- Add app icon to fastlane folder
## 3.5.0.0 (versionCode 32, 2022-10-08)
- Update to moasdawiki-server 3.5.0
- Upgrade library dependencies
## 3.4.5.0 (versionCode 31, 2022-09-05)
- Update to moasdawiki-server 3.4.5
- Upgrade library dependencies
## 3.4.4.0 (versionCode 30, 2022-04-14)
- Update to moasdawiki-server 3.4.4
- Upgrade library dependencies
## 3.2.1.0 (versionCode 29, 2021-12-29)
- Update Gradle version in moasdawiki-server and in app to fix build issue
- Update to moasdawiki-server 3.2.1
## 3.1.0.0 (versionCode 28, 2021-12-25)
- Small layout optimizations
- Update to moasdawiki-server 3.1.0
- Support for Android 12
- Upgrade library dependencies
- Update copyright year
## 2.6.1.0 (versionCode 27, 2021-06-09)
- Remove double back key press to close the app
- Update to moasdawiki-server 2.6.1
- Upgrade library dependencies
## 2.6.0.0 (versionCode 26, 2021-05-13)
- Make GPL-3.0-only licensing more clear
- Update to moasdawiki-server 2.6.0
## 2.5.2.1 (versionCode 25, 2021-05-08)
- Update documentation
- Update library dependencies
## 2.5.2.0 (versionCode 24, 2021-02-28)
- Find also words that start with the search string
- Update to moasdawiki-server 2.5.2
## 2.5.1.0 (versionCode 23, 2021-01-31)
- Enhance search index to full words
- Introduce search ignore list
- Add support for SVG images
- Update to moasdawiki-server 2.5.1
## 2.4.4.0 (versionCode 22, 2021-01-23)
- Speed up search
-53
View File
@@ -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>.
+29 -18
View File
@@ -2,37 +2,47 @@
## 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)
or [Google Play](https://play.google.com/store/apps/details?id=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. 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.
2. Set up a MoasdaWiki Server instance in your LAN.
3. Enable LAN access to the server: Edit the repository file `config.txt` and change the setting `authentication.onlylocalhost = false`. Restart the server afterwards.
4. Install the MoasdaWiki App.
5. In the app you can see a hint that it has to be configured first. Press on that hint.
6. Press on "Host name" and enter the host name or IP address of the server instance, e.g. `192.168.1.101`. Press OK.
7. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
8. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
9. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
10. 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.
11. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
## Support
@@ -40,6 +50,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
+24 -21
View File
@@ -1,33 +1,36 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 30 // 30 = Android 11
namespace = "net.moasdawiki.app"
compileSdk = 36 // 36 = Android 16 Baklava
defaultConfig {
applicationId "net.moasdawiki.app"
minSdkVersion 26 // 26 = Oreo 8.0
targetSdkVersion 30 // should be same as compileSdkVersion
versionCode 22
versionName "2.4.4.0"
archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
}
sourceSets {
main {
java {
exclude "net/moasdawiki/plugin/sync/SynchronizationPlugin*"
}
}
minSdk = 33 // 33 = Android 13 Tiramisu
targetSdk = 36 // should be same as compileSdk
versionCode = 48
versionName = "3.9.5.1"
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
buildFeatures {
buildConfig = true
}
lintOptions {
// Workaround for NullPointerException in :app:lintVitalAnalyzeRelease in fdroid build
checkReleaseBuilds = false
}
base {
archivesName = "moasdawiki-" + defaultConfig.versionName + "-" + defaultConfig.versionCode
}
}
dependencies {
implementation 'net.moasdawiki:moasdawiki-server:2.4.4'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.preference:preference:1.1.1'
compileOnly 'org.jetbrains:annotations:20.1.0'
testImplementation 'org.testng:testng:7.3.0'
api 'net.moasdawiki:moasdawiki-server:3.9.5'
implementation ('androidx.appcompat:appcompat:1.7.1')
implementation ('androidx.preference:preference:1.2.1')
// Fix duplicate class error
implementation ("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.10")
}
+7 -5
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="net.moasdawiki.app">
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
@@ -16,11 +15,13 @@
android:name=".WikiEngineApplication"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
android:allowBackup="false">
android:allowBackup="false"
android:fullBackupContent="false"
android:dataExtractionRules="@xml/data_extraction_rules">
<activity
android:name=".MainActivity"
android:label="@string/app_name">
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
@@ -44,7 +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>
@@ -1,37 +1,36 @@
/*
* MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2025 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;
import androidx.annotation.NonNull;
import net.moasdawiki.base.Logger;
import net.moasdawiki.base.Settings;
import net.moasdawiki.service.repository.RepositoryService;
import org.jetbrains.annotations.NotNull;
public class AndroidSettings extends Settings {
public AndroidSettings(@NotNull Logger logger, @NotNull RepositoryService repositoryService, @NotNull String configFileName) {
public AndroidSettings(@NonNull Logger logger, @NonNull RepositoryService repositoryService, @NonNull String configFileName) {
super(logger, repositoryService, configFileName);
}
@Override
@NotNull
@NonNull
public String getVersion() {
return BuildConfig.VERSION_NAME;
}
@@ -1,19 +1,18 @@
/*
* MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2025 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;
@@ -24,7 +23,7 @@ import android.accounts.AccountAuthenticatorResponse;
import android.content.Context;
import android.os.Bundle;
import org.jetbrains.annotations.Nullable;
import androidx.annotation.Nullable;
/**
* Stub authenticator, required for calendar sync adapter.
@@ -1,19 +1,18 @@
/*
* MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2025 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;
@@ -22,7 +21,7 @@ import android.app.Service;
import android.content.Intent;
import android.os.IBinder;
import org.jetbrains.annotations.Nullable;
import androidx.annotation.Nullable;
/**
* Service to bind the CalendarAccountAuthenticator.
@@ -1,19 +1,18 @@
/*
* MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2025 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;
@@ -22,8 +21,9 @@ import android.content.ContentProvider;
import android.content.ContentValues;
import android.database.Cursor;
import android.net.Uri;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
/**
* Stub content provider, necessary for sync adapter.
@@ -37,33 +37,33 @@ public class CalendarContentProvider extends ContentProvider {
@Nullable
@Override
public String getType(@NotNull Uri uri) {
public String getType(@NonNull Uri uri) {
// Return no type for MIME type
return null;
}
@Nullable
@Override
public Cursor query(@NotNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder) {
public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder) {
// query() always returns no results
return null;
}
@Nullable
@Override
public Uri insert(@NotNull Uri uri, @Nullable ContentValues contentValues) {
public Uri insert(@NonNull Uri uri, @Nullable ContentValues contentValues) {
// Provider doesn't support changes from outside
return null;
}
@Override
public int delete(@NotNull Uri uri, @Nullable String s, @Nullable String[] strings) {
public int delete(@NonNull Uri uri, @Nullable String s, @Nullable String[] strings) {
// Provider doesn't support changes from outside
return 0;
}
@Override
public int update(@NotNull Uri uri, @Nullable ContentValues contentValues, @Nullable String s, @Nullable String[] strings) {
public int update(@NonNull Uri uri, @Nullable ContentValues contentValues, @Nullable String s, @Nullable String[] strings) {
// Provider doesn't support changes from outside
return 0;
}
@@ -1,19 +1,18 @@
/*
* MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2025 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;
@@ -37,6 +36,9 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.provider.CalendarContract;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.ActivityCompat;
import androidx.preference.PreferenceManager;
@@ -46,11 +48,10 @@ import android.widget.Toast;
import net.moasdawiki.service.transform.TerminTransformer;
import net.moasdawiki.util.PathUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.TimeZone;
@@ -72,8 +73,21 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
private static final Uri EVENT_URI = CalendarContract.Events. CONTENT_URI;
private static final Uri REMINDER_URI = CalendarContract.Reminders.CONTENT_URI;
/**
* Alert event 4h before it starts, i.e. at 8pm in the evening before the event day.
*/
private static final int REMINDER_BEFORE_EVENT_MINUTES = 4 * 60;
/**
* Import maximum 100 events. If there are more events found, take the 100 upcoming events
* sorted by date.
*
* Android has a global event limitation of 500 events. If more than 500 events are created,
* Android throws errors with message "Maximum limit of concurrent alarms 500 reached" and
* ignores some events.
*/
private static final int MAX_EVENT_COUNT = 100;
private final ContentResolver contentResolver;
@SuppressWarnings("SameParameterValue")
@@ -85,13 +99,19 @@ 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<TerminTransformer.Event> events = getWikiEvents();
// collect and filter events
List<TerminTransformer.Event> rawEvents = getWikiEvents();
fillEmptyDateFields(rawEvents);
List<TerminTransformer.Event> events = filterEvents(rawEvents);
// update Android calendar
String calendarId = createCalendar();
if (calendarId != null) {
deleteAllEvents(calendarId);
addEvents(calendarId, events);
}
// inform user about completed update
Handler handler = new Handler(Looper.getMainLooper());
handler.post(() -> {
Toast toast = Toast.makeText(getContext(), R.string.calendar_sync_finished, Toast.LENGTH_SHORT);
@@ -103,7 +123,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
/**
* Imports all events on Wiki pages to the Android calendar.
*/
@NotNull
@NonNull
private List<TerminTransformer.Event> getWikiEvents() {
Log.d(TAG, "Reading Wiki events");
WikiEngineApplication app = (WikiEngineApplication) getContext();
@@ -117,8 +137,67 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
return events;
}
@NotNull
private Uri buildUri(@NotNull Uri uri) {
/**
* Fills empty day, month, and year fields in all events.
*/
private void fillEmptyDateFields(@NonNull List<TerminTransformer.Event> events) {
TimeZone utc = TimeZone.getTimeZone("UTC");
Calendar calendar = Calendar.getInstance(utc);
for (TerminTransformer.Event event : events) {
if (event.dateFields.day == null) {
event.dateFields.day = 1;
}
if (event.dateFields.month == null) {
event.dateFields.month = 1;
}
if (event.dateFields.year == null) {
event.dateFields.year = calendar.get(Calendar.YEAR);
}
}
}
/**
* Reduces the number of events if more than MAX_EVENT_COUNT, only keep events in the near future.
*/
@NonNull
private List<TerminTransformer.Event> filterEvents(@NonNull List<TerminTransformer.Event> rawEvents) {
if (rawEvents.size() <= MAX_EVENT_COUNT) {
return rawEvents;
}
// sort by month and day;
// ignore year because events repeat every year
List<TerminTransformer.Event> sortedEvents = new ArrayList<>(rawEvents);
sortedEvents.sort(Comparator.comparingInt((TerminTransformer.Event event) -> event.dateFields.month).thenComparingInt(event -> event.dateFields.day));
// keep next MAX_EVENT_COUNT events from today onwards
List<TerminTransformer.Event> result = new ArrayList<>(MAX_EVENT_COUNT);
// find first event in future
TimeZone utc = TimeZone.getTimeZone("UTC");
Calendar calendar = Calendar.getInstance(utc);
int index = 0;
while (index < sortedEvents.size() - 1
&& (sortedEvents.get(index).dateFields.month < calendar.get(Calendar.MONTH) + 1
|| sortedEvents.get(index).dateFields.month == calendar.get(Calendar.MONTH) + 1
&& sortedEvents.get(index).dateFields.day < calendar.get(Calendar.DAY_OF_MONTH))) {
index++;
}
// copy events until end of year
while (result.size() < MAX_EVENT_COUNT && index < sortedEvents.size() - 1) {
result.add(sortedEvents.get(index));
index++;
}
// copy events in new year
index = 0;
while (result.size() < MAX_EVENT_COUNT && index < sortedEvents.size() - 1) {
result.add(sortedEvents.get(index));
index++;
}
return result;
}
@NonNull
private Uri buildUri(@NonNull Uri uri) {
return uri.buildUpon()
.appendQueryParameter(android.provider.CalendarContract.CALLER_IS_SYNCADAPTER, "true")
.appendQueryParameter(CalendarContract.Calendars.ACCOUNT_NAME, ACCOUNT_NAME)
@@ -156,7 +235,6 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
cv.put(CalendarContract.Calendars.NAME, CALENDAR_NAME);
String displayName = getContext().getString(R.string.calendar_display_name);
cv.put(CalendarContract.Calendars.CALENDAR_DISPLAY_NAME, displayName);
//cv.put(CalendarContract.Calendars.CALENDAR_COLOR, 0xEA8561);
cv.put(CalendarContract.Calendars.CALENDAR_ACCESS_LEVEL, CalendarContract.Calendars.CAL_ACCESS_READ);
cv.put(CalendarContract.Calendars.OWNER_ACCOUNT, ACCOUNT_NAME);
cv.put(CalendarContract.Calendars.VISIBLE, 1);
@@ -173,7 +251,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
/**
* Clears the calendar. This is necessary if e.g. a birthday has been changed or removed.
*/
private void deleteAllEvents(@NotNull String calendarId) {
private void deleteAllEvents(@NonNull String calendarId) {
Log.d(TAG, "Delete all events from calendar");
Uri eventUri = buildUri(EVENT_URI);
try (Cursor cursor = contentResolver.query(eventUri,
@@ -192,10 +270,10 @@ 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.
* Adds up to 100 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<TerminTransformer.Event> events) {
private void addEvents(@NonNull String calendarId, @NonNull List<TerminTransformer.Event> events) {
Log.d(TAG, "Create calendar events");
for (TerminTransformer.Event event : events) {
String title = event.description;
@@ -215,7 +293,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
* Adds a single event to the calendar.
*/
@Nullable
private String addEvent(@NotNull String calendarId, @Nullable Integer day, @Nullable Integer month, @Nullable Integer year, @NotNull String title, @NotNull String description) {
private String addEvent(@NonNull String calendarId, int day, int month, int year, @NonNull String title, @NonNull String description) {
Log.d(TAG, "Create calendar event: day=" + day + ", month=" + month + ", year=" + year
+ ", title=" + title + ", description=" + description);
ContentValues cv = new ContentValues();
@@ -225,18 +303,8 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
TimeZone utc = TimeZone.getTimeZone("UTC");
Calendar beginTime = Calendar.getInstance(utc);
if (day == null) {
day = 1;
}
if (month == null) {
month = 1;
}
if (year == null) {
year = beginTime.get(Calendar.YEAR);
}
beginTime.clear();
beginTime.set(year, month - 1, day);
cv.put(CalendarContract.Events.DTSTART, beginTime.getTimeInMillis());
cv.put(CalendarContract.Events.DURATION, "PT1D");
cv.put(CalendarContract.Events.ALL_DAY, 1);
@@ -256,7 +324,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
/**
* Add a reminder to the given event.
*/
private void addReminder(@NotNull String eventId) {
private void addReminder(@NonNull String eventId) {
Log.d(TAG, "Add reminder to eventId=" + eventId);
ContentValues cv = new ContentValues();
cv.put(CalendarContract.Reminders.EVENT_ID, eventId);
@@ -270,7 +338,7 @@ public class CalendarSyncAdapter extends AbstractThreadedSyncAdapter {
/**
* Initiates the calendar sync.
*/
public static void requestCalendarSync(@NotNull Activity activity) {
public static void requestCalendarSync(@NonNull Activity activity) {
Log.d(TAG, "Requesting calendar synchronization");
Context context = activity.getApplicationContext();
@@ -1,19 +1,18 @@
/*
* MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2025 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;
@@ -22,7 +21,7 @@ import android.app.Service;
import android.content.Intent;
import android.os.IBinder;
import org.jetbrains.annotations.Nullable;
import androidx.annotation.Nullable;
public class CalendarSyncAdapterService extends Service {
@@ -1,25 +1,24 @@
/*
* MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2025 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;
/**
* Enthält zentrale Konstanten.
* Defines constants and settings.
*/
public abstract class Constants {
public static final String PREFERENCES_SYNC_SERVER_HOST = "sync_server_host";
@@ -1,19 +1,18 @@
/*
* MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2025 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;
@@ -45,27 +44,26 @@ import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import android.window.OnBackInvokedCallback;
import android.window.OnBackInvokedDispatcher;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
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.server.HttpRequest;
import net.moasdawiki.http.ContentType;
import net.moasdawiki.http.HttpRequest;
import net.moasdawiki.server.RequestDispatcher;
import net.moasdawiki.service.HttpResponse;
import net.moasdawiki.service.repository.RepositoryService;
import net.moasdawiki.util.EscapeUtils;
import org.jetbrains.annotations.NotNull;
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;
@@ -78,7 +76,7 @@ import java.util.concurrent.Executors;
/**
* Displays the main window with the embedded wiki browser.
*/
public class MainActivity extends AppCompatActivity {
public class MainActivity extends AppCompatActivity implements OnBackInvokedCallback {
private static final String TAG = "MainActivity";
private static final String SERVER_BASE_URL = "http://localhost:1/";
@@ -89,7 +87,6 @@ public class MainActivity extends AppCompatActivity {
private RequestDispatcher requestDispatcher;
private WebView webview;
private long backButtonPressedTimestamp;
private ExecutorService synchronizationExecutorService;
@@ -118,6 +115,8 @@ public class MainActivity extends AppCompatActivity {
return false;
}
});
getOnBackInvokedDispatcher().registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT, this);
}
/**
@@ -136,7 +135,7 @@ public class MainActivity extends AppCompatActivity {
* External URLs will be shown in an external browser.
*/
@Override
public boolean shouldOverrideUrlLoading(@NotNull WebView view, @NotNull WebResourceRequest webResourceRequest) {
public boolean shouldOverrideUrlLoading(@NonNull WebView view, @NonNull WebResourceRequest webResourceRequest) {
Uri uri = webResourceRequest.getUrl();
String host = uri.getHost();
if ("localhost".equals(host)) {
@@ -156,11 +155,12 @@ public class MainActivity extends AppCompatActivity {
*/
@Override
@Nullable
public WebResourceResponse shouldInterceptRequest (@NotNull WebView view, @NotNull WebResourceRequest request) {
public WebResourceResponse shouldInterceptRequest (@NonNull WebView view, @NonNull WebResourceRequest request) {
try {
// determine URL path
Uri uri = request.getUrl();
String encodedUrl = uri.toString();
//noinspection CharsetObjectCanBeUsed
String url = URLDecoder.decode(encodedUrl, "UTF-8");
if (!url.startsWith(SERVER_BASE_URL)) {
return null;
@@ -173,20 +173,20 @@ 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
InputStream responseData = new ByteArrayInputStream(response.content);
return new WebResourceResponse(response.contentType, "UTF-8", responseData);
} catch (IOException e) {
String mimeType;
if (response.getContentType() != null) {
mimeType = response.getContentType().getMediaType();
} else {
mimeType = ContentType.BINARY.getMediaType();
}
InputStream responseData = new ByteArrayInputStream(response.getContent());
return new WebResourceResponse(mimeType, "UTF-8", responseData);
} catch (Exception e) {
e.printStackTrace();
}
@@ -205,8 +205,8 @@ public class MainActivity extends AppCompatActivity {
webSettings.setJavaScriptEnabled(true);
}
@NotNull
private Map<String, String> convertParameters(@NotNull Uri uri) {
@NonNull
private Map<String, String> convertParameters(@NonNull Uri uri) {
Map<String, String> result = new HashMap<>();
for (String name : uri.getQueryParameterNames()) {
String value = uri.getQueryParameter(name);
@@ -217,7 +217,7 @@ public class MainActivity extends AppCompatActivity {
@SuppressLint("RestrictedApi")
@Override
public boolean onCreateOptionsMenu(@NotNull Menu menu) {
public boolean onCreateOptionsMenu(@NonNull Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.menu_layout, menu);
if(menu instanceof MenuBuilder){
@@ -233,7 +233,7 @@ public class MainActivity extends AppCompatActivity {
}
@Override
public boolean onOptionsItemSelected(@NotNull MenuItem item) {
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
@@ -266,37 +266,26 @@ public class MainActivity extends AppCompatActivity {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
}
@Override
public void onBackPressed() {
// webview.canGoBack() always returns false
public void onBackInvoked() {
WebBackForwardList backForwardList = webview.copyBackForwardList();
Log.d(TAG, "Back button pressed, backForwardList index == " + backForwardList.getCurrentIndex());
if (backForwardList.getCurrentIndex() > 0) {
webview.goBack();
} else {
long currentTimeMillis = System.currentTimeMillis();
if (backButtonPressedTimestamp + 5000 < currentTimeMillis) {
// First click on back button or previous click was more than 5 seconds ago
Log.d(TAG, "Back button 1x, show close hint");
showToast(getString(R.string.action_back_close_hint));
backButtonPressedTimestamp = currentTimeMillis;
} else {
// Second click on back button within 5 seconds -> close app
Log.d(TAG, "Back button 2x, closing app");
finish();
}
// Close app
finish();
}
}
public void onConfigurationHintClicked(View view) {
public void onConfigurationHintClicked(@SuppressWarnings("unused") View view) {
showSettingsDialog();
}
public void onSynchronizeHintClicked(View view) {
public void onSynchronizeHintClicked(@SuppressWarnings("unused") View view) {
synchronizeWithServer();
}
public void onSearch(View view) {
public void onSearch(@SuppressWarnings("unused") View view) {
EditText searchInput = findViewById(R.id.search_input);
String query = searchInput.getText().toString();
query = query.trim();
@@ -356,24 +345,33 @@ public class MainActivity extends AppCompatActivity {
* This method is run in an asynchronous background thread.
*/
private void runSynchronizationWithServer() {
int filesCount;
SynchronizeWikiClient.SyncResult syncResult;
try {
filesCount = synchronizeWikiClient.synchronizeRepository(this::syncProgress);
syncResult = synchronizeWikiClient.synchronizeRepository(this::syncProgress);
} catch (ServiceException e) {
Log.e(TAG, "Error synchronizing repository with server", e);
runOnUiThread(() -> showToast(getString(R.string.settings_synchronize_failed)));
runOnUiThread(() -> showToast(getString(R.string.synchronize_failed)));
return;
}
if (filesCount > 0) {
runOnUiThread(() -> showToast(getString(R.string.settings_synchronize_successful, filesCount)));
if (!syncResult.isSessionValid()) {
runOnUiThread(() -> showToast(getString(R.string.synchronize_session_not_valid)));
}
else if (!syncResult.isSessionAuthorized()) {
runOnUiThread(() -> showToast(getString(R.string.synchronize_session_not_authorized)));
}
else if (syncResult.isSyncFailed()) {
runOnUiThread(() -> showToast(getString(R.string.synchronize_failed)));
}
else if (syncResult.getFileCount() > 0) {
runOnUiThread(() -> showToast(getString(R.string.synchronize_successful, syncResult.getFileCount())));
WikiEngineApplication app = (WikiEngineApplication) getApplication();
app.resetServices();
CalendarSyncAdapter.requestCalendarSync(this);
} else {
runOnUiThread(() -> showToast(getString(R.string.settings_synchronize_not_necessary)));
runOnUiThread(() -> showToast(getString(R.string.synchronize_not_necessary)));
}
runOnUiThread(this::hideProgressBar);
@@ -387,17 +385,17 @@ public class MainActivity extends AppCompatActivity {
/**
* Open a URL in the embedded browser.
*/
private void loadUrl(@NotNull String url) {
private void loadUrl(@NonNull String url) {
Log.d(TAG, "Open URL " + url);
webview.loadUrl(url);
}
@NotNull
private String getWikiserverSearchUrl(@NotNull String query) {
@NonNull
private String getWikiserverSearchUrl(@NonNull String query) {
return SERVER_BASE_URL + "search/?text=" + EscapeUtils.encodeUrlParameter(query);
}
@NotNull
@NonNull
private String getWikiserverHelpUrl() {
return SERVER_BASE_URL + "view/wiki/";
}
@@ -1,19 +1,18 @@
/*
* MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2025 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;
@@ -21,10 +20,9 @@ package net.moasdawiki.app;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import org.jetbrains.annotations.Nullable;
/**
* Settings dialog
*/
@@ -1,19 +1,18 @@
/*
* MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2025 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;
@@ -50,6 +49,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//noinspection DataFlowIssue
WikiEngineApplication app = (WikiEngineApplication) getContext().getApplicationContext();
synchronizeWikiClient = app.getSynchronizeWikiClient();
repositoryService = app.getRepositoryService();
@@ -185,10 +185,10 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
return;
}
boolean success = synchronizeWikiClient.createAndCheckSession();
SynchronizeWikiClient.SessionStatus sessionStatus = synchronizeWikiClient.createAndCheckSession();
updateStatusText();
if (!success) {
if (!sessionStatus.isValid()) {
showToast(getString(R.string.settings_search_failed));
}
}
@@ -1,19 +1,18 @@
/*
* MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2025 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;
@@ -24,6 +23,8 @@ import android.os.Build;
import android.util.Base64;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceManager;
import net.moasdawiki.base.Logger;
@@ -36,10 +37,8 @@ import net.moasdawiki.util.DateUtils;
import net.moasdawiki.util.xml.XmlGenerator;
import net.moasdawiki.util.xml.XmlParser;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.math.BigInteger;
@@ -48,14 +47,14 @@ import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.URI;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.security.SecureRandom;
import java.util.Date;
import java.util.Enumeration;
/**
* Sucht einen Wikiserver in Netzwerk und synchronisiert alle Wikidateien
* im eigenen Repository..
* Connects to the configured MoasdaWiki server and downloads the wiki files.
*/
public class SynchronizeWikiClient {
@@ -63,19 +62,23 @@ public class SynchronizeWikiClient {
private static final String PROTOCOL_VERSION = "2.0";
@NotNull
private static final int CONNECTION_CONNECT_TIMEOUT = 2_000; // 2 seconds
private static final int CONNECTION_READ_TIMEOUT = 120_000; // 2 minutes
private static final int CONNECTION_RETRIES = 3;
@NonNull
private final Context mContext;
@NotNull
@NonNull
private final Logger logger;
@NotNull
@NonNull
private final Settings settings;
@NotNull
@NonNull
private final RepositoryService repositoryService;
@NotNull
@NonNull
private final SecureRandom random;
public SynchronizeWikiClient(@NotNull Context mContext, @NotNull Logger logger, @NotNull Settings settings,
@NotNull RepositoryService repositoryService) {
public SynchronizeWikiClient(@NonNull Context mContext, @NonNull Logger logger, @NonNull Settings settings,
@NonNull RepositoryService repositoryService) {
this.mContext = mContext;
this.logger = logger;
this.settings = settings;
@@ -84,13 +87,13 @@ public class SynchronizeWikiClient {
}
/**
* Verbindet sich mit dem Wikiserver. Ist bereits eine Serversession vorhanden, wird diese
* weiter verwendet.
* Connects with the MoasdaWiki server.
* If there is already a valid server session, it is reused.
*/
public boolean createAndCheckSession() {
public SessionStatus createAndCheckSession() {
String serverHostPort = getServerHostPort();
if (serverHostPort == null) {
return false;
return new SessionStatus(false, false);
}
PreferenceManager.getDefaultSharedPreferences(mContext);
@@ -98,37 +101,39 @@ public class SynchronizeWikiClient {
String serverSessionId = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID, null);
try {
// Wenn noch keine Session vorhanden ist, eine erzeugen
// If there is no session yet, create a new session
boolean createSessionCalled = false;
if (serverSessionId == null) {
createSessionCalled = true;
createSession(serverHostPort);
}
// Ist Session freigeschaltet zur Synchronisierung?
boolean[] checkResult = checkSession(serverHostPort);
if (checkResult[0]) {
return true;
// Check existing session if it's still valid
SessionStatus sessionStatus = checkSession(serverHostPort);
if (sessionStatus.isValid()) {
return sessionStatus;
}
// Session ist ungültig --> neue Session holen
// If session ist invalid, create new session
if (createSessionCalled) {
// createSession nicht erneut aufrufen
return false;
// don't call createSession() twice
return new SessionStatus(false, false);
}
createSession(serverHostPort);
// Session erneut prüfen
boolean[] checkResult2 = checkSession(serverHostPort);
return checkResult2[0];
// Check session again
return checkSession(serverHostPort);
}
catch (ServiceException e) {
return false;
return new SessionStatus(false, false);
}
}
private void createSession(@NotNull String serverHostPort) throws ServiceException {
// Anfrage schicken
/**
* Connects with the MoasdaWiki server and creates a new session.
*/
private void createSession(@NonNull String serverHostPort) throws ServiceException {
// send request
CreateSessionXml createSessionXml = new CreateSessionXml();
createSessionXml.version = PROTOCOL_VERSION;
createSessionXml.clientSessionId = generateSessionId();
@@ -142,11 +147,11 @@ public class SynchronizeWikiClient {
String requestXml = generateXml(createSessionXml);
String responseXml = sendXmlRequest(serverHostPort, "/sync/create-session", requestXml);
// Antwort auswerten
// parse response
CreateSessionResponseXml response = parseXml(responseXml, CreateSessionResponseXml.class);
Log.d(TAG, "Current sync session ID '" + response.serverSessionId + "'");
// Session prüfen
// check for session id
if (response.serverSessionId == null) {
throw new ServiceException("Didn't get a server session ID");
}
@@ -158,30 +163,34 @@ public class SynchronizeWikiClient {
editor.putString(Constants.PREFERENCES_SYNC_SERVER_HOST_DISPLAYNAME, response.serverHost);
editor.putString(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID, response.serverSessionId);
editor.putString(Constants.PREFERENCES_SYNC_CLIENT_SESSION_ID, createSessionXml.clientSessionId);
// Synchronisierungszeiten können nicht mehr genutzt werden
// reset sync data
editor.remove(Constants.PREFERENCES_SYNC_SERVER_TIME);
editor.remove(Constants.PREFERENCES_SYNC_SERVER_SESSION_AUTHORIZED);
editor.apply();
}
@NonNull
private String generateSessionId() {
return new BigInteger(130, random).toString(32);
}
@NotNull
private boolean[] checkSession(@NotNull String serverHostPort) throws ServiceException {
/**
* Check if our MoasdaWiki server session is valid and authorized.
*/
@NonNull
private SessionStatus checkSession(@NonNull String serverHostPort) throws ServiceException {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
String serverSessionId = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID, null);
String clientSessionId = preferences.getString(Constants.PREFERENCES_SYNC_CLIENT_SESSION_ID, null);
// Anfrage schicken
// Send request
CheckSessionXml checkSessionXml = new CheckSessionXml();
checkSessionXml.version = PROTOCOL_VERSION;
checkSessionXml.serverSessionId = serverSessionId;
String requestXml = generateXml(checkSessionXml);
String responseXml = sendXmlRequest(serverHostPort, "/sync/check-session", requestXml);
// Antwort auswerten
// Parse response
CheckSessionResponseXml response = parseXml(responseXml, CheckSessionResponseXml.class);
if (response.valid == null || !response.valid) {
Log.d(TAG, "Sync server session ID '" + serverSessionId + "' is not valid any more");
@@ -189,7 +198,7 @@ public class SynchronizeWikiClient {
editor.remove(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID);
editor.remove(Constants.PREFERENCES_SYNC_CLIENT_SESSION_ID);
editor.apply();
return new boolean[]{ false, false };
return new SessionStatus(false, false);
}
if (clientSessionId != null && !clientSessionId.equals(response.clientSessionId)) {
Log.d(TAG, "Sync server authentication failed, client session ID does not match");
@@ -197,37 +206,70 @@ public class SynchronizeWikiClient {
editor.remove(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID);
editor.remove(Constants.PREFERENCES_SYNC_CLIENT_SESSION_ID);
editor.apply();
return new boolean[]{ false, false };
return new SessionStatus(false, false);
}
SharedPreferences.Editor editor = preferences.edit();
boolean authorized = response.authorized != null && response.authorized;
editor.putBoolean(Constants.PREFERENCES_SYNC_SERVER_SESSION_AUTHORIZED, authorized);
editor.apply();
return new boolean[]{ true, authorized };
return new SessionStatus(true, authorized);
}
/**
* Synchronisiert alle Repository-Dateien mit dem Wikiserver. Vorher wird geprüft, ob
* die Server-Session noch gültig ist und wir mit demselben Server verbunden sind.
*
* @return Anzahl der synchronisierten Dateien.
* Contains the session status.
*/
public int synchronizeRepository(ProgressFeedback feedback) throws ServiceException {
boolean sessionValid = createAndCheckSession();
if (!sessionValid) {
throw new ServiceException("No valid server session found");
public static class SessionStatus {
/**
* Is the MoasdaWiki server session valid?
*/
private final boolean valid;
/**
* Is the session authorized at server side?
*/
private final boolean authorized;
public SessionStatus(boolean valid, boolean authorized) {
this.valid = valid;
this.authorized = authorized;
}
public boolean isValid() {
return valid;
}
public boolean isAuthorized() {
return authorized;
}
}
/**
* Downloads the wiki files from the MoasdaWiki server.
* Checks if the session is still valid.
*/
public SyncResult synchronizeRepository(ProgressFeedback feedback) throws ServiceException {
String serverHostPort = getServerHostPort();
if (serverHostPort == null) {
throw new ServiceException("No wiki server configured");
Log.w(TAG, "No server host name configured");
return new SyncResult(false, false, true, 0);
}
SessionStatus sessionStatus = createAndCheckSession();
if (!sessionStatus.isValid()) {
Log.w(TAG, "No valid server session");
return new SyncResult(false, false, true, 0);
}
if (!sessionStatus.isAuthorized()) {
Log.w(TAG, "Server session not authorized");
return new SyncResult(true, false, true, 0);
}
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
String serverSessionId = preferences.getString(Constants.PREFERENCES_SYNC_SERVER_SESSION_ID, null);
if (serverSessionId == null) {
throw new ServiceException("Not server session ID found");
Log.w(TAG, "No server session available");
return new SyncResult(false, false, true, 0);
}
long lastSyncServerTimeMs = preferences.getLong(Constants.PREFERENCES_SYNC_SERVER_TIME, 0);
Date lastSyncServerTime = null;
@@ -249,7 +291,7 @@ public class SynchronizeWikiClient {
Log.d(TAG, "Downloading " + fileCount + " files from server");
if (fileCount == 0) {
// no files to download, cancel process
return 0;
return new SyncResult(true, true, false, 0);
}
for (int i = 0; i < fileCount; i++) {
@@ -276,10 +318,40 @@ public class SynchronizeWikiClient {
editor.apply();
}
return fileCount;
return new SyncResult(true, true, false, fileCount);
}
private void downloadFileFromServer(@NotNull String serverHostPort, @NotNull String serverSessionId, @NotNull String filePath) throws ServiceException {
public static class SyncResult {
private final boolean sessionValid;
private final boolean sessionAuthorized;
private final boolean syncFailed;
private final int fileCount;
public SyncResult(boolean sessionValid, boolean sessionAuthorized, boolean syncFailed, int fileCount) {
this.sessionValid = sessionValid;
this.sessionAuthorized = sessionAuthorized;
this.syncFailed = syncFailed;
this.fileCount = fileCount;
}
public boolean isSessionValid() {
return sessionValid;
}
public boolean isSessionAuthorized() {
return sessionAuthorized;
}
public boolean isSyncFailed() {
return syncFailed;
}
public int getFileCount() {
return fileCount;
}
}
private void downloadFileFromServer(@NonNull String serverHostPort, @NonNull String serverSessionId, @NonNull String filePath) throws ServiceException {
// Anfrage schicken
ReadFileXml readFileXml = new ReadFileXml();
readFileXml.version = PROTOCOL_VERSION;
@@ -355,7 +427,7 @@ public class SynchronizeWikiClient {
return null;
}
@NotNull
@NonNull
private String getDeviceName() {
String manufacturer = Build.MANUFACTURER;
String model = Build.MODEL;
@@ -374,46 +446,20 @@ public class SynchronizeWikiClient {
}
/**
* Schickt einen XML-Request und liest die XML-Antwort ein.
*
* @param urlPath HTTP-URL, nicht null
* @param requestXml XML-Anfrage, nicht null.
* @return XML-Antwort, nicht null.
* Sends an XML request and reads the XML response.
*/
@NotNull
private String sendXmlRequest(@NotNull String serverHostPort, @NotNull String urlPath, @NotNull String requestXml) throws ServiceException {
@NonNull
private String sendXmlRequest(@NonNull String serverHostPort, @NonNull String urlPath, @NonNull String requestXml) throws ServiceException {
try {
String url = "http://" + serverHostPort + urlPath;
Log.d(TAG, "Request to " + url + ": " + truncateLogText(requestXml, 200));
byte[] requestBytes = requestXml.getBytes(StandardCharsets.UTF_8);
URI uri = new URI(url);
HttpURLConnection conn = (HttpURLConnection) uri.toURL().openConnection();
conn.setRequestMethod("POST");
conn.setRequestProperty("Content-Type", "text/xml");
conn.setRequestProperty("Content-Length", Integer.toString(requestBytes.length));
conn.setUseCaches(false);
conn.setDoOutput(true);
conn.setDoInput(true);
conn.setConnectTimeout(1000); // 1 Sekunde
conn.setReadTimeout(10000); // 10 Sekunden
conn.connect();
byte[] responseBytes = sendBinaryRequestWithRetries(new URI(url).toURL(), requestBytes);
OutputStream out = conn.getOutputStream();
out.write(requestBytes);
out.flush();
InputStream in = conn.getInputStream();
ByteArrayOutputStream byteStream = new ByteArrayOutputStream(in.available());
int bytesRead;
byte[] buffer = new byte[1024];
while ((bytesRead = in.read(buffer)) != -1) {
byteStream.write(buffer, 0, bytesRead);
}
byte[] responseBytes = byteStream.toByteArray();
String responseXml = new String(responseBytes, StandardCharsets.UTF_8);
Log.d(TAG, "Response: " + truncateLogText(responseXml, 400));
//noinspection CharsetObjectCanBeUsed
String responseXml = new String(responseBytes, "UTF-8");
Log.d(TAG, "Response: " + truncateLogText(responseXml, 100));
return responseXml;
} catch (Exception e) {
Log.e(TAG, "Error sending XML request", e);
@@ -421,6 +467,44 @@ public class SynchronizeWikiClient {
}
}
private byte[] sendBinaryRequestWithRetries(@NonNull URL url, byte[] requestBytes) throws ServiceException {
for (int i = 1; i <= CONNECTION_RETRIES; i++) {
try {
return sendBinaryRequest(url, requestBytes);
}
catch (Exception e) {
Log.d(TAG, "Error sending request to MoasdaWiki server in attempt " + i + " of " + CONNECTION_RETRIES, e);
}
}
throw new ServiceException("Error sending request to MoasdaWiki server for " + CONNECTION_RETRIES + " times, failed");
}
private byte[] sendBinaryRequest(@NonNull URL url, byte[] requestBytes) throws IOException {
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("POST");
conn.setRequestProperty("Content-Type", "text/xml");
conn.setRequestProperty("Content-Length", Integer.toString(requestBytes.length));
conn.setUseCaches(false);
conn.setDoOutput(true);
conn.setDoInput(true);
conn.setConnectTimeout(CONNECTION_CONNECT_TIMEOUT);
conn.setReadTimeout(CONNECTION_READ_TIMEOUT);
conn.connect();
OutputStream out = conn.getOutputStream();
out.write(requestBytes);
out.flush();
InputStream in = conn.getInputStream();
ByteArrayOutputStream byteStream = new ByteArrayOutputStream(in.available());
int bytesRead;
byte[] buffer = new byte[1024];
while ((bytesRead = in.read(buffer)) != -1) {
byteStream.write(buffer, 0, bytesRead);
}
return byteStream.toByteArray();
}
private String truncateLogText(String logText, int maxLength) {
if (logText.length() <= maxLength) {
return logText;
@@ -431,22 +515,22 @@ public class SynchronizeWikiClient {
/**
* Wandelt eine JAXB-Bean in einen XML-Strom um.
*/
@NotNull
private String generateXml(@NotNull AbstractSyncXml xmlBean) throws ServiceException {
XmlGenerator xmlGenerator = new XmlGenerator(logger);
@NonNull
private String generateXml(@NonNull AbstractSyncXml xmlBean) throws ServiceException {
XmlGenerator xmlGenerator = new XmlGenerator();
return xmlGenerator.generate(xmlBean);
}
/**
* Wandelt einen XML-Strom in eine JAXB-Bean um.
*/
@NotNull
private <T extends AbstractSyncXml> T parseXml(@NotNull String xml, @NotNull Class<T> xmlBeanType) throws ServiceException {
@NonNull
private <T extends AbstractSyncXml> T parseXml(@NonNull String xml, @NonNull Class<T> xmlBeanType) throws ServiceException {
try {
XmlParser xmlParser = new XmlParser(logger);
return xmlParser.parse(xml, xmlBeanType);
} catch (ServiceException e) {
logger.write("Failed to parse XML for class " + xmlBeanType.getSimpleName() + ", try class ErrorResponseXml", e);
Log.d(TAG, "Failed to parse XML for class " + xmlBeanType.getSimpleName() + ", try class ErrorResponseXml", e);
// Versuche eine Fehlerantwort zu parsen
XmlParser xmlParser = new XmlParser(logger);
ErrorResponseXml errorResponseXml = xmlParser.parse(xml, ErrorResponseXml.class);
@@ -1,19 +1,18 @@
/*
* MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2025 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);
+5 -2
View File
@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical"
tools:context=".MainActivity">
@@ -16,13 +17,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 +52,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
@@ -2,6 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:fitsSystemWindows="true"
android:id="@+id/settings_layout">
</FrameLayout>
+5 -4
View File
@@ -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>
@@ -29,7 +28,9 @@
<string name="settings_status_server_connected">Am Server angemeldet</string>
<string name="settings_status_server_authorization_mission">Erfordert Berechtigung am Server</string>
<string name="settings_search_failed">Keinen Wikiserver gefunden!</string>
<string name="settings_synchronize_successful">%1$d Dateien erfolgreich synchronisiert</string>
<string name="settings_synchronize_not_necessary">Dateien sind bereits aktuell</string>
<string name="settings_synchronize_failed">Synchronisierung nicht möglich, bitte überprüfen Sie die Einstellungen und den Status!</string>
<string name="synchronize_successful">%1$d Dateien erfolgreich synchronisiert</string>
<string name="synchronize_not_necessary">Dateien sind bereits aktuell</string>
<string name="synchronize_session_not_valid">Keine Verbindung zum MoasdaWiki-Server vorhanden! Bitte überprüfe die Einstellungen und den Status!</string>
<string name="synchronize_session_not_authorized">Fehlende Berechtigung beim MoasdaWiki-Server! Bitte schalte den Zugang für die App beim Server frei!</string>
<string name="synchronize_failed">Synchronisierung nicht möglich, bitte überprüfe die Einstellungen und den Status!</string>
</resources>
+6 -5
View File
@@ -1,10 +1,9 @@
<resources>
<string name="app_name" translatable="false">MoasdaWiki App</string>
<string name="app_name" translatable="false">MoasdaWiki</string>
<string name="about_copyright">Copyright %1$d © Herbert Reiter</string>
<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>
@@ -30,7 +29,9 @@
<string name="settings_status_server_connected">Connected to server</string>
<string name="settings_status_server_authorization_mission">Needs authorization at server</string>
<string name="settings_search_failed">No Wiki server found!</string>
<string name="settings_synchronize_successful">Successfully synchronized %1$d files</string>
<string name="settings_synchronize_not_necessary">All files are up-to-date</string>
<string name="settings_synchronize_failed">Synchronization failed, please check settings and status!</string>
<string name="synchronize_successful">Successfully synchronized %1$d files</string>
<string name="synchronize_not_necessary">All files are up-to-date</string>
<string name="synchronize_session_not_valid">No connection to MoasdaWiki server available! Please check settings and status!</string>
<string name="synchronize_session_not_authorized">Connection to MoasdaWiki server not authorized! Please authorize at server side first!</string>
<string name="synchronize_failed">Synchronization failed, please check settings and status!</string>
</resources>
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<data-extraction-rules>
<cloud-backup>
<exclude domain="root" />
<exclude domain="file" />
<exclude domain="database" />
<exclude domain="sharedpref" />
<exclude domain="external" />
</cloud-backup>
<device-transfer>
<exclude domain="root" />
<exclude domain="file" />
<exclude domain="database" />
<exclude domain="sharedpref" />
<exclude domain="external" />
</device-transfer>
</data-extraction-rules>
+3 -3
View File
@@ -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:8.12.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -15,7 +15,7 @@ buildscript {
allprojects {
repositories {
jcenter()
mavenCentral()
google()
}
}
@@ -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
@@ -0,0 +1,2 @@
- Auch Wörter, die mit dem Suchtext beginnen, finden
- Auf moasdawiki-server 2.5.2 aktualisieren
@@ -0,0 +1,2 @@
- Documentation aktualisieren
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -0,0 +1 @@
- Lizenz GPL-3.0-only klarer herausstellen
@@ -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
@@ -0,0 +1,4 @@
- Kleine Layoutverbesserungen
- Auf moasdawiki-server 3.1.0 aktualisieren
- Unterstützung für Android 12
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -0,0 +1,2 @@
- Gradle-Version in moasdawiki-server und in der App aktualisieren um ein Build-Problem zu beheben
- Auf moasdawiki-server 3.2.1 aktualisieren
@@ -0,0 +1,2 @@
- Auf moasdawiki-server 3.4.4 aktualisieren
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -0,0 +1,2 @@
- Auf moasdawiki-server 3.4.5 aktualisieren
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -0,0 +1,2 @@
- Auf moasdawiki-server 3.5.0 aktualisieren
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -0,0 +1 @@
- App-Symbol im fastlane-Ordner hinzufügen
@@ -0,0 +1,2 @@
- Auf moasdawiki-server 3.5.1 aktualisieren
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -0,0 +1,3 @@
- Auf moasdawiki-server 3.6.0 aktualisieren
- Bibliotheks-Abhängigkeiten aktualisieren
- Copyright-Jahr aktualisieren
@@ -0,0 +1,2 @@
- Auf moasdawiki-server 3.6.1 aktualisieren
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -0,0 +1,2 @@
- Auf moasdawiki-server 3.6.2 aktualisieren
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -0,0 +1 @@
- Gradle-Problem beheben
@@ -0,0 +1,5 @@
- Anzahl Kalendereinträge auf 100 begrenzen, weil Android ein globales Limit von 500 Events hat
- Synchronisationsverbindungen zum Server im Fehlerfall wiederholen
- Auf moasdawiki-server 3.6.3 aktualisieren
- Bibliotheks-Abhängigkeiten aktualisieren
- Unterstützung von Android API 34 (Android 14)
@@ -0,0 +1 @@
- Gradle-Problem bei fdroid beheben
@@ -0,0 +1,3 @@
- Auf moasdawiki-server 3.7.1 aktualisieren
- Gradle-Upgrade auf 8.5
- Copyright-Jahr aktualisieren
@@ -0,0 +1 @@
- Upgrade to Gradle 8.7
@@ -0,0 +1,3 @@
- Auf moasdawiki-server 3.9.1 aktualisieren
- Gradle-Upgrade auf 8.10.2
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -0,0 +1,2 @@
- Anleitung für App-Synchronisierung ergänzen
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -0,0 +1,4 @@
- Auf moasdawiki-server 3.9.3 aktualisieren
- Gradle-Upgrade auf 8.12
- Bibliotheks-Abhängigkeiten aktualisieren
- Copyright-Jahr aktualisieren
@@ -0,0 +1,5 @@
- Auf moasdawiki-server 3.9.5 aktualisieren
- Android API 36 (Android 16) unterstützen
- Gradle-Upgrade auf 8.14.3
- Bibliotheks-Abhängigkeiten aktualisieren
- Warnung beheben
@@ -0,0 +1,5 @@
- Bugfix: Suchleiste nicht sichtbar auf neueren Androidversionen
- Appname gekürzt
- Minimalanforderung auf Android API to 33 (Android 13) erhöht
- Nullable-Annotation auf Android-Paket umstellen
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -1,22 +1,24 @@
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.
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.
10. Nun solltest du alle Inhalte des Servers auch in der App haben und die Wikiseite "Startseite-App" sehen.
3. Erlaube LAN-Zugriff auf den Server: Editiere die Datei config.txt im Repository und ändere die Einstellung authentication.onlylocalhost = false. Anschließend den Server neu starten.
4. Installiere die MoasdaWiki-App.
5. In der App kannst du einen Hinweis sehen, dass sie zunächst konfiguriert werden muss. Drücke auf den Hinweis.
6. Drücke auf "Hostname" und gib den Hostnamen oder IP-Adresse der Server-Instanz ein, z.B. 192.168.1.101. Drücke OK.
7. Im Statusbereich darunter solltest du nun "Erfordert Berechtigung am Server" sehen. Andernfalls prüfe erneut Hostname und Port.
8. Öffne auf der Serverseite die Wikiseite im Browser, klicke auf "Hilfe" und "Synchronisierung".
9. Du siehst eine Liste von Geräte und Synchronisierungs-Sitzungen. Überprüfe den Gerätenamen und klicke auf "Erlauben".
10. 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.
11. 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.
Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

@@ -1 +1 @@
App zum Synchronizieren der Inhalte vom MoasdaWiki-Server.
Datenschutzfreundliche Wissensverwaltung
@@ -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
@@ -0,0 +1,2 @@
- Find also words that start with the search string
- Update to moasdawiki-server 2.5.2
@@ -0,0 +1,2 @@
- Update documentation
- Update library dependencies
@@ -0,0 +1 @@
- Make GPL-3.0-only licensing more clear
@@ -0,0 +1,3 @@
- Remove double back key press to close the app
- Update to moasdawiki-server 2.6.1
- Upgrade library dependencies
@@ -0,0 +1,4 @@
- Small layout optimizations
- Update to moasdawiki-server 3.1.0
- Support for Android 12
- Upgrade library dependencies
@@ -0,0 +1,2 @@
- Update Gradle version in moasdawiki-server and in app to fix build issue
- Update to moasdawiki-server 3.2.1
@@ -0,0 +1,2 @@
- Update to moasdawiki-server 3.4.4
- Upgrade library dependencies
@@ -0,0 +1,2 @@
- Update to moasdawiki-server 3.4.5
- Upgrade library dependencies
@@ -0,0 +1,2 @@
- Update to moasdawiki-server 3.5.0
- Upgrade library dependencies
@@ -0,0 +1 @@
- Add app icon to fastlane folder
@@ -0,0 +1,2 @@
- Update to moasdawiki-server 3.5.1
- Upgrade library dependencies
@@ -0,0 +1,3 @@
- Update to moasdawiki-server 3.6.0
- Upgrade library dependencies
- Update copyright year
@@ -0,0 +1,2 @@
- Update to moasdawiki-server 3.6.1
- Upgrade library dependencies
@@ -0,0 +1,2 @@
- Update to moasdawiki-server 3.6.2
- Upgrade library dependencies
@@ -0,0 +1 @@
- Fix Gradle build issue
@@ -0,0 +1,5 @@
- Limit calendar import to 100 events as Android has a global limit of 500 events
- Retry failed server sync requests
- Update to moasdawiki-server 3.6.3
- Upgrade library dependencies
- Upgrade to Android API 34 (Android 14)
@@ -0,0 +1 @@
- Fix Gradle build issue in fdroid build
@@ -0,0 +1,3 @@
- Update to moasdawiki-server 3.7.1
- Upgrade to Gradle 8.5
- Update copyright year
@@ -0,0 +1 @@
- Upgrade to Gradle 8.7
@@ -0,0 +1,3 @@
- Update to moasdawiki-server 3.9.1
- Upgrade to Gradle 8.10.2
- Upgrade library dependencies
@@ -0,0 +1,2 @@
- Update App sync description
- Upgrade library dependencies
@@ -0,0 +1,4 @@
- Update to moasdawiki-server 3.9.3
- Upgrade to Gradle 8.12
- Upgrade library dependencies
- Update copyright year
@@ -0,0 +1,5 @@
- Update to moasdawiki-server 3.9.5
- Upgrade to Android API 36 (Android 16)
- Upgrade to Gradle 8.14.3
- Upgrade library dependencies
- Fix warning
@@ -0,0 +1,5 @@
- Bugfix: Searchbar not visible on newer Android versions
- Shortened app name
- Update minimum supported Android API to 33 (Android 13)
- Use Nullable annotations from Android package
- Upgrade library dependencies
@@ -1,22 +1,25 @@
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.
6. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
7. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
8. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
9. Back in the app press the back button (&larr;) on the upper left corner to get back to the main dialog. Now you can see a hint that the app has to be synchronized. Press on that hint.
10. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
3. Enable LAN access to the server: Edit the repository file config.txt and change the setting authentication.onlylocalhost = false. Restart the server afterwards.
4. Install the MoasdaWiki App.
5. In the app you can see a hint that it has to be configured first. Press on that hint.
6. Press on "Host name" and enter the host name or IP address of the server instance, e.g. 192.168.1.101. Press OK.
7. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
8. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
9. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
10. 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.
11. 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.
Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

@@ -1 +1 @@
App to synchronize data from MoasdaWiki Server.
Privacy-Friendly Knowledge Management App
+1 -20
View File
@@ -1,22 +1,3 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx3100M
org.gradle.warning.mode=all
Binary file not shown.
+4 -2
View File
@@ -1,6 +1,8 @@
#Sun Dec 27 12:01:31 CET 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
Vendored Regular → Executable
+195 -116
View File
@@ -1,78 +1,129 @@
#!/usr/bin/env sh
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#
##############################################################################
##
## Gradle start up script for UN*X
##
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
MAX_FD=maximum
warn () {
echo "$*"
}
} >&2
die () {
echo
echo "$*"
echo
exit 1
}
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD="$JAVA_HOME/bin/java"
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,92 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
JAVACMD=java
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"
Vendored
+44 -34
View File
@@ -1,4 +1,22 @@
@if "%DEBUG%" == "" @echo off
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -9,25 +27,29 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
@@ -35,48 +57,36 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal