Added Insights and fixed extended party bug

Disa-im · Dec 16, 2016 · 80e858a · 80e858a
1 parent 1ecdb2d
commit 80e858a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/Disa.Framework.Telegram.Mobile.Shared/Setup.cs b/Disa.Framework.Telegram.Mobile.Shared/Setup.cs
@@ -12,6 +12,7 @@
 using System.Text;
 using System.Security.Cryptography;
 using System.IO;
+using Xamarin;
 
 namespace Disa.Framework.Telegram.Mobile
 {
@@ -42,6 +43,24 @@ public TelegramSetupSettings()
             }
         }
 
+		//Setup exception class for Xamarin Insights Exception
+		public class SetupException : Exception
+		{ 
+			public SetupException()
+			{
+		    }
+
+		    public SetupException(string message)
+		        : base(message)
+		    {
+			}
+
+			public SetupException(string message, Exception inner)
+		        : base(message, inner)
+		    {
+			}
+		}
+
         private static Task<ActivationResult> Register(Service service, string nationalNumber, string countryCode, string code, string firstName = null, string lastName = null)
         {
             return Task<ActivationResult>.Factory.StartNew(() =>
@@ -185,6 +204,7 @@ private static void Save(Service service, uint accountId, TelegramSettings setti
                 }
 
                 Utils.DebugPrint("Starting the service...!");
+				Insights.Report(new SetupException("Telegram Setup Ended"));
                 ServiceManager.Start(service, true);
             }
             catch (Exception ex)
@@ -314,6 +334,7 @@ public static Page Fetch(Service service)
 
             tabs.Title = Localize.GetString("TelegramSetupWizardTitle");
             _cachedPage = tabs;
+			Insights.Report(new SetupException("Telegram Setup Started"));
             return tabs;
         }
 

diff --git a/Disa.Framework.Telegram.Shared/Telegram.cs b/Disa.Framework.Telegram.Shared/Telegram.cs
@@ -835,7 +835,10 @@ private List<VisualBubble> MakePartyInformationBubble(MessageService messageServ
                     var bubbleGroupToDelete = BubbleGroupManager.FindWithAddress(this, address);
                     if (bubbleGroupToSwitch != null)
                     {
-                        Platform.SwitchCurrentBubbleGroupOnUI(bubbleGroupToSwitch);
+						if (Platform.GetCurrentBubbleGroupOnUI() == bubbleGroupToDelete)
+						{
+							Platform.SwitchCurrentBubbleGroupOnUI(bubbleGroupToSwitch);
+						}
                     }
                     if (bubbleGroupToDelete != null)
                     {