fixed upload progress (again)1.0.2

11 files changed, 31 insertions, 24 deletions

diff --git a/NextcloudApp/BundleArtifacts/Upload/arm.txt b/NextcloudApp/BundleArtifacts/Upload/arm.txt
index 5ee3679..f34389c 100644
--- a/NextcloudApp/BundleArtifacts/Upload/arm.txt
+++ b/NextcloudApp/BundleArtifacts/Upload/arm.txt
@@ -1,3 +1,3 @@
-MainPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\bin\ARM\Release\Upload\NextcloudApp_1.0.1.0_ARM.appx
-SymbolPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\AppPackages\NextcloudApp_1.0.1.0\NextcloudApp_1.0.1.0_ARM.appxsym
+MainPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\bin\ARM\Release\Upload\NextcloudApp_1.0.2.0_ARM.appx
+SymbolPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\AppPackages\NextcloudApp_1.0.2.0\NextcloudApp_1.0.2.0_ARM.appxsym
 ResourcePack=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\_language-de.appx
diff --git a/NextcloudApp/BundleArtifacts/Upload/x64.txt b/NextcloudApp/BundleArtifacts/Upload/x64.txt
index 0526124..ada31a7 100644
--- a/NextcloudApp/BundleArtifacts/Upload/x64.txt
+++ b/NextcloudApp/BundleArtifacts/Upload/x64.txt
@@ -1,2 +1,2 @@
-MainPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\bin\x64\Release\Upload\NextcloudApp_1.0.1.0_x64.appx
-SymbolPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\AppPackages\NextcloudApp_1.0.1.0\NextcloudApp_1.0.1.0_x64.appxsym
+MainPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\bin\x64\Release\Upload\NextcloudApp_1.0.2.0_x64.appx
+SymbolPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\AppPackages\NextcloudApp_1.0.2.0\NextcloudApp_1.0.2.0_x64.appxsym
diff --git a/NextcloudApp/BundleArtifacts/Upload/x86.txt b/NextcloudApp/BundleArtifacts/Upload/x86.txt
index 5edf76c..8189544 100644
--- a/NextcloudApp/BundleArtifacts/Upload/x86.txt
+++ b/NextcloudApp/BundleArtifacts/Upload/x86.txt
@@ -1,2 +1,2 @@
-MainPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\bin\x86\Release\Upload\NextcloudApp_1.0.1.0_x86.appx
-SymbolPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\AppPackages\NextcloudApp_1.0.1.0\NextcloudApp_1.0.1.0_x86.appxsym
+MainPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\bin\x86\Release\Upload\NextcloudApp_1.0.2.0_x86.appx
+SymbolPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\AppPackages\NextcloudApp_1.0.2.0\NextcloudApp_1.0.2.0_x86.appxsym
diff --git a/NextcloudApp/BundleArtifacts/arm.txt b/NextcloudApp/BundleArtifacts/arm.txt
index 2d64679..86c3290 100644
--- a/NextcloudApp/BundleArtifacts/arm.txt
+++ b/NextcloudApp/BundleArtifacts/arm.txt
@@ -1,3 +1,3 @@
-MainPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\bin\ARM\Release\NextcloudApp_1.0.1.0_ARM.appx
-SymbolPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\AppPackages\NextcloudApp_1.0.1.0_Test\NextcloudApp_1.0.1.0_ARM.appxsym
-ResourcePack=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\bin\ARM\Release\NextcloudApp_1.0.1.0_language-de.appx
+MainPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\bin\ARM\Release\NextcloudApp_1.0.2.0_ARM.appx
+SymbolPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\AppPackages\NextcloudApp_1.0.2.0_Test\NextcloudApp_1.0.2.0_ARM.appxsym
+ResourcePack=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\bin\ARM\Release\NextcloudApp_1.0.2.0_language-de.appx
diff --git a/NextcloudApp/BundleArtifacts/x64.txt b/NextcloudApp/BundleArtifacts/x64.txt
index 93a298c..b41979a 100644
--- a/NextcloudApp/BundleArtifacts/x64.txt
+++ b/NextcloudApp/BundleArtifacts/x64.txt
@@ -1,2 +1,2 @@
-MainPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\bin\x64\Release\NextcloudApp_1.0.1.0_x64.appx
-SymbolPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\AppPackages\NextcloudApp_1.0.1.0_Test\NextcloudApp_1.0.1.0_x64.appxsym
+MainPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\bin\x64\Release\NextcloudApp_1.0.2.0_x64.appx
+SymbolPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\AppPackages\NextcloudApp_1.0.2.0_Test\NextcloudApp_1.0.2.0_x64.appxsym
diff --git a/NextcloudApp/BundleArtifacts/x86.txt b/NextcloudApp/BundleArtifacts/x86.txt
index fc41f86..f16508b 100644
--- a/NextcloudApp/BundleArtifacts/x86.txt
+++ b/NextcloudApp/BundleArtifacts/x86.txt
@@ -1,2 +1,2 @@
-MainPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\bin\x86\Release\NextcloudApp_1.0.1.0_x86.appx
-SymbolPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\AppPackages\NextcloudApp_1.0.1.0_Test\NextcloudApp_1.0.1.0_x86.appxsym
+MainPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\bin\x86\Release\NextcloudApp_1.0.2.0_x86.appx
+SymbolPackage=D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\AppPackages\NextcloudApp_1.0.2.0_Test\NextcloudApp_1.0.2.0_x86.appxsym
diff --git a/NextcloudApp/Package.appxmanifest b/NextcloudApp/Package.appxmanifest
index 55e0420..121b3ec 100644
--- a/NextcloudApp/Package.appxmanifest
+++ b/NextcloudApp/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="36131AndrFiedler.NextcloudApp" Publisher="CN=917F995D-B866-486B-AAD5-A2B63E22FF51" Version="1.0.1.0" />
+  <Identity Name="36131AndrFiedler.NextcloudApp" Publisher="CN=917F995D-B866-486B-AAD5-A2B63E22FF51" Version="1.0.2.0" />
   <mp:PhoneIdentity PhoneProductId="6cfb0110-8cde-4e3f-9aab-0c54e98b3b3d" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Nextcloud App</DisplayName>
diff --git a/NextcloudApp/_language-de.appx b/NextcloudApp/_language-de.appx
index ed36872..da83535 100644
--- a/NextcloudApp/_language-de.appx
+++ b/NextcloudApp/_language-de.appx
diff --git a/NextcloudApp/_pkginfo.txt b/NextcloudApp/_pkginfo.txt
index 28b1e1f..2c848a5 100644
--- a/NextcloudApp/_pkginfo.txt
+++ b/NextcloudApp/_pkginfo.txt
@@ -1 +1 @@
-D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\AppPackages\NextcloudApp_1.0.1.0\NextcloudApp_1.0.1.0_x86_x64_arm.appxbundle
+D:\00_Work\99_AFiedler\NextcloudApp\NextcloudApp\AppPackages\NextcloudApp_1.0.2.0\NextcloudApp_1.0.2.0_x86_x64_arm.appxbundle
diff --git a/NextcloudClient/NextcloudClient.cs b/NextcloudClient/NextcloudClient.cs
index 0978fb9..383537f 100644
--- a/NextcloudClient/NextcloudClient.cs
+++ b/NextcloudClient/NextcloudClient.cs
@@ -81,7 +81,11 @@ namespace NextcloudClient
 
             _url = url;
 
-            _client = new HttpClient(new HttpBaseProtocolFilter { AllowUI = false });
+            _client = new HttpClient(new HttpBaseProtocolFilter
+            {
+                // Disable the UI mode, we will handle password entry in the app
+                AllowUI = false
+            });
             _client.DefaultRequestHeaders["Pragma"] = "no-cache";
 
             var encoded =
diff --git a/WebDavClient/WebDavClient/WebDavClient.cs b/WebDavClient/WebDavClient/WebDavClient.cs
index 2427e0c..f3d198b 100644
--- a/WebDavClient/WebDavClient/WebDavClient.cs
+++ b/WebDavClient/WebDavClient/WebDavClient.cs
@@ -4,7 +4,6 @@ using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Net.Http.Headers;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -41,7 +40,16 @@ namespace WebDavClient
         /// <param name="credential">The credential.</param>
         public WebDavClient(WebDavCredential credential)
         {
-            _client = new HttpClient(new HttpBaseProtocolFilter { AllowUI = false });
+            var httpFilter = new HttpBaseProtocolFilter();
+
+            // Disable the write cache, so we can track the real upload progress
+            httpFilter.CacheControl.WriteBehavior =  HttpCacheWriteBehavior.NoCache;
+
+            // Disable the UI mode, we will handle password entry in the app
+            httpFilter.AllowUI = false;
+            
+            _client = new HttpClient(httpFilter);
+
             _client.DefaultRequestHeaders["Pragma"] = "no-cache";
             Credential = credential;
             if (Credential == null)
@@ -308,12 +316,7 @@ namespace WebDavClient
             var streamContent = new HttpStreamContent(inputStream);
             streamContent.Headers["Content-Type"] = contentType;
             streamContent.Headers["Content-Length"] = stream.Size.ToString();
-
-            //var requestContent = new HttpMultipartContent {streamContent};
-
-            var response = await _client.PutAsync(uri, streamContent).AsTask(cts.Token, progress);
-
-            return response;
+            return await _client.PutAsync(uri, streamContent).AsTask(cts.Token, progress);
         }
 
         /// <summary>