ConcurrentDictionary used and counter locked

Author: Adam Pedley

Toasts.Forms.Plugin.Abstractions/Options/NotificationOptions.cs

@@ -1,7 +1,8 @@
 namespace Plugin.Toasts
 {
     using System;
-    using System.Collections.Generic;
+	using System.Collections.Concurrent;
+	using System.Collections.Generic;
 
     public class NotificationOptions : INotificationOptions
     {
@@ -17,7 +18,7 @@ public class NotificationOptions : INotificationOptions
 
         public IiOSOptions iOSOptions { get; set; } = new iOSOptions();
 
-        public IDictionary<string, string> CustomArgs { get; set; } = new Dictionary<string, string>();
+        public IDictionary<string, string> CustomArgs { get; set; } = new ConcurrentDictionary<string, string>();
 
         public bool ClearFromHistory { get; set; } = false;
 

Toasts.Forms.Plugin.Droid/NotificationBuilder.cs

@@ -7,15 +7,16 @@
 using System.Threading;
 using System.Xml.Serialization;
 using Plugin.Toasts.Interfaces;
+using System.Collections.Concurrent;
 
 namespace Plugin.Toasts
 {
     class NotificationBuilder
     {
         public static string PackageName { get; set; }
 
-        public static IDictionary<string, ManualResetEvent> ResetEvent = new Dictionary<string, ManualResetEvent>();
-        public static IDictionary<string, NotificationResult> EventResult = new Dictionary<string, NotificationResult>();
+        public static IDictionary<string, ManualResetEvent> ResetEvent = new ConcurrentDictionary<string, ManualResetEvent>();
+        public static IDictionary<string, NotificationResult> EventResult = new ConcurrentDictionary<string, NotificationResult>();
         public static List<string> Channels = new List<string>();
 
         public const string NotificationId = "NOTIFICATION_ID";
@@ -154,10 +155,15 @@ public INotificationResult Notify(Activity activity, INotificationOptions option
             INotificationResult notificationResult = null;
             if (options != null)
             {
-                var notificationId = _count;
-                var id = _count.ToString();
-                _count++;
-
+				var notificationId = 0;
+				var id = "";
+				lock (_lock)
+				{
+					notificationId = _count;
+					id = _count.ToString();
+					_count++;
+				}
+             
                 int smallIcon;
 
                 if (options.AndroidOptions.SmallDrawableIcon.HasValue)

Toasts.Forms.Plugin.Droid/SnackbarNotification.cs

@@ -5,13 +5,14 @@ namespace Plugin.Toasts
     using Android.Text;
     using Android.Views;
     using System;
-    using System.Collections.Generic;
+	using System.Collections.Concurrent;
+	using System.Collections.Generic;
     using System.Threading;
 
     internal class SnackbarNotification
     {
-        private IDictionary<string, ManualResetEvent> _resetEvents = new Dictionary<string, ManualResetEvent>();
-        private IDictionary<string, NotificationResult> _eventResult = new Dictionary<string, NotificationResult>();
+        private IDictionary<string, ManualResetEvent> _resetEvents = new ConcurrentDictionary<string, ManualResetEvent>();
+        private IDictionary<string, NotificationResult> _eventResult = new ConcurrentDictionary<string, NotificationResult>();
         private IList<Snackbar> _snackBars = new List<Snackbar>();
 
         private int _count = 0;

Toasts.Forms.Plugin.UWP/ToastNotification.cs

@@ -8,13 +8,14 @@
     using System;
     using Windows.ApplicationModel.Activation;
     using System.Xml;
+	using System.Collections.Concurrent;
 
-    public class ToastNotification : IToastNotificator
+	public class ToastNotification : IToastNotificator
     {
 
-        private IDictionary<string, ManualResetEvent> _resetEvents = new Dictionary<string, ManualResetEvent>();
-        private IDictionary<string, NotificationResult> _eventResult = new Dictionary<string, NotificationResult>();
-        private IDictionary<string, INotificationOptions> _notificationOptions = new Dictionary<string, INotificationOptions>();
+        private IDictionary<string, ManualResetEvent> _resetEvents = new ConcurrentDictionary<string, ManualResetEvent>();
+        private IDictionary<string, NotificationResult> _eventResult = new ConcurrentDictionary<string, NotificationResult>();
+        private IDictionary<string, INotificationOptions> _notificationOptions = new ConcurrentDictionary<string, INotificationOptions>();
         private int _count = 0;
 
         public static void Init() { }

Toasts.Forms.Plugin.iOS/UNNotificationManager.cs

@@ -3,14 +3,15 @@
     using Extensions;
     using Foundation;
     using System;
-    using System.Collections.Generic;
+	using System.Collections.Concurrent;
+	using System.Collections.Generic;
     using System.Threading;
     using UserNotifications;
 
     public class UNNotificationManager
     {
-        private IDictionary<string, ManualResetEvent> _resetEvents = new Dictionary<string, ManualResetEvent>();
-        private IDictionary<string, NotificationResult> _eventResult = new Dictionary<string, NotificationResult>();
+        private IDictionary<string, ManualResetEvent> _resetEvents = new ConcurrentDictionary<string, ManualResetEvent>();
+        private IDictionary<string, NotificationResult> _eventResult = new ConcurrentDictionary<string, NotificationResult>();
         private int _count = 0;
         private static object _lock = new object();