using modernhttpclient for uploading file streams

Kinvey-Utils/Logger.cs

@@ -4,14 +4,16 @@ namespace KinveyUtils
 {
 	public class Logger
 	{
-		public static bool initialized {get; set;} = false;
+		public static bool initialized {get; set;}
 
 		public static Action<string> logIt {get; set;}
 
 		public static void initialize(Action<string> logAction){
 			if (logAction != null) {
 				logIt = logAction;
 				initialized = true;
+			} else {
+				initialized = false;
 			}
 		}
 

Kinvey-Xamarin/Async/AsyncFile.cs

@@ -87,6 +87,23 @@ public void upload(FileMetaData metadata, byte[] content, KinveyDelegate<FileMet
 
 		}
 
+		/// <summary>
+		/// Upload the specified stream to Kinvey's file storage.  The FileMetaData contains extra data about the file.
+		/// </summary>
+		/// <param name="metadata">Metadata associated with the file, supports arbitrary key/value pairs</param>
+		/// <param name="content">the actual bytes of the file to upload.</param>
+		/// <param name="delegates">Delegates for success or failure.</param>
+		public void upload(FileMetaData metadata, Stream content, KinveyDelegate<FileMetaData> delegates){
+			Task.Run (() => {
+				try {
+					FileMetaData entity = base.uploadBlocking (metadata).executeAndUploadFrom (content);
+					delegates.onSuccess (entity);
+				} catch (Exception e) {
+					delegates.onError (e);
+				}
+			});
+		}
+
 		/// <summary>
 		/// Uploads metadata associated with a file, without changing the file itself.  Do not modify the id or filename using this method-- it's for any other key/value pairs.
 		/// </summary>

Kinvey-Xamarin/File/FileMetaData.cs

@@ -13,6 +13,7 @@
 
 using System;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace KinveyXamarin
 {
@@ -83,6 +84,9 @@ public FileMetaData ()
 		/// <value><c>true</c> if public; otherwise, <c>false</c>.</value>
 		[JsonProperty("_public")]
 		public bool _public {get; set;}
+
+		[JsonProperty("_requiredHeaders")]
+		public Dictionary<string, string> headers;
 	}
 }
 

Kinvey-Xamarin/File/KinveyFileRequest.cs

@@ -15,6 +15,8 @@
 using System.Collections.Generic;
 using RestSharp;
 using System.IO;
+using System.Net.Http;
+using ModernHttpClient;
 
 namespace KinveyXamarin
 {
@@ -44,6 +46,12 @@ public FileMetaData executeAndUploadFrom(byte[] input){
 			uploadFile (metadata, input);
 			return metadata;
 		}
+
+		public FileMetaData executeAndUploadFrom(Stream stream){
+			FileMetaData metadata = base.Execute ();
+			uploadFile (metadata, stream);
+			return metadata;
+		}
 
 		private void downloadFile(FileMetaData metadata, Stream stream){
 			string downloadURL = metadata.downloadURL;
@@ -83,13 +91,43 @@ private void uploadFile(FileMetaData metadata, byte[] input){
 			} else {
 				request.Method = Method.POST;
 			}
-
+				
 			//TODO what are these parameters for `name` and `filename` used for?
 			request.AddFile ("test", input, "filenameTest");
 
 			var req = client.ExecuteAsync (request);
 			var response = req.Result;
 		}
+
+		private void uploadFile(FileMetaData metadata, Stream input){
+			string uploadURL = metadata.uploadUrl;
+
+			var httpClient = new HttpClient(new NativeMessageHandler());
+			Uri requestURI = new Uri (uploadURL);
+
+			foreach (string key in metadata.headers.Keys) {
+				httpClient.DefaultRequestHeaders.Add(key, metadata.headers[key]);
+
+
+			}
+
+			//StreamContent content = new StreamContent ();
+			if (input.CanSeek) {
+				input.Position = 0;
+		//	httpClient.DefaultRequestHeaders.Add ("Content-Length", "1024");
+		//	httpClient.
+			}
+
+			//var content = new MultipartContent ();
+			//content.Add(new StreamContent(input));
+
+
+			var req = httpClient.PutAsync(requestURI, new StreamContent(input));
+			var response = req.Result;
+			response.EnsureSuccessStatusCode();
+
+
+		}
 	}
 }
 

Kinvey-Xamarin/Kinvey-Xamarin.csproj

@@ -130,6 +130,9 @@
     <Reference Include="SQLite.Net.Async">
       <HintPath>..\packages\SQLite.Net.Async-PCL.2.5\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.Async.dll</HintPath>
     </Reference>
+    <Reference Include="ModernHttpClient">
+      <HintPath>..\packages\modernhttpclient.2.1.5\lib\Portable-Net45+WinRT45+WP8+WPA81\ModernHttpClient.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\RestSharp.Portable\RestSharp.Portable.csproj">

Kinvey-Xamarin/Offline/AbstractKinveyOfflineClientRequest.cs

@@ -190,10 +190,15 @@ public async override Task<T> ExecuteAsync(){
 				}
 
 			} else if (policy == OfflinePolicy.ONLINE_FIRST) {
+				bool failed = false;
 				try {
 					ret = await offlineFromServiceAsync ();
 				} catch (Exception e) {
 					Logger.Log (e);
+					failed = true;
+
+				}
+				if (failed) {
 					ret = await offlineFromStoreAsync ();
 				}
 			}

Kinvey-Xamarin/packages.config

@@ -5,6 +5,7 @@
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
   <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
+  <package id="modernhttpclient" version="2.1.5" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
   <package id="Newtonsoft.Json" version="6.0.7" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
   <package id="SQLite.Net.Async-PCL" version="2.5" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
   <package id="SQLite.Net-PCL" version="2.5" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />