Compare commits
	
		
			2 Commits
		
	
	
		
			pcloud-hel
			...
			Branch_b0f
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 0ce77a2729 | ||
|   | b0f61038e3 | 
							
								
								
									
										
											BIN
										
									
								
								src/PCloudBindings/Jars/pcloud-sdk-android-1.0.1.aar
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								src/PCloudBindings/Jars/pcloud-sdk-android-1.0.1.aar
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								src/PCloudBindings/Jars/pcloud-sdk-java-core-1.0.1.jar
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								src/PCloudBindings/Jars/pcloud-sdk-java-core-1.0.1.jar
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							| @@ -67,7 +67,7 @@ | |||||||
|  |  | ||||||
|     <None Include="Jars\AboutJars.txt" /> |     <None Include="Jars\AboutJars.txt" /> | ||||||
|     <None Include="Additions\AboutAdditions.txt" /> |     <None Include="Additions\AboutAdditions.txt" /> | ||||||
|     <LibraryProjectZip Include="Jars\pcloud-sdk-android-1.1.0.aar" /> |     <LibraryProjectZip Include="Jars\pcloud-sdk-android-1.0.1.aar" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <TransformFile Include="Transforms\Metadata.xml" /> |     <TransformFile Include="Transforms\Metadata.xml" /> | ||||||
| @@ -84,7 +84,7 @@ | |||||||
|   </Target> |   </Target> | ||||||
|   --> |   --> | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <EmbeddedReferenceJar Include="Jars\pcloud-sdk-java-core-1.1.0.jar" /> |     <EmbeddedReferenceJar Include="Jars\pcloud-sdk-java-core-1.0.1.jar" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  |  | ||||||
| </Project> | </Project> | ||||||
|   | |||||||
| @@ -26,5 +26,5 @@ using Android.App; | |||||||
| // You can specify all the values or you can default the Build and Revision Numbers  | // You can specify all the values or you can default the Build and Revision Numbers  | ||||||
| // by using the '*' as shown below: | // by using the '*' as shown below: | ||||||
| // [assembly: AssemblyVersion("1.0.*")] | // [assembly: AssemblyVersion("1.0.*")] | ||||||
| [assembly: AssemblyVersion("1.1.0.0")] | [assembly: AssemblyVersion("1.0.0.0")] | ||||||
| [assembly: AssemblyFileVersion("1.1.0.0")] | [assembly: AssemblyFileVersion("1.0.0.0")] | ||||||
| @@ -35,8 +35,8 @@ dependencies { | |||||||
|     compile('com.onedrive.sdk:onedrive-sdk-android:1.2.0') { |     compile('com.onedrive.sdk:onedrive-sdk-android:1.2.0') { | ||||||
|         transitive = false |         transitive = false | ||||||
|     } |     } | ||||||
|     compile 'com.pcloud.sdk:java-core:1.1.0' |     compile 'com.pcloud.sdk:java-core:1.0.1' | ||||||
|     compile 'com.pcloud.sdk:android:1.1.0' |     compile 'com.pcloud.sdk:android:1.0.1' | ||||||
|     compile('com.microsoft.graph:msgraph-sdk-android:1.2.+') |     compile('com.microsoft.graph:msgraph-sdk-android:1.2.+') | ||||||
|     compile ('com.microsoft.identity.client:msal:0.1.+') { |     compile ('com.microsoft.identity.client:msal:0.1.+') { | ||||||
|         exclude group: 'com.android.support', module: 'appcompat-v7' |         exclude group: 'com.android.support', module: 'appcompat-v7' | ||||||
|   | |||||||
| @@ -190,12 +190,14 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase { | |||||||
| 			String part = parts[parts.length-1]; | 			String part = parts[parts.length-1]; | ||||||
| 			logDebug("parsing part " + part); | 			logDebug("parsing part " + part); | ||||||
| 			int indexOfSeparator = part.lastIndexOf(NAME_ID_SEP); | 			int indexOfSeparator = part.lastIndexOf(NAME_ID_SEP); | ||||||
|  | 			String name = ""; | ||||||
| 			if (indexOfSeparator < 0) | 			if (indexOfSeparator < 0) | ||||||
| 			{ | 			{ | ||||||
| 				//seems invalid, but we're very generous here | 				//seems invalid, but we're very generous here | ||||||
| 				displayName += "/"+part; | 				displayName += "/"+part; | ||||||
| 			} | 			} | ||||||
| 			String name = part.substring(0, indexOfSeparator); | 			else | ||||||
|  | 				name = part.substring(0, indexOfSeparator); | ||||||
| 			try { | 			try { | ||||||
| 				name = decode(name); | 				name = decode(name); | ||||||
| 			} catch (UnsupportedEncodingException e) { | 			} catch (UnsupportedEncodingException e) { | ||||||
|   | |||||||
| @@ -28,7 +28,6 @@ import com.pcloud.sdk.PCloudSdk; | |||||||
| import com.pcloud.sdk.RemoteEntry; | import com.pcloud.sdk.RemoteEntry; | ||||||
| import com.pcloud.sdk.RemoteFile; | import com.pcloud.sdk.RemoteFile; | ||||||
| import com.pcloud.sdk.RemoteFolder; | import com.pcloud.sdk.RemoteFolder; | ||||||
| import com.pcloud.sdk.UploadOptions; |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * FileStorage implementation for PCloud provider. |  * FileStorage implementation for PCloud provider. | ||||||
| @@ -137,10 +136,10 @@ public class PCloudFileStorage extends JavaFileStorageBase | |||||||
|         String filePath = path.substring(0, path.lastIndexOf("/") + 1); |         String filePath = path.substring(0, path.lastIndexOf("/") + 1); | ||||||
|         RemoteFolder remoteFolder = this.getRemoteFolderByPath(filePath); |         RemoteFolder remoteFolder = this.getRemoteFolderByPath(filePath); | ||||||
|  |  | ||||||
|  |         String tempName = "." + UUID.randomUUID().toString(); | ||||||
|         try { |         try { | ||||||
|             RemoteFile remoteFile = this.apiClient.createFile( |             RemoteFile remoteFile = this.apiClient.createFile(remoteFolder, tempName, dataSource).execute(); | ||||||
|                 remoteFolder, filename, dataSource, null, null, UploadOptions.OVERRIDE_FILE |             this.apiClient.rename(remoteFile, filename).execute(); | ||||||
|             ).execute(); |  | ||||||
|         } catch (ApiError e) { |         } catch (ApiError e) { | ||||||
|             throw convertApiError(e); |             throw convertApiError(e); | ||||||
|         } |         } | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| <?xml version="1.0" encoding="utf-8"?> | <?xml version="1.0" encoding="utf-8"?> | ||||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android"  | <manifest xmlns:android="http://schemas.android.com/apk/res/android"  | ||||||
| 			android:versionCode="135"  | 			android:versionCode="138"  | ||||||
| 			android:versionName="1.07-pre8"  | 			android:versionName="1.07-r1"  | ||||||
| 			package="keepass2android.keepass2android"  | 			package="keepass2android.keepass2android"  | ||||||
| 			android:installLocation="auto"> | 			android:installLocation="auto"> | ||||||
| 	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26" /> | 	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26" /> | ||||||
| @@ -132,7 +132,7 @@ | |||||||
| 				<category android:name="android.intent.category.DEFAULT" /> | 				<category android:name="android.intent.category.DEFAULT" /> | ||||||
| 			</intent-filter> | 			</intent-filter> | ||||||
| 		</activity> | 		</activity> | ||||||
| 			<uses-library required="false" name="com.sec.android.app.multiwindow" /> | 			<uses-library android:required="false" android:name="com.sec.android.app.multiwindow" /> | ||||||
| 		<meta-data android:name="com.sec.android.support.multiwindow" android:value="true" /> | 		<meta-data android:name="com.sec.android.support.multiwindow" android:value="true" /> | ||||||
| 		<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:value="632.0dip" /> | 		<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:value="632.0dip" /> | ||||||
| 		<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:value="598.0dip" /> | 		<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:value="598.0dip" /> | ||||||
| @@ -153,4 +153,4 @@ | |||||||
|  |  | ||||||
| 	<!-- Samsung Pass permission --> | 	<!-- Samsung Pass permission --> | ||||||
| 	<uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY" /> | 	<uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY" /> | ||||||
| </manifest> | </manifest> | ||||||
|   | |||||||
| @@ -625,7 +625,7 @@ | |||||||
|   <string name="EntryChannel_name">Indtastningsnotifikationer</string> |   <string name="EntryChannel_name">Indtastningsnotifikationer</string> | ||||||
|   <string name="EntryChannel_desc">Notificering til forenkelse af adgang til den aktuelt valgte indtastning.</string> |   <string name="EntryChannel_desc">Notificering til forenkelse af adgang til den aktuelt valgte indtastning.</string> | ||||||
|   <string name="ShowKeyboardDuringFingerprintAuth">Vis soft-tastatur til adgangskodeinput, når fingeraftrykaflæsning er aktiv.</string> |   <string name="ShowKeyboardDuringFingerprintAuth">Vis soft-tastatur til adgangskodeinput, når fingeraftrykaflæsning er aktiv.</string> | ||||||
|   <string name="ChangeLog_1_07">    Version 1.07\n |   <string name="ChangeLog_1_07">    Version 1.07-pre2\n | ||||||
|     * Løser nedbrud på Samsungs Android 9\n |     * Løser nedbrud på Samsungs Android 9\n | ||||||
|     * Tillader åbning af flere end én database, kompatibel med KeeAutoExec\n |     * Tillader åbning af flere end én database, kompatibel med KeeAutoExec\n | ||||||
|     * SFTP: Tillader offentlig nøglegodkendelse, tjekker om værtsnøgle er ændret\n |     * SFTP: Tillader offentlig nøglegodkendelse, tjekker om værtsnøgle er ændret\n | ||||||
|   | |||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -548,7 +548,6 @@ | |||||||
| 	<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="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_gdrive">Google Drive</string> | ||||||
|   <string name="filestoragename_pcloud">PCloud</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_onedrive">OneDrive</string> | ||||||
|   <string name="filestoragename_sftp">SFTP (SSH File Transfer)</string> |   <string name="filestoragename_sftp">SFTP (SSH File Transfer)</string> | ||||||
| 	<string name="filestoragename_content">System file picker</string> | 	<string name="filestoragename_content">System file picker</string> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user