updated JavaFileStorageBindings (added PrepareFileUsage method without UI)
deleted livesdk.jar, is now included in JavaFileStorage added javafilestorage.jar, allows simpler build process
This commit is contained in:
		
										
											Binary file not shown.
										
									
								
							| @@ -150,9 +150,6 @@ | ||||
|       <Link>Jars\jsr305-1.3.9.jar</Link> | ||||
|     </EmbeddedReferenceJar> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <EmbeddedReferenceJar Include="Jars\livesdk.jar" /> | ||||
|   </ItemGroup> | ||||
|   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" /> | ||||
|   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.  | ||||
|        Other similar extension points exist, see Microsoft.Common.targets. | ||||
|   | ||||
| @@ -10,4 +10,5 @@ | ||||
| 	<remove-node path="/api/package[@name='com.jcraft.jsch.jce']" /> | ||||
| 	<remove-node path="/api/package[@name='com.jcraft.jsch.jcraft']" /> | ||||
| 	<remove-node path="/api/package[@name='com.jcraft.jzlib']" /> | ||||
| 	<remove-node path="/api/package[@name='com.microsoft.live']" /> | ||||
| </metadata> | ||||
|   | ||||
| @@ -245,6 +245,11 @@ namespace keepass2android.Io | ||||
| 			activity.OnImmediateResult(requestCode, (int) FileStorageResults.FileUsagePrepared, intent); | ||||
| 		} | ||||
|  | ||||
| 		public void PrepareFileUsage(Context ctx, IOConnectionInfo ioc) | ||||
| 		{ | ||||
| 			//nothing to do, we're ready to go | ||||
| 		} | ||||
|  | ||||
| 		public void OnCreate(IFileStorageSetupActivity activity, Bundle savedInstanceState) | ||||
| 		{ | ||||
| 			throw new NotImplementedException(); | ||||
|   | ||||
| @@ -124,6 +124,14 @@ namespace keepass2android.Io | ||||
| 		/// </summary> | ||||
| 		void PrepareFileUsage(IFileStorageSetupInitiatorActivity activity, IOConnectionInfo ioc, int requestCode, bool alwaysReturnSuccess); | ||||
|  | ||||
| 		/// <summary> | ||||
| 		/// Initiates the process for using a file in the given file storage. | ||||
| 		/// This method either silently prepares using the file (if any preparation is required) or throws | ||||
| 		/// UserInteractionRequiredException (or any other exception in case of an error).  | ||||
| 		/// Can be used from a service, i.e. when no Activity is open. | ||||
| 		/// </summary> | ||||
| 		void PrepareFileUsage(Context ctx, IOConnectionInfo ioc); | ||||
|  | ||||
| 		//Setup methods: these are called from the setup activity so the file storage can handle UI events for authorization etc. | ||||
| 		void OnCreate(IFileStorageSetupActivity activity, Bundle savedInstanceState); | ||||
| 		void OnResume(IFileStorageSetupActivity activity); | ||||
|   | ||||
| @@ -244,6 +244,11 @@ namespace keepass2android.Io | ||||
| 			_jfs.PrepareFileUsage((IJavaFileStorageFileStorageSetupInitiatorActivity)activity, IocToPath(ioc), requestCode, alwaysReturnSuccess); | ||||
| 		} | ||||
|  | ||||
| 		public void PrepareFileUsage(Context ctx, IOConnectionInfo ioc) | ||||
| 		{ | ||||
| 			_jfs.PrepareFileUsage(ctx, IocToPath(ioc)); | ||||
| 		} | ||||
|  | ||||
| 		public void OnCreate(IFileStorageSetupActivity activity, Bundle savedInstanceState) | ||||
| 		{ | ||||
| 			_jfs.OnCreate(((IJavaFileStorageFileStorageSetupActivity)activity), savedInstanceState); | ||||
|   | ||||
										
											Binary file not shown.
										
									
								
							
		Reference in New Issue
	
	Block a user
	 Philipp Crocoll
					Philipp Crocoll