qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GoogleDriveFileStorage: update libraries and reimplement authentication workflow to show consent screen (verification by Google now passed); migrate Java filestorage and filechooser projects to AndroidX; disable "app is blocked" message; see #1833

Browse Source
This commit is contained in:
Philipp Crocoll
2022-01-12 08:07:28 +01:00
parent 1442af3148
commit 309fd9f4d1
38 changed files with 306 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/JavaFileStorageTest-AS/app/build.gradle
View File

@@ -5,7 +5,7 @@ android {
buildToolsVersion '28.0.3'
defaultConfig {
applicationId "com.crocoapps.javafilestoragetest"
applicationId "com.crocoapps.javafilestoragetest2"
minSdkVersion 21
targetSdkVersion 28
versionCode 1

2
src/java/JavaFileStorageTest-AS/app/src/androidTest/java/com/crocoapps/javafilestoragetest/ApplicationTest.java → src/java/JavaFileStorageTest-AS/app/src/androidTest/java/com/crocoapps/javafilestoragetest2/ApplicationTest.java
View File

@@ -1,4 +1,4 @@
package com.crocoapps.javafilestoragetest;
package com.crocoapps.javafilestoragetest2;
import android.app.Application;
import android.test.ApplicationTestCase;

13
src/java/JavaFileStorageTest-AS/app/src/main/AndroidManifest.xml
View File

@@ -1,7 +1,7 @@
<?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="com.crocoapps.javafilestoragetest">
package="com.crocoapps.javafilestoragetest2">
<application
android:allowBackup="true"
@@ -9,7 +9,7 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<activity android:name="com.crocoapps.javafilestoragetest2.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -17,6 +17,9 @@
</intent-filter>
</activity>
<meta-data android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
<provider
android:name="keepass2android.kp2afilechooser.StorageFileProvider"
android:authorities="keepass2android.kp2afilechooser.StorageFileProvider"
@@ -24,13 +27,13 @@
<provider
android:name="group.pals.android.lib.ui.filechooser.providers.localfile.LocalFileProvider"
android:authorities="com.crocoapps.javafilestoragetest.android-filechooser.localfile"
android:authorities="com.crocoapps.javafilestoragetest2.android-filechooser.localfile"
android:exported="false" />
<provider
android:name="group.pals.android.lib.ui.filechooser.providers.history.HistoryProvider"
android:authorities="com.crocoapps.javafilestoragetest.android-filechooser.history"
android:authorities="com.crocoapps.javafilestoragetest2.android-filechooser.history"
android:exported="false" />
@@ -41,7 +44,7 @@
android:theme="@style/Afc.Theme.Light" />
<activity
android:name="com.crocoapps.javafilestoragetest.FileStorageSetupActivity"
android:name="com.crocoapps.javafilestoragetest2.FileStorageSetupActivity"
android:label="@string/title_activity_file_storage_setup" >
</activity>
<activity

2
src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest/FileStorageSetupActivity.java → src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/FileStorageSetupActivity.java
View File

@@ -1,4 +1,4 @@
package com.crocoapps.javafilestoragetest;
package com.crocoapps.javafilestoragetest2;
import keepass2android.javafilestorage.JavaFileStorage;
import android.os.Bundle;

13
src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest/MainActivity.java → src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/MainActivity.java
View File

@@ -1,4 +1,4 @@
package com.crocoapps.javafilestoragetest;
package com.crocoapps.javafilestoragetest2;
//
//import java.io.IOException;
@@ -145,10 +145,9 @@ import java.util.ArrayList;
import java.util.List;
//import keepass2android.javafilestorage.DropboxCloudRailStorage;
import keepass2android.javafilestorage.DropboxV2Storage;
import keepass2android.javafilestorage.GoogleDriveFileStorage;
import keepass2android.javafilestorage.JavaFileStorage;
import keepass2android.javafilestorage.JavaFileStorage.FileEntry;
import keepass2android.javafilestorage.PCloudFileStorage;
import keepass2android.javafilestorage.SftpStorage;
import keepass2android.javafilestorage.UserInteractionRequiredException;
import keepass2android.javafilestorage.WebDavStorage;
@@ -163,7 +162,7 @@ import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.support.annotation.RequiresApi;
import androidx.annotation.RequiresApi;
import android.util.Log;
import android.view.Menu;
import android.view.View;
@@ -218,7 +217,7 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
String filename = path+"file.text";*/
fs.uploadFile(filename2,textToUpload2.getBytes(),true);
FileEntry e1 = fs.getFileEntry(parentPath);
// FileEntry e1 = fs.getFileEntry(parentPath);
FileEntry e2 = fs.getFileEntry(path);
boolean receivedFileNotFoundException;
@@ -544,7 +543,7 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
//storageToTest = new SkyDriveFileStorage("000000004010C234", appContext);
//storageToTest = new GoogleDriveFileStorage();
storageToTest = new GoogleDriveFileStorage();
/*storageToTest = new WebDavStorage(new ICertificateErrorHandler() {
@Override
public boolean onValidationError(String error) {
@@ -557,7 +556,7 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
}
});*/
storageToTest = new DropboxV2Storage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", !simulateRestart);
//storageToTest = new DropboxV2Storage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", !simulateRestart);
//storageToTest = new DropboxFileStorage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", !simulateRestart);
//storageToTest = new DropboxAppFolderFileStorage(ctx,"ax0268uydp1ya57", "3s86datjhkihwyc", true);

2
src/java/JavaFileStorageTest-AS/app/src/main/java/keepass2android/kp2afilechooser/StorageFileProvider.java
View File

@@ -2,7 +2,7 @@ package keepass2android.kp2afilechooser;
import java.util.List;
import com.crocoapps.javafilestoragetest.MainActivity;
import com.crocoapps.javafilestoragetest2.MainActivity;
public class StorageFileProvider extends Kp2aFileProvider {

4
src/java/JavaFileStorageTest-AS/gradle.properties
View File

@@ -17,4 +17,6 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2048m
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx2048m