♻️ move ringtone to notification class

Author: xavierfoucrier

code/Inbox.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Media;
 using System.Net;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -141,11 +140,6 @@ public async Task Sync(bool manual = true, bool token = false) {
 					// manage unread spams
 					if (UnreadSpams > 0) {
 
-						// play a sound on unread spams
-						if (Settings.Default.AudioNotification) {
-							SystemSounds.Exclamation.Play();
-						}
-
 						// display a balloon tip in the systray with the total of unread threads
 						UI.NotificationService.Tip($"{UnreadSpams} {(UnreadSpams > 1 ? Translation.unreadSpams : Translation.unreadSpam)}", Translation.newUnreadSpam, Notification.Type.Error);
 
@@ -184,25 +178,6 @@ public async Task Sync(bool manual = true, bool token = false) {
 					// manage message notification
 					if (Settings.Default.MessageNotification) {
 
-						// play a sound on unread threads
-						if (Settings.Default.AudioNotification) {
-
-							// play a ringtone based on user setting
-							if (Settings.Default.Ringtone) {
-
-								// switch to the default ringtone if the audio file can't be found
-								if (File.Exists(Settings.Default.RingtoneFile)) {
-									using (SoundPlayer player = new SoundPlayer(Settings.Default.RingtoneFile)) {
-										player.Play();
-									}
-								} else {
-									Settings.Default.Ringtone = false;
-								}
-							} else {
-								SystemSounds.Asterisk.Play();
-							}
-						}
-
 						// get the message details
 						UsersResource.MessagesResource.ListRequest messages = User.Messages.List("me");
 						messages.LabelIds = "UNREAD";

code/Notification.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Diagnostics;
+using System.IO;
+using System.Media;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using notifier.Languages;
@@ -65,6 +67,9 @@ public Notification(ref Main form) {
 		/// <param name="duration">How long the notification is displayed</param>
 		public void Tip(string title, string text, Type icon = Type.Info, int duration = 450) {
 			UI.notifyIcon.ShowBalloonTip(duration, title, text, (ToolTipIcon)icon);
+
+			// play audio based on balloon type
+			Ringtone(icon);
 		}
 
 		/// <summary>
@@ -238,6 +243,41 @@ public void Reset() {
 			UI.menuItemMarkAsRead.Enabled = false;
 		}
 
+		/// <summary>
+		/// Play ringtone based on displayed notification
+		/// </summary>
+		/// <param name="type"></param>
+		private void Ringtone(Type type = Type.Info) {
+			if (!Settings.Default.AudioNotification) {
+				return;
+			}
+
+			// 
+			switch (type) {
+				case Type.Info:
+
+					// play a ringtone based on user setting
+					if (Settings.Default.Ringtone) {
+
+						// switch to the default ringtone if the audio file can't be found
+						if (File.Exists(Settings.Default.RingtoneFile)) {
+							using (SoundPlayer player = new SoundPlayer(Settings.Default.RingtoneFile)) {
+								player.Play();
+							}
+						} else {
+							Settings.Default.Ringtone = false;
+						}
+					} else {
+						SystemSounds.Asterisk.Play();
+					}
+
+					break;
+				case Type.Error:
+					SystemSounds.Exclamation.Play();
+					break;
+			}
+		}
+
 		/// <summary>
 		/// Return the Gmail base URL depending on the notification behavior
 		/// </summary>