diff --git a/src/JavaFileStorageBindings/Jars/dropbox-core-sdk-3.0.3.jar b/src/JavaFileStorageBindings/Jars/dropbox-core-sdk-3.0.3.jar deleted file mode 100644 index 68d66fa4..00000000 Binary files a/src/JavaFileStorageBindings/Jars/dropbox-core-sdk-3.0.3.jar and /dev/null differ diff --git a/src/JavaFileStorageBindings/Jars/dropbox-core-sdk-3.1.1.jar b/src/JavaFileStorageBindings/Jars/dropbox-core-sdk-3.1.1.jar new file mode 100644 index 00000000..160d750f Binary files /dev/null and b/src/JavaFileStorageBindings/Jars/dropbox-core-sdk-3.1.1.jar differ diff --git a/src/JavaFileStorageBindings/Jars/gson-2.3.1.jar b/src/JavaFileStorageBindings/Jars/gson-2.3.1.jar deleted file mode 100644 index 250132c1..00000000 Binary files a/src/JavaFileStorageBindings/Jars/gson-2.3.1.jar and /dev/null differ diff --git a/src/JavaFileStorageBindings/Jars/gson-2.8.1.jar b/src/JavaFileStorageBindings/Jars/gson-2.8.1.jar new file mode 100644 index 00000000..5222355a Binary files /dev/null and b/src/JavaFileStorageBindings/Jars/gson-2.8.1.jar differ diff --git a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj index bc0e6833..3474aa6e 100644 --- a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj +++ b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj @@ -12,6 +12,7 @@ 512 false v8.0 + class-parse true @@ -86,9 +87,6 @@ - - - @@ -143,13 +141,16 @@ - - - + + + + + + \ No newline at end of file diff --git a/src/java/JavaFileStorage/app/build.gradle b/src/java/JavaFileStorage/app/build.gradle index cbb8cbcf..13208c38 100644 --- a/src/java/JavaFileStorage/app/build.gradle +++ b/src/java/JavaFileStorage/app/build.gradle @@ -21,6 +21,10 @@ android { } } +/* +NOTE: If you change dependencies here, don't forget to update the jar files in JavaFileStorageBindings as well! + */ + dependencies { compile 'com.squareup.okhttp3:okhttp:3.9.0' compile 'com.burgstaller:okhttp-digest:1.7' diff --git a/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/OneDriveStorage2.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/OneDriveStorage2.java index 398318f6..5fa64f96 100644 --- a/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/OneDriveStorage2.java +++ b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/OneDriveStorage2.java @@ -50,7 +50,7 @@ public class OneDriveStorage2 extends JavaFileStorageBase private static final String[] scopes = {"openid","offline_access", "https://graph.microsoft.com/Files.ReadWrite","https://graph.microsoft.com/User.Read"}; - public OneDriveStorage2(final Activity context, final String clientId) { + public OneDriveStorage2(final Context context, final String clientId) { mPublicClientApp = new PublicClientApplication(context, clientId); diff --git a/src/java/JavaFileStorage/libs/dropbox-android-sdk-1.6.2.jar b/src/java/JavaFileStorage/libs/dropbox-android-sdk-1.6.2.jar deleted file mode 100644 index 997663e8..00000000 Binary files a/src/java/JavaFileStorage/libs/dropbox-android-sdk-1.6.2.jar and /dev/null differ diff --git a/src/keepass2android/Properties/AndroidManifest_debug.xml b/src/keepass2android/Properties/AndroidManifest_debug.xml index f968d69a..96ea77be 100644 --- a/src/keepass2android/Properties/AndroidManifest_debug.xml +++ b/src/keepass2android/Properties/AndroidManifest_debug.xml @@ -8,6 +8,10 @@ android:roundIcon="@mipmap/ic_launcher_online_round" android:networkSecurityConfig="@xml/network_security_config" > + + diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml index aa31b78c..ff30bf7b 100644 --- a/src/keepass2android/Properties/AndroidManifest_net.xml +++ b/src/keepass2android/Properties/AndroidManifest_net.xml @@ -14,6 +14,11 @@ android:networkSecurityConfig="@xml/network_security_config" > + + + diff --git a/src/keepass2android/Properties/AndroidManifest_nonet.xml b/src/keepass2android/Properties/AndroidManifest_nonet.xml index ee2792f6..ceeb5006 100644 --- a/src/keepass2android/Properties/AndroidManifest_nonet.xml +++ b/src/keepass2android/Properties/AndroidManifest_nonet.xml @@ -12,6 +12,10 @@ android:icon="@mipmap/ic_launcher_offline" android:networkSecurityConfig="@xml/network_security_config" > + + diff --git a/src/keepass2android/app/App.cs b/src/keepass2android/app/App.cs index 47a14eab..b3d6800d 100644 --- a/src/keepass2android/app/App.cs +++ b/src/keepass2android/app/App.cs @@ -688,12 +688,12 @@ namespace keepass2android new DropboxAppFolderFileStorage(Application.Context, this), new GoogleDriveFileStorage(Application.Context, this), new OneDriveFileStorage(Application.Context, this), - new SftpFileStorage(Application.Context, this), + new SftpFileStorage(Application.Context, this), new NetFtpFileStorage(Application.Context, this), new WebDavFileStorage(this), new PCloudFileStorage(Application.Context, this), //new LegacyWebDavStorage(this), - //new LegacyFtpStorage(this), + //new LegacyFtpStorage(this), #endif #endif new LocalFileStorage(this) diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj index d60bdafe..de34ab48 100644 --- a/src/keepass2android/keepass2android.csproj +++ b/src/keepass2android/keepass2android.csproj @@ -16,7 +16,7 @@ keepass2android OnLoad Properties\AndroidManifest.xml - v8.0 + v9.0 1G false @@ -44,11 +44,12 @@ false SdkOnly false - False - false + false + true true false false + 2G full @@ -1926,6 +1927,12 @@ + + + + + + diff --git a/src/netftpandroid b/src/netftpandroid index 23df4cf1..099c7b6d 160000 --- a/src/netftpandroid +++ b/src/netftpandroid @@ -1 +1 @@ -Subproject commit 23df4cf135857eb33f3656567d08ec228d96d4b5 +Subproject commit 099c7b6dd23e941b09bcaec204b8f03b47a8a113