diff --git a/src/JavaFileStorageBindings/Jars/dropbox-core-sdk-4.0.0.jar b/src/JavaFileStorageBindings/Jars/dropbox-core-sdk-5.4.6.jar similarity index 50% rename from src/JavaFileStorageBindings/Jars/dropbox-core-sdk-4.0.0.jar rename to src/JavaFileStorageBindings/Jars/dropbox-core-sdk-5.4.6.jar index e8376c42..9004a26d 100644 Binary files a/src/JavaFileStorageBindings/Jars/dropbox-core-sdk-4.0.0.jar and b/src/JavaFileStorageBindings/Jars/dropbox-core-sdk-5.4.6.jar differ diff --git a/src/JavaFileStorageBindings/Jars/jackson-core-2.13.5.jar b/src/JavaFileStorageBindings/Jars/jackson-core-2.13.5.jar new file mode 100644 index 00000000..401dee31 Binary files /dev/null and b/src/JavaFileStorageBindings/Jars/jackson-core-2.13.5.jar differ diff --git a/src/JavaFileStorageBindings/Jars/jackson-core-2.7.4.jar b/src/JavaFileStorageBindings/Jars/jackson-core-2.7.4.jar deleted file mode 100644 index 2e70b2ed..00000000 Binary files a/src/JavaFileStorageBindings/Jars/jackson-core-2.7.4.jar and /dev/null differ diff --git a/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6.aar b/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6.aar deleted file mode 100644 index c15fe3e7..00000000 Binary files a/src/JavaFileStorageBindings/Jars/msa-auth-0.8.6.aar and /dev/null differ diff --git a/src/JavaFileStorageBindings/Jars/okhttp-4.10.0-RC1.jar b/src/JavaFileStorageBindings/Jars/okhttp-4.10.0-RC1.jar deleted file mode 100644 index 48ef9da8..00000000 Binary files a/src/JavaFileStorageBindings/Jars/okhttp-4.10.0-RC1.jar and /dev/null differ diff --git a/src/JavaFileStorageBindings/Jars/okhttp-4.12.0.jar b/src/JavaFileStorageBindings/Jars/okhttp-4.12.0.jar new file mode 100644 index 00000000..faf3fa86 Binary files /dev/null and b/src/JavaFileStorageBindings/Jars/okhttp-4.12.0.jar differ diff --git a/src/JavaFileStorageBindings/Jars/okhttp-digest-2.5.jar b/src/JavaFileStorageBindings/Jars/okhttp-digest-2.5.jar deleted file mode 100644 index ba18ed81..00000000 Binary files a/src/JavaFileStorageBindings/Jars/okhttp-digest-2.5.jar and /dev/null differ diff --git a/src/JavaFileStorageBindings/Jars/okhttp-digest-3.1.0.jar b/src/JavaFileStorageBindings/Jars/okhttp-digest-3.1.0.jar new file mode 100644 index 00000000..af2c08ae Binary files /dev/null and b/src/JavaFileStorageBindings/Jars/okhttp-digest-3.1.0.jar differ diff --git a/src/JavaFileStorageBindings/Jars/okio-2.9.0.jar b/src/JavaFileStorageBindings/Jars/okio-2.9.0.jar deleted file mode 100644 index fe3b0403..00000000 Binary files a/src/JavaFileStorageBindings/Jars/okio-2.9.0.jar and /dev/null differ diff --git a/src/JavaFileStorageBindings/Jars/okio-3.6.0.jar b/src/JavaFileStorageBindings/Jars/okio-3.6.0.jar new file mode 100644 index 00000000..f3137562 Binary files /dev/null and b/src/JavaFileStorageBindings/Jars/okio-3.6.0.jar differ diff --git a/src/JavaFileStorageBindings/Jars/okio-jvm-3.6.0.jar b/src/JavaFileStorageBindings/Jars/okio-jvm-3.6.0.jar new file mode 100644 index 00000000..ec8ad90f Binary files /dev/null and b/src/JavaFileStorageBindings/Jars/okio-jvm-3.6.0.jar differ diff --git a/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2.aar b/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2.aar deleted file mode 100644 index db0ac519..00000000 Binary files a/src/JavaFileStorageBindings/Jars/onedrive-sdk-android-1.2.2.aar and /dev/null differ diff --git a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj index 5f98fd1f..4aa00a81 100644 --- a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj +++ b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj @@ -183,6 +183,7 @@ Jars\JavaFileStorage-debug.aar + @@ -236,21 +237,6 @@ - - - - - - - - - - - - - - - @@ -284,7 +270,18 @@ - + + + + + + + + + + + + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". diff --git a/src/JavaFileStorageBindings/app.config b/src/JavaFileStorageBindings/app.config new file mode 100644 index 00000000..5b9d6904 --- /dev/null +++ b/src/JavaFileStorageBindings/app.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/KeePass.sln b/src/KeePass.sln index bcd542c4..7eade212 100644 --- a/src/KeePass.sln +++ b/src/KeePass.sln @@ -27,7 +27,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "keepass2android-app", "keep EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kp2aAutofillParser", "Kp2aAutofillParser\Kp2aAutofillParser.csproj", "{39B12571-BAFE-4D3A-AEE2-4D74F14DFD96}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kp2aAutofillParserTest", "Kp2aAutofillParserTest\Kp2aAutofillParserTest.csproj", "{3D1560FF-86BB-4CB4-8367-80BA13B81C38}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kp2aAutofillParserTest", "Kp2aAutofillParserTest\Kp2aAutofillParserTest.csproj", "{3D1560FF-86BB-4CB4-8367-80BA13B81C38}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/java/JavaFileStorage/app/build.gradle b/src/java/JavaFileStorage/app/build.gradle index 41dbd3e1..939b6edd 100644 --- a/src/java/JavaFileStorage/app/build.gradle +++ b/src/java/JavaFileStorage/app/build.gradle @@ -33,15 +33,15 @@ NOTE: If you change dependencies here, don't forget to update the jar files in J dependencies { - implementation 'com.squareup.okhttp3:okhttp:4.10.0-RC1' - implementation 'io.github.rburgst:okhttp-digest:2.5' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'io.github.rburgst:okhttp-digest:3.1.0' implementation 'com.google.http-client:google-http-client-gson:1.20.0' implementation('com.google.api-client:google-api-client-android:1.30.5') { exclude group: 'com.google.android.google-play-services' } implementation 'com.google.apis:google-api-services-drive:v2-rev102-1.16.0-rc' - implementation 'com.dropbox.core:dropbox-core-sdk:4.0.0' + implementation 'com.dropbox.core:dropbox-core-sdk:5.4.6' implementation 'com.google.api-client:google-api-client:1.30.5' implementation 'com.google.api-client:google-api-client-android:1.30.5' diff --git a/src/keepass2android/services/AutofillBase/ChooseForAutofillActivityBase.cs b/src/keepass2android/services/AutofillBase/ChooseForAutofillActivityBase.cs index 133ffaa9..ab9dea41 100644 --- a/src/keepass2android/services/AutofillBase/ChooseForAutofillActivityBase.cs +++ b/src/keepass2android/services/AutofillBase/ChooseForAutofillActivityBase.cs @@ -13,9 +13,6 @@ using keepass2android.services.AutofillBase.model; using System.Linq; using Android.Content.PM; using Kp2aAutofillParser; -#if !NoNet -using Com.Dropbox.Core.V2.Teamlog; -#endif using AlertDialog = Android.App.AlertDialog; namespace keepass2android.services.AutofillBase