Revert "Revert "1.7.0-rc1""

This reverts commit a090c63.
SKLn-Rad · Aug 31, 2017 · f454cb0 · f454cb0
1 parent a090c63
commit f454cb0
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,7 @@
 /WebViewPlugin/WebView.Plugin.WinPhone/obj
 
 /UpgradeLog.htm
+/WebViewPlugin/WebView.Plugin.WindowsPhone/bin/Release
+/WebViewPlugin/WebView.Plugin.WindowsPhone/obj
+/WebViewPlugin/WebView.Plugin.WindowsStore/bin
+/WebViewPlugin/WebView.Plugin.WindowsStore/obj
diff --git a/SampleApp/SampleApp.Windows/Package.appxmanifest b/SampleApp/SampleApp.Windows/Package.appxmanifest
@@ -21,6 +21,7 @@
       <ApplicationContentUriRules>
         <Rule Match="https://www.xamarin.com" Type="include" />
         <Rule Match="https://www.google.co.uk" Type="include" />
+        <Rule Match="https://httpbin.org/headers" Type="include" />
       </ApplicationContentUriRules>
     </Application>
   </Applications>

diff --git a/SampleApp/SampleApp.iOS/SampleApp.iOS.csproj.user b/SampleApp/SampleApp.iOS/SampleApp.iOS.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SelectedDevice>iPad Air 2 iOS 10.3</SelectedDevice>
+    <SelectedDevice>Simulator</SelectedDevice>
     <DefaultDevice>iPad Air 2 iOS 10.3</DefaultDevice>
   </PropertyGroup>
 </Project>
diff --git a/SampleApp/SampleApp/App.cs b/SampleApp/SampleApp/App.cs
@@ -8,7 +8,7 @@ public class App : Application
 
         public App()
         {
-            MainPage = new HeadersSample();
+            MainPage = new MainPage();
         }
 
         protected override void OnStart()

diff --git a/WebViewPlugin/WebView.Plugin.iOS/FormsWebViewRenderer.cs b/WebViewPlugin/WebView.Plugin.iOS/FormsWebViewRenderer.cs
@@ -135,20 +135,19 @@ internal void InjectJS(string js)
 
         void OnUserNavigationRequested(FormsWebView sender, string uri, Abstractions.Enumerations.WebViewContentType contentType)
         {
-            if (Element == sender)
+            if (Element != sender) return;
+
+            switch (contentType)
             {
-                switch (contentType)
-                {
-                    case Abstractions.Enumerations.WebViewContentType.Internet:
-                        CommitNsUrlRequest(new NSUrl(uri));
-                        break;
-                    case Abstractions.Enumerations.WebViewContentType.LocalFile:
-                        LoadLocalContent(uri);
-                        break;
-                    case Abstractions.Enumerations.WebViewContentType.StringData:
-                        Control.LoadHtmlString(uri, new NSUrl(string.Concat("file://", GetCorrectBaseUrl(), "/")));
-                        break;
-                }
+                case Abstractions.Enumerations.WebViewContentType.Internet:
+                    CommitNsUrlRequest(new NSUrl(uri));
+                    break;
+                case Abstractions.Enumerations.WebViewContentType.LocalFile:
+                    LoadLocalContent(uri);
+                    break;
+                case Abstractions.Enumerations.WebViewContentType.StringData:
+                    Control.LoadHtmlString(uri, new NSUrl(string.Concat("file://", GetCorrectBaseUrl(), "/")));
+                    break;
             }
         }
 

diff --git a/package.nuspec b/package.nuspec
@@ -2,13 +2,13 @@
 <package>
   <metadata>
     <id>Xam.Plugin.WebView</id>
-    <version>1.6.1</version>
+    <version>1.7.0-rc1</version>
     <title>WebView Plugin for Xamarin Forms</title>
     <authors>Ryan Dixon</authors>
     <owners>Ryan Dixon</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A simple lightweight HybridWebView designed to work with Xamarin Forms</description>
-    <releaseNotes>Match Android WebView to parent height/width. Extra NRE checking on UWP.</releaseNotes>
+    <releaseNotes>Support for iOS 11 and Request Headers.</releaseNotes>
 	<iconUrl>https://s18.postimg.org/wjfexgtnt/FWV.png</iconUrl>
     <tags>Plugins, Xamarin, WebView, Web, HTML, Forms, Android, iOS, UWP, WinRT</tags>
     <dependencies>