3 files changed, 22 insertions, 44 deletions
diff --git a/Juick/ViewModels/AppViewModel.cs b/Juick/ViewModels/AppViewModel.cs
index ab00cb0..e3a58bb 100644
--- a/Juick/ViewModels/AppViewModel.cs
+++ b/Juick/ViewModels/AppViewModel.cs
@@ -2,8 +2,10 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Net.NetworkInformation;
 using Juick.Classes;
 using JuickApi;
+using Microsoft.Phone.Net.NetworkInformation;
 using RestSharp;
 using Microsoft.Phone.Notification;
 using System.Diagnostics;
@@ -13,13 +15,21 @@ namespace Juick.ViewModels
 {
     public class AppViewModel : ViewModelBase
     {
+        static readonly string IsNetworkAvailablePropertyName = ExpressionHelper.GetPropertyName<AppViewModel>(x => x.NetworkUnavailable);
         readonly HttpNotificationChannel pushChannel; 
 
         // The name of our push channel.
         string channelName = "JuickChannel";
 
+        public void UpdateNetworkStatus()
+        {
+            NetworkUnavailable = !DeviceNetworkInformation.IsNetworkAvailable;
+        }
+
         public AppViewModel()
         {
+            UpdateNetworkStatus();
+            NetworkChange.NetworkAddressChanged += (sender, args) => UpdateNetworkStatus();
             pushChannel = HttpNotificationChannel.Find(channelName);
 
                   // If the channel was not found, then create a new connection to the push service.
@@ -120,6 +130,16 @@ namespace Juick.ViewModels
                 }
             }
         }
+        private bool _isNetworkUnavailable;
+        public bool NetworkUnavailable
+        {
+            get { return _isNetworkUnavailable; }
+            set
+            {
+                _isNetworkUnavailable = value;
+                NotifyPropertyChanged(IsNetworkAvailablePropertyName);
+            }
+        }
 
         private AccountManager _acc;
 
diff --git a/Juick/ViewModels/PageViewModel.cs b/Juick/ViewModels/PageViewModel.cs
index e398caf..ce48449 100644
--- a/Juick/ViewModels/PageViewModel.cs
+++ b/Juick/ViewModels/PageViewModel.cs
@@ -72,6 +72,8 @@ namespace Juick.ViewModels
             _context.Client.ExecuteAsync<List<Message>>(request, response =>
             {
                 _context.IsDataLoading = false;
+                if (response.Data == null)
+                    return;
                 response.Data.Select(x => new PostItem(x)).ToList().ForEach(i => Items.Add(i));
             });
             _context.IsDataLoading = true;
diff --git a/Juick/ViewModels/Validation/DataViewModelBase.cs b/Juick/ViewModels/Validation/DataViewModelBase.cs
deleted file mode 100644
index dcbf34b..0000000
--- a/Juick/ViewModels/Validation/DataViewModelBase.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-
-namespace Juick.ViewModels.Validation
-{
-    public class DataViewModelBase : ViewModelBase, IDataErrorInfo
-    {
-
-        private readonly Dictionary<String, List<String>> _errors =
-           new Dictionary<string, List<string>>();
-
-        // Adds the specified error to the errors collection if it is not already 
-        // present, inserting it in the first position if isWarning is false. 
-        public void AddError(string propertyName, string error, bool isWarning)
-        {
-            if (!_errors.ContainsKey(propertyName))
-                _errors[propertyName] = new List<string>();
-
-            if (_errors[propertyName].Contains(error)) return;
-            if (isWarning) _errors[propertyName].Add(error);
-            else _errors[propertyName].Insert(0, error);
-        }
-
-        // Removes the specified error from the errors collection if it is present. 
-        public void RemoveError(string propertyName, string error)
-        {
-            if (!_errors.ContainsKey(propertyName) || !_errors[propertyName].Contains(error)) return;
-            _errors[propertyName].Remove(error);
-            if (_errors[propertyName].Count == 0) _errors.Remove(propertyName);
-        }
-
-        public string Error { get { throw new NotImplementedException(); } }
-
-        public string this[string columnName]
-        {
-            get
-            {
-                return (!_errors.ContainsKey(columnName) ? null :
-                    String.Join(Environment.NewLine, _errors[columnName]));
-            }
-        }
-    }
-}