From 9f291e1fd5e35a6648024bad98d832ed32521c1c Mon Sep 17 00:00:00 2001
From: Maxallica <BitWatchman@outlook.com>
Date: Fri, 19 Apr 2019 16:19:42 +0200
Subject: [PATCH 1/2] Upgraded Xamarin.Forms version to 2.5.0.280555 #718

---
 Samples/Forms/Core/FormsSample.csproj                         | 2 +-
 Samples/Forms/Droid/FormsSample.Droid.csproj                  | 4 ++--
 Samples/Forms/WindowsUniversal/project.json                   | 2 +-
 Samples/Forms/iOS/FormsSample.iOS.csproj                      | 2 +-
 .../ZXing.Net.Mobile.Forms.Android.csproj                     | 2 +-
 Source/ZXing.Net.Mobile.Forms.WindowsUniversal/project.json   | 2 +-
 .../ZXing.Net.Mobile.Forms.iOS.csproj                         | 2 +-
 Source/ZXing.Net.Mobile.Forms/ZXing.Net.Mobile.Forms.csproj   | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Samples/Forms/Core/FormsSample.csproj b/Samples/Forms/Core/FormsSample.csproj
index 55bb60631..a769b23fa 100644
--- a/Samples/Forms/Core/FormsSample.csproj
+++ b/Samples/Forms/Core/FormsSample.csproj
@@ -54,6 +54,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.3.4.270" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Samples/Forms/Droid/FormsSample.Droid.csproj b/Samples/Forms/Droid/FormsSample.Droid.csproj
index 7b6757de4..bbcdccfef 100644
--- a/Samples/Forms/Droid/FormsSample.Droid.csproj
+++ b/Samples/Forms/Droid/FormsSample.Droid.csproj
@@ -96,8 +96,8 @@
     <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Android.Support.v4" Version="25.4.0.2" />
+	<PackageReference Include="Xamarin.Android.Support.v4" Version="25.4.0.2" />
     <PackageReference Include="FastAndroidCamera" Version="2.0.0" />
-    <PackageReference Include="Xamarin.Forms" Version="2.4.0.18342" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Samples/Forms/WindowsUniversal/project.json b/Samples/Forms/WindowsUniversal/project.json
index 140f37629..f024695ca 100644
--- a/Samples/Forms/WindowsUniversal/project.json
+++ b/Samples/Forms/WindowsUniversal/project.json
@@ -4,7 +4,7 @@
     "Microsoft.ApplicationInsights.PersistenceChannel": "1.2.3",
     "Microsoft.ApplicationInsights.WindowsApps": "1.1.1",
     "Microsoft.NETCore.UniversalWindowsPlatform": "6.0.1",
-    "Xamarin.Forms": "2.4.0.18342"
+    "Xamarin.Forms": "2.5.0.280555"
   },
   "frameworks": {
     "uap10.0": {}
diff --git a/Samples/Forms/iOS/FormsSample.iOS.csproj b/Samples/Forms/iOS/FormsSample.iOS.csproj
index 351585a19..64527bf0a 100644
--- a/Samples/Forms/iOS/FormsSample.iOS.csproj
+++ b/Samples/Forms/iOS/FormsSample.iOS.csproj
@@ -126,6 +126,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.TestCloud.Agent" Version="0.21.1" />
-    <PackageReference Include="Xamarin.Forms" Version="2.4.0.18342" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/ZXing.Net.Mobile.Forms.Android/ZXing.Net.Mobile.Forms.Android.csproj b/Source/ZXing.Net.Mobile.Forms.Android/ZXing.Net.Mobile.Forms.Android.csproj
index 0164f7cab..2f39539cf 100644
--- a/Source/ZXing.Net.Mobile.Forms.Android/ZXing.Net.Mobile.Forms.Android.csproj
+++ b/Source/ZXing.Net.Mobile.Forms.Android/ZXing.Net.Mobile.Forms.Android.csproj
@@ -79,6 +79,6 @@
   <ItemGroup>
     <PackageReference Include="Xamarin.Android.Support.v4" Version="23.3.0" />
     <PackageReference Include="FastAndroidCamera" Version="2.0.0" />
-    <PackageReference Include="Xamarin.Forms" Version="2.3.4.270" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/ZXing.Net.Mobile.Forms.WindowsUniversal/project.json b/Source/ZXing.Net.Mobile.Forms.WindowsUniversal/project.json
index c4e711589..ff54cc4fe 100644
--- a/Source/ZXing.Net.Mobile.Forms.WindowsUniversal/project.json
+++ b/Source/ZXing.Net.Mobile.Forms.WindowsUniversal/project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "Microsoft.NETCore.UniversalWindowsPlatform": "6.0.1",
-    "Xamarin.Forms": "2.3.4.270"
+    "Xamarin.Forms": "2.5.0.280555"
   },
   "frameworks": {
     "uap10.0": {}
diff --git a/Source/ZXing.Net.Mobile.Forms.iOS/ZXing.Net.Mobile.Forms.iOS.csproj b/Source/ZXing.Net.Mobile.Forms.iOS/ZXing.Net.Mobile.Forms.iOS.csproj
index aee6862b2..342bccf07 100644
--- a/Source/ZXing.Net.Mobile.Forms.iOS/ZXing.Net.Mobile.Forms.iOS.csproj
+++ b/Source/ZXing.Net.Mobile.Forms.iOS/ZXing.Net.Mobile.Forms.iOS.csproj
@@ -65,6 +65,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.3.4.270" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/ZXing.Net.Mobile.Forms/ZXing.Net.Mobile.Forms.csproj b/Source/ZXing.Net.Mobile.Forms/ZXing.Net.Mobile.Forms.csproj
index 79fd21eca..4cd1c9365 100644
--- a/Source/ZXing.Net.Mobile.Forms/ZXing.Net.Mobile.Forms.csproj
+++ b/Source/ZXing.Net.Mobile.Forms/ZXing.Net.Mobile.Forms.csproj
@@ -51,6 +51,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.3.4.270" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From 02577a33effbe1bd638f79a02c4203837e2e7b90 Mon Sep 17 00:00:00 2001
From: Maxallica <BitWatchman@outlook.com>
Date: Fri, 19 Apr 2019 16:23:35 +0200
Subject: [PATCH 2/2] Fixed issue NullReferenceException due to Context in
 ZXingScannerViewRenderer Xamarin.Forms version greater than or equal 2.5 has
 optimized Context integration to avoid null Context Added constructor with
 Context Removed unused variable requestPermissionTask Added condition to
 check if Context is an Activity #718

---
 .../ZXingScannerViewRenderer.cs               | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/Source/ZXing.Net.Mobile.Forms.Android/ZXingScannerViewRenderer.cs b/Source/ZXing.Net.Mobile.Forms.Android/ZXingScannerViewRenderer.cs
index f88201000..b4c20523a 100644
--- a/Source/ZXing.Net.Mobile.Forms.Android/ZXingScannerViewRenderer.cs
+++ b/Source/ZXing.Net.Mobile.Forms.Android/ZXingScannerViewRenderer.cs
@@ -12,14 +12,19 @@
 using ZXing.Mobile;
 using System.Threading.Tasks;
 using System.Linq.Expressions;
+using Android.Content;
 
 [assembly:ExportRenderer(typeof(ZXingScannerView), typeof(ZXingScannerViewRenderer))]
 namespace ZXing.Net.Mobile.Forms.Android
 {
     [Preserve(AllMembers = true)]
     public class ZXingScannerViewRenderer : ViewRenderer<ZXingScannerView, ZXing.Mobile.ZXingSurfaceView>
-    {       
-        public ZXingScannerViewRenderer () : base ()
+    {
+        public ZXingScannerViewRenderer() : base()
+        {
+        }
+
+        public ZXingScannerViewRenderer (Context context) : base (context)
         {
         }
 
@@ -32,7 +37,6 @@ public static void Init ()
         protected ZXingScannerView formsView;
 
         protected ZXingSurfaceView zxingSurface;
-        internal Task<bool> requestPermissionsTask;
 
         protected override async void OnElementChanged(ElementChangedEventArgs<ZXingScannerView> e)
         {
@@ -52,24 +56,25 @@ protected override async void OnElementChanged(ElementChangedEventArgs<ZXingScan
                     }
                 };
 
-                var activity = Context as Activity;
-
-                if (activity != null)                
+                if (Context is Activity activity) { 
                     await ZXing.Net.Mobile.Android.PermissionsHandler.RequestPermissionsAsync (activity);
-                
-                zxingSurface = new ZXingSurfaceView (Xamarin.Forms.Forms.Context as Activity, formsView.Options);
-                zxingSurface.LayoutParameters = new LayoutParams (LayoutParams.MatchParent, LayoutParams.MatchParent);
 
-                base.SetNativeControl (zxingSurface);
+                    zxingSurface = new ZXingSurfaceView (activity, formsView.Options)
+                    {
+                        LayoutParameters = new LayoutParams (LayoutParams.MatchParent, LayoutParams.MatchParent)
+                    };
 
-                if (formsView.IsScanning)
-                    zxingSurface.StartScanning(formsView.RaiseScanResult, formsView.Options);
+                    base.SetNativeControl (zxingSurface);
 
-                if (!formsView.IsAnalyzing)
-                    zxingSurface.PauseAnalysis ();
+                    if (formsView.IsScanning)
+                        zxingSurface.StartScanning (formsView.RaiseScanResult, formsView.Options);
+
+                    if (!formsView.IsAnalyzing)
+                        zxingSurface.PauseAnalysis ();
 
-                if (formsView.IsTorchOn)
-                    zxingSurface.Torch (true);
+                    if (formsView.IsTorchOn)
+                        zxingSurface.Torch (true);
+                }
             }
         }