diff --git a/src/PCloudBindings/Jars/pcloud-sdk-android-1.0.1.aar b/src/PCloudBindings/Jars/pcloud-sdk-android-1.0.1.aar deleted file mode 100644 index 29c5015b..00000000 Binary files a/src/PCloudBindings/Jars/pcloud-sdk-android-1.0.1.aar and /dev/null differ diff --git a/src/PCloudBindings/Jars/pcloud-sdk-android-1.1.0.aar b/src/PCloudBindings/Jars/pcloud-sdk-android-1.1.0.aar new file mode 100644 index 00000000..a8012a33 Binary files /dev/null and b/src/PCloudBindings/Jars/pcloud-sdk-android-1.1.0.aar differ diff --git a/src/PCloudBindings/Jars/pcloud-sdk-java-core-1.0.1.jar b/src/PCloudBindings/Jars/pcloud-sdk-java-core-1.0.1.jar deleted file mode 100644 index 96a99ec5..00000000 Binary files a/src/PCloudBindings/Jars/pcloud-sdk-java-core-1.0.1.jar and /dev/null differ diff --git a/src/PCloudBindings/Jars/pcloud-sdk-java-core-1.1.0.jar b/src/PCloudBindings/Jars/pcloud-sdk-java-core-1.1.0.jar new file mode 100644 index 00000000..5515a0df Binary files /dev/null and b/src/PCloudBindings/Jars/pcloud-sdk-java-core-1.1.0.jar differ diff --git a/src/PCloudBindings/PCloudBindings.csproj b/src/PCloudBindings/PCloudBindings.csproj index 6ccc261a..c28479d6 100644 --- a/src/PCloudBindings/PCloudBindings.csproj +++ b/src/PCloudBindings/PCloudBindings.csproj @@ -67,7 +67,7 @@ - + @@ -84,7 +84,7 @@ --> - + diff --git a/src/PCloudBindings/Properties/AssemblyInfo.cs b/src/PCloudBindings/Properties/AssemblyInfo.cs index b4493d7e..8e086067 100644 --- a/src/PCloudBindings/Properties/AssemblyInfo.cs +++ b/src/PCloudBindings/Properties/AssemblyInfo.cs @@ -26,5 +26,5 @@ using Android.App; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyFileVersion("1.1.0.0")] diff --git a/src/java/JavaFileStorage/app/build.gradle b/src/java/JavaFileStorage/app/build.gradle index fc53c4e6..b1c0f11c 100644 --- a/src/java/JavaFileStorage/app/build.gradle +++ b/src/java/JavaFileStorage/app/build.gradle @@ -35,8 +35,8 @@ dependencies { compile('com.onedrive.sdk:onedrive-sdk-android:1.2.0') { transitive = false } - compile 'com.pcloud.sdk:java-core:1.0.1' - compile 'com.pcloud.sdk:android:1.0.1' + compile 'com.pcloud.sdk:java-core:1.1.0' + compile 'com.pcloud.sdk:android:1.1.0' compile('com.microsoft.graph:msgraph-sdk-android:1.2.+') compile ('com.microsoft.identity.client:msal:0.1.+') { exclude group: 'com.android.support', module: 'appcompat-v7' diff --git a/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/PCloudFileStorage.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/PCloudFileStorage.java index 5ef0ffb0..4b36d44f 100644 --- a/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/PCloudFileStorage.java +++ b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/PCloudFileStorage.java @@ -28,6 +28,7 @@ import com.pcloud.sdk.PCloudSdk; import com.pcloud.sdk.RemoteEntry; import com.pcloud.sdk.RemoteFile; import com.pcloud.sdk.RemoteFolder; +import com.pcloud.sdk.UploadOptions; /** * FileStorage implementation for PCloud provider. @@ -136,10 +137,10 @@ public class PCloudFileStorage extends JavaFileStorageBase String filePath = path.substring(0, path.lastIndexOf("/") + 1); RemoteFolder remoteFolder = this.getRemoteFolderByPath(filePath); - String tempName = "." + UUID.randomUUID().toString(); try { - RemoteFile remoteFile = this.apiClient.createFile(remoteFolder, tempName, dataSource).execute(); - this.apiClient.rename(remoteFile, filename).execute(); + RemoteFile remoteFile = this.apiClient.createFile( + remoteFolder, filename, dataSource, null, null, UploadOptions.OVERRIDE_FILE + ).execute(); } catch (ApiError e) { throw convertApiError(e); } diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml index ad472a65..26b77e08 100644 --- a/src/keepass2android/Resources/values/strings.xml +++ b/src/keepass2android/Resources/values/strings.xml @@ -548,6 +548,7 @@ If you do not want to give KP2A access to your full Dropbox, you may select this option. It will request only access to the folder Apps/Keepass2Android. This is especially suited when creating a new database. If you already have a database, select this option to create the folder, then place your file inside the folder (from your PC) and then select this option again for opening the file. Google Drive PCloud + This storage type will only request access to the "Applications/Keepass2Android" folder. If you want to use an existing database from your PCloud account, please make sure the file is placed in this folder. OneDrive SFTP (SSH File Transfer) System file picker