Merge branch 'anttiharju/master' into update-libs-and-tools

.github/workflows/build.yml

@@ -10,16 +10,15 @@ jobs:
   #   runs-on: macos-12
 
   #   steps:
-  #   - uses: actions/checkout@v3
-
-  #   - name: Fetch submodules
-  #     run: git submodule init && git submodule update
+  #   - uses: actions/checkout@v4
+  #     with:
+  #       submodules: true
 
   #   - name: Setup Gradle
-  #     uses: gradle/gradle-build-action@v2
+  #     uses: gradle/actions/setup-gradle@v3
 
   #   - name: Cache NuGet packages
-  #     uses: actions/cache@v3
+  #     uses: actions/cache@v4
   #     with:
   #       path: ~/.nuget/packages
   #       key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
@@ -52,7 +51,7 @@ jobs:
   #       # $VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.2
 
   #   - name: Switch to JDK-11
-  #     uses: actions/setup-java@v3
+  #     uses: actions/setup-java@v4
   #     with:
   #       java-version: '11'
   #       distribution: 'temurin'
@@ -82,7 +81,7 @@ jobs:
   #       make apk Flavor=Net
 
   #   - name: Archive production artifacts (net)
-  #     uses: actions/upload-artifact@v3
+  #     uses: actions/upload-artifact@v4
   #     with:
   #       name: signed APK ('net' built on ${{ github.job }})
   #       path: |
@@ -100,7 +99,7 @@ jobs:
   #       make apk Flavor=NoNet
 
   #   - name: Archive production artifacts (nonet)
-  #     uses: actions/upload-artifact@v3
+  #     uses: actions/upload-artifact@v4
   #     with:
   #       name: signed APK ('nonet' built on ${{ github.job }})
   #       path: |
@@ -130,16 +129,15 @@ jobs:
   #       # Build Artifact of xamarin.android-oss dated 2022-02-16, master branch (= version 12.2.99)
   #       xamarin_url: https://artprodcus3.artifacts.visualstudio.com/Ad0adf05a-e7d7-4b65-96fe-3f3884d42038/6fd3d886-57a5-4e31-8db7-52a1b47c07a8/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL3hhbWFyaW4vcHJvamVjdElkLzZmZDNkODg2LTU3YTUtNGUzMS04ZGI3LTUyYTFiNDdjMDdhOC9idWlsZElkLzU0OTUzL2FydGlmYWN0TmFtZS9pbnN0YWxsZXJzLXVuc2lnbmVkKy0rTGludXg1/content?format=zip
   #   steps:
-  #   - uses: actions/checkout@v3
-
-  #   - name: Fetch submodules
-  #     run: git submodule init && git submodule update
+  #   - uses: actions/checkout@v4
+  #     with:
+  #       submodules: true
 
   #   - name: Setup Gradle
-  #     uses: gradle/gradle-build-action@v2
+  #     uses: gradle/actions/setup-gradle@v3
 
   #   - name: Cache NuGet packages
-  #     uses: actions/cache@v3
+  #     uses: actions/cache@v4
   #     with:
   #       path: ~/.nuget/packages
   #       key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
@@ -148,7 +146,7 @@ jobs:
 
   #   - name: Cache Xamarin.Android packages
   #     id: xamarin_cache
-  #     uses: actions/cache@v3
+  #     uses: actions/cache@v4
   #     with:
   #       path: ~/xamarin.android-oss
   #       key: ${{ runner.os }}-xamarin.android-oss-${{ env.xamarin_url }}
@@ -183,7 +181,7 @@ jobs:
   #       echo "$HOME/xamarin.android-oss/bin/Release/bin" >> $GITHUB_PATH
 
   #   - name: Switch to JDK-11
-  #     uses: actions/setup-java@v3
+  #     uses: actions/setup-java@v4
   #     with:
   #       java-version: '11'
   #       distribution: 'temurin'
@@ -217,7 +215,7 @@ jobs:
   #       make apk Flavor=Net
 
   #   - name: Archive production artifacts (net)
-  #     uses: actions/upload-artifact@v3
+  #     uses: actions/upload-artifact@v4
   #     with:
   #       name: signed APK ('net' built on ${{ github.job }})
   #       path: |
@@ -235,7 +233,7 @@ jobs:
   #       make apk Flavor=NoNet
 
   #   - name: Archive production artifacts (nonet)
-  #     uses: actions/upload-artifact@v3
+  #     uses: actions/upload-artifact@v4
   #     with:
   #       name: signed APK ('nonet' built on ${{ github.job }})
   #       path: |
@@ -254,37 +252,36 @@ jobs:
     runs-on: windows-2022
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
 
     - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/actions/setup-gradle@v3
 
     - name: Cache NuGet packages
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.nuget/packages
         key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
         restore-keys: |
           ${{ runner.os }}-nuget-
 
-    - name: Fetch submodules
-      run: git submodule init && git submodule update
-
     # Workaround an issue when building on windows-2022. Error was
     #       D8 : OpenJDK 64-Bit Server VM warning : INFO: os::commit_memory(0x00000000ae400000, 330301440, 0) failed; error='The paging file is too small for this operation to complete' (DOS error/errno=1455) [D:\a\keepass2android\keepass2android\src\keepass2android\keepass2android-app.csproj]
     #       C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Xamarin\Android\Xamarin.Android.D8.targets(81,5): error MSB6006: "java.exe" exited with code 1. [D:\a\keepass2android\keepass2android\src\keepass2android\keepass2android-app.csproj]
     - name: Configure Pagefile
-      uses: al-cheb/configure-pagefile-action@v1.3
+      uses: al-cheb/configure-pagefile-action@a3b6ebd6b634da88790d9c58d4b37a7f4a7b8708 # v1.4
       with:
         minimum-size: 8GB
 
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.1
+      uses: microsoft/setup-msbuild@v2
       # If we want to also have nmake, use this instead
       #uses: ilammy/msvc-dev-cmd@v1
 
     - name: Switch to JDK-11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '11'
         distribution: 'temurin'
@@ -320,7 +317,7 @@ jobs:
         make apk Flavor=Net
 
     - name: Archive production artifacts (net)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: signed APK ('net' built on ${{ github.job }})
         path: |
@@ -341,7 +338,7 @@ jobs:
         make apk Flavor=NoNet
 
     - name: Archive production artifacts (nonet)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: signed APK ('nonet' built on ${{ github.job }})
         path: |

src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/MainActivity.java

@@ -145,7 +145,9 @@
 import java.util.List;
 
 //import keepass2android.javafilestorage.DropboxCloudRailStorage;
+import keepass2android.javafilestorage.DropboxV2Storage;
 import keepass2android.javafilestorage.GoogleDriveAppDataFileStorage;
+import keepass2android.javafilestorage.ICertificateErrorHandler;
 import keepass2android.javafilestorage.JavaFileStorage;
 import keepass2android.javafilestorage.JavaFileStorage.FileEntry;
 import keepass2android.javafilestorage.PCloudFileStorage;
@@ -347,7 +349,7 @@ protected Void doInBackground(Object... params) {
 				fileList = fs.listFiles(path);
 				checkFileList(path, fileList, false, true); //second param indicates the file must be gone
 
-				Log.d("KP2AJ", "Delete a folder recursive");
+				Log.d("KP2AJ", "xDelete a folder recursive: " + subfolderPath);
 				fs.delete(subfolderPath);
 
 				Log.d("KP2AJ", "List files again to check if deleting the folder was successful:");
@@ -540,12 +542,12 @@ public void run() {
 
 	static JavaFileStorage createStorageToTest(Context ctx, Context appContext, boolean simulateRestart) {
 		//storageToTest = new SftpStorage(ctx.getApplicationContext());
-		storageToTest = new PCloudFileStorage(ctx, "FLm22de7bdS", "pcloud", "pcloudtest");
+		//storageToTest = new PCloudFileStorage(ctx, "FLm22de7bdS", "pcloud", "pcloudtest");
 		//storageToTest = new SkyDriveFileStorage("000000004010C234", appContext);
 
 
 		//storageToTest = new GoogleDriveAppDataFileStorage();
-		/*storageToTest = new WebDavStorage(new ICertificateErrorHandler() {
+		storageToTest = new WebDavStorage(new ICertificateErrorHandler() {
 			@Override
 			public boolean onValidationError(String error) {
 				return false;
@@ -555,7 +557,7 @@ public boolean onValidationError(String error) {
 			public boolean alwaysFailOnValidationError() {
 				return false;
 			}
-		});*/
+		});
 
 		//storageToTest =  new DropboxV2Storage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", !simulateRestart);
 		//storageToTest =  new DropboxFileStorage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", !simulateRestart);

src/java/JavaFileStorageTest-AS/app/src/main/res/layout/webdav_credentials.xml

@@ -15,15 +15,15 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:inputType="textNoSuggestions"
-            android:text="https://daigers.diskstation.me:5006/Keepass2Android/Apps/Keepass2Android/"
+            android:text="https://webdav.hidrive.ionos.com/users/philippcro"
             android:hint="Server URL" />
        </LinearLayout>
     <EditText
         android:id="@+id/user"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:singleLine="true"
-        android:text="Keepass"
+        android:text="PhilippCro"
         android:hint="@string/hint_username" />
 
     <EditText
@@ -32,7 +32,7 @@
         android:layout_height="wrap_content"
         android:inputType="textPassword"
         android:singleLine="true"
-        android:text="$T3st17$"
+        android:text="WSBa1wh4o4YyLK"
         android:hint="@string/hint_pass"
         android:importantForAccessibility="no" />