Merge branch 'master' of https://bitbucket.org/vitalyster/juick-windowsphone

Conflicts:
	Juick/Properties/WMAppManifest.xml

1 files changed, 4 insertions, 3 deletions

diff --git a/Juick/Classes/MyUriMapper.cs b/Juick/Classes/MyUriMapper.cs
index 4f757a5..8add683 100644
--- a/Juick/Classes/MyUriMapper.cs
+++ b/Juick/Classes/MyUriMapper.cs
@@ -18,13 +18,14 @@ namespace Juick.Classes
             // Incoming URI example: /MainPage.xaml?Action=ShareContent&FileId=%7BA3D54E2D-7977-4E2B-B92D-3EB126E5D168%7D
             if ((tempUri.Contains("ShareContent")) && (tempUri.Contains("FileId")))
             {
-                mappedUri = tempUri.Replace("MainPage", "NewPostView");
+                mappedUri = tempUri.Replace("LaunchPage", "NewPostView");
                 return new Uri(mappedUri, UriKind.Relative);
             }
 
-            if (!App.AppContext.Account.IsAuthenticated)
+            if (uri.OriginalString == "/LaunchPage.xaml")
             {
-                mappedUri = tempUri.Replace("MainPage", "LoginView");
+                var realPage = App.AppContext.Account.IsAuthenticated ? "MainPage" : "LoginView";
+                mappedUri = tempUri.Replace("LaunchPage", realPage);
                 return new Uri(mappedUri, UriKind.Relative);
             }