Compare commits
4 Commits
feature/de
...
v1.12-r3
Author | SHA1 | Date | |
---|---|---|---|
![]() |
a9fed1c203 | ||
![]() |
1157716c9c | ||
![]() |
861615b7a4 | ||
![]() |
e12d11264e |
@@ -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);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@@ -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) {
|
||||
|
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:versionCode="203"
|
||||
android:versionName="1.12-r2"
|
||||
android:versionCode="204"
|
||||
android:versionName="1.12-r3"
|
||||
package="keepass2android.keepass2android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:installLocation="auto">
|
||||
|
@@ -733,18 +733,20 @@
|
||||
<AndroidNativeLibrary Include="..\java\argon2\libs\armeabi-v7a\libargon2.so" Link="armeabi-v7a\libargon2.so" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.7.0.3" />
|
||||
<PackageReference Include="Xamarin.AndroidX.AppCompat.AppCompatResources" Version="1.7.0.3" />
|
||||
<PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.28" />
|
||||
<PackageReference Include="Xamarin.AndroidX.Biometric" Version="1.1.0.25" />
|
||||
<PackageReference Include="Xamarin.AndroidX.CoordinatorLayout" Version="1.2.0.17" />
|
||||
<PackageReference Include="Xamarin.AndroidX.CursorAdapter" Version="1.0.0.29" />
|
||||
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Common" Version="2.8.5.1" />
|
||||
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" Version="2.8.5.1" />
|
||||
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.2.1.10" />
|
||||
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.3" />
|
||||
<PackageReference Include="Xamarin.GooglePlayServices.Base" Version="118.5.0.2" />
|
||||
<PackageReference Include="Xamarin.GooglePlayServices.Code.Scanner" Version="116.1.0.3" />
|
||||
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.7.0.5" />
|
||||
<PackageReference Include="Xamarin.AndroidX.AppCompat.AppCompatResources" Version="1.7.0.5" />
|
||||
<PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.30" />
|
||||
<PackageReference Include="Xamarin.AndroidX.Biometric" Version="1.1.0.27" />
|
||||
<PackageReference Include="Xamarin.AndroidX.CoordinatorLayout" Version="1.3.0" />
|
||||
<PackageReference Include="Xamarin.AndroidX.CursorAdapter" Version="1.0.0.31" />
|
||||
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Common" Version="2.8.7.2" />
|
||||
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" Version="2.8.7.2" />
|
||||
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.2.1.12" />
|
||||
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
|
||||
<PackageReference Include="Xamarin.Google.Guava" Version="33.4.0.1" />
|
||||
<PackageReference Include="Xamarin.GooglePlayServices.Auth" Version="121.3.0.1" />
|
||||
<PackageReference Include="Xamarin.GooglePlayServices.Base" Version="118.5.0.4" />
|
||||
<PackageReference Include="Xamarin.GooglePlayServices.Code.Scanner" Version="116.1.0.10" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\AndroidFileChooserBinding\AndroidFileChooserBinding.csproj" />
|
||||
|
Reference in New Issue
Block a user