From 6a1cc12b2ca35637241ec1b9f9109eb602652f8c Mon Sep 17 00:00:00 2001
From: ChrisK91 <ChrisGit@outlook.com>
Date: Fri, 6 Sep 2013 00:35:40 +0200
Subject: [PATCH] Multiple enhancements

- Fixed various search issues, closes #78
- Added basic support for chat, updates every two seconds. Still some
bugs to iron out (see #8)
- Made "message" button on profile page functional (closes #69)
- Added SmartDispatcher, that only dispatches when needed, Should give
us a little performance increase
- Changed Dispatching in MainViewModel
- Added ability to suppress notifications
- Made Helpers.Notify thread safe
- Added auto updating to Chat
- Added client function to post a chat message
- Added client function to get chat beacon
---
 SparklrLib/Objects/Requests/Work/Chat.cs    |   2 +-
 SparklrLib/Objects/Responses/Beacon/Chat.cs |   5 +-
 SparklrLib/PortableSparklrLib.csproj        |   1 +
 SparklrLib/SparklrClient.cs                 |  17 +-
 SparklrWP/App.xaml.cs                       |   4 +-
 SparklrWP/Pages/ChatPage.xaml               |   2 +-
 SparklrWP/Pages/ChatPage.xaml.cs            |  12 ++
 SparklrWP/Pages/Profile.xaml                |   2 +-
 SparklrWP/Pages/Profile.xaml.cs             |   5 +
 SparklrWP/Pages/SearchPage.xaml             |   4 +-
 SparklrWP/Pages/SearchPage.xaml.cs          |  12 +-
 SparklrWP/SparklrWP.csproj                  |   1 +
 SparklrWP/Utils/Helpers.cs                  |  11 +-
 SparklrWP/Utils/SmartDispatcher.cs          |  34 ++++
 SparklrWP/ViewModels/ChatViewModel.cs       | 166 ++++++++++++++++++--
 SparklrWP/ViewModels/MainViewModel.cs       |  51 ++++--
 SparklrWP/ViewModels/SearchViewModel.cs     |  38 ++---
 17 files changed, 306 insertions(+), 61 deletions(-)
 create mode 100644 SparklrWP/Utils/SmartDispatcher.cs

diff --git a/SparklrLib/Objects/Requests/Work/Chat.cs b/SparklrLib/Objects/Requests/Work/Chat.cs
index a9d2379..f1d1044 100644
--- a/SparklrLib/Objects/Requests/Work/Chat.cs
+++ b/SparklrLib/Objects/Requests/Work/Chat.cs
@@ -3,7 +3,7 @@ namespace SparklrLib.Objects.Requests.Work
 {
     public class Chat
     {
-        public string to { get; set; }
+        public int to { get; set; }
         public string message { get; set; }
     }
 }
diff --git a/SparklrLib/Objects/Responses/Beacon/Chat.cs b/SparklrLib/Objects/Responses/Beacon/Chat.cs
index ef78f52..33e000d 100644
--- a/SparklrLib/Objects/Responses/Beacon/Chat.cs
+++ b/SparklrLib/Objects/Responses/Beacon/Chat.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-
+
 namespace SparklrLib.Objects.Responses.Beacon
 {
     public class ChatMessage
@@ -12,6 +11,6 @@ public class ChatMessage
 
     public class Chat : BeaconBase
     {
-        public List<ChatMessage> data { get; set; }
+        public ChatMessage[] data { get; set; }
     }
 }
diff --git a/SparklrLib/PortableSparklrLib.csproj b/SparklrLib/PortableSparklrLib.csproj
index aa266eb..37689ac 100644
--- a/SparklrLib/PortableSparklrLib.csproj
+++ b/SparklrLib/PortableSparklrLib.csproj
@@ -39,6 +39,7 @@
     <Compile Include="Objects\JSONRequestEventArgs.cs" />
     <Compile Include="Objects\LoginEventArgs.cs" />
     <Compile Include="Objects\NotificationEventArgs.cs" />
+    <Compile Include="Objects\Requests\Work\Chat.cs" />
     <Compile Include="Objects\Requests\Work\Comment.cs" />
     <Compile Include="Objects\Requests\Work\Like.cs" />
     <Compile Include="Objects\Requests\Work\Post.cs" />
diff --git a/SparklrLib/SparklrClient.cs b/SparklrLib/SparklrClient.cs
index 5a1948c..e61a86c 100644
--- a/SparklrLib/SparklrClient.cs
+++ b/SparklrLib/SparklrClient.cs
@@ -1,6 +1,5 @@
 using Newtonsoft.Json;
 using SparklrLib.Objects;
-using SparklrLib.Objects.Responses;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -488,7 +487,7 @@ public async Task<SparklrEventArgs> PostAsync(string message, Stream image)
                     int count;
                     while ((count = image.Read(array, 0, array.Length)) != 0)
                     {
-                       ms.Write(array, 0, count);
+                        ms.Write(array, 0, count);
                     }
 #else
                     image.CopyTo(ms);
@@ -666,6 +665,20 @@ public async Task<SparklrEventArgs> PostAsync(string message, Stream image)
             return requestJsonObjectAsync<Objects.Responses.Work.Chat[]>("/work/chat/" + otherid.ToString());
         }
 
+        public Task<JSONRequestEventArgs<Objects.Responses.Beacon.Chat>> GetBeaconChatAsync(int otherid, int since, int limit = 0)
+        {
+            return requestJsonObjectAsync<Objects.Responses.Beacon.Chat>("/beacon/chat/" + otherid.ToString() + "?since=" + since.ToString() + "&n=" + limit.ToString());
+        }
+
+        public Task<JSONRequestEventArgs<Objects.Responses.Generic>> PostChatMessageAsync(int recipient, string message)
+        {
+            return requestJsonObjectAsync<Objects.Responses.Generic>("/work/chat", new Objects.Requests.Work.Chat()
+                {
+                    to = recipient,
+                    message = message
+                }, "", "POST");
+        }
+
         private void raiseCredentialsExpired()
         {
             //Fire only once
diff --git a/SparklrWP/App.xaml.cs b/SparklrWP/App.xaml.cs
index 2c39a89..93bc0dd 100644
--- a/SparklrWP/App.xaml.cs
+++ b/SparklrWP/App.xaml.cs
@@ -68,6 +68,7 @@ public App()
 
         }
 
+        static internal bool SuppressNotifications = false;
         private int previousNotifications = 0;
         void SparklrClient_NotificationsReceived(object sender, SparklrLib.Objects.NotificationEventArgs e)
         {
@@ -76,7 +77,8 @@ void SparklrClient_NotificationsReceived(object sender, SparklrLib.Objects.Notif
             {
                 if (e.Notifications.Length != previousNotifications)
                 {
-                    Helpers.Notify(String.Format("You have {0} notifications.", e.Notifications.Length));
+                    if (!SuppressNotifications)
+                        Helpers.Notify(String.Format("You have {0} notifications.", e.Notifications.Length));
                     previousNotifications = e.Notifications.Length;
                 }
 
diff --git a/SparklrWP/Pages/ChatPage.xaml b/SparklrWP/Pages/ChatPage.xaml
index 7009dd9..07e195e 100644
--- a/SparklrWP/Pages/ChatPage.xaml
+++ b/SparklrWP/Pages/ChatPage.xaml
@@ -69,7 +69,7 @@
                     </Style>
                 </ListBox.ItemContainerStyle>
             </ListBox>
-            <codingForFun:ChatBubbleTextBox Grid.Row="1" ChatBubbleDirection="LowerRight" Margin="75,0,0,5" />
+            <codingForFun:ChatBubbleTextBox Grid.Row="1" ChatBubbleDirection="LowerRight" Margin="75,0,0,5" KeyDown="ChatBubbleTextBox_KeyDown" Text="{Binding Message, Mode=TwoWay}" x:Name="chatBubbleTextBox" InputScope="Chat" />
         </Grid>
         <!-- Visibility set in code behind -->
         <sparklrControls:LoadingOverlay x:Name="loadingOverlay" Grid.Row="0" Grid.RowSpan="2" Visibility="Collapsed" />
diff --git a/SparklrWP/Pages/ChatPage.xaml.cs b/SparklrWP/Pages/ChatPage.xaml.cs
index 19b991b..88fa835 100644
--- a/SparklrWP/Pages/ChatPage.xaml.cs
+++ b/SparklrWP/Pages/ChatPage.xaml.cs
@@ -1,6 +1,8 @@
 using Microsoft.Phone.Controls;
+using SparklrWP.Utils;
 using System;
 using System.Windows;
+using System.Windows.Input;
 
 namespace SparklrWP.Pages
 {
@@ -58,5 +60,15 @@ void model_LoadingFinished(object sender, EventArgs e)
             if (loadingOverlay.Visibility == System.Windows.Visibility.Visible)
                 loadingOverlay.FinishLoading();
         }
+
+        private void ChatBubbleTextBox_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                chatBubbleTextBox.UpdateBinding();
+                model.sendMessage();
+                Focus();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/SparklrWP/Pages/Profile.xaml b/SparklrWP/Pages/Profile.xaml
index 02d0dae..6f4bb68 100644
--- a/SparklrWP/Pages/Profile.xaml
+++ b/SparklrWP/Pages/Profile.xaml
@@ -140,7 +140,7 @@
             
             <controls:PanoramaItem Header="more">
                 <StackPanel>
-                    <Button>message</Button>
+                    <Button Click="MessageButton_Click">message</Button>
                     <Button Click="MentionButton_Click">mention</Button>
                     <Button Content="{Binding FollowButtonCaption}" Click="FollowButton_Click" />
                 </StackPanel>
diff --git a/SparklrWP/Pages/Profile.xaml.cs b/SparklrWP/Pages/Profile.xaml.cs
index d6193fb..a81e898 100644
--- a/SparklrWP/Pages/Profile.xaml.cs
+++ b/SparklrWP/Pages/Profile.xaml.cs
@@ -185,5 +185,10 @@ private async void FollowButton_Click(object sender, System.Windows.RoutedEventA
             if (userargs.IsSuccessful)
                 refreshUserDetails(userargs);
         }
+
+        private void MessageButton_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            NavigationService.Navigate(new Uri("/Pages/ChatPage.xaml?id=" + model.ID, UriKind.Relative));
+        }
     }
 }
\ No newline at end of file
diff --git a/SparklrWP/Pages/SearchPage.xaml b/SparklrWP/Pages/SearchPage.xaml
index def343a..b1c2b7b 100644
--- a/SparklrWP/Pages/SearchPage.xaml
+++ b/SparklrWP/Pages/SearchPage.xaml
@@ -23,7 +23,7 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <!-- todo: replace with toolkit:PhoneTextBox once we got the newest toolkit version working -->
-        <toolkit:PhoneTextBox Grid.Row="0"  Hint="Search" Text="{Binding Keyword}" x:Name="searchTextBox" ActionIcon="../Assets/Search.png" KeyDown="TextBox_KeyDown" ActionIconTapped="searchTextBox_ActionIconTapped"  />
+        <toolkit:PhoneTextBox Grid.Row="0"  Hint="Search" Text="{Binding Keyword, Mode=TwoWay}" x:Name="searchTextBox" ActionIcon="../Assets/Search.png" KeyDown="TextBox_KeyDown" ActionIconTapped="searchTextBox_ActionIconTapped"  />
         <!--<TextBox Grid.Row="0" Grid.Column="0" Text="{Binding Keyword, Mode=TwoWay}" IsEnabled="{Binding IsReady}" KeyDown="TextBox_KeyDown" x:Name="searchTextBox" />
         <Button Grid.Row="0" Grid.Column="1" Height="72" Width="72" IsEnabled="{Binding IsReady}" Click="Button_Click">
             <Button.Background>
@@ -39,7 +39,7 @@
                 <ListBox ItemsSource="{Binding Users}">
                     <ListBox.ItemTemplate>
                         <DataTemplate>
-                            <StackPanel Tag="{Binding Id}" Orientation="Horizontal">
+                            <StackPanel Tag="{Binding Id}" Orientation="Horizontal" Tap="UserStackPanel_Tap" toolkit:TiltEffect.IsTiltEnabled="True">
                                 <sparklrControls:ExtendedImageControl Height="75" Width="75" ImageSource="{Binding Image, FallbackValue='http://d.sparklr.me/i/t1.jpg'}" Margin="12,6" HorizontalAlignment="Left" />
                                 <TextBlock Text="{Binding Name}" Style="{StaticResource PhoneTextExtraLargeStyle}" VerticalAlignment="Center" Margin="0,15,12,15" />
                             </StackPanel>
diff --git a/SparklrWP/Pages/SearchPage.xaml.cs b/SparklrWP/Pages/SearchPage.xaml.cs
index 651e744..5f4bba0 100644
--- a/SparklrWP/Pages/SearchPage.xaml.cs
+++ b/SparklrWP/Pages/SearchPage.xaml.cs
@@ -18,14 +18,13 @@ public SearchPage()
 
         private void TextBox_KeyDown(object sender, KeyEventArgs e)
         {
-            ((TextBox)sender).UpdateBinding();
-
             if (e.Key == Key.Enter)
                 doSearch();
         }
 
         private void doSearch()
         {
+            searchTextBox.UpdateBinding();
             this.Focus();
             model.Search();
         }
@@ -39,5 +38,14 @@ private void searchTextBox_ActionIconTapped(object sender, System.EventArgs e)
         {
             doSearch();
         }
+
+        private void UserStackPanel_Tap(object sender, System.Windows.Input.GestureEventArgs e)
+        {
+            FriendViewModel i = ((StackPanel)sender).DataContext as FriendViewModel;
+            if (i != null)
+            {
+                NavigationService.Navigate(new System.Uri("/Pages/Profile.xaml?userId=" + i.Id.ToString(), System.UriKind.Relative));
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/SparklrWP/SparklrWP.csproj b/SparklrWP/SparklrWP.csproj
index 54ead39..91a0fb9 100644
--- a/SparklrWP/SparklrWP.csproj
+++ b/SparklrWP/SparklrWP.csproj
@@ -227,6 +227,7 @@
     <Compile Include="Utils\ListToGroupedListConverter.cs" />
     <Compile Include="Utils\MemoryDiagnosticsHelper.cs" />
     <Compile Include="Utils\ObservableCollectionWithItemNotification.cs" />
+    <Compile Include="Utils\SmartDispatcher.cs" />
     <Compile Include="Utils\StringExtensions.cs" />
     <Compile Include="Utils\Task.cs" />
     <Compile Include="ViewModels\FriendViewModel.cs" />
diff --git a/SparklrWP/Utils/Helpers.cs b/SparklrWP/Utils/Helpers.cs
index 81ef82b..988eb70 100644
--- a/SparklrWP/Utils/Helpers.cs
+++ b/SparklrWP/Utils/Helpers.cs
@@ -111,14 +111,17 @@ public static Task<BitmapImage> LoadImageFromUrlAsync(string location)
         }
 
         /// <summary>
-        /// Displays a non intrusive toast notification
+        /// Displays a non intrusive toast notification. Thread safe.
         /// </summary>
         /// <param name="text">The text to display</param>
         public static void Notify(string text)
         {
-            ToastPrompt p = new ToastPrompt();
-            p.Message = text;
-            p.Show();
+            SmartDispatcher.BeginInvoke(() =>
+            {
+                ToastPrompt p = new ToastPrompt();
+                p.Message = text;
+                p.Show();
+            });
         }
 
         /// <summary>
diff --git a/SparklrWP/Utils/SmartDispatcher.cs b/SparklrWP/Utils/SmartDispatcher.cs
new file mode 100644
index 0000000..cf3a15c
--- /dev/null
+++ b/SparklrWP/Utils/SmartDispatcher.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Windows.Threading;
+
+namespace SparklrWP.Utils
+{
+    /// <summary>
+    /// Provides access to a smart invoke method, that only dispatchs if required.
+    /// </summary>
+    public static class SmartDispatcher
+    {
+        private static Dispatcher dispatcher;
+
+        static SmartDispatcher()
+        {
+            dispatcher = System.Windows.Deployment.Current.Dispatcher;
+        }
+
+        /// <summary>
+        /// Dispatches the given action to the UI thread
+        /// </summary>
+        /// <param name="a">The action to execute</param>
+        public static void BeginInvoke(Action a)
+        {
+            if (dispatcher.CheckAccess())
+            {
+                a();
+            }
+            else
+            {
+                dispatcher.BeginInvoke(a);
+            }
+        }
+    }
+}
diff --git a/SparklrWP/ViewModels/ChatViewModel.cs b/SparklrWP/ViewModels/ChatViewModel.cs
index 20d5116..3b3793b 100644
--- a/SparklrWP/ViewModels/ChatViewModel.cs
+++ b/SparklrWP/ViewModels/ChatViewModel.cs
@@ -1,8 +1,10 @@
 using SparklrLib.Objects;
+using SparklrLib.Objects.Responses;
 using SparklrLib.Objects.Responses.Work;
 using SparklrWP.Utils;
 using System;
 using System.ComponentModel;
+using System.Threading;
 using System.Windows;
 
 namespace SparklrWP
@@ -109,10 +111,38 @@ private void NotifyPropertyChanged(String propertyName)
         }
     }
 
-    public class ChatViewModel : INotifyPropertyChanged
+    public sealed class ChatViewModel : INotifyPropertyChanged, IDisposable
     {
+        //TODO: Stop autoupdates when not focused
+        Timer updateScheduler;
+        int lastTime = 0;
+
+        private async void updateMessages(object state)
+        {
+            GlobalLoading.Instance.IsLoading = true;
+            //Deactivate the timer to prevent multiple updates
+            updateScheduler.Change(Timeout.Infinite, Timeout.Infinite);
+
+            App.SuppressNotifications = true;
+            JSONRequestEventArgs<SparklrLib.Objects.Responses.Beacon.Chat> response = await App.Client.GetBeaconChatAsync(From, lastTime);
+            App.SuppressNotifications = false;
+
+            if (response.IsSuccessful)
+            {
+                foreach (SparklrLib.Objects.Responses.Beacon.ChatMessage i in response.Object.data)
+                {
+                    AddMessage(i);
+                }
+            }
+
+            //reschedule the timer
+            updateScheduler.Change(2000, Timeout.Infinite);
+            GlobalLoading.Instance.IsLoading = false;
+        }
+
         public ChatViewModel()
         {
+            updateScheduler = new Timer(updateMessages, null, 2, Timeout.Infinite);
         }
 
         public event EventHandler LoadingFinished;
@@ -134,6 +164,23 @@ public string Name
             }
         }
 
+        private string _message = "";
+        public string Message
+        {
+            get
+            {
+                return _message;
+            }
+            set
+            {
+                if (Message != value)
+                {
+                    _message = value;
+                    NotifyPropertyChanged("Message");
+                }
+            }
+        }
+
         private int _from;
         public int From
         {
@@ -185,16 +232,14 @@ private async void loadMessages()
 
                 foreach (Chat i in result.Object)
                 {
-                    Messages.Add(new ChatMessageModel()
-                    {
-                        From = i.from,
-                        To = i.to,
-                        CurrentUser = i.from == App.Client.UserId,
-                        Message = i.message,
-                        Time = i.time
-                    });
+                    AddMessage(i);
                 }
 
+                //TODO: prevent the last message from showing again
+
+                //Start automatic updates
+                updateScheduler.Change(2000, Timeout.Infinite);
+
                 if (LoadingFinished != null)
                     LoadingFinished(this, null);
             }
@@ -204,6 +249,77 @@ private async void loadMessages()
             }
         }
 
+        private void AddMessage(Chat item)
+        {
+            ChatMessageModel m = new ChatMessageModel()
+            {
+                From = item.from,
+                To = item.to,
+                CurrentUser = item.from == App.Client.UserId,
+                Message = item.message,
+                Time = item.time
+            };
+
+            insertItem(m);
+
+            if (item.time > lastTime)
+            {
+                lastTime = item.time;
+            }
+        }
+
+        private void AddMessage(SparklrLib.Objects.Responses.Beacon.ChatMessage item)
+        {
+            ChatMessageModel m = new ChatMessageModel()
+            {
+                From = item.from,
+                To = item.to,
+                CurrentUser = item.from == App.Client.UserId,
+                Message = item.message,
+                Time = item.time
+            };
+
+            insertItem(m);
+
+            if (item.time > lastTime)
+            {
+                lastTime = item.time;
+            }
+        }
+
+        private void insertItem(ChatMessageModel m)
+        {
+            if (Messages.Count == 0)
+            {
+                SmartDispatcher.BeginInvoke(() =>
+                            {
+                                Messages.Add(m);
+                            });
+            }
+            else
+            {
+                for (int i = 0; i < Messages.Count; i++)
+                {
+                    if (Messages[i].Time < m.Time)
+                    {
+                        SmartDispatcher.BeginInvoke(() =>
+                            {
+                                Messages.Insert(i, m);
+                            });
+                        break;
+                    }
+                    else if (i + 1 == Messages.Count)
+                    {
+                        SmartDispatcher.BeginInvoke(() =>
+                            {
+                                Messages.Add(m);
+                            });
+                        break;
+                    }
+                }
+            }
+        }
+
         private async void updateName()
         {
             int updated = _from;
@@ -241,5 +357,37 @@ private void NotifyPropertyChanged(String propertyName)
                 handler(this, new PropertyChangedEventArgs(propertyName));
             }
         }
+
+        public async void sendMessage()
+        {
+            if (!String.IsNullOrEmpty(Message))
+            {
+                GlobalLoading.Instance.IsLoading = true;
+
+                JSONRequestEventArgs<Generic> result = await App.Client.PostChatMessageAsync(From, Message);
+
+                if (result.IsSuccessful)
+                {
+                    Message = "";
+                }
+                else
+                {
+                    Helpers.Notify("Couldnt send your message :(");
+                }
+
+                GlobalLoading.Instance.IsLoading = false;
+            }
+            else
+            {
+                Helpers.Notify("Don't be so shy. Say something ;)");
+            }
+
+        }
+
+        public void Dispose()
+        {
+            if (updateScheduler != null)
+                updateScheduler.Dispose();
+        }
     }
 }
diff --git a/SparklrWP/ViewModels/MainViewModel.cs b/SparklrWP/ViewModels/MainViewModel.cs
index 502cce0..8fe2903 100644
--- a/SparklrWP/ViewModels/MainViewModel.cs
+++ b/SparklrWP/ViewModels/MainViewModel.cs
@@ -7,7 +7,6 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Threading;
-using System.Windows;
 
 namespace SparklrWP
 {
@@ -42,10 +41,7 @@ public MainViewModel()
         void streamUpdater_Tick(object state)
         {
             //The streamUpdater is stopped in loadData to prevent multiple requests
-            System.Windows.Deployment.Current.Dispatcher.BeginInvoke(() =>
-            {
-                loadData();
-            });
+            loadData();
         }
 
         private ObservableCollectionWithItemNotification<ItemViewModel> _items;
@@ -64,7 +60,7 @@ private set
                 {
                     _items = value;
 
-                    Deployment.Current.Dispatcher.BeginInvoke(() =>
+                    SmartDispatcher.BeginInvoke(() =>
                     {
                         NotifyPropertyChanged("Items");
                     });
@@ -185,10 +181,13 @@ public void UpdateNotifications(Notification[] notifications)
                 Notifications.Clear();
                 foreach (Notification n in notifications)
                 {
-                    Notifications.Add(new NotificationViewModel(n.id)
+                    SmartDispatcher.BeginInvoke(() =>
                     {
-                        Message = n.body,
-                        From = n.from
+                        Notifications.Add(new NotificationViewModel(n.id)
+                        {
+                            Message = n.body,
+                            From = n.from
+                        });
                     });
                 }
             }
@@ -199,12 +198,18 @@ private void addItem(ItemViewModel item)
             if (Items == null)
                 Items = new ObservableCollectionWithItemNotification<ItemViewModel>();
 
-            if (BeforeItemAdded != null)
-                BeforeItemAdded(this, null);
+            SmartDispatcher.BeginInvoke(() =>
+                {
+                    if (BeforeItemAdded != null)
+                        BeforeItemAdded(this, null);
+                });
 
             if (Items.Count() == 0)
             {
-                Items.Add(item);
+                SmartDispatcher.BeginInvoke(() =>
+                    {
+                        Items.Add(item);
+                    });
             }
             else
             {
@@ -214,19 +219,28 @@ private void addItem(ItemViewModel item)
                 {
                     if (Items[i].OrderTime < time)
                     {
-                        Items.Insert(i, item);
+                        SmartDispatcher.BeginInvoke(() =>
+                            {
+                                Items.Insert(i, item);
+                            });
                         break;
                     }
                     else if (i + 1 == Items.Count())
                     {
-                        Items.Add(item);
+                        SmartDispatcher.BeginInvoke(() =>
+                            {
+                                Items.Add(item);
+                            });
                         break;
                     }
                 }
             }
 
-            if (AfterItemAdded != null)
-                AfterItemAdded(this, null);
+            SmartDispatcher.BeginInvoke(() =>
+                {
+                    if (AfterItemAdded != null)
+                        AfterItemAdded(this, null);
+                });
         }
 
         public async void LoadMore()
@@ -313,7 +327,10 @@ public int NewCount
                 if (value != _newCount)
                 {
                     _newCount = value;
-                    NotifyPropertyChanged("NewCount");
+                    SmartDispatcher.BeginInvoke(() =>
+                        {
+                            NotifyPropertyChanged("NewCount");
+                        });
                 }
             }
         }
diff --git a/SparklrWP/ViewModels/SearchViewModel.cs b/SparklrWP/ViewModels/SearchViewModel.cs
index 1724d71..1ce620e 100644
--- a/SparklrWP/ViewModels/SearchViewModel.cs
+++ b/SparklrWP/ViewModels/SearchViewModel.cs
@@ -92,25 +92,27 @@ public async void Search()
                 Posts.Clear();
                 Users.Clear();
 
-                foreach (SearchUser user in results.Object.users)
-                {
-                    Users.Add(new FriendViewModel(user.id)
-                        {
-                            Name = user.username,
-                            Image = "http://d.sparklr.me/i/t" + user.id + ".jpg"
-                        });
-                }
+                if (results.Object.users != null)
+                    foreach (SearchUser user in results.Object.users)
+                    {
+                        Users.Add(new FriendViewModel(user.id)
+                            {
+                                Name = user.username,
+                                Image = "http://d.sparklr.me/i/t" + user.id + ".jpg"
+                            });
+                    }
 
-                foreach (SearchPost post in results.Object.posts)
-                {
-                    Posts.Add(new ItemViewModel(post.id)
-                        {
-                            AuthorId = post.from,
-                            Message = post.message,
-                            CommentCount = post.commentcount ?? 0,
-                            ImageUrl = !String.IsNullOrEmpty(post.meta) ? String.Format("http://d.sparklr.me/i/t{0}", post.meta) : null
-                        });
-                }
+                if (results.Object.posts != null)
+                    foreach (SearchPost post in results.Object.posts)
+                    {
+                        Posts.Add(new ItemViewModel(post.id)
+                            {
+                                AuthorId = post.from,
+                                Message = post.message,
+                                CommentCount = post.commentcount ?? 0,
+                                ImageUrl = !String.IsNullOrEmpty(post.meta) ? String.Format("http://d.sparklr.me/i/t{0}", post.meta) : null
+                            });
+                    }
             }
             else
             {