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

Conflicts:
	Juick/Properties/WMAppManifest.xml

11 files changed, 23 insertions, 21 deletions

diff --git a/Juick/App.xaml.cs b/Juick/App.xaml.cs
index bb8dddb..100f0e3 100644
--- a/Juick/App.xaml.cs
+++ b/Juick/App.xaml.cs
@@ -10,15 +10,15 @@ namespace Juick
 {

     public partial class App : Application

     {

-        public void NavigateTo(Uri param, bool removeFromStack = false)

+        public void NavigateTo(Uri param)

         {

-            var page = (PhoneApplicationPage) RootFrame.Content;

+            var page = (PhoneApplicationPage)RootFrame.Content;

             var service = page.NavigationService;

-            service.Navigate(param);

-            if (removeFromStack)

+            page.Dispatcher.BeginInvoke(() =>

             {

-                page.Dispatcher.BeginInvoke(() => service.RemoveBackEntry());

-            }

+                service.Navigate(param);                

+            });            

+            

         }

         private static AppViewModel _context = null;

 

@@ -230,7 +230,7 @@ namespace Juick
                     // The app was relaunched via a Deep Link.

                     // The page stack will be cleared.

                 }

-                else if (e.Uri.OriginalString.Contains("/MainPage.xaml"))

+                else if (e.Uri.OriginalString.Contains("/LaunchPage.xaml"))

                 {

                     // This block will run if the navigation Uri is the main page

                     if (_sessionType == SessionType.DeepLink)

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);
             }
 
diff --git a/Juick/Controls/MessageList.xaml b/Juick/Controls/MessageList.xaml
index 93dd08f..d23903d 100644
--- a/Juick/Controls/MessageList.xaml
+++ b/Juick/Controls/MessageList.xaml
@@ -8,7 +8,7 @@
              xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"

              mc:Ignorable="d"

     FontFamily="{StaticResource PhoneFontFamilyNormal}"

-    FontSize="{StaticResource PhoneFontSizeNormal}"

+    FontSize="{StaticResource PhoneFontSizeMedium}"

     Foreground="{StaticResource PhoneForegroundBrush}"

     d:DesignHeight="480" d:DesignWidth="480">

     

diff --git a/Juick/MainPage.xaml b/Juick/MainPage.xaml
index 840f8ae..0b427be 100644
--- a/Juick/MainPage.xaml
+++ b/Juick/MainPage.xaml
@@ -12,7 +12,7 @@
     xmlns:usercontrols="clr-namespace:Juick.Controls" xmlns:classes="clr-namespace:Juick.Classes"

     mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="696"

     FontFamily="{StaticResource PhoneFontFamilyNormal}"

-    FontSize="{StaticResource PhoneFontSizeNormal}"

+    FontSize="{StaticResource PhoneFontSizeMedium}"

     Foreground="{StaticResource PhoneForegroundBrush}"

     SupportedOrientations="PortraitOrLandscape"  Orientation="Portrait"

     phoneshell:SystemTray.IsVisible="True" CacheMode="BitmapCache">

diff --git a/Juick/NewPostView.xaml b/Juick/NewPostView.xaml
index a04c305..bac2552 100644
--- a/Juick/NewPostView.xaml
+++ b/Juick/NewPostView.xaml
@@ -7,7 +7,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

     FontFamily="{StaticResource PhoneFontFamilyNormal}"

-    FontSize="{StaticResource PhoneFontSizeNormal}"

+    FontSize="{StaticResource PhoneFontSizeMedium}"

     Foreground="{StaticResource PhoneForegroundBrush}"

     SupportedOrientations="PortraitOrLandscape" Orientation="Portrait"

     mc:Ignorable="d" d:DesignHeight="696" d:DesignWidth="480"

diff --git a/Juick/Properties/AssemblyInfo.cs b/Juick/Properties/AssemblyInfo.cs
index eee1c5c..578be39 100644
--- a/Juick/Properties/AssemblyInfo.cs
+++ b/Juick/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@ using System.Resources;
 //

 // You can specify all the values or you can default the Revision and Build Numbers 

 // by using the '*' as shown below:

-[assembly: AssemblyVersion("2.1.0.*")]

-[assembly: AssemblyFileVersion("2.1.0.*")]

+[assembly: AssemblyVersion("2.1.1")]

+[assembly: AssemblyFileVersion("2.1.1")]

 [assembly: NeutralResourcesLanguageAttribute("en-US")]

diff --git a/Juick/Properties/WMAppManifest.xml b/Juick/Properties/WMAppManifest.xml
index 4b0e327..67457fb 100644
--- a/Juick/Properties/WMAppManifest.xml
+++ b/Juick/Properties/WMAppManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Deployment xmlns="http://schemas.microsoft.com/windowsphone/2014/deployment" AppPlatformVersion="8.1">

   <DefaultLanguage xmlns="" code="en-US" />

-  <App xmlns="" ProductID="{ba7895cf-3f11-4459-9f91-6fe7df26e202}" Title="Juick" RuntimeType="Silverlight" Version="2.1.0" Genre="apps.normal" Author="Juick author" Description="Client for the juick.com service" Publisher="Juick" PublisherID="{bfbcb16e-c78a-4595-afc6-6ada592f1adc}" NotificationService="MPN">

+  <App xmlns="" ProductID="{ba7895cf-3f11-4459-9f91-6fe7df26e202}" Title="Juick" RuntimeType="Silverlight" Version="2.1.1" Genre="apps.normal" Author="Juick author" Description="Client for the juick.com service" Publisher="Juick" PublisherID="{bfbcb16e-c78a-4595-afc6-6ada592f1adc}" NotificationService="MPN">

     <IconPath IsRelative="true" IsResource="false">Assets\ApplicationIcon.png</IconPath>

     <Capabilities>

       <Capability Name="ID_CAP_IDENTITY_DEVICE" />

@@ -22,7 +22,7 @@
       <Capability Name="ID_CAP_REMOVABLE_STORAGE" />

     </Capabilities>

     <Tasks>

-      <DefaultTask Name="_default" NavigationPage="MainPage.xaml" ActivationPolicy="Resume" />

+      <DefaultTask Name="_default" NavigationPage="LaunchPage.xaml" ActivationPolicy="Resume" />

     </Tasks>

     <Tokens>

       <PrimaryToken TokenID="JuickToken" TaskName="_default">

@@ -39,6 +39,7 @@
           </BackTitle>

           <LargeBackgroundImageURI IsRelative="true" IsResource="false">Assets\WideLogo.png</LargeBackgroundImageURI>

           <LargeBackContent />

+          <DeviceLockImageURI />

           <HasLarge>True</HasLarge>

         </TemplateFlip>

       </PrimaryToken>

diff --git a/Juick/ThreadView.xaml b/Juick/ThreadView.xaml
index 2f67219..4d214e8 100644
--- a/Juick/ThreadView.xaml
+++ b/Juick/ThreadView.xaml
@@ -8,7 +8,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="clr-namespace:Juick.Controls" xmlns:bindings="clr-namespace:Juick.Classes"
     FontFamily="{StaticResource PhoneFontFamilyNormal}"
-    FontSize="{StaticResource PhoneFontSizeNormal}"
+    FontSize="{StaticResource PhoneFontSizeMedium}"
     Foreground="{StaticResource PhoneForegroundBrush}"
     SupportedOrientations="PortraitOrLandscape" Orientation="Portrait"
     mc:Ignorable="d" d:DesignHeight="696" d:DesignWidth="480"
diff --git a/Juick/UserFeed.xaml b/Juick/UserFeed.xaml
index 464ef09..de5afa8 100644
--- a/Juick/UserFeed.xaml
+++ b/Juick/UserFeed.xaml
@@ -7,7 +7,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     FontFamily="{StaticResource PhoneFontFamilyNormal}"
-    FontSize="{StaticResource PhoneFontSizeNormal}"
+    FontSize="{StaticResource PhoneFontSizeMedium}"
     Foreground="{StaticResource PhoneForegroundBrush}"
     SupportedOrientations="Portrait" Orientation="Portrait"
     mc:Ignorable="d" d:DesignHeight="768" d:DesignWidth="480"
diff --git a/Juick/ViewModels/LoginViewModel.cs b/Juick/ViewModels/LoginViewModel.cs
index 9589f08..f6f50ec 100644
--- a/Juick/ViewModels/LoginViewModel.cs
+++ b/Juick/ViewModels/LoginViewModel.cs
@@ -60,7 +60,7 @@ namespace Juick.ViewModels
                                                                                      App.AppContext.Account.Password = Password;
                                                                                      App.AppContext.Account.IsAuthenticated = true;
                                                                                      App.AppContext.EnableNotifications();
-                                                                                     ((App)Application.Current).NavigateTo(NextUri, true);
+                                                                                     ((App)Application.Current).NavigateTo(NextUri);
                                                                                  }
                                                                                  else if (response.StatusCode ==
                                                                                           HttpStatusCode.Forbidden)
diff --git a/Juick/ViewModels/PageViewModel.cs b/Juick/ViewModels/PageViewModel.cs
index c13e6f1..152e9d9 100644
--- a/Juick/ViewModels/PageViewModel.cs
+++ b/Juick/ViewModels/PageViewModel.cs
@@ -73,7 +73,7 @@ namespace Juick.ViewModels
             _context.Client.ExecuteAsync<List<Message>>(request, response =>

             {

                 _context.IsDataLoading = false;

-                if (response.ErrorException != null)

+                if (response == null || response.ErrorException != null)

                 {

                     return;

                 }