Compare commits
	
		
			1 Commits
		
	
	
		
			2396--webd
			...
			1949--enab
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | cc19e6f326 | 
| @@ -185,7 +185,7 @@ namespace KeePassLib.Serialization | ||||
| 					byte[] pbFile = StrUtil.Utf8.GetBytes(sb.ToString()); | ||||
|  | ||||
| 					s = IOConnection.OpenWrite(iocLockFile); | ||||
| 					if(s == null) throw new IOException(UrlUtil.GetFileName(iocLockFile.Path)); | ||||
| 					if(s == null) throw new IOException(iocLockFile.GetDisplayName()); | ||||
| 					s.Write(pbFile, 0, pbFile.Length); | ||||
| 				} | ||||
| 				finally { if(s != null) s.Close(); } | ||||
| @@ -205,7 +205,8 @@ namespace KeePassLib.Serialization | ||||
| 			if(lfiEx != null) | ||||
| 			{ | ||||
| 				m_iocLockFile = null; // Otherwise Dispose deletes the existing one | ||||
| 				throw new FileLockException(UrlUtil.GetFileName(iocBaseFile.Path), lfiEx.GetOwner()); | ||||
| 				throw new FileLockException(iocBaseFile.GetDisplayName(), | ||||
| 					lfiEx.GetOwner()); | ||||
| 			} | ||||
|  | ||||
| 			LockFileInfo.Create(m_iocLockFile); | ||||
|   | ||||
| @@ -28,7 +28,6 @@ using System.Diagnostics; | ||||
|  | ||||
| using KeePassLib.Resources; | ||||
| using KeePassLib.Serialization; | ||||
| using Android.Webkit; | ||||
|  | ||||
| namespace KeePassLib.Utility | ||||
| { | ||||
| @@ -412,7 +411,7 @@ Clipboard.SetText(ObjectsToMessage(vLines, true));*/ | ||||
| 		public static void ShowLoadWarning(IOConnectionInfo ioConnection, Exception ex) | ||||
| 		{ | ||||
| 			if (ioConnection != null) | ||||
| 				ShowLoadWarning(UrlUtil.GetFileName(ioConnection.Path), ex, false); | ||||
| 				ShowLoadWarning(ioConnection.GetDisplayName(), ex, false); | ||||
| 			else ShowWarning(ex); | ||||
| 		} | ||||
|  | ||||
| @@ -445,7 +444,7 @@ Clipboard.SetText(ObjectsToMessage(vLines, true));*/ | ||||
| 			bool bCorruptionWarning) | ||||
| 		{ | ||||
| 			if (ioConnection != null) | ||||
| 				ShowSaveWarning(UrlUtil.GetFileName(ioConnection.Path), ex, bCorruptionWarning); | ||||
| 				ShowSaveWarning(ioConnection.GetDisplayName(), ex, bCorruptionWarning); | ||||
| 			else ShowWarning(ex); | ||||
| 		} | ||||
|  | ||||
|   | ||||
| @@ -124,7 +124,7 @@ namespace keepass2android.Io | ||||
| 				&& File.Exists(VersionFilePath(ioc)) | ||||
| 				&& File.Exists(BaseVersionFilePath(ioc)); | ||||
|  | ||||
| 			Kp2aLog.Log(GetDisplayName(ioc) + " isCached = " + result); | ||||
| 			Kp2aLog.Log(ioc.GetDisplayName() + " isCached = " + result); | ||||
|  | ||||
|             return result; | ||||
|         } | ||||
| @@ -598,14 +598,13 @@ namespace keepass2android.Io | ||||
| 		public string GetBaseVersionHash(IOConnectionInfo ioc) | ||||
| 		{ | ||||
| 			string hash = File.ReadAllText(BaseVersionFilePath(ioc)); | ||||
|             Kp2aLog.Log(GetDisplayName(ioc) + " baseVersionHash = " + hash); | ||||
|             Kp2aLog.Log(ioc.GetDisplayName() + " baseVersionHash = " + hash); | ||||
| 			return hash; | ||||
|         } | ||||
| 		public string GetLocalVersionHash(IOConnectionInfo ioc) | ||||
| 		{ | ||||
| 			string hash = File.ReadAllText(VersionFilePath(ioc)); | ||||
| 			 | ||||
|             Kp2aLog.Log(GetDisplayName(ioc) + " localVersionHash = " + hash); | ||||
|             Kp2aLog.Log(ioc.GetDisplayName() + " localVersionHash = " + hash); | ||||
| 			return hash; | ||||
| 		} | ||||
| 		public bool HasLocalChanges(IOConnectionInfo ioc) | ||||
|   | ||||
| @@ -348,7 +348,7 @@ namespace keepass2android.Io | ||||
| 			} | ||||
| 			catch (Exception e) | ||||
| 			{ | ||||
| 				throw new Exception("Error finding " + filename + " in " + GetDisplayName(folderPath), e); | ||||
| 				throw new Exception("Error finding " + filename + " in " + folderPath.GetDisplayName(), e); | ||||
| 			} | ||||
| 			 | ||||
| 		} | ||||
|   | ||||
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								src/PCloudBindings/Jars/pcloud-sdk-android-1.9.1.aar
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								src/PCloudBindings/Jars/pcloud-sdk-android-1.9.1.aar
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								src/PCloudBindings/Jars/pcloud-sdk-java-core-1.9.1.jar
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								src/PCloudBindings/Jars/pcloud-sdk-java-core-1.9.1.jar
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| @@ -56,7 +56,7 @@ | ||||
|   <ItemGroup> | ||||
|     <None Include="Jars\AboutJars.txt" /> | ||||
|     <None Include="Additions\AboutAdditions.txt" /> | ||||
|     <LibraryProjectZip Include="Jars\pcloud-sdk-android-1.8.1.aar" /> | ||||
|     <LibraryProjectZip Include="Jars\pcloud-sdk-android-1.9.1.aar" /> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <TransformFile Include="Transforms\Metadata.xml" /> | ||||
| @@ -72,6 +72,6 @@ | ||||
|   </Target> | ||||
|   --> | ||||
|   <ItemGroup> | ||||
|     <EmbeddedReferenceJar Include="Jars\pcloud-sdk-java-core-1.8.1.jar" /> | ||||
|     <EmbeddedReferenceJar Include="Jars\pcloud-sdk-java-core-1.9.1.jar" /> | ||||
|   </ItemGroup> | ||||
| </Project> | ||||
|   | ||||
| @@ -47,8 +47,8 @@ dependencies { | ||||
|     implementation('com.onedrive.sdk:onedrive-sdk-android:1.2.0') { | ||||
|         transitive = false | ||||
|     } | ||||
|     implementation 'com.pcloud.sdk:java-core:1.8.1' | ||||
|     implementation 'com.pcloud.sdk:android:1.8.1' | ||||
|     implementation 'com.pcloud.sdk:java-core:1.9.1' | ||||
|     implementation 'com.pcloud.sdk:android:1.9.1' | ||||
|     implementation 'com.google.code.gson:gson:2.8.6' | ||||
|     implementation 'com.microsoft.services.msa:msa-auth:0.8.6' | ||||
|     implementation 'com.microsoft.aad:adal:1.14.0' | ||||
|   | ||||
| @@ -1,13 +1,3 @@ | ||||
| package com.crocoapps.javafilestoragetest2; | ||||
|  | ||||
| import android.app.Application; | ||||
| import android.test.ApplicationTestCase; | ||||
|  | ||||
| /** | ||||
|  * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a> | ||||
|  */ | ||||
| public class ApplicationTest extends ApplicationTestCase<Application> { | ||||
|     public ApplicationTest() { | ||||
|         super(Application.class); | ||||
|     } | ||||
| } | ||||
| @@ -129,7 +129,7 @@ namespace OtpKeyProv | ||||
| 			if(!OtpInfo.Save(auxFileIoc, otpInfo)) | ||||
| 			{ | ||||
| 				MessageService.ShowWarning("Failed to save auxiliary OTP info file:", | ||||
|                     UrlUtil.GetFileName(auxFileIoc.Path)); | ||||
| 					auxFileIoc.GetDisplayName()); | ||||
| 				return false; | ||||
| 			} | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user