Implemented workaround for crash documented here: ufuf#5

d-m-wilson · Jun 3, 2019 · 01182d8 · 01182d8
1 parent 39998ec
commit 01182d8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/AdvancedTimer.Forms.Plugin.nuspec b/AdvancedTimer.Forms.Plugin.nuspec
@@ -2,15 +2,15 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata minClientVersion="2.8.1">
        <id>info.dmwilson.AdvancedTimer.Forms.Plugin</id>
-       <version>1.0.2.0-alpha2</version>
+       <version>1.0.2.0-alpha5</version>
        <title>AdvancedTimer Plugin for Xamarin.Forms</title>
        <authors>Ufuk ARSLAN,David M. Wilson</authors>
        <owners>David M. Wilson</owners>
        <licenseUrl>https://github.com/d-m-wilson/AdvancedTimer/blob/master/LICENSE</licenseUrl>
        <projectUrl>https://github.com/d-m-wilson/AdvancedTimer</projectUrl>
        <requireLicenseAcceptance>false</requireLicenseAcceptance>
        <description>
-		 This is a .NET Standard 2.0 version of the AdvancedTimer plugin by Ufuk Arslan. The code has not been modified, only the project types and references.
+         This is a .NET Standard 2.0 version of the AdvancedTimer plugin by Ufuk Arslan.
 
          Timer object and its methods are implemented for extended support for timers.
          You can start, stop, change interval of a timer.

diff --git a/AdvancedTimer/AdvancedTimer.Forms.Plugin.Android/AdvancedTimerImplementation.cs b/AdvancedTimer/AdvancedTimer.Forms.Plugin.Android/AdvancedTimerImplementation.cs
@@ -1,10 +1,8 @@
-using AdvancedTimer.Forms.Plugin.Abstractions;
 using System;
-using Xamarin.Forms;
-using AdvancedTimer.Forms.Plugin.Droid;
 using System.Timers;
+using AdvancedTimer.Forms.Plugin.Abstractions;
+using Xamarin.Forms;
 
-[assembly: Dependency(typeof(AdvancedTimerImplementation))]
 namespace AdvancedTimer.Forms.Plugin.Droid
 {
     /// <summary>
@@ -19,7 +17,10 @@ public class AdvancedTimerImplementation : IAdvancedTimer
         /// <summary>
         /// Used for registration with dependency service
         /// </summary>
-        public static void Init() { }
+        public static void Init()
+        {
+            DependencyService.Register<IAdvancedTimer, AdvancedTimerImplementation>();
+        }
 
         /// <summary>
         /// Used for initializing timer and options

diff --git a/AdvancedTimer/AdvancedTimer.Forms.Plugin.iOSUnified/AdvancedTimerImplementation.cs b/AdvancedTimer/AdvancedTimer.Forms.Plugin.iOSUnified/AdvancedTimerImplementation.cs
@@ -1,15 +1,14 @@
-using AdvancedTimer.Forms.Plugin.Abstractions;
-using System;
-using Xamarin.Forms;
-using AdvancedTimer.Forms.Plugin.iOS;
+using System;
 using System.Timers;
+using AdvancedTimer.Forms.Plugin.Abstractions;
+using Xamarin.Forms;
 
-[assembly: Dependency(typeof(AdvancedTimerImplementation))]
 namespace AdvancedTimer.Forms.Plugin.iOS
 {
     /// <summary>
     /// AdvancedTimer Implementation
     /// </summary>
+    [Foundation.Preserve(AllMembers = true, Conditional = false)]
     public class AdvancedTimerImplementation : IAdvancedTimer
     {
         Timer timer;
@@ -19,7 +18,10 @@ public class AdvancedTimerImplementation : IAdvancedTimer
         /// <summary>
         /// Used for registration with dependency service
         /// </summary>
-        public static void Init() { }
+        public static void Init()
+        {
+            DependencyService.Register<IAdvancedTimer, AdvancedTimerImplementation>();
+        }
 
         /// <summary>
         /// Used for initializing timer and options