From e12d11264efa90d52efbb3118ac48ded53616fdc Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Tue, 18 Mar 2025 16:32:55 +0100 Subject: [PATCH 1/3] switch to testing Google Drive --- .../FileStorageSetupActivity.java | 11 +++++++++++ .../crocoapps/javafilestoragetest2/MainActivity.java | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/FileStorageSetupActivity.java b/src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/FileStorageSetupActivity.java index d277a9ad..96574514 100644 --- a/src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/FileStorageSetupActivity.java +++ b/src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/FileStorageSetupActivity.java @@ -113,4 +113,15 @@ extends Activity implements JavaFileStorage.FileStorageSetupActivity { return state; } + + @Override + public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + MainActivity.storageToTest.onRequestPermissionsResult(this, requestCode, permissions, grantResults); + + + + } + + } diff --git a/src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/MainActivity.java b/src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/MainActivity.java index 2ed8958d..1c81a604 100644 --- a/src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/MainActivity.java +++ b/src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/MainActivity.java @@ -147,6 +147,7 @@ import java.util.List; //import keepass2android.javafilestorage.DropboxCloudRailStorage; import keepass2android.javafilestorage.DropboxV2Storage; import keepass2android.javafilestorage.GoogleDriveAppDataFileStorage; +import keepass2android.javafilestorage.GoogleDriveFullFileStorage; import keepass2android.javafilestorage.ICertificateErrorHandler; import keepass2android.javafilestorage.JavaFileStorage; import keepass2android.javafilestorage.JavaFileStorage.FileEntry; @@ -547,7 +548,7 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag //storageToTest = new GoogleDriveAppDataFileStorage(); - storageToTest = new WebDavStorage(new ICertificateErrorHandler() { + /*storageToTest = new WebDavStorage(new ICertificateErrorHandler() { @Override public boolean onValidationError(String error) { return false; @@ -558,10 +559,11 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag return false; } }); - +*/ //storageToTest = new DropboxV2Storage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", !simulateRestart); //storageToTest = new DropboxFileStorage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", !simulateRestart); //storageToTest = new DropboxAppFolderFileStorage(ctx,"ax0268uydp1ya57", "3s86datjhkihwyc", true); + storageToTest = new GoogleDriveFullFileStorage(); return storageToTest; @@ -580,6 +582,8 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag getMenuInflater().inflate(R.menu.main, menu); return true; } + + @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { From 861615b7a4307d898a2b0b29d2dd0b52b1705cb9 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Tue, 18 Mar 2025 16:34:31 +0100 Subject: [PATCH 2/3] update AndroidX packages and add missing dependencies to Guava and PlayServices.Auth. --- .../keepass2android-app.csproj | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/keepass2android-app/keepass2android-app.csproj b/src/keepass2android-app/keepass2android-app.csproj index 543812e3..6ea6d37c 100644 --- a/src/keepass2android-app/keepass2android-app.csproj +++ b/src/keepass2android-app/keepass2android-app.csproj @@ -733,18 +733,20 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + From 1157716c9c3aff4d7f3178a12f97f82d814e0107 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Tue, 18 Mar 2025 16:35:58 +0100 Subject: [PATCH 3/3] manifest for 1.12-r3 --- src/keepass2android-app/Manifests/AndroidManifest_net.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/keepass2android-app/Manifests/AndroidManifest_net.xml b/src/keepass2android-app/Manifests/AndroidManifest_net.xml index 4c66a71b..7ad26ee0 100644 --- a/src/keepass2android-app/Manifests/AndroidManifest_net.xml +++ b/src/keepass2android-app/Manifests/AndroidManifest_net.xml @@ -1,7 +1,7 @@