Merge pull request #835 from PhilippC/pcloud-help-dialog

PCloud improvements

src/PCloudBindings/PCloudBindings.csproj

@@ -67,7 +67,7 @@
 
     <None Include="Jars\AboutJars.txt" />
     <None Include="Additions\AboutAdditions.txt" />
-    <LibraryProjectZip Include="Jars\pcloud-sdk-android-1.0.1.aar" />
+    <LibraryProjectZip Include="Jars\pcloud-sdk-android-1.1.0.aar" />
   </ItemGroup>
   <ItemGroup>
     <TransformFile Include="Transforms\Metadata.xml" />
@@ -84,7 +84,7 @@
   </Target>
   -->
   <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\pcloud-sdk-java-core-1.0.1.jar" />
+    <EmbeddedReferenceJar Include="Jars\pcloud-sdk-java-core-1.1.0.jar" />
   </ItemGroup>
 
 </Project>

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: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]

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:java-core:1.1.0'
-    compile 'com.pcloud.sdk:android:1.0.1'
+    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'

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();
+            RemoteFile remoteFile = this.apiClient.createFile(
-            this.apiClient.rename(remoteFile, filename).execute();
+                remoteFolder, filename, dataSource, null, null, UploadOptions.OVERRIDE_FILE
+            ).execute();
         } catch (ApiError e) {
             throw convertApiError(e);
         }

src/keepass2android/Resources/values/strings.xml

@@ -548,6 +548,7 @@
 	<string name="filestoragehelp_dropboxKP2A">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.</string>
 	<string name="filestoragename_gdrive">Google Drive</string>
   <string name="filestoragename_pcloud">PCloud</string>
+	<string name="filestoragehelp_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.</string>
   <string name="filestoragename_onedrive">OneDrive</string>
   <string name="filestoragename_sftp">SFTP (SSH File Transfer)</string>
 	<string name="filestoragename_content">System file picker</string>