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

[Manuel de la Peña]

Adds the initial implementation of the views used to show the user that the app is being updated.

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

67. By Manuel de la Peña on 2010-07-30

Merge with trunk.

68. By Manuel de la Peña on 2010-07-30

Merge with trunk.

[Manuel de la Peña (mandel)]

This branch adds a set of view to us in the download dialogue, due to the fact that the views have no code at all besides setting and getting properties.

In order to build and run the tests you have to execute the following command from the root of the branch:

tools\Nant\bin\nant.exe tests

More info about compiling and testing here: https://wiki.ubuntu.com/UbuntuOne/Contribute/WindowsTesting

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

69. By Manuel de la Peña on 2010-08-04

Fix criss-cross

[John Lenton (chipaca)]

The branch looks good. I have only read it through, having no windows vm to test it with right now. So a full review is definitely still needed.

review: Approve

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

70. By Manuel de la Peña on 2010-08-05

Ignore test that gives erros due to RhinoMocks bug.

[Rick McBride (rmcbride)]

Looks good. The remaining issue we saw with the bootstrapper is not related to this branch

review: Approve

=== modified file 'build.number'
--- build.number	2010-07-30 09:33:20 +0000
+++ build.number	2010-08-05 19:26:41 +0000
@@ -1,1 +1,1 @@
-1.0.0.0
\ No newline at end of file
+1.0.404.5869
\ No newline at end of file

=== modified file 'main.build'
--- main.build	2010-08-02 17:57:48 +0000
+++ main.build	2010-08-05 19:26:41 +0000
@@ -160,7 +160,7 @@
               workingdir="src/Canonical.UbuntuOne.ProcessDispatcher.Tests/bin/${enviroment}"
               program="nunit-console.exe"
               commandline="Canonical.UbuntuOne.ProcessDispatcher.Tests.dll /xml=../../../../test-results/Canonical.UbuntuOne.ProcessDispatcher.Tests-Result.xml" />
-		
+
 		<echo>Canonical.UbuntuOne.Client.Test</echo>
 		<exec basedir="tools/NUnit"
               managed="true"

=== modified file 'src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj'
--- src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-08-02 17:57:48 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-08-05 19:26:41 +0000
@@ -60,6 +60,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\WPFContrib\AvalonLibrary.dll</HintPath>
     </Reference>
+    <Reference Include="DotUpdater, Version=0.2.0.4, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\DotUpdater\DotUpdater.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -99,6 +103,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Update\DownloadingView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Update\UpdatingView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -109,6 +121,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="UbuntuOneMessageBox.cs" />
     <Compile Include="..\Version.cs">
       <Link>Properties\Version.cs</Link>
     </Compile>
@@ -133,6 +146,12 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="Update\DownloadingView.xaml.cs">
+      <DependentUpon>DownloadingView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Update\UpdatingView.xaml.cs">
+      <DependentUpon>UpdatingView.xaml</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -189,6 +208,10 @@
       <Project>{7467483A-D6D5-4362-8DF4-57A7254EB569}</Project>
       <Name>Canonical.UbuntuOne.Client</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Canonical.UbuntuOne.Common\Canonical.UbuntuOne.Common.csproj">
+      <Project>{11353FF8-8E5A-488E-9CB1-873DADD232B9}</Project>
+      <Name>Canonical.UbuntuOne.Common</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

=== modified file 'src/Canonical.UbuntuOne.Client.Views/Resources/Resources.Designer.cs'
--- src/Canonical.UbuntuOne.Client.Views/Resources/Resources.Designer.cs	2010-07-27 15:35:34 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Resources/Resources.Designer.cs	2010-08-05 19:26:41 +0000
@@ -61,6 +61,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Ubuntu One.
+        /// </summary>
+        public static string ApplicationName {
+            get {
+                return ResourceManager.GetString("ApplicationName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Downloading updates....
+        /// </summary>
+        public static string DownloadingDialogTitle {
+            get {
+                return ResourceManager.GetString("DownloadingDialogTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Exit.
         /// </summary>
         public static string Exit {
@@ -122,5 +140,14 @@
                 return ResourceManager.GetString("UbuntuOnePreferences", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Updating Ubuntu One....
+        /// </summary>
+        public static string UpdatingDialogTitle {
+            get {
+                return ResourceManager.GetString("UpdatingDialogTitle", resourceCulture);
+            }
+        }
     }
 }

=== modified file 'src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx'
--- src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx	2010-07-27 15:35:34 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx	2010-08-05 19:26:41 +0000
@@ -117,6 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ApplicationName" xml:space="preserve">
+    <value>Ubuntu One</value>
+  </data>
+  <data name="DownloadingDialogTitle" xml:space="preserve">
+    <value>Downloading updates...</value>
+  </data>
   <data name="Exit" xml:space="preserve">
     <value>Exit</value>
   </data>
@@ -138,4 +144,7 @@
   <data name="UbuntuOnePreferences" xml:space="preserve">
     <value>Ubuntu One Preferences</value>
   </data>
+  <data name="UpdatingDialogTitle" xml:space="preserve">
+    <value>Updating Ubuntu One...</value>
+  </data>
 </root>
\ No newline at end of file

=== added file 'src/Canonical.UbuntuOne.Client.Views/UbuntuOneMessageBox.cs'
--- src/Canonical.UbuntuOne.Client.Views/UbuntuOneMessageBox.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client.Views/UbuntuOneMessageBox.cs	2010-08-05 19:26:41 +0000
@@ -0,0 +1,100 @@
+/**
+ * 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.Windows;
+using Canonical.UbuntuOne.Common;
+
+namespace Canonical.UbuntuOne.Client.Views
+{
+    /// <summary>
+    /// Provides a collection of useful method to show information to the user.
+    /// </summary>
+    public class UbuntuOneMessageBox : IMessageBox
+    {
+        /// <summary>
+        /// Displays an error dialog with a given message.
+        /// </summary>
+        /// <param name="message">The message to be displayed.</param>
+        public void ShowError(string message)
+        {
+            ShowMessage(message, MessageBoxImage.Error);
+        }
+
+        /// <summary>
+        /// Displays an error dialog with a given message.
+        /// </summary>
+        /// <param name="message">The message to be displayed.</param>
+        public void ShowInformation(string message)
+        {
+            ShowMessage(message, MessageBoxImage.Information);
+        }
+
+        /// <summary>
+        /// Displays an error dialog with a given message.
+        /// </summary>
+        /// <param name="message">The message to be displayed.</param>
+        public void ShowWarning(string message)
+        {
+            ShowMessage(message, MessageBoxImage.Warning);
+        }
+
+        /// <summary>
+        /// Displays an error dialog with a given message and icon.
+        /// </summary>
+        /// <param name="message">The message to be displayed.</param>
+        /// <param name="icon">The icon to be displayed with the message.</param>
+        public void ShowMessage(string message, MessageBoxImage icon)
+        {
+            MessageBox.Show(message, Resources.Resources.ApplicationName, MessageBoxButton.OK, icon);
+        }
+
+        /// <summary>
+        /// Displays an OK / Cancel dialog and returns the user input.
+        /// </summary>
+        /// <param name="message">The message to be displayed.</param>
+        /// <param name="icon">The icon to be displayed.</param>
+        /// <returns>User selection.</returns>
+        public MessageBoxResult ShowOkCancel(string message, MessageBoxImage icon)
+        {
+            return MessageBox.Show(message, Resources.Resources.ApplicationName, MessageBoxButton.OKCancel, icon);
+        }
+
+        /// <summary>
+        /// Displays a Yes/No dialog and returns the user input.
+        /// </summary>
+        /// <param name="message">The message to be displayed.</param>
+        /// <param name="icon">The icon to be displayed.</param>
+        /// <returns>User selection.</returns>
+        public MessageBoxResult ShowYesNo(string message, MessageBoxImage icon)
+        {
+            return MessageBox.Show(message, Resources.Resources.ApplicationName, MessageBoxButton.YesNo, icon);
+        }
+
+        /// <summary>
+        /// Displays an Yes / No / Cancel dialog and returns the user input.
+        /// </summary>
+        /// <param name="message">The message to be displayed.</param>
+        /// <param name="icon">The icon to be displayed.</param>
+        /// <returns>User selection.</returns>
+        public MessageBoxResult ShowYesNoCancel(string message, MessageBoxImage icon)
+        {
+            return MessageBox.Show(message, Resources.Resources.ApplicationName, MessageBoxButton.YesNoCancel, icon);
+        }
+    }
+}

=== added directory 'src/Canonical.UbuntuOne.Client.Views/Update'
=== added file 'src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml'
--- src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml	2010-08-05 19:26:41 +0000
@@ -0,0 +1,40 @@
+<!--
+ * 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]>
+-->
+<Window x:Class="Canonical.UbuntuOne.Client.Views.Update.DownloadingView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Height="150" Width="350">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+        </Grid.RowDefinitions>
+        <Label Name="MessageLabel" Grid.Row="0" Margin="3">Test</Label>
+        <ProgressBar Name="Progressbar" Grid.Row="1" HorizontalAlignment="Stretch" Margin="3" />
+        <Grid Grid.Row="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="85"/>
+            </Grid.ColumnDefinitions>
+            <Button Name="CloseButton" Grid.Column="1" Margin="3">Close</Button>
+        </Grid>
+    </Grid>
+</Window>

=== added file 'src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml.cs	2010-08-05 19:26:41 +0000
@@ -0,0 +1,72 @@
+/**
+ * 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.Update;
+using StaticResources = Canonical.UbuntuOne.Client.Views.Resources.Resources;
+namespace Canonical.UbuntuOne.Client.Views.Update
+{
+    /// <summary>
+    /// Interaction logic for DownloadingView.xaml
+    /// </summary>
+    public partial class DownloadingView : IDownloadingView
+    {
+        public DownloadingView()
+        {
+            InitializeComponent();
+            Title = StaticResources.DownloadingDialogTitle;
+        }
+
+        public bool CloseButtonIsEnabled
+        {
+            get { return CloseButton.IsEnabled; }
+            set { CloseButton.IsEnabled = value; }
+        }
+
+        public bool IsShown
+        {
+            get { return IsVisible; }
+        }
+
+        public string DownloadingMessage
+        {
+            get { return (String)MessageLabel.Content; }
+            set { MessageLabel.Content = value; }
+        }
+
+        public double MinimumValue
+        {
+            get { return Progressbar.Minimum; }
+            set { Progressbar.Minimum = value; }
+        }
+
+        public double MaximumValue
+        {
+            get { return Progressbar.Maximum; }
+            set { Progressbar.Maximum = value; }
+        }
+
+        public double Progress
+        {
+            get { return Progressbar.Value; }
+            set { Progressbar.Value = value; }
+        }
+
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Client.Views/Update/UpdatingView.xaml'
--- src/Canonical.UbuntuOne.Client.Views/Update/UpdatingView.xaml	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Update/UpdatingView.xaml	2010-08-05 19:26:41 +0000
@@ -0,0 +1,32 @@
+<!--
+ * 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]>
+-->
+<Window x:Class="Canonical.UbuntuOne.Client.Views.Update.UpdatingView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Title="UpdatingView" Height="150" Width="350">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="75" />
+        </Grid.RowDefinitions>
+        <Label Name="MessageLabel" Grid.Row="0" Margin="3">Test</Label>
+        <ProgressBar Name="Progressbar" Grid.Row="1" HorizontalAlignment="Stretch" Margin="3" Height="28"/>
+    </Grid>
+</Window>

=== added file 'src/Canonical.UbuntuOne.Client.Views/Update/UpdatingView.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/Update/UpdatingView.xaml.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Update/UpdatingView.xaml.cs	2010-08-05 19:26:41 +0000
@@ -0,0 +1,48 @@
+/**
+ * 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.Update;
+
+namespace Canonical.UbuntuOne.Client.Views.Update
+{
+    /// <summary>
+    /// Interaction logic for UpdatingView.xaml
+    /// </summary>
+    public partial class UpdatingView : IUpdatingView
+    {
+        public UpdatingView()
+        {
+            InitializeComponent();
+        }
+
+        public bool IsShown
+        {
+            get { return IsVisible; }
+        }
+
+        public bool IsUpdating { get; set; }
+
+        public string UpdatingText
+        {
+            get { return (String) MessageLabel.Content; }
+            set { MessageLabel.Content = value; }
+        }
+    }
+}

=== modified file 'src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj'
--- src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj	2010-07-30 09:33:20 +0000
+++ src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj	2010-08-05 19:26:41 +0000
@@ -42,7 +42,10 @@
     <Compile Include="ProcessManagementExceptionFixture.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SyncDaemonExceptionFixture.cs" />
+    <Compile Include="Update\DownloadingPresenterFixture.cs" />
+    <Compile Include="Update\SelfUpdateExceptionFixture.cs" />
     <Compile Include="Update\UpdaterFixture.cs" />
+    <Compile Include="Update\UpdatingPresenterFixture.cs" />
     <Compile Include="Validation\ArgumentValidationFixture.cs" />
     <Compile Include="Validation\EqualityExtensionsValidation.cs" />
     <Compile Include="Validation\MultiExceptionFixture.cs" />
@@ -61,6 +64,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Nunit\nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="PresentationFramework">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
     <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\RhinoMocks\Rhino.Mocks.dll</HintPath>

=== added file 'src/Canonical.UbuntuOne.Common.Tests/Update/DownloadingPresenterFixture.cs'
--- src/Canonical.UbuntuOne.Common.Tests/Update/DownloadingPresenterFixture.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common.Tests/Update/DownloadingPresenterFixture.cs	2010-08-05 19:26:41 +0000
@@ -0,0 +1,141 @@
+/**
+ * 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.Update;
+using Microsoft.ApplicationBlocks.Updater;
+using NUnit.Framework;
+using Rhino.Mocks;
+namespace Canonical.UbuntuOne.Common.Tests.Update
+{
+    [TestFixture]
+    public class DownloadingPresenterFixture
+    {
+        #region Variables
+
+        private MockRepository _mocks;
+        private IDownloadingView _view;
+        private DownloadingPresenter _presenter;
+
+        #endregion
+
+        #region SetUp & TearDown
+
+        [SetUp]
+        public void Setup()
+        {
+            _mocks = new MockRepository();
+            _view = _mocks.DynamicMock<IDownloadingView>();
+            _presenter = new DownloadingPresenter
+            {
+                View = _view
+            };
+            // If you do not do this the _view will want to play back the settins done inthe 
+            // _presenter set view method.
+            _mocks.BackToRecord(_view);
+        }
+
+        #endregion
+
+        [Test]
+        public void ViewSetterPropertyNullViewTest()
+        {
+            using(_mocks.Record())
+            {
+                _view.MaximumValue = DownloadingPresenter.MaximumValue;
+                _view.MinimumValue = DownloadingPresenter.MinimumValue;
+                _view.Progress = DownloadingPresenter.MinimumValue;
+
+            }
+            using(_mocks.Playback())
+            {
+                _presenter.View = _view;
+            }
+        }
+
+        [TestCase(34, 45)]
+        [TestCase(2, 100)]
+        [TestCase(35, 100)]
+        public void DownloadProgressHandlerVisibleTest(long progress, long total)
+        {
+            using (_mocks.Record())
+            {
+                SetupResult.For(_view.IsShown)
+                    .Return(true);
+                _view.DownloadingMessage = UpdateResources.DownloadInProgress;
+                _view.Progress = (progress * DownloadingPresenter.MaximumValue) / total;
+            }
+            using (_mocks.Playback())
+            {
+                _presenter.DownloadProgressHandler(this, new DownloadTaskProgressEventArgs(total, progress, 2, 1, null));
+            }
+        }
+
+        [TestCase(34, 45)]
+        [TestCase(2, 100)]
+        [TestCase(35, 100)]
+        public void DownloadProgressHandlerNotVisibleTest(long progress, long total)
+        {
+            using (_mocks.Record())
+            {
+                SetupResult.For(_view.IsShown)
+                    .Return(false);
+                Expect.Call(() => _view.Show())
+                    .Repeat.Once();
+                _view.DownloadingMessage = UpdateResources.DownloadInProgress;
+                _view.Progress = (progress * DownloadingPresenter.MaximumValue) / total;
+            }
+            using (_mocks.Playback())
+            {
+                _presenter.DownloadProgressHandler(this, new DownloadTaskProgressEventArgs(total, progress, 2, 1, null));
+            }
+        }
+
+        [Test]
+        public void DownloadErrorHandlerTest()
+        {
+            using (_mocks.Record())
+            {
+                _view.DownloadingMessage = UpdateResources.DownloadError;
+                _view.CloseButtonIsEnabled = true;
+                _view.Progress = DownloadingPresenter.MinimumValue;
+            }
+            using (_mocks.Playback())
+            {
+                _presenter.DownloadErrorHandler(this, new DownloadTaskErrorEventArgs(null, new Exception()));
+            }
+        }
+
+        [Test]
+        public void DownloadUpdateCompleted()
+        {
+            using (_mocks.Record())
+            {
+                _view.DownloadingMessage = UpdateResources.DownloadCompleted;
+                _view.Progress = DownloadingPresenter.MaximumValue;
+                _view.Close();
+            }
+            using (_mocks.Playback())
+            {
+                _presenter.DownloadUpdateCompleted(this, new TaskEventArgs(null));
+            }
+        }
+
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Common.Tests/Update/SelfUpdateExceptionFixture.cs'
--- src/Canonical.UbuntuOne.Common.Tests/Update/SelfUpdateExceptionFixture.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common.Tests/Update/SelfUpdateExceptionFixture.cs	2010-08-05 19:26:41 +0000
@@ -0,0 +1,60 @@
+/**
+ * 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.Update;
+using NUnit.Framework;
+
+namespace Canonical.UbuntuOne.Common.Tests.Update
+{
+    [TestFixture]
+    public class SelfUpdateExceptionFixture
+    {
+
+        #region Tests
+
+        [Test]
+        public void EmptyConstructor()
+        {
+            var ex = new SelfUpdateException();
+            Assert.IsNotNullOrEmpty(ex.Message);
+            Assert.IsNull(ex.InnerException);
+        }
+
+        [TestCase("Message")]
+        [TestCase("mandel")]
+        public void MessageConstructorTest(string message)
+        {
+            var exception = new SelfUpdateException(message);
+            Assert.AreEqual(message, exception.Message);
+        }
+
+        [TestCase("Message", typeof(InvalidOperationException))]
+        [TestCase("mandel", typeof(NullReferenceException))]
+        public void MessageInnerExceptionConstructor(string message, Type exceptionType)
+        {
+            var inner = (Exception)Activator.CreateInstance(exceptionType);
+            var ex = new SelfUpdateException(message, inner);
+            Assert.AreEqual(message, ex.Message);
+            Assert.IsInstanceOf(exceptionType, ex.InnerException);
+        }
+        #endregion
+    }
+}

=== modified file 'src/Canonical.UbuntuOne.Common.Tests/Update/UpdaterFixture.cs'
--- src/Canonical.UbuntuOne.Common.Tests/Update/UpdaterFixture.cs	2010-07-28 14:35:45 +0000
+++ src/Canonical.UbuntuOne.Common.Tests/Update/UpdaterFixture.cs	2010-08-05 19:26:41 +0000
@@ -17,6 +17,7 @@
  * 
  * Authors: Manuel de la Peña <[e-mail]>
  */
+using System.Windows;
 using Canonical.UbuntuOne.Common.Update;
 using log4net;
 using Microsoft.ApplicationBlocks.Updater;
@@ -33,12 +34,12 @@
     {
         #region Setup
 
-        private Logger _dotLogger;
         private ILog _logger;
         private MockRepository _mocks;
         private Updater _updater;
-        private IUpdateView _view;
+        private IDownloadingPresenter _presenter;
         private IDotUpdaterWrapper _dotUpdaterWrapper;
+        private IMessageBox _messageBox;
 
         [SetUp]
         public void Setup()
@@ -46,14 +47,16 @@
             
             _mocks = new MockRepository();
             _logger = _mocks.DynamicMock<ILog>();
-            _dotLogger = _mocks.DynamicMock<Logger>();
+            _mocks.DynamicMock<Logger>();
             _dotUpdaterWrapper = _mocks.DynamicMock<IDotUpdaterWrapper>();
-            _view = _mocks.DynamicMock<IUpdateView>();
+            _presenter = _mocks.DynamicMock<IDownloadingPresenter>();
+            _messageBox = _mocks.StrictMock<IMessageBox>();
             _updater = new Updater
             {
                 Logger = _logger,
-                UpdateView = _view,
-                DotUpdater = _dotUpdaterWrapper
+                DownloadingPresenter = _presenter,
+                DotUpdater = _dotUpdaterWrapper,
+                MessageBox = _messageBox
             };
         }
 
@@ -115,7 +118,38 @@
         [ExpectedException(typeof(SelfUpdateException))]
         public void PerformUpdateNoCheckDoneTest()
         {
-            _updater.PerformUpdate();
+            using(_mocks.Record())
+            {
+                Expect.Call(_messageBox.ShowYesNo(UpdateResources.DownloadUpdatesQuestion, MessageBoxImage.Question))
+                    .Return(MessageBoxResult.Yes);
+            }
+            using (_mocks.Playback())
+            {
+                _updater.PerformUpdate();
+            }
+        }
+
+        [Test]
+        public void PerformUpdateUserSaysNoTest()
+        {
+            var task = _mocks.DynamicMock<UpdaterTask>("", "wewe", new string[0], "code", new string[0]);
+            using (_mocks.Record())
+            {
+                Expect.Call(_messageBox.ShowYesNo(UpdateResources.DownloadUpdatesQuestion, MessageBoxImage.Question))
+                    .Return(MessageBoxResult.No);
+                Expect.Call(_dotUpdaterWrapper.CheckForUpdates())
+                    .Return(task)
+                    .Repeat.Once();
+                Expect.Call(() => _dotUpdaterWrapper.BeginDownload(task))
+                    .Repeat.Never();
+            }
+            using (_mocks.Playback())
+            {
+                if (_updater.UpdatesArePresent())
+                {
+                    _updater.PerformUpdate();
+                }
+            }
         }
 
         [Test]
@@ -124,6 +158,8 @@
         {
             using (_mocks.Record())
             {
+                Expect.Call(_messageBox.ShowYesNo(UpdateResources.DownloadUpdatesQuestion, MessageBoxImage.Question))
+                    .Return(MessageBoxResult.Yes);
                 Expect.Call(_dotUpdaterWrapper.CheckForUpdates())
                     .Return(null)
                     .Repeat.Once();
@@ -142,6 +178,9 @@
             var task = _mocks.DynamicMock<UpdaterTask>("", "wewe", new string[0], "code", new string[0]);
             using(_mocks.Record())
             {
+                Expect.Call(_messageBox.ShowYesNo(UpdateResources.DownloadUpdatesQuestion, MessageBoxImage.Question))
+                    .Return(MessageBoxResult.Yes);
+
                 Expect.Call(_dotUpdaterWrapper.CheckForUpdates())
                     .Return(task)
                     .Repeat.Once();
@@ -150,13 +189,13 @@
                     .Repeat.Once();
 
                 // ensure the handlers have been registered
-                _dotUpdaterWrapper.OnDownloadProgress += _view.DownloadProgressHandler;
+                _dotUpdaterWrapper.OnDownloadProgress += _presenter.DownloadProgressHandler;
 
-                _dotUpdaterWrapper.OnDownloadCompleted += _view.DownloadUpdateCompleted;
+                _dotUpdaterWrapper.OnDownloadCompleted += _presenter.DownloadUpdateCompleted;
                 _dotUpdaterWrapper.OnDownloadCompleted += null;
                 LastCall.IgnoreArguments();
 
-                _dotUpdaterWrapper.OnDownloadError += _view.DownloadErrorHandler;
+                _dotUpdaterWrapper.OnDownloadError += _presenter.DownloadErrorHandler;
                 _dotUpdaterWrapper.OnDownloadError += null;
                 LastCall.IgnoreArguments();
 
@@ -177,6 +216,8 @@
             var task = _mocks.DynamicMock<UpdaterTask>("", "wewe", new string[0], "code", new string[0]);
             using (_mocks.Record())
             {
+                Expect.Call(_messageBox.ShowYesNo(UpdateResources.DownloadUpdatesQuestion, MessageBoxImage.Question))
+                    .Return(MessageBoxResult.Yes);
                 Expect.Call(_dotUpdaterWrapper.CheckForUpdates())
                     .Return(task)
                     .Repeat.Once();

=== added file 'src/Canonical.UbuntuOne.Common.Tests/Update/UpdatingPresenterFixture.cs'
--- src/Canonical.UbuntuOne.Common.Tests/Update/UpdatingPresenterFixture.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common.Tests/Update/UpdatingPresenterFixture.cs	2010-08-05 19:26:41 +0000
@@ -0,0 +1,107 @@
+/**
+ * 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 Canonical.UbuntuOne.Common.Update;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Canonical.UbuntuOne.Common.Tests.Update
+{
+    [TestFixture]
+    public class UpdatingPresenterFixture
+    {
+        #region Variables
+
+        private MockRepository _mocks;
+        private IUpdatingView _view;
+        private UpdatingPresenter _presenter;
+
+        #endregion
+
+        #region Setup & TearDown
+
+        [SetUp]
+        public void Setup()
+        {
+            _mocks = new MockRepository();
+            _view = _mocks.StrictMock<IUpdatingView>();
+            _presenter = new UpdatingPresenter
+            {
+                View = _view
+            };
+        }
+
+        #endregion
+
+        #region Tests
+
+        [Test]
+        public void UpdatingStartedShownTest()
+        {
+            using(_mocks.Record())
+            {
+                SetupResult.For(_view.IsShown)
+                    .Return(true);
+                _view.UpdatingText = UpdateResources.UpdateStarted;
+                _view.IsUpdating = true;
+            }
+            using(_mocks.Playback())
+            {
+                _presenter.UpdatingStarted();
+            }
+        }
+
+        [Test]
+        public void UpdatingStartedNotShownTest()
+        {
+            using (_mocks.Record())
+            {
+                SetupResult.For(_view.IsShown)
+                    .Return(false);
+                Expect.Call(() => _view.Show())
+                    .Repeat.Once();
+                    
+                _view.UpdatingText = UpdateResources.UpdateStarted;
+                _view.IsUpdating = true;
+            }
+            using (_mocks.Playback())
+            {
+                _presenter.UpdatingStarted();
+            }
+        }
+
+        [Test]
+        public void UpdatingFinishedTest()
+        {
+            using (_mocks.Record())
+            {
+                _view.UpdatingText = UpdateResources.UpdateFinished;
+                _view.IsUpdating = false;
+            }
+            using (_mocks.Playback())
+            {
+                _presenter.UpdatingFinished();
+            }
+        }
+
+        #endregion
+
+    }
+}

=== modified file 'src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj'
--- src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj	2010-07-30 09:33:20 +0000
+++ src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj	2010-08-05 19:26:41 +0000
@@ -57,6 +57,7 @@
     <Compile Include="Container\SpringContainer.cs" />
     <Compile Include="Container\UnsatisfiedDependencyException.cs" />
     <Compile Include="IAuthentication.cs" />
+    <Compile Include="IMessageBox.cs" />
     <Compile Include="IProcessManager.cs" />
     <Compile Include="IProcessManagerFactory.cs" />
     <Compile Include="ProcessManagementException.cs" />
@@ -83,10 +84,14 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Update\DotLogger.cs" />
     <Compile Include="Update\DotUpdaterWrapper.cs" />
+    <Compile Include="Update\DownloadingPresenter.cs" />
     <Compile Include="Update\Enumerators.cs" />
     <Compile Include="Update\IDotUpdaterWrapper.cs" />
-    <Compile Include="Update\IUpdateView.cs" />
+    <Compile Include="Update\IDownloadingPresenter.cs" />
+    <Compile Include="Update\IDownloadingView.cs" />
     <Compile Include="Update\IUpdater.cs" />
+    <Compile Include="Update\IUpdatingPresenter.cs" />
+    <Compile Include="Update\IUpdatingView.cs" />
     <Compile Include="Update\Updater.cs" />
     <Compile Include="Update\UpdateResources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -94,6 +99,7 @@
       <DependentUpon>UpdateResources.resx</DependentUpon>
     </Compile>
     <Compile Include="Update\SelfUpdateException.cs" />
+    <Compile Include="Update\UpdatingPresenter.cs" />
     <Compile Include="Validation\ArgumentValidation.cs" />
     <Compile Include="Validation\EqualityValidationExtensions.cs" />
     <Compile Include="Validation\MultiException.cs" />
@@ -114,6 +120,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\log4net\log4net.dll</HintPath>
     </Reference>
+    <Reference Include="PresentationFramework">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
     <Reference Include="Spring.Aop, Version=1.3.0.20214, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Spring.Net\Spring.Aop.dll</HintPath>

=== added file 'src/Canonical.UbuntuOne.Common/IMessageBox.cs'
--- src/Canonical.UbuntuOne.Common/IMessageBox.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/IMessageBox.cs	2010-08-05 19:26:41 +0000
@@ -0,0 +1,71 @@
+/**
+ * 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.Windows;
+
+namespace Canonical.UbuntuOne.Common
+{
+    /// <summary>
+    /// Interface to be implemented by a class that allows to show general useful informatio to the user.
+    /// </summary>
+    public interface IMessageBox
+    {
+        /// <summary>
+        /// Displays an error dialog with a given message.
+        /// </summary>
+        /// <param name="message">The message to be displayed.</param>
+        void ShowError(string message);
+
+        /// <summary>
+        /// Displays an error dialog with a given message.
+        /// </summary>
+        /// <param name="message">The message to be displayed.</param>
+        void ShowInformation(string message);
+
+        /// <summary>
+        /// Displays an error dialog with a given message.
+        /// </summary>
+        /// <param name="message">The message to be displayed.</param>
+        void ShowWarning(string message);
+
+        /// <summary>
+        /// Displays an OK / Cancel dialog and returns the user input.
+        /// </summary>
+        /// <param name="message">The message to be displayed.</param>
+        /// <param name="icon">The icon to be displayed.</param>
+        /// <returns>User selection.</returns>
+        MessageBoxResult ShowOkCancel(string message, MessageBoxImage icon);
+
+        /// <summary>
+        /// Displays a Yes/No dialog and returns the user input.
+        /// </summary>
+        /// <param name="message">The message to be displayed.</param>
+        /// <param name="icon">The icon to be displayed.</param>
+        /// <returns>User selection.</returns>
+        MessageBoxResult ShowYesNo(string message, MessageBoxImage icon);
+
+        /// <summary>
+        /// Displays an Yes / No / Cancel dialog and returns the user input.
+        /// </summary>
+        /// <param name="message">The message to be displayed.</param>
+        /// <param name="icon">The icon to be displayed.</param>
+        /// <returns>User selection.</returns>
+        MessageBoxResult ShowYesNoCancel(string message, MessageBoxImage icon);
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Common/Update/DownloadingPresenter.cs'
--- src/Canonical.UbuntuOne.Common/Update/DownloadingPresenter.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Update/DownloadingPresenter.cs	2010-08-05 19:26:41 +0000
@@ -0,0 +1,82 @@
+/**
+ * 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.Threading;
+using Microsoft.ApplicationBlocks.Updater;
+
+namespace Canonical.UbuntuOne.Common.Update
+{
+    /// <summary>
+    /// Presenter that manages Downloading views.
+    /// </summary>
+    public class DownloadingPresenter : IDownloadingPresenter
+    {
+        #region Variables
+
+        private IDownloadingView _view;
+        public const double MaximumValue = 100;
+        public const double MinimumValue = 0;
+
+        #endregion
+
+        public IDownloadingView View
+        {
+            get { return _view; }
+            set
+            {
+                if (value != null)
+                {
+                    var progress = (_view != null) ? _view.Progress : 0;
+                    _view = value;
+                    _view.MaximumValue = MaximumValue;
+                    _view.MinimumValue = MinimumValue;
+                    _view.Progress = progress;
+                }
+                else
+                {
+                    _view = null;
+                }
+            }
+        }
+
+        public void DownloadProgressHandler(object sender, DownloadTaskProgressEventArgs args)
+        {
+            if(!View.IsShown)
+                View.Show();
+            View.DownloadingMessage = UpdateResources.DownloadInProgress;
+            View.Progress = (args.BytesTransferred * MaximumValue) / args.BytesTotal;
+        }
+
+        public void DownloadErrorHandler(object sender, DownloadTaskErrorEventArgs args)
+        {
+            View.DownloadingMessage = UpdateResources.DownloadError;
+            View.Progress = MinimumValue;
+            View.CloseButtonIsEnabled = true;
+        }
+
+        public void DownloadUpdateCompleted(object sender, TaskEventArgs e)
+        {
+            View.DownloadingMessage = UpdateResources.DownloadCompleted;   
+            View.Progress = MaximumValue;
+            // let the user know
+            Thread.Sleep(100);
+            View.Close();
+        }
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Common/Update/IDownloadingPresenter.cs'
--- src/Canonical.UbuntuOne.Common/Update/IDownloadingPresenter.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Update/IDownloadingPresenter.cs	2010-08-05 19:26:41 +0000
@@ -0,0 +1,63 @@
+/**
+ * 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 Microsoft.ApplicationBlocks.Updater;
+
+namespace Canonical.UbuntuOne.Common.Update
+{
+    /// <summary>
+    /// Interface that represents the view that will ask for a confirmation to the user
+    /// regarding the update procedure.
+    /// </summary>
+    public interface IDownloadingPresenter
+    {
+        /// <summary>
+        /// Gets and sets the view used by the presenter.
+        /// </summary>
+        IDownloadingView View { get; set; }
+
+        /// <summary>
+        /// Handler that will be used when there is an update in the progress of the download.
+        /// This handler can be used to allow the user know the progress of the download.
+        /// </summary>
+        /// <param name="sender">The object that sent the arguments.</param>
+        /// <param name="args">The event arguments that provide the information to be 
+        /// shown to the user.</param>
+        void DownloadProgressHandler(object sender, DownloadTaskProgressEventArgs args);
+
+        /// <summary>
+        /// Handler that will be used when there was an error in the update. This will allow
+        /// the view to communicate the user that there was an error but should not try to do anything about 
+        /// it since this object is just a view.
+        /// </summary>
+        /// <param name="sender">The object that sent the event.</param>
+        /// <param name="args">The event arguments that provide the information to be 
+        /// shown to the user.</param>
+        void DownloadErrorHandler(object sender, DownloadTaskErrorEventArgs args);
+
+        /// <summary>
+        /// Handler that will be used when the download of the updates finished. This will allows th view
+        /// to let the user know that we finished and that the updating will be in progress.
+        /// </summary>
+        /// <param name="sender">The object that sent the event.</param>
+        /// <param name="e">The event arguments that provide the information to be 
+        /// shown to the user.</param>
+        void DownloadUpdateCompleted(object sender, TaskEventArgs e);
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Common/Update/IDownloadingView.cs'
--- src/Canonical.UbuntuOne.Common/Update/IDownloadingView.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Update/IDownloadingView.cs	2010-08-05 19:26:41 +0000
@@ -0,0 +1,68 @@
+/**
+ * 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]>
+ */
+namespace Canonical.UbuntuOne.Common.Update
+{
+    /// <summary>
+    /// Interface to be implemented by those views that are used to display the download process.
+    /// </summary>
+    public interface IDownloadingView
+    {
+        /// <summary>
+        /// Gets and sets if the close button is enabled.
+        /// </summary>
+        bool CloseButtonIsEnabled { get; set; }
+
+        /// <summary>
+        /// Gets if the view is visible.
+        /// </summary>
+        bool IsShown { get; }
+
+        /// <summary>
+        /// Gets and sets the downloading message to be displayed.
+        /// </summary>
+        string DownloadingMessage { get; set; }
+
+        /// <summary>
+        /// Gets and sets the min value of the progress.
+        /// </summary>
+        double MinimumValue { get; set; }
+
+        /// <summary>
+        /// Get and sets the max value of the progress.
+        /// </summary>
+        double MaximumValue { get; set; }
+
+        /// <summary>
+        /// Gets and sets the current progress.
+        /// </summary>
+        double Progress { get; set; }
+
+        /// <summary>
+        /// Shows the view to the user.
+        /// </summary>
+        void Show();
+
+        /// <summary>
+        /// Closes the view.
+        /// </summary>
+        void Close();
+
+    }
+}

=== removed file 'src/Canonical.UbuntuOne.Common/Update/IUpdateView.cs'
--- src/Canonical.UbuntuOne.Common/Update/IUpdateView.cs	2010-07-28 10:41:14 +0000
+++ src/Canonical.UbuntuOne.Common/Update/IUpdateView.cs	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-/**
- * 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 Microsoft.ApplicationBlocks.Updater;
-
-namespace Canonical.UbuntuOne.Common.Update
-{
-    /// <summary>
-    /// Interface that represents the view that will ask for a confirmation to the user
-    /// regarding the update procedure.
-    /// </summary>
-    public interface IUpdateView
-    {
-        /// <summary>
-        /// This method should prompt some kind of confirmation message to the user
-        /// and return if he decided to update the application or not.
-        /// </summary>
-        /// <returns>The answer that the user provided.</returns>
-        UpdateConfirmation AskForDownloadAndUpdateConfirmation();
-
-        /// <summary>
-        /// This method should prompt some kind of confirmation to the user to close and install the update
-        /// of the application.
-        /// </summary>
-        /// <returns>The answer that the suer provided.</returns>
-        UpdateConfirmation AskForCloseAnInstallConfirmation();
-
-        /// <summary>
-        /// This method wil be called when the update finished. The view should show the appropiate
-        /// data to the user when this occurs.
-        /// </summary>
-        void Updatefinished();
-
-        /// <summary>
-        /// Handler that will be used when there is an update in the progress of the download.
-        /// This handler can be used to allow the user know the progress of the download.
-        /// </summary>
-        /// <param name="sender">The object that sent the arguments.</param>
-        /// <param name="args">The event arguments that provide the information to be 
-        /// shown to the user.</param>
-        void DownloadProgressHandler(object sender, DownloadTaskProgressEventArgs args);
-
-        /// <summary>
-        /// Handler that will be used when there was an error in the update. This will allow
-        /// the view to communicate the user that there was an error but should not try to do anything about 
-        /// it since this object is just a view.
-        /// </summary>
-        /// <param name="sender">The object that sent the event.</param>
-        /// <param name="args">The event arguments that provide the information to be 
-        /// shown to the user.</param>
-        void DownloadErrorHandler(object sender, DownloadTaskErrorEventArgs args);
-
-        /// <summary>
-        /// Handler that will be used when the download of the updates finished. This will allows th view
-        /// to let the user know that we finished and that the updating will be in progress.
-        /// </summary>
-        /// <param name="sender">The object that sent the event.</param>
-        /// <param name="e">The event arguments that provide the information to be 
-        /// shown to the user.</param>
-        void DownloadUpdateCompleted(object sender, TaskEventArgs e);
-    }
-}

=== modified file 'src/Canonical.UbuntuOne.Common/Update/IUpdater.cs'
--- src/Canonical.UbuntuOne.Common/Update/IUpdater.cs	2010-07-14 13:50:36 +0000
+++ src/Canonical.UbuntuOne.Common/Update/IUpdater.cs	2010-08-05 19:26:41 +0000
@@ -37,7 +37,7 @@
         /// <summary>
         /// Gets and sets the view that will be used to ask for confirmation when an update exists.
         /// </summary>
-        IUpdateView UpdateView { get; set; }
+        IDownloadingPresenter DownloadingPresenter { get; set; }
 
         /// <summary>
         /// Returns if the are updates present for the application.

=== added file 'src/Canonical.UbuntuOne.Common/Update/IUpdatingPresenter.cs'
--- src/Canonical.UbuntuOne.Common/Update/IUpdatingPresenter.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Update/IUpdatingPresenter.cs	2010-08-05 19:26:41 +0000
@@ -0,0 +1,39 @@
+/**
+ * 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]>
+ */
+namespace Canonical.UbuntuOne.Common.Update
+{
+    public interface IUpdatingPresenter
+    {
+        /// <summary>
+        /// Gets and sets the view used by the presenter.
+        /// </summary>
+        IUpdatingView View { get; set; }
+
+        /// <summary>
+        /// Method used to notify the user that the updating started.
+        /// </summary>
+        void UpdatingStarted();
+
+        /// <summary>
+        /// Method used to notify the user that the updating finished.
+        /// </summary>
+        void UpdatingFinished();
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Common/Update/IUpdatingView.cs'
--- src/Canonical.UbuntuOne.Common/Update/IUpdatingView.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Update/IUpdatingView.cs	2010-08-05 19:26:41 +0000
@@ -0,0 +1,50 @@
+/**
+ * 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]>
+ */
+
+namespace Canonical.UbuntuOne.Common.Update
+{
+    public interface IUpdatingView
+    {
+        /// <summary>
+        /// Gets and sets if the view is visible
+        /// </summary>
+        bool IsShown { get; }
+
+        /// <summary>
+        /// Gets and sets if the application is being updated.
+        /// </summary>
+        bool IsUpdating { get; set; }
+
+        /// <summary>
+        /// Gets and sets the text tht tell the user the app is being updated.
+        /// </summary>
+        string UpdatingText { get; set; }
+
+        /// <summary>
+        /// Displays the view to the user.
+        /// </summary>
+        void Show();
+
+        /// <summary>
+        /// Closes the view.
+        /// </summary>
+        void Close();
+    }
+}

=== modified file 'src/Canonical.UbuntuOne.Common/Update/UpdateResources.Designer.cs'
--- src/Canonical.UbuntuOne.Common/Update/UpdateResources.Designer.cs	2010-07-21 10:07:22 +0000
+++ src/Canonical.UbuntuOne.Common/Update/UpdateResources.Designer.cs	2010-08-05 19:26:41 +0000
@@ -97,6 +97,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Downloading....
+        /// </summary>
+        internal static string DownloadInProgress {
+            get {
+                return ResourceManager.GetString("DownloadInProgress", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to There are updates avialable. Do you want to download them?.
+        /// </summary>
+        internal static string DownloadUpdatesQuestion {
+            get {
+                return ResourceManager.GetString("DownloadUpdatesQuestion", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Updater RSS feed is null or empty..
         /// </summary>
         internal static string NoRSSFeedPresent {
@@ -113,5 +131,50 @@
                 return ResourceManager.GetString("NoUpdatesAvailable", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The updates have been correctly downloaded. Do you want to update Ubuntu One?.
+        /// </summary>
+        internal static string PerformUpdateQuestion {
+            get {
+                return ResourceManager.GetString("PerformUpdateQuestion", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The update process has finished..
+        /// </summary>
+        internal static string UpdateFinished {
+            get {
+                return ResourceManager.GetString("UpdateFinished", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The update process could not be completed..
+        /// </summary>
+        internal static string UpdatesError {
+            get {
+                return ResourceManager.GetString("UpdatesError", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The application was correctly updated..
+        /// </summary>
+        internal static string UpdatesSucceded {
+            get {
+                return ResourceManager.GetString("UpdatesSucceded", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The update process has started..
+        /// </summary>
+        internal static string UpdateStarted {
+            get {
+                return ResourceManager.GetString("UpdateStarted", resourceCulture);
+            }
+        }
     }
 }

=== modified file 'src/Canonical.UbuntuOne.Common/Update/UpdateResources.resx'
--- src/Canonical.UbuntuOne.Common/Update/UpdateResources.resx	2010-07-21 10:07:22 +0000
+++ src/Canonical.UbuntuOne.Common/Update/UpdateResources.resx	2010-08-05 19:26:41 +0000
@@ -129,10 +129,31 @@
   <data name="DownloadError" xml:space="preserve">
     <value>The download could not me completed.</value>
   </data>
+  <data name="DownloadUpdatesQuestion" xml:space="preserve">
+    <value>There are updates avialable. Do you want to download them?</value>
+  </data>
   <data name="NoRSSFeedPresent" xml:space="preserve">
     <value>Updater RSS feed is null or empty.</value>
   </data>
   <data name="NoUpdatesAvailable" xml:space="preserve">
     <value>There are no updates available.</value>
   </data>
+  <data name="PerformUpdateQuestion" xml:space="preserve">
+    <value>The updates have been correctly downloaded. Do you want to update Ubuntu One?</value>
+  </data>
+  <data name="UpdateFinished" xml:space="preserve">
+    <value>The update process has finished.</value>
+  </data>
+  <data name="UpdatesError" xml:space="preserve">
+    <value>The update process could not be completed.</value>
+  </data>
+  <data name="UpdatesSucceded" xml:space="preserve">
+    <value>The application was correctly updated.</value>
+  </data>
+  <data name="UpdateStarted" xml:space="preserve">
+    <value>The update process has started.</value>
+  </data>
+  <data name="DownloadInProgress" xml:space="preserve">
+    <value>Downloading...</value>
+  </data>
 </root>
\ No newline at end of file

=== modified file 'src/Canonical.UbuntuOne.Common/Update/Updater.cs'
--- src/Canonical.UbuntuOne.Common/Update/Updater.cs	2010-07-28 14:35:45 +0000
+++ src/Canonical.UbuntuOne.Common/Update/Updater.cs	2010-08-05 19:26:41 +0000
@@ -18,6 +18,7 @@
  * Authors: Manuel de la Peña <[e-mail]>
  */
 using System;
+using System.Windows;
 using System.Windows.Threading;
 using DotUpdater;
 using log4net;
@@ -45,7 +46,7 @@
 
         #endregion
 
-        #region Delegats
+        #region Delegates
 
         delegate void UpdaterDelegate(UpdaterTask task);
 
@@ -54,8 +55,9 @@
         #region DI properties
 
         public string RSSFeed { get; set; }
-
-        public IUpdateView UpdateView { get; set; }
+        public IMessageBox MessageBox { get; set; }
+        public IDownloadingPresenter DownloadingPresenter { get; set; }
+        public IUpdatingPresenter UpdatingPresenter { get; set; }
 
         #endregion
 
@@ -145,15 +147,26 @@
         /// <param name="task">The updater tasks that was being performed.</param>
         private void UpdateDownloadedMainThread(UpdaterTask task)
         {
-            if (UpdateView.AskForCloseAnInstallConfirmation() != UpdateConfirmation.YES) 
+            if (MessageBox.ShowOkCancel(UpdateResources.PerformUpdateQuestion, MessageBoxImage.Question) == MessageBoxResult.Cancel ) 
                 return;
 
-            // perform the update
-            DotUpdater.Install(_task);
-            // clean the resoruces
-            _task = null;
-            _updateChecked = false;
-            _downloadingUpdate = false;
+            try
+            {
+                UpdatingPresenter.UpdatingStarted();
+                // perform the update
+                DotUpdater.Install(_task);
+                // clean the resoruces
+                _task = null;
+                _updateChecked = false;
+                _downloadingUpdate = false;
+                UpdatingPresenter.UpdatingFinished();
+                MessageBox.ShowInformation(UpdateResources.UpdatesSucceded);
+            }
+            catch(UpdaterException)
+            {
+                MessageBox.ShowError(UpdateResources.UpdatesError);
+            }
+
         }
 
         #endregion
@@ -185,7 +198,7 @@
             lock (_updateLock)
             {
                 // ask the user if he wants to perform the update
-                if (UpdateView.AskForDownloadAndUpdateConfirmation() == UpdateConfirmation.NO) return;
+                if (MessageBox.ShowYesNo(UpdateResources.DownloadUpdatesQuestion, MessageBoxImage.Question) == MessageBoxResult.No) return;
                 if (!_updateChecked)
                 {
                     Logger.Error(UpdateResources.CheckNotDone);
@@ -205,14 +218,14 @@
                         DotUpdater.BeginDownload(_task);
                         // provide the handler for the progress of the download as well as the 
                         // error and finish
-                        DotUpdater.OnDownloadProgress += UpdateView.DownloadProgressHandler;
+                        DotUpdater.OnDownloadProgress += DownloadingPresenter.DownloadProgressHandler;
                         // we provide two handlers one for the view to let the user know we completed
                         // the download and a second one for the updater that will do the actual work
-                        DotUpdater.OnDownloadCompleted += UpdateView.DownloadUpdateCompleted;
+                        DotUpdater.OnDownloadCompleted += DownloadingPresenter.DownloadUpdateCompleted;
                         DotUpdater.OnDownloadCompleted += DownloadUpdateCompleted;
                         // register to handlers, one for the view that will show the error and an other
                         // one for the updater that will handle the error.
-                        DotUpdater.OnDownloadError += UpdateView.DownloadErrorHandler;
+                        DotUpdater.OnDownloadError += DownloadingPresenter.DownloadErrorHandler;
                         DotUpdater.OnDownloadError += DownloadErrorHandler;
                     }
                     catch (UpdaterException e)

=== added file 'src/Canonical.UbuntuOne.Common/Update/UpdatingPresenter.cs'
--- src/Canonical.UbuntuOne.Common/Update/UpdatingPresenter.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Update/UpdatingPresenter.cs	2010-08-05 19:26:41 +0000
@@ -0,0 +1,41 @@
+/**
+ * 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]>
+ */
+
+namespace Canonical.UbuntuOne.Common.Update
+{
+    public class UpdatingPresenter : IUpdatingPresenter
+    {
+        public IUpdatingView View { get; set; }
+
+        public void UpdatingStarted()
+        {
+            if(!View.IsShown)
+                View.Show();
+            View.UpdatingText = UpdateResources.UpdateStarted;
+            View.IsUpdating = true;
+        }
+
+        public void UpdatingFinished()
+        {
+            View.UpdatingText = UpdateResources.UpdateFinished;
+            View.IsUpdating = false;
+        }
+    }
+}

=== modified file 'src/UbuntuOneClient.Tests/ProgramFixture.cs'
--- src/UbuntuOneClient.Tests/ProgramFixture.cs	2010-07-28 14:35:45 +0000
+++ src/UbuntuOneClient.Tests/ProgramFixture.cs	2010-08-05 19:26:41 +0000
@@ -64,6 +64,7 @@
             // ensure that the updater thread joins the application, if not we will have an issue 
             // with the tests since the thread will not be collected
             _program.StopUpdaterThread();
+            _mocks.BackToRecordAll();
         }
 
         #endregion
@@ -94,6 +95,7 @@
         [Test]
         public void StartApplicationWithUpdates()
         {
+            Assert.Ignore("RhinoMocks does not support multithreaded tests and therefore this test will not be reliable");
             using (_mocks.Record())
             {
                 _app.ShutdownMode = ShutdownMode.OnExplicitShutdown;

=== modified file 'src/Version.cs'
--- src/Version.cs	2010-07-30 09:33:20 +0000
+++ src/Version.cs	2010-08-05 19:26:41 +0000
@@ -10,6 +10,6 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: AssemblyVersionAttribute("1.0.0.0")]
-[assembly: AssemblyFileVersionAttribute("1.0.0.0")]
+[assembly: AssemblyVersionAttribute("1.0.404.5869")]
+[assembly: AssemblyFileVersionAttribute("1.0.404.5869")]