Merge lp:~mandel/ubuntuone-windows-installer/fix_multithreading into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

Fixes the issue related with the fact that the ui elements are created in a different thread.

[Stuart Colville (muffinresearch)]

I get a test failure for this: https://pastebin.canonical.com/36643/

[Rick McBride (rmcbride)]

Build fails for me in the same way as Stuart reported.

review: Needs Fixing

[Manuel de la Peña (mandel)]

Sorry, mea culpa, I changed the way the multithreading works and the tests are failing, I'm on my way to fix it.

[lp:~mandel/ubuntuone-windows-installer/fix_multithreading]

71. By Manuel de la Peña on 2010-09-02

Fixed issues with the tests that were not modify to follow the new multithreading style.

72. By Manuel de la Peña on 2010-09-02

Updated release notes.

[Rick McBride (rmcbride)]

tests pass now

review: Approve

[lp:~mandel/ubuntuone-windows-installer/fix_multithreading]

73. By Manuel de la Peña on 2010-09-02

Updated release notes

[Stuart Colville (muffinresearch)]

Tests pass +1

review: Approve

=== added file 'RELEASE_NOTES.txt'
--- RELEASE_NOTES.txt	1970-01-01 00:00:00 +0000
+++ RELEASE_NOTES.txt	2010-09-02 15:23:39 +0000
@@ -0,0 +1,19 @@
+RELEASE HISTORY
+
+September 02 2010 • Ubuntu One Windows Port 1.0.502.6037
+
+Bug fixes:
+    
+    626702 - The storage protocol certificates are not correctly distributed 
+             https://bugs.edge.launchpad.net/ubuntuone-windows-installer/+bug/626702
+    626899 - UbuntuOne installer offers too many options
+             https://bugs.edge.launchpad.net/ubuntuone-windows-installer/+bug/626899
+    626889 - Installer shows CPL, but Ubuntu One is GPL.
+             https://bugs.edge.launchpad.net/ubuntuone-windows-installer/+bug/626889
+    627930 - The checksum from the updates is not correctly verified
+             https://bugs.edge.launchpad.net/ubuntuone-windows-installer/+bug/627930
+    628693 - Ubuntu One sync fails on Windows XP because the paths are not quoted
+             https://bugs.edge.launchpad.net/ubuntuone-windows-installer/+bug/628693
+    628759 - When an update is available it cannot be performed because the UI element 
+             was created in a different thread 
+             https://bugs.edge.launchpad.net/ubuntuone-windows-installer/+bug/628759
\ No newline at end of file

=== modified file 'lib/DotUpdater/DotUpdater.dll'
Binary files lib/DotUpdater/DotUpdater.dll	2010-09-02 09:25:13 +0000 and lib/DotUpdater/DotUpdater.dll	2010-09-02 15:23:39 +0000 differ
=== modified file 'lib/DotUpdater/DotUpdater.pdb'
Binary files lib/DotUpdater/DotUpdater.pdb	2010-09-02 09:25:13 +0000 and lib/DotUpdater/DotUpdater.pdb	2010-09-02 15:23:39 +0000 differ
=== modified file 'src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml.cs	2010-08-19 16:57:06 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml.cs	2010-09-02 15:23:39 +0000
@@ -1,20 +1,22 @@
-// Copyright 2010 Canonical Ltd.
-// 
-// This file is part of UbuntuOne on Windows.
-// 
-// UbuntuOne on Windows is free software: you can redistribute it and/or modify		
-// it under the terms of the GNU Lesser General Public License version 		
-// as published by the Free Software Foundation.		
-//		
-// Ubuntu One on Windows is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
-// GNU Lesser General Public License for more details.	
-//
-// You should have received a copy of the GNU Lesser General Public License	
-// along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
-// 
-// Authors: Manuel de la Peña <[e-mail]>
+/*
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
 using System;
 using Canonical.UbuntuOne.Common.Threading;
 using Canonical.UbuntuOne.Common.Update;

=== modified file 'src/Canonical.UbuntuOne.Common.Tests/Update/UpdatingPresenterFixture.cs'
--- src/Canonical.UbuntuOne.Common.Tests/Update/UpdatingPresenterFixture.cs	2010-07-29 16:38:26 +0000
+++ src/Canonical.UbuntuOne.Common.Tests/Update/UpdatingPresenterFixture.cs	2010-09-02 15:23:39 +0000
@@ -18,6 +18,7 @@
  * Authors: Manuel de la Peña <[e-mail]>
  */
 
+using Canonical.UbuntuOne.Common.Threading;
 using Canonical.UbuntuOne.Common.Update;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -32,6 +33,7 @@
         private MockRepository _mocks;
         private IUpdatingView _view;
         private UpdatingPresenter _presenter;
+        private IDispatcher _dispatcher;
 
         #endregion
 
@@ -42,6 +44,7 @@
         {
             _mocks = new MockRepository();
             _view = _mocks.StrictMock<IUpdatingView>();
+            _dispatcher = _mocks.StrictMock<IDispatcher>();
             _presenter = new UpdatingPresenter
             {
                 View = _view
@@ -59,8 +62,10 @@
             {
                 SetupResult.For(_view.IsShown)
                     .Return(true);
-                _view.UpdatingText = UpdateResources.UpdateStarted;
-                _view.IsUpdating = true;
+                SetupResult.For(_view.ViewDispatcher)
+                    .Return(_dispatcher);
+                Expect.Call(() => _dispatcher.Dispatch(null))
+                    .IgnoreArguments();
             }
             using(_mocks.Playback())
             {
@@ -75,11 +80,11 @@
             {
                 SetupResult.For(_view.IsShown)
                     .Return(false);
-                Expect.Call(() => _view.Show())
-                    .Repeat.Once();
-                    
-                _view.UpdatingText = UpdateResources.UpdateStarted;
-                _view.IsUpdating = true;
+                SetupResult.For(_view.ViewDispatcher)
+                    .Return(_dispatcher);
+                Expect.Call(() => _dispatcher.Dispatch(null))
+                    .IgnoreArguments()
+                    .Repeat.Twice();
             }
             using (_mocks.Playback())
             {
@@ -92,8 +97,10 @@
         {
             using (_mocks.Record())
             {
-                _view.UpdatingText = UpdateResources.UpdateFinished;
-                _view.IsUpdating = false;
+                SetupResult.For(_view.ViewDispatcher)
+                    .Return(_dispatcher);
+                Expect.Call(() => _dispatcher.Dispatch(null))
+                    .IgnoreArguments();
             }
             using (_mocks.Playback())
             {

=== modified file 'src/Canonical.UbuntuOne.Common/Update/Updater.cs'
--- src/Canonical.UbuntuOne.Common/Update/Updater.cs	2010-08-19 16:57:06 +0000
+++ src/Canonical.UbuntuOne.Common/Update/Updater.cs	2010-09-02 15:23:39 +0000
@@ -141,8 +141,7 @@
         {
             Logger.Info(UpdateResources.DownloadCompleted);
             // call the method in an other thread that will perform the update
-            UpdaterDelegate updaterDelegate = UpdateDownloadedMainThread;
-            Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Normal, updaterDelegate, e.Task);
+            UpdateDownloadedMainThread(e.Task);
         }
 
         /// <summary>
@@ -154,7 +153,7 @@
         private void DownloadErrorHandler(object sender, DownloadTaskErrorEventArgs args)
         {
             Logger.Error(args.Exception.Message);
-            //throw new SelfUpdateException(UpdateResources.DownloadError, args.Exception);
+            throw new SelfUpdateException(UpdateResources.DownloadError, args.Exception);
         }
 
         /// <summary>

=== modified file 'src/Canonical.UbuntuOne.Common/Update/UpdatingPresenter.cs'
--- src/Canonical.UbuntuOne.Common/Update/UpdatingPresenter.cs	2010-08-05 07:13:28 +0000
+++ src/Canonical.UbuntuOne.Common/Update/UpdatingPresenter.cs	2010-09-02 15:23:39 +0000
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2010 Canonical Ltd.
  * 
  * This file is part of UbuntuOne on Windows.
@@ -36,10 +36,15 @@
         /// </summary>
         public void UpdatingStarted()
         {
-            if(!View.IsShown)
-                View.Show();
-            View.UpdatingText = UpdateResources.UpdateStarted;
-            View.IsUpdating = true;
+            if (!View.IsShown)
+                View.ViewDispatcher.Dispatch(() => View.Show());
+            View.ViewDispatcher.Dispatch(
+                () =>
+                    {
+                        View.UpdatingText = UpdateResources.UpdateStarted;
+                        View.IsUpdating = true;
+                    });
+            
         }
 
         /// <summary>
@@ -47,8 +52,12 @@
         /// </summary>
         public void UpdatingFinished()
         {
-            View.UpdatingText = UpdateResources.UpdateFinished;
-            View.IsUpdating = false;
+            View.ViewDispatcher.Dispatch(
+                () =>
+                    {
+                        View.UpdatingText = UpdateResources.UpdateFinished;
+                        View.IsUpdating = false;
+                    });
         }
     }
 }