Migrate some WP8 fixups to WinRT

reactiveui · Feb 11, 2013 · f9c1da0 · f9c1da0
1 parent 5469611
commit f9c1da0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/MobileSample-WP8/ViewModels/TestPage1ViewModel.cs b/MobileSample-WP8/ViewModels/TestPage1ViewModel.cs
@@ -11,6 +11,7 @@ public class TestPage1ViewModel : ReactiveObject, IRoutableViewModel
         public string UrlPathSegment { get { return "test1"; } }
         public IScreen HostScreen { get; private set; }
 
+        [DataMember]
         Guid _RandomGuid;
         public Guid RandomGuid {
             get { return _RandomGuid; }

diff --git a/ReactiveUI.Mobile/PhoneServiceStateDriver.cs b/ReactiveUI.Mobile/PhoneServiceStateDriver.cs
@@ -25,7 +25,8 @@ public PhoneServiceStateDriver(JsonSerializerSettings settings)
         {
             var serializer = JsonSerializer.Create(SerializerSettings);
             try {
-                var reader = new JsonTextReader(new StringReader((string)PhoneApplicationService.Current.State["state"]));
+                var state = (string) PhoneApplicationService.Current.State["state"];
+                var reader = new JsonTextReader(new StringReader(state));
                 return Observable.Return(serializer.Deserialize<T>(reader));
             } catch (Exception ex) {
                 return Observable.Throw<T>(ex);

diff --git a/ReactiveUI.Mobile/WinRTAutoSuspendApplication.cs b/ReactiveUI.Mobile/WinRTAutoSuspendApplication.cs
@@ -37,9 +37,15 @@ public abstract class AutoSuspendApplication : Application, IEnableLogger
 
         public IApplicationRootState ViewModel {
             get { return _ViewModel; }
-            set { _ViewModel = value; _viewModelChanged.OnNext(value); }
+            set {
+                if (_ViewModel == value) return;
+                _ViewModel = value; 
+                _viewModelChanged.OnNext(value);
+            }
         }
 
+
+
         protected AutoSuspendApplication()
         {
             var host = new SuspensionHost();
@@ -111,9 +117,7 @@ internal void setupDefaultSuspendResume(ISuspensionDriver driver)
                     Observable.Defer(() => Observable.Return(RxApp.GetService<IApplicationRootState>())),
                     "Failed to restore app state from storage, creating from scratch")
                 .ObserveOn(RxApp.DeferredScheduler)
-                .Subscribe(x => {
-                    ViewModel = x;
-                });
+                .Subscribe(x => ViewModel = x);
 
             SuspensionHost.IsLaunchingNew.Subscribe(_ => {
                 ViewModel = RxApp.GetService<IApplicationRootState>();
@@ -123,9 +127,6 @@ internal void setupDefaultSuspendResume(ISuspensionDriver driver)
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
             base.OnLaunched(args);
-
-            // NB: We can't touch RxApp until OnLaunched is called :-/
-            RxApp.Register(typeof(WinRTSuspensionHost), typeof(ISuspensionHost));
             _launched.OnNext(args);
         }
     }