#144: Fixed

FoxTube/Classes/Methods.cs

@@ -14,6 +14,7 @@ namespace FoxTube
 {
     public static class Methods
     {
+        public static bool NeedToResponse { get; set; } = false;
         public static MainPage MainPage
         {
             get { return (Window.Current.Content as Frame).Content as MainPage; }

FoxTube/Pages/ChannelPage.xaml.cs

@@ -86,6 +86,9 @@ namespace FoxTube.Pages
             try
             {
                 channelId = id;
+                if (Methods.NeedToResponse)
+                    Methods.MainPage.content_Navigated(this, null);
+
                 ChannelsResource.ListRequest request = SecretsVault.Service.Channels.List("snippet,statistics,brandingSettings");
                 request.Id = id;
                 if (content.Items.Count == 4)
@@ -133,8 +136,6 @@ namespace FoxTube.Pages
 
                 if (SecretsVault.IsAuthorized)
                 {
-                    SecretsVault.Subscriptions.ForEach(x => Debug.WriteLine($"{x.Snippet.Title}: {x.Snippet.ResourceId.ChannelId}"));
-                    Debug.WriteLine($"Current channel ID: {item.Id}");
                     bool b = false;
                     foreach (Subscription s in SecretsVault.Subscriptions)
                     {
@@ -148,7 +149,6 @@ namespace FoxTube.Pages
                             break;
                         }
                     }
-                    Debug.WriteLine($"Channel was found: {b}");
                     subscriptionPane.Visibility = Visibility.Visible;
                 }
 

FoxTube/Pages/MainPage.xaml.cs

@@ -502,7 +502,7 @@ namespace FoxTube
                 s = Sender.None;
         }
 
-        private void content_Navigated(object sender, NavigationEventArgs e)
+        public void content_Navigated(object sender, NavigationEventArgs e)
         {
             Dictionary<Type, Action> switchCase = new Dictionary<Type, Action>()
             {
@@ -535,9 +535,16 @@ namespace FoxTube
                     } },
                     { typeof(ChannelPage), () =>
                     {
+                        if(sender.GetType() != typeof(ChannelPage))
+                        {
+                            Methods.NeedToResponse = true;
+                            s = Sender.None;
+                            return;
+                        }
+                        Methods.NeedToResponse = false;
                         if(SecretsVault.IsAuthorized)
                             {
-                            if((content.Content as ChannelPage).channelId == SecretsVault.AccountId)
+                                if((content.Content as ChannelPage).channelId == SecretsVault.UserChannel.Id)
                                 {
                                     if(nav.SelectedItem != toChannel)
                                         nav.SelectedItem = toChannel;
@@ -559,14 +566,23 @@ namespace FoxTube
                                         }
 
                                     if(!found)
+                                    {
                                         nav.SelectedItem = null;
                                     }
                                 }
+                            }
                             else
                                 nav.SelectedItem = null;
                     } },
                     { typeof(PlaylistPage), () =>
                     {
+                        if(sender.GetType() != typeof(PlaylistPage))
+                        {
+                            Methods.NeedToResponse = true;
+                            s = Sender.None;
+                            return;
+                        }
+                        Methods.NeedToResponse = false;
                         if((content.Content as PlaylistPage).playlistId == SecretsVault.UserChannel.ContentDetails.RelatedPlaylists.Likes)
                         {
                             if(nav.SelectedItem != toLiked)
@@ -617,7 +633,7 @@ namespace FoxTube
                         } }
                 };
 
-                try { navCase[e.SourcePageType](); }
+                try { navCase[content.SourcePageType](); }
                 catch
                 {
                     nav.SelectedItem = null;
@@ -631,7 +647,7 @@ namespace FoxTube
             else
                 nav.IsBackEnabled = false;
 
-            if (e.SourcePageType == typeof(Home) || e.SourcePageType == typeof(Settings) || e.SourcePageType == typeof(Subscriptions))
+            if (content.SourcePageType == typeof(Home) || content.SourcePageType == typeof(Settings) || content.SourcePageType == typeof(Subscriptions))
             {
                 nav.ExpandedModeThresholdWidth = 1008;
                 if (nav.DisplayMode == NavigationViewDisplayMode.Expanded)

FoxTube/Pages/PlaylistPage.xaml.cs

@@ -62,6 +62,9 @@ namespace FoxTube.Pages
             try
             {
                 playlistId = id;
+                if (Methods.NeedToResponse)
+                    Methods.MainPage.content_Navigated(this, null);
+
                 PlaylistsResource.ListRequest request = SecretsVault.Service.Playlists.List("snippet,contentDetails");
                 request.Id = id;