Android 3.5.6

Trying to fix #13992

This reverts commit 5be124b54a.

.gitignore

@@ -1,6 +1,7 @@
 _mydocs
 _releases
 _vieux/
+.claude
 !/var/cache
 !/var/logs
 !/var/sessions

packages/app-cli/jest.config.js

@@ -26,7 +26,16 @@
 
 module.exports = {
 	testMatch: [
-		'**/tests/**/*.js',
+		'**/tests/HtmlToHtml.js',
+		'**/tests/HtmlToMd.js',
+		'**/tests/MarkupToHtml.js',
+		'**/tests/MdToHtml.js',
+		'**/tests/feature_NoteHistory.js',
+		'**/tests/feature_NoteList.js',
+		'**/tests/feature_ShowAllNotes.js',
+		'**/tests/feature_TagList.js',
+
+		'**/tests/services/**/*.js',
 		'**/*.test.js',
 	],
 

packages/app-cli/package.json

@@ -7,7 +7,7 @@
   "scripts": {
     "test": "jest --verbose=false --config=jest.config.js --bail --forceExit",
     "test-one": "jest --verbose=false --config=jest.config.js --bail --forceExit",
-    "test-ci": "jest --config=jest.config.js --forceExit",
+    "test-ci": "jest --config=jest.config.js --forceExit --testPathIgnorePatterns=cli-integration-tests.test",
     "build": "gulp build",
     "start": "gulp build -L && node \"build/main.js\" --stack-trace-enabled --log-level debug --env dev",
     "start-no-build": "node \"build/main.js\" --stack-trace-enabled --log-level debug --env dev",

packages/app-mobile/android/app/build.gradle

@@ -89,8 +89,8 @@ android {
         applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097785
-		versionName "3.5.5"
+		versionCode 2097786
+		versionName "3.5.6"
         ndk {
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }

packages/app-mobile/package.json

@@ -16,7 +16,7 @@
     "clean": "node tools/clean.js",
     "buildInjectedJs": "gulp buildInjectedJs",
     "test": "jest",
-    "test-ci": "yarn test",
+    "test-ci": "node tools/runTestsConditionally.js",
     "watchInjectedJs": "gulp watchInjectedJs",
     "postinstall": "jetify"
   },

packages/app-mobile/tools/runTestsConditionally.js

@@ -0,0 +1,13 @@
+const { execSync } = require('child_process');
+
+if (process.env.RUNNER_OS === 'macOS') {
+	console.info('Skipping app-mobile tests on macOS');
+	process.exit(0);
+}
+
+try {
+	execSync('yarn test', { stdio: 'inherit' });
+} catch (error) {
+	console.error(error);
+	process.exit(1);
+}

packages/lib/WebDavApi.js

@@ -369,7 +369,7 @@ class WebDavApi {
 		// The "solution", an ugly one, is to send a purposely invalid string as eTag, which will bypass the If-None-Match check  - Seafile
 		// finds out that no resource has this ID and simply sends the requested data.
 		// Also add a random value to make sure the eTag is unique for each call.
-		if (['GET', 'HEAD'].indexOf(method) < 0) headers['If-None-Match'] = `"JoplinIgnore-${Math.floor(Math.random() * 100000)}"`;
+		if (['GET', 'HEAD'].indexOf(method) < 0) headers['If-None-Match'] = `JoplinIgnore-${Math.floor(Math.random() * 100000)}`;
 		if (!headers['User-Agent']) headers['User-Agent'] = 'Joplin/1.0';
 
 		const fetchOptions = {};

packages/tools/postPreReleasesToForum.json

@@ -189,6 +189,7 @@
 		"ios-v13.5.1": true,
 		"v3.5.9": true,
 		"android-v3.5.3": true,
-		"android-v3.5.4": true
+		"android-v3.5.4": true,
+		"android-v3.5.5": true
 	}
 }

readme/about/changelog/android.md

@@ -1,5 +1,9 @@
 # Joplin Android Changelog
 
+## [android-v3.5.6](https://github.com/laurent22/joplin/releases/tag/android-v3.5.6) (Pre-release) - 2025-12-27T20:34:44Z
+
+- Revert "All: Apache Tomcat WebDAV compatibility for sync (#13614)"
+
 ## [android-v3.5.5](https://github.com/laurent22/joplin/releases/tag/android-v3.5.5) (Pre-release) - 2025-12-26T10:53:20Z
 
 - Improved: Update js-draw to v1.33.0 (#13990 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))