Merge branch 'master' of https://git01.codeplex.com/keepass2android

Conflicts:
	src/java/JavaFileStorage/bin/javafilestorage.jar

src/Kp2aBusinessLogic/Io/BuiltInFileStorage.cs

@@ -246,6 +246,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();

src/Kp2aBusinessLogic/Io/IFileStorage.cs

@@ -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);

src/Kp2aBusinessLogic/Io/JavaFileStorage.cs

@@ -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);