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

[Manuel de la Peña]

Allows to remove the current machine from ubuntu one by adding a way to manage your devices.

[John Lenton (chipaca)]

review: Approve

=== modified file 'src/Canonical.Ubuntu.SSO.Tests/SSOLoginProcessorFixture.cs'
--- src/Canonical.Ubuntu.SSO.Tests/SSOLoginProcessorFixture.cs	2010-10-05 09:49:29 +0000
+++ src/Canonical.Ubuntu.SSO.Tests/SSOLoginProcessorFixture.cs	2010-11-14 21:31:15 +0000
@@ -54,7 +54,6 @@
             _processor = new SSOLoginProcessor
             {
                 Authentications = _auth,
-                HttpWebRequestFactory = _requestFactory,
                 Keyring = _keyring,
                 OAuth = _oauth,
                 SSOCredentialsEncoder = _encode

=== modified file 'src/Canonical.Ubuntu.SSO/Canonical.Ubuntu.SSO.csproj'
--- src/Canonical.Ubuntu.SSO/Canonical.Ubuntu.SSO.csproj	2010-10-12 13:07:02 +0000
+++ src/Canonical.Ubuntu.SSO/Canonical.Ubuntu.SSO.csproj	2010-11-14 21:31:15 +0000
@@ -89,13 +89,11 @@
     <Compile Include="IDataProtector.cs" />
     <Compile Include="ILoginOrRegisterView.cs" />
     <Compile Include="ILoginView.cs" />
-    <Compile Include="IOAuth.cs" />
     <Compile Include="ISSOCredentialsEncoder.cs" />
     <Compile Include="ISSOLoginProcessor.cs" />
     <Compile Include="JsonSSOCredentialsEncoder.cs" />
     <Compile Include="Keyring.cs" />
     <Compile Include="LoginCredentialsEventArgs.cs" />
-    <Compile Include="OAuth.cs" />
     <Compile Include="Service\Account.cs" />
     <Compile Include="Service\AccountDiff.cs" />
     <Compile Include="Service\AccountFull.cs" />

=== modified file 'src/Canonical.Ubuntu.SSO/IKeyring.cs'
--- src/Canonical.Ubuntu.SSO/IKeyring.cs	2010-09-16 16:18:56 +0000
+++ src/Canonical.Ubuntu.SSO/IKeyring.cs	2010-11-14 21:31:15 +0000
@@ -37,6 +37,13 @@
         void CreateSecret(string keyringName, string applicationName, string secret);
 
         /// <summary>
+        /// Removes the given secret from the keyring.
+        /// </summary>
+        /// <param name="keyring">The keyring where th esecret is found.</param>
+        /// <param name="applicationName">The name of the application.</param>
+        void RemoveSecret(string keyring, string applicationName);
+
+        /// <summary>
         /// Gets the secret froma keyring using the name of the application that stored it.
         /// </summary>
         /// <param name="keyringName">The name of the keyring where the secret was stored.</param>

=== modified file 'src/Canonical.Ubuntu.SSO/ISSOCredentialsProvider.cs'
--- src/Canonical.Ubuntu.SSO/ISSOCredentialsProvider.cs	2010-10-18 10:53:55 +0000
+++ src/Canonical.Ubuntu.SSO/ISSOCredentialsProvider.cs	2010-11-14 21:31:15 +0000
@@ -72,6 +72,22 @@
         /// </summary>
         void LoginOrRegisterToGetCredentials();
 
+        /// <summary>
+        /// Returns the credentials of the user and requests a login if necesary.
+        /// </summary>
+        /// <param name="applicationName">The name of the application requesting the info.</param>
+        /// <param name="token">The token part of the oauth.</param>
+        /// <param name="tokenSecret">The token secret of the part of the oauth.</param>
+        /// <param name="consumerKey">The consumer key of the oauth.</param>
+        /// <param name="consumerSecret">The consumer secret of the oauth.</param>
+        void LoginToGetCredentials(string applicationName, out string token, out string tokenSecret, out string consumerKey, out string consumerSecret);
+
+        /// <summary>
+        /// Removes the credentials for the given application name in the machine.
+        /// </summary>
+        /// <param name="applicationName">The name of the applications whose credentials we want to remove.</param>
+        void RemoveCredentials(string applicationName);
+
         #endregion
 
     }

=== modified file 'src/Canonical.Ubuntu.SSO/Keyring.cs'
--- src/Canonical.Ubuntu.SSO/Keyring.cs	2010-10-06 18:29:07 +0000
+++ src/Canonical.Ubuntu.SSO/Keyring.cs	2010-11-14 21:31:15 +0000
@@ -17,6 +17,7 @@
  * 
  * Authors: Manuel de la Peña <[e-mail]>
  */
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
@@ -272,6 +273,26 @@
         }
 
         /// <summary>
+        /// Removes the given secret from the keyring.
+        /// </summary>
+        /// <param name="keyringName">The keyring where th esecret is found.</param>
+        /// <param name="applicationName">The name of the application.</param>
+        public void RemoveSecret(string keyringName, string applicationName)
+        {
+            ValidateArgs.Begin()
+                .IsNotNullOrEmpty(keyringName, "keyringName")
+                .IsNotNullOrEmpty(applicationName, "applicationName")
+                .Check();
+            if(KeyringExist(keyringName))
+            {
+                using(var keyring = OpenKeyring(keyringName))
+                {
+                    keyring.DeleteValue(applicationName);
+                }
+            }
+        }
+
+        /// <summary>
         /// Gets the secret froma keyring using the name of the application that stored it.
         /// </summary>
         /// <param name="keyringName">The name of the keyring where the secret was stored.</param>

=== modified file 'src/Canonical.Ubuntu.SSO/SSOCredentialsProvider.cs'
--- src/Canonical.Ubuntu.SSO/SSOCredentialsProvider.cs	2010-10-20 11:32:24 +0000
+++ src/Canonical.Ubuntu.SSO/SSOCredentialsProvider.cs	2010-11-14 21:31:15 +0000
@@ -157,6 +157,71 @@
             throw new NotImplementedException();
         }
 
+        /// <summary>
+        /// Returns the credentials of the user and requests a login if necesary.
+        /// </summary>
+        /// <param name="token">The token part of the oauth.</param>
+        /// <param name="tokenSecret">The token secret of the part of the oauth.</param>
+        /// <param name="consumerKey">The consumer key of the oauth.</param>
+        /// <param name="consumerSecret">The consumer secret of the oauth.</param>
+        public void LoginToGetCredentials(string applicationName, out string token, out string tokenSecret, out string consumerKey, out string consumerSecret)
+        {
+            token = null;
+            tokenSecret = null;
+            consumerKey = null;
+            consumerSecret = null;
+            try
+            {
+                // try to get the credentials from the keyring
+                var secret = Keyring.GetSecretByName(KeyringName, ApplicationName);
+                if (secret == null)
+                {
+                    // we need to use the processor to get the login info
+                    if (LoginView.ViewDispatcher.Dispatch(() => LoginView.IsShown))
+                        return;
+                    
+                    if (LoginView.ViewDispatcher.Dispatch(() => LoginView.ShowDialog() != MessageBoxResult.Cancel))
+                    {
+                        var tokenName = string.Format(ApplicationTokenName, Environment.MachineName);
+                        secret = SSOLoginProcessor.Login(
+                            LoginView.ViewDispatcher.Dispatch(() => LoginView.EmailAddress),
+                            LoginView.ViewDispatcher.Dispatch(() => LoginView.Password),
+                            tokenName);
+                        // save the credentials in the keyring
+                        // TODO: We have an issue here since we have more than one listening for the same credntials of Ubuntu One
+                        Keyring.CreateSecret(KeyringName, applicationName, secret);
+                    }
+                    else
+                    {
+                        return;
+                    }
+                }
+                // we execute the credentials found event
+                if (!string.IsNullOrEmpty(secret) && OnCredentialsFound != null)
+                {
+                    SSOLoginProcessor.SSOCredentialsEncoder.Decode(secret, out token, out tokenSecret, out consumerKey, out consumerSecret);
+                }
+            }
+            catch (SSOLoginException e)
+            {
+                // TODO: Show message!
+            }
+            catch (Exception e)
+            {
+                // TODO: Show message!
+            }
+        }
+
+        /// <summary>
+        /// Removes the credentials for the given application name in the machine.
+        /// </summary>
+        /// <param name="applicationName">The name of the applications whose credentials we want to remove.</param>
+        public void RemoveCredentials(string applicationName)
+        {
+            // TODO: Currently the application name is hardcoded!
+            Keyring.RemoveSecret(KeyringName, ApplicationName);
+        }
+
         #endregion
     }
 }

=== modified file 'src/Canonical.Ubuntu.SSO/SSOLoginProcessor.cs'
--- src/Canonical.Ubuntu.SSO/SSOLoginProcessor.cs	2010-10-05 15:20:36 +0000
+++ src/Canonical.Ubuntu.SSO/SSOLoginProcessor.cs	2010-11-14 21:31:15 +0000
@@ -58,40 +58,11 @@
         /// </summary>
         public IOAuth OAuth { get; set; }
 
-        public IHttpWebRequestFactory HttpWebRequestFactory { get; set; }
-
         #endregion
 
         #region Helper methods}
 
         /// <summary>
-        /// Creates an oauth request that can access a protected web resource.
-        /// </summary>
-        /// <param name="uri">The uri where the resource is found.</param>
-        /// <param name="httpMethod">The request berb to be used.</param>
-        /// <param name="consumerKey">Consumer key from oauth.</param>
-        /// <param name="consumerSecret">Consumer secret from oauth.</param>
-        /// <param name="token">Token from oauth.</param>
-        /// <param name="tokenSecret">Token secret from oauth.</param>
-        /// <returns>A webrequest that can be used to access the resource.</returns>
-        public IHttpWebRequest MakeRequest(string uri, string httpMethod, string consumerKey, string consumerSecret, string token, string tokenSecret)
-        {
-            // Form the full REST request url
-            var url = new Uri(uri);
-            string normUrl;
-            string normParams;
-
-            // get oauth header
-            var authHeader = OAuth.GenerateHeaderWithSignature(url, string.Empty, consumerKey, consumerSecret,
-                token, tokenSecret, httpMethod, OAuth.GenerateTimeStamp(), OAuth.GenerateNonce(), SSO.OAuth.SignatureTypes.HMACSHA1,
-                out normUrl, out normParams);
-
-            var request = HttpWebRequestFactory.Create(url);
-            request.Headers.Add(authHeader.Key, authHeader.Value);
-            return request;
-        }
-
-        /// <summary>
         /// Pings the Ubuntu One server so that the SSO tokens are added to them and they know how to identify the user.
         /// </summary>
         /// <param name="email">The email used by the user to register to u1.</param>
@@ -102,7 +73,7 @@
         private void PingUbuntuOneServer(string email, string consumerKey, string consumerSecret, string token, string tokenSecret)
         {
             // ping the service to make it download the tokens
-            var pingRequest = MakeRequest(Constants.PingUrl + email, "GET", consumerKey, consumerSecret,
+            var pingRequest = OAuth.MakeRequest(Constants.PingUrl + email, "GET", consumerKey, consumerSecret,
                                           token, tokenSecret);
             try
             {

=== modified file 'src/Canonical.Ubuntu.SSO/objects.xml'
--- src/Canonical.Ubuntu.SSO/objects.xml	2010-10-05 15:20:36 +0000
+++ src/Canonical.Ubuntu.SSO/objects.xml	2010-11-14 21:31:15 +0000
@@ -19,9 +19,6 @@
           type="Canonical.Ubuntu.SSO.JsonSSOCredentialsEncoder , Canonical.Ubuntu.SSO"
           autowire="autodetect"/>
 
-  <object id="OAuth"
-          type="Canonical.Ubuntu.SSO.OAuth , Canonical.Ubuntu.SSO"
-          autowire="autodetect"/>
   
   <!-- The actual interesting objects to perform the SSO -->
 

=== modified file 'src/Canonical.UbuntuOne.Client.Test/Canonical.UbuntuOne.Client.Test.csproj'
--- src/Canonical.UbuntuOne.Client.Test/Canonical.UbuntuOne.Client.Test.csproj	2010-10-12 13:07:02 +0000
+++ src/Canonical.UbuntuOne.Client.Test/Canonical.UbuntuOne.Client.Test.csproj	2010-11-14 21:31:15 +0000
@@ -82,6 +82,7 @@
     <Compile Include="..\Version.cs">
       <Link>Properties\Version.cs</Link>
     </Compile>
+    <Compile Include="DeviceFactoryFixture.cs" />
     <Compile Include="Notification\NotificationEventArgsFixture.cs" />
     <Compile Include="Notification\NotificationPresenterFixture.cs" />
     <Compile Include="Notification\OperationCompletenessEventArgsFixture.cs" />
@@ -90,6 +91,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Canonical.Ubuntu.SSO\Canonical.Ubuntu.SSO.csproj">
+      <Project>{9460A771-2589-45DA-9618-9FE8BB7D16E8}</Project>
+      <Name>Canonical.Ubuntu.SSO</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Canonical.UbuntuOne.Client\Canonical.UbuntuOne.Client.csproj">
       <Project>{7467483A-D6D5-4362-8DF4-57A7254EB569}</Project>
       <Name>Canonical.UbuntuOne.Client</Name>

=== added file 'src/Canonical.UbuntuOne.Client.Test/DeviceFactoryFixture.cs'
--- src/Canonical.UbuntuOne.Client.Test/DeviceFactoryFixture.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client.Test/DeviceFactoryFixture.cs	2010-11-14 21:31:15 +0000
@@ -0,0 +1,92 @@
+/* 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 NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Canonical.UbuntuOne.Client.Test
+{
+    [TestFixture]
+    public class DeviceFactoryFixture
+    {
+        #region Variables
+
+        private IDeviceManager _deviceManager;
+        private MockRepository _mocks;
+        private DeviceFactory _factory;
+
+        #endregion
+
+        #region Setup
+
+        [SetUp]
+        public void SetUp()
+        {
+            _mocks = new MockRepository();
+            _deviceManager = _mocks.StrictMock<IDeviceManager>();
+            _factory = new DeviceFactory {DeviceManager = _deviceManager};
+        }
+
+        #endregion
+
+        #region Tests
+
+        [TestCase("firstToken", "batman", "computer")]
+        [TestCase("secondToken", "robin", "computer")]
+        [TestCase("thirdToken", "blah blah", "phone")]
+        public void CreateCurrentDeviceTest(string token, string description, string kind)
+        {
+            using (_mocks.Record())
+            {
+                Expect.Call(_deviceManager.IsCurrentMachine(token))
+                    .Repeat.Once()
+                    .Return(true);
+            }
+            using(_mocks.Playback())
+            {
+                var device = _factory.Create(description, token, kind);
+                Assert.AreEqual(token, device.Token);
+                Assert.AreEqual(DeviceFactory.CurrentMachine, device.Description);
+                Assert.AreEqual(kind == "computer" ? DeviceType.COMPUTER : DeviceType.PHONE, device.Type);
+            }
+        }
+
+        [TestCase("firstToken", "batman", "computer")]
+        [TestCase("secondToken", "robin", "computer")]
+        [TestCase("thirdToken", "blah blah", "phone")]
+        public void CreateOtherDeviceTest(string token, string description, string kind)
+        {
+            using (_mocks.Record())
+            {
+                Expect.Call(_deviceManager.IsCurrentMachine(token))
+                    .Repeat.Once()
+                    .Return(false);
+            }
+            using (_mocks.Playback())
+            {
+                var device = _factory.Create(description, token, kind);
+                Assert.AreEqual(token, device.Token);
+                Assert.AreEqual(description, device.Description);
+                Assert.AreEqual(kind == "computer" ? DeviceType.COMPUTER : DeviceType.PHONE, device.Type);
+            }
+        }
+
+        #endregion
+
+    }
+}

=== modified file 'src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj'
--- src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-11-02 23:28:01 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-11-14 21:31:15 +0000
@@ -86,6 +86,9 @@
     <Compile Include="BetaView.xaml.cs">
       <DependentUpon>BetaView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="DeviceControl.xaml.cs">
+      <DependentUpon>DeviceControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="WindowsSettingsView.xaml.cs">
       <DependentUpon>WindowsSettingsView.xaml</DependentUpon>
     </Compile>
@@ -97,6 +100,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="DeviceControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="DevicesView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

=== added file 'src/Canonical.UbuntuOne.Client.Views/DeviceControl.xaml'
--- src/Canonical.UbuntuOne.Client.Views/DeviceControl.xaml	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client.Views/DeviceControl.xaml	2010-11-14 21:31:15 +0000
@@ -0,0 +1,23 @@
+<UserControl x:Class="Canonical.UbuntuOne.Client.Views.DeviceControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="64" d:DesignWidth="300" BorderThickness="2 1 2 1">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="64"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <Image Name="DeviceTypeImage" Grid.Column="0" />
+        <Grid Grid.Column="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Label Name="DescriptionLabel" Grid.Row="0" Margin="3" HorizontalAlignment="Center">Description</Label>
+            <Button Name="RemoveButton" Grid.Row="1" Margin="3" Width="Auto" HorizontalAlignment="Center" Click="OnRemoveButtonClick">Remove</Button>
+        </Grid>
+    </Grid>
+</UserControl>

=== added file 'src/Canonical.UbuntuOne.Client.Views/DeviceControl.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/DeviceControl.xaml.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client.Views/DeviceControl.xaml.cs	2010-11-14 21:31:15 +0000
@@ -0,0 +1,51 @@
+using System.Windows.Input;
+using Canonical.UbuntuOne.Client.Preferences;
+
+namespace Canonical.UbuntuOne.Client.Views
+{
+    /// <summary>
+    /// Interaction logic for DeviceControl.xaml
+    /// </summary>
+    public partial class DeviceControl
+    {
+        #region Variables
+
+        private IDevice _device;
+
+        #endregion
+
+        #region Properties
+
+        public IDevice Device
+        {
+            get { return _device; }
+            set 
+            { 
+                _device = value;
+                DescriptionLabel.Content = _device.Description;
+            }
+        }
+
+        /// <summary>
+        /// Gets and sets the presenter used to manage the user preferences.
+        /// </summary>
+        public IPreferencesDialogPresenter PreferencesDialogPresenter { get; set; } 
+
+        #endregion
+
+        public DeviceControl()
+        {
+            InitializeComponent();
+        }
+
+        private void OnRemoveButtonClick(object sender, System.Windows.RoutedEventArgs e)
+        {
+            if (PreferencesDialogPresenter == null) return;
+            Mouse.OverrideCursor = Cursors.Wait;
+            var removed = PreferencesDialogPresenter.RemoveDevice(Device.Type, Device.Token);
+            Mouse.OverrideCursor = null;
+            if(removed)
+                Visibility = System.Windows.Visibility.Collapsed;
+        }
+    }
+}

=== modified file 'src/Canonical.UbuntuOne.Client.Views/DevicesView.xaml'
--- src/Canonical.UbuntuOne.Client.Views/DevicesView.xaml	2010-10-13 09:56:20 +0000
+++ src/Canonical.UbuntuOne.Client.Views/DevicesView.xaml	2010-11-14 21:31:15 +0000
@@ -24,15 +24,15 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:resx="clr-namespace:Canonical.UbuntuOne.Client.Views.Resources"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
+             d:DesignHeight="298" d:DesignWidth="300">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="75" />
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <TextBlock Name="MessageText" Grid.Row="0" Margin="3" TextWrapping="Wrap" Text="{x:Static resx:Resources.DevicesViewMessageTextBlock}"/>
-        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
-            <StackPanel Name="MachinesContent">
+        <ScrollViewer Grid.Row="1" Height="Auto" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="6" BorderThickness="3" BorderBrush="Black">
+            <StackPanel Name="MachinesContent" Margin="3">
                 
             </StackPanel>
         </ScrollViewer>

=== modified file 'src/Canonical.UbuntuOne.Client.Views/DevicesView.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/DevicesView.xaml.cs	2010-10-20 23:09:36 +0000
+++ src/Canonical.UbuntuOne.Client.Views/DevicesView.xaml.cs	2010-11-14 21:31:15 +0000
@@ -17,7 +17,9 @@
  * 
  * Authors: Manuel de la Peña <[e-mail]>
  */
+using System.Collections.Generic;
 using System.Windows.Controls;
+using Canonical.UbuntuOne.Client.Preferences;
 
 namespace Canonical.UbuntuOne.Client.Views
 {
@@ -28,6 +30,34 @@
     {
         #region Properties
 
+        private IList<IDevice> _devices;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets and sets the presenter used to manage the user preferences.
+        /// </summary>
+        public IPreferencesDialogPresenter PreferencesDialogPresenter { get; set; } 
+
+        ///<summary>
+        /// Gets and sets the devices shown in the dialog.
+        ///</summary>
+        public IList<IDevice> Devices
+        {
+            get { return _devices; }
+            set 
+            {
+                _devices = value;
+                MachinesContent.Children.RemoveRange(0, MachinesContent.Children.Count);
+                foreach (var currentDevice in value)
+                {
+                    var newControl = new DeviceControl {Device = currentDevice, PreferencesDialogPresenter = PreferencesDialogPresenter};
+                    MachinesContent.Children.Add(newControl);
+                }
+            }
+        }
 
         #endregion
 
@@ -38,5 +68,6 @@
         {
             InitializeComponent();
         }
+
     }
 }

=== modified file 'src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml'
--- src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml	2010-11-02 23:28:01 +0000
+++ src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml	2010-11-14 21:31:15 +0000
@@ -22,7 +22,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
     xmlns:Views="clr-namespace:Canonical.UbuntuOne.Client.Views" 
     xmlns:resx="clr-namespace:Canonical.UbuntuOne.Client.Views.Resources"
-    Title="{x:Static resx:Resources.PreferencesDialogTitle}" Height="450" Width="400">
+    Title="{x:Static resx:Resources.PreferencesDialogTitle}" Height="450" Width="400" ResizeMode="NoResize">
     <Grid Margin="3">
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
@@ -39,25 +39,26 @@
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <ProgressBar Name="Progressbar" Grid.Column="0" HorizontalAlignment="Stretch" Margin="3" />
+                <ProgressBar Name="ConsumptionProgressbar" Grid.Column="0" HorizontalAlignment="Stretch" Margin="3" Minimum="0" Maximum="100"/>
                 <Label Name="ConsumptionLabel" Grid.Column="1">Unknown</Label>
             </Grid>
             <Label Name="StatusLabel" Grid.Row="1">Disconnected</Label>
         </Grid>
-        <TabControl Margin="3" Grid.Row="1">
+        <TabControl Margin="3" Grid.Row="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+            <TabItem Header="{x:Static resx:Resources.PreferencesDialogDevicesTabHeader}" >
+                <Views:DevicesView x:Name="DevicesTab" Height="300" HorizontalAlignment="Stretch"/>
+            </TabItem>
+            <TabItem Header="{x:Static resx:Resources.PreferencesDialogWindowsTabHeader}">
+                <Views:WindowsSettingsView x:Name="WindowsTab" Height="300" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+            </TabItem>
             <TabItem Header="Beta" >
-                <Views:BetaView x:Name="BetaTab" Height="300" IsEnabled="False"/>
-            </TabItem>
-            <TabItem Header="{x:Static resx:Resources.PreferencesDialogWindowsTabHeader}">
-                <Views:WindowsSettingsView x:Name="WindowsTab" Height="300" />
+                <Views:BetaView x:Name="BetaTab" Height="300" IsEnabled="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
             </TabItem>
             <!--
             <TabItem Header="{x:Static resx:Resources.PreferencesDialogAccountTabHeader}" >
                 <Views:AccountView x:Name="AccountsTab" Height="300" IsEnabled="False"/>
             </TabItem>
-            <TabItem Header="{x:Static resx:Resources.PreferencesDialogDevicesTabHeader}" >
-                <Views:DevicesView x:Name="DevicesTab" Height="300" IsEnabled="False"/>
-            </TabItem>
+            
             <TabItem Header="{x:Static resx:Resources.PreferencesDialogServicesTabHeader}" >
                 <Views:ServicesView x:Name="ServicesTab" Height="300" IsEnabled="False"/>
             </TabItem> 

=== modified file 'src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml.cs	2010-11-02 23:28:01 +0000
+++ src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml.cs	2010-11-14 21:31:15 +0000
@@ -16,6 +16,8 @@
  * 
  * Authors: Manuel de la Peña <[e-mail]>
  */
+using System;
+using System.Collections.Generic;
 using System.Windows;
 using Canonical.UbuntuOne.Client.Preferences;
 
@@ -26,12 +28,26 @@
     /// </summary>
     public partial class PreferencesDialog : Window, IPreferencesView
     {
+        #region Variables
+
+        private IPreferencesDialogPresenter _presenter;
+
+        #endregion
+
         #region DI properties
 
         /// <summary>
         /// Gets and sets the presenter that will be used by the view.
         /// </summary>
-        public IPreferencesDialogPresenter PreferencesDialogPresenter { get; set; }
+        public IPreferencesDialogPresenter PreferencesDialogPresenter
+        {
+            get { return _presenter; }
+            set 
+            { 
+                _presenter = value;
+                DevicesTab.PreferencesDialogPresenter = value;
+            }
+        }
 
         #endregion
 
@@ -88,6 +104,31 @@
         //    set { ServicesTab.IsMusicSynced = value; }
         //}
 
+        /// <summary>
+        /// Sets the consumption of the plan so far. The value should be between 0 and 100.
+        /// </summary>
+        public double Consumption
+        {
+            set { ConsumptionProgressbar.Value = value; }
+        }
+
+        /// <summary>
+        /// Sets the text used next the consumption.
+        /// </summary>
+        public string ConsumptionText
+        {
+            set { ConsumptionLabel.Content = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the devices shown in the app.
+        /// </summary>
+        public IList<IDevice> Devices
+        {
+            get { return DevicesTab.Devices; }
+            set { DevicesTab.Devices = value; }
+        }
+
         public string UserName
         {
             set {  }

=== modified file 'src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj'
--- src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj	2010-11-11 11:44:38 +0000
+++ src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj	2010-11-14 21:31:15 +0000
@@ -74,6 +74,13 @@
     <Compile Include="..\Version.cs">
       <Link>Properties\Version.cs</Link>
     </Compile>
+    <Compile Include="Device.cs" />
+    <Compile Include="DeviceFactory.cs" />
+    <Compile Include="DeviceManager.cs" />
+    <Compile Include="DeviceManagerException.cs" />
+    <Compile Include="IDevice.cs" />
+    <Compile Include="IDeviceFactory.cs" />
+    <Compile Include="IDeviceManager.cs" />
     <Compile Include="Notification\Enums.cs" />
     <Compile Include="Notification\INotificationIconView.cs" />
     <Compile Include="Notification\IStateMapper.cs" />
@@ -176,5 +183,8 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Devices\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

=== added file 'src/Canonical.UbuntuOne.Client/Device.cs'
--- src/Canonical.UbuntuOne.Client/Device.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/Device.cs	2010-11-14 21:31:15 +0000
@@ -0,0 +1,38 @@
+/* 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.Client
+{
+    internal class Device : IDevice
+    {
+        /// <summary>
+        /// Gets and sets a descriptin of the device.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// The token that identifies the device.
+        /// </summary>
+        public string Token { get; set; }
+
+        /// <summary>
+        /// Gets and sets the type of device.
+        /// </summary>
+        public DeviceType Type { get; set; }
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Client/DeviceFactory.cs'
--- src/Canonical.UbuntuOne.Client/DeviceFactory.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/DeviceFactory.cs	2010-11-14 21:31:15 +0000
@@ -0,0 +1,57 @@
+/* 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.Client
+{
+    internal class DeviceFactory : IDeviceFactory
+    {
+        #region Variables
+
+        internal const string ComputerType = "computer";
+        internal const string PhoneType = "phone";
+        internal const string CurrentMachine = "Current machine";
+
+        #endregion
+
+        #region Di Properties
+
+        /// <summary>
+        /// Gets and sets the device manager used to access device info.
+        /// </summary>
+        public IDeviceManager DeviceManager { get; set; }
+
+        #endregion
+
+        /// <summary>
+        /// Creates a new device from the given data.
+        /// </summary>
+        /// <param name="description">A string with the description of the machine.</param>
+        /// <param name="token">The token that identifies the device.</param>
+        /// <param name="type">The type of device.</param>
+        /// <returns>A device with the given data.</returns>
+        public IDevice Create(string description, string token, string type)
+        {
+            return new Device
+            {
+                Description = (DeviceManager.IsCurrentMachine(token))?CurrentMachine:description, 
+                Token = token, 
+                Type = string.Compare(type, ComputerType, true) == 0 ? DeviceType.COMPUTER : DeviceType.PHONE
+            };
+        }
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Client/DeviceManager.cs'
--- src/Canonical.UbuntuOne.Client/DeviceManager.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/DeviceManager.cs	2010-11-14 21:31:15 +0000
@@ -0,0 +1,157 @@
+/* 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 System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Canonical.Ubuntu.SSO;
+using Canonical.UbuntuOne.Common.Net;
+using log4net;
+using Newtonsoft.Json.Linq;
+
+namespace Canonical.UbuntuOne.Client
+{
+    internal class DeviceManager : IDeviceManager
+    {
+
+        #region Variables
+
+        private const string DevicesUrl = "https://one.ubuntu.com/api/1.0/devices/";
+        private const string RemoveUrl = "https://one.ubuntu.com/api/1.0/devices/remove/{0}/{1}";
+        private ILog _logger;
+        private readonly object _loggerLock = new object();
+
+        #endregion
+
+        #region Di properties
+
+        /// <summary>
+        /// Gets and sets the object used to perform the secure requests.
+        /// </summary>
+        public IOAuth OAuth { get; set; }
+
+        /// <summary>
+        /// Gets and sets the credentials provider used to get the user credentials.
+        /// </summary>
+        public ISSOCredentialsProvider SSOCredentialsProvider { get; set; }
+
+        /// <summary>
+        /// Gets and sets the factory that creates devices.
+        /// </summary>
+        public IDeviceFactory DeviceFactory { get; set; } 
+
+        /// <summary>
+        /// Gets and sets the logger used by the class.
+        /// </summary>
+        internal ILog Logger
+        {
+            get
+            {
+                if (_logger == null)
+                {
+                    lock (_loggerLock)
+                    {
+                        _logger = LogManager.GetLogger(typeof(DeviceManager));
+                    }
+                }
+                return _logger;
+            }
+            set { _logger = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Returns if the machine with the given token is th current machine.
+        /// </summary>
+        /// <param name="token">The token of the machine.</param>
+        /// <returns>A bool stating if th token represents the current machine.</returns>
+        public bool IsCurrentMachine(string token)
+        {
+            string currentToken;
+            string currentTokenSecret;
+            string currentConsumerKey;
+            string currentConsumerSecret;
+
+            // get the credentials
+            SSOCredentialsProvider.LoginToGetCredentials("UbuntuOne", out currentToken, out currentTokenSecret, out currentConsumerKey,
+                                                         out currentConsumerSecret);
+            return string.Compare(currentToken, token) == 0;
+        }
+
+        /// <summary>
+        /// Removes a machine with the given token from the machines synced with ubuntu one.
+        /// </summary>
+        /// <param name="kind"></param>
+        /// <param name="tokenToRemove"></param>
+        public void RemoveDevice(string kind, string tokenToRemove)
+        {
+            string token;
+            string tokenSecret;
+            string consumerKey;
+            string consumerSecret;
+
+            // get the credentials
+            SSOCredentialsProvider.LoginToGetCredentials("UbuntuOne", out token, out tokenSecret, out consumerKey,
+                                                         out consumerSecret);
+            var uri = string.Format(RemoveUrl, kind, tokenToRemove);
+            var request = OAuth.MakeRequest(uri, "GET", consumerKey, consumerSecret, token, tokenSecret);
+            try
+            {
+                var response = request.GetResponse();
+            }
+            catch (Exception e)
+            {
+                throw new DeviceManagerException("Machine could not be removed.", e);
+            }
+        }
+
+        /// <summary>
+        /// Returns a list with the current machines synced in the account.
+        /// </summary>
+        public IList<IDevice> GetSyncedDevices()
+        {
+            string token;
+            string tokenSecret;
+            string consumerKey;
+            string consumerSecret;
+
+            // get the credentials
+            SSOCredentialsProvider.LoginToGetCredentials("UbuntuOne", out token, out tokenSecret, out consumerKey,
+                                                         out consumerSecret);
+            var request = OAuth.MakeRequest(DevicesUrl, "GET", consumerKey, consumerSecret, token, tokenSecret);
+            try
+            {
+                var response = request.GetResponse();
+                var data = new StreamReader(response.GetResponseStream()).ReadToEnd();
+                // parse the json string
+                var devicesArray = JArray.Parse(data);
+                return devicesArray.Select(currentJDevice => 
+                    DeviceFactory.Create(
+                        (string) currentJDevice["description"], 
+                        (string) currentJDevice["token"], 
+                        (string) currentJDevice["kind"])).ToList();
+            }
+            catch (Exception e)
+            {
+                throw new DeviceManagerException("Machine could not be removed.", e);
+            }
+        }
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Client/DeviceManagerException.cs'
--- src/Canonical.UbuntuOne.Client/DeviceManagerException.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/DeviceManagerException.cs	2010-11-14 21:31:15 +0000
@@ -0,0 +1,57 @@
+/* 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;
+
+namespace Canonical.UbuntuOne.Client
+{
+    ///<summary>
+    /// Exception thrown when there was an issue managing the devices of the account.
+    ///</summary>
+    public class DeviceManagerException : Exception
+    {
+        ///<summary>
+        /// Creates a new instance of the class.
+        ///</summary>
+        public DeviceManagerException()
+        {
+            
+        }
+
+        /// <summary>
+        /// Creates a new instance of the exception.
+        /// </summary>
+        /// <param name="message">The message to be carried by the exception.</param>
+        public DeviceManagerException(string message)
+            : base(message)
+        {
+            
+        }
+
+        /// <summary>
+        /// Creates a new instance of the exception.
+        /// </summary>
+        /// <param name="message">The message to be carried by the exception.</param>
+        /// <param name="inner">The inner exception to be carried by the exception.</param>
+        public DeviceManagerException(string message, Exception inner)
+            : base(message, inner)
+        {
+            
+        }
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Client/IDevice.cs'
--- src/Canonical.UbuntuOne.Client/IDevice.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/IDevice.cs	2010-11-14 21:31:15 +0000
@@ -0,0 +1,57 @@
+/* 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.Client
+{
+    /// <summary>
+    /// Enumerator that describes the different types of devices.
+    /// </summary>
+    public enum DeviceType
+    {
+        ///<summary>
+        /// The device is a computer.
+        ///</summary>
+        COMPUTER,
+        ///<summary>
+        /// The device is a phone.
+        ///</summary>
+        PHONE
+    }
+
+    /// <summary>
+    /// Interface that represents a device in the system.
+    /// </summary>
+    public interface IDevice
+    {
+        /// <summary>
+        /// Gets and sets a descriptin of the device.
+        /// </summary>
+        string Description { get; set; }
+
+        /// <summary>
+        /// The token that identifies the device.
+        /// </summary>
+        string Token { get; set; }
+
+        /// <summary>
+        /// Gets and sets the type of device.
+        /// </summary>
+        DeviceType Type { get; set; }
+
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Client/IDeviceFactory.cs'
--- src/Canonical.UbuntuOne.Client/IDeviceFactory.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/IDeviceFactory.cs	2010-11-14 21:31:15 +0000
@@ -0,0 +1,35 @@
+/* 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.Client
+{
+    /// <summary>
+    /// A factory that can create devices.
+    /// </summary>
+    public interface IDeviceFactory
+    {
+        /// <summary>
+        /// Creates a new device from the given data.
+        /// </summary>
+        /// <param name="description">A string with the description of the machine.</param>
+        /// <param name="token">The token that identifies the device.</param>
+        /// <param name="type">The type of device.</param>
+        /// <returns>A device with the given data.</returns>
+        IDevice Create(string description, string token, string type);
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Client/IDeviceManager.cs'
--- src/Canonical.UbuntuOne.Client/IDeviceManager.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/IDeviceManager.cs	2010-11-14 21:31:15 +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.Collections.Generic;
+
+namespace Canonical.UbuntuOne.Client
+{
+    /// <summary>
+    /// Interface to be implemented by those objects that can manage the different devices 
+    /// found in the Ubuntu One account.
+    /// </summary>
+    public interface IDeviceManager
+    {
+        /// <summary>
+        /// Returns if the machine with the given token is th current machine.
+        /// </summary>
+        /// <param name="token">The token of the machine.</param>
+        /// <returns>A bool stating if th token represents the current machine.</returns>
+        bool IsCurrentMachine(string token);
+
+        /// <summary>
+        /// Removes a machine with the given token from the machines synced with ubuntu one.
+        /// </summary>
+        /// <param name="king"></param>
+        /// <param name="token"></param>
+        void RemoveDevice(string king, string token);
+
+        /// <summary>
+        /// Returns a list with the current machines synced in the account.
+        /// </summary>
+        IList<IDevice> GetSyncedDevices();
+    }
+}

=== modified file 'src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs'
=== modified file 'src/Canonical.UbuntuOne.Client/Preferences/IPreferencesDialogPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Preferences/IPreferencesDialogPresenter.cs	2010-10-19 12:34:50 +0000
+++ src/Canonical.UbuntuOne.Client/Preferences/IPreferencesDialogPresenter.cs	2010-11-14 21:31:15 +0000
@@ -31,5 +31,12 @@
         /// Updates the preferences that the user will use in the application.
         /// </summary>
         void UpdatePreferences();
+
+        /// <summary>
+        /// Removes the device with the given token from the system.
+        /// </summary>
+        /// <param name="deviceType">The type of the device to remove.</param>
+        /// <param name="token">The token of the device to remove.</param>
+        bool RemoveDevice(DeviceType deviceType, string token);
     }
 }

=== modified file 'src/Canonical.UbuntuOne.Client/Preferences/IPreferencesView.cs'
--- src/Canonical.UbuntuOne.Client/Preferences/IPreferencesView.cs	2010-10-13 10:38:57 +0000
+++ src/Canonical.UbuntuOne.Client/Preferences/IPreferencesView.cs	2010-11-14 21:31:15 +0000
@@ -17,6 +17,8 @@
  * 
  * Authors: Manuel de la Peña <[e-mail]>
  */
+using System.Collections.Generic;
+
 namespace Canonical.UbuntuOne.Client.Preferences
 {
     /// <summary>
@@ -26,6 +28,21 @@
     public interface IPreferencesView
     {
         /// <summary>
+        /// Sets the consumption of the plan so far. The value should be between 0 and 100.
+        /// </summary>
+        double Consumption { set; }
+
+        /// <summary>
+        /// Sets the text used next the consumption.
+        /// </summary>
+        string ConsumptionText { set; }
+
+        /// <summary>
+        /// Gets and sets the devices shown in the app.
+        /// </summary>
+        IList<IDevice> Devices { get; set; }
+
+        /// <summary>
         /// Allows to set the name that will be displayed in the UI.
         /// </summary>
         string UserName { set; }
@@ -79,5 +96,10 @@
         /// Tell the view to show itself as a dialog.
         /// </summary>
         void ShowDialog();
+
+        /// <summary>
+        /// Hides the dialog.
+        /// </summary>
+        void Hide();
     }
 }

=== modified file 'src/Canonical.UbuntuOne.Client/Preferences/PreferencesDialogPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Preferences/PreferencesDialogPresenter.cs	2010-11-11 11:43:38 +0000
+++ src/Canonical.UbuntuOne.Client/Preferences/PreferencesDialogPresenter.cs	2010-11-14 21:31:15 +0000
@@ -18,9 +18,12 @@
  */
 using System;
 using System.IO;
+using System.Windows;
 using Canonical.Ubuntu.SSO;
 using Canonical.UbuntuOne.Common;
+using Canonical.UbuntuOne.Common.Net;
 using log4net;
+using Newtonsoft.Json.Linq;
 
 namespace Canonical.UbuntuOne.Client.Preferences
 {
@@ -36,6 +39,7 @@
         private readonly object _loggerLock = new object();
         private const string EventName = "UbuntuOneAutoManualSync";
         private const string ApplicationName = "UbuntuOne";
+        private const string ConsumptionUrl = "https://one.ubuntu.com/api/quota/";
 
         #endregion
 
@@ -64,6 +68,11 @@
         #region DI Properties
 
         /// <summary>
+        /// Gets and sets the object that allows to mange the devices of the Ubuntu One.
+        /// </summary>
+        public IDeviceManager DeviceManager { get; set; }
+
+        /// <summary>
         /// Gets and sets the view used by this presenter.
         /// </summary>
         public IPreferencesView PreferencesView { get; set; }
@@ -100,6 +109,11 @@
         /// </summary>
         public IMessageBox MessageBox { get; set; }
 
+        /// <summary>
+        /// Gets and sets the oauth used to access secure resources.
+        /// </summary>
+        public IOAuth OAuth { get; set; }
+
         #endregion
 
         #region Helpers
@@ -142,14 +156,49 @@
             MessageBox.ShowError("An error courred when trying to retrieve your credentials.");
         }
 
+        /// <summary>
+        /// Returns the comsumption so far.
+        /// </summary>
+        /// <returns></returns>
+        private double GetConsumption()
+        {
+            string token;
+            string tokenSecret;
+            string consumerKey;
+            string consumerSecret;
+
+            // get the credentials
+            SSOCredentialsProvider.LoginToGetCredentials("UbuntuOne", out token, out tokenSecret, out consumerKey,
+                                                         out consumerSecret);
+            var request = OAuth.MakeRequest(ConsumptionUrl, "GET", consumerKey, consumerSecret, token, tokenSecret);
+            try
+            {
+                var response = request.GetResponse();
+                var data = new StreamReader(response.GetResponseStream()).ReadToEnd();
+                // parse the json string
+                var consumption = JObject.Parse(data);
+                return ((Int64)consumption["used"] * 100) / (Int64)consumption["total"];
+            }
+            catch (Exception e)
+            {
+                throw new DeviceManagerException("Machine could not be listed.", e);
+            }
+        }
+
         #endregion
 
         public void Show()
         {
             // set the preferences to be shown in the UI.
             PreferencesView.IsAutoSyncEnable = PreferencesManager.IsAutoSyncEnable;
+            // set consumption
+            var consumption = GetConsumption();
+            PreferencesView.Consumption = consumption;
+            PreferencesView.ConsumptionText = string.Format("{0}% used", consumption);
+            PreferencesView.Devices = DeviceManager.GetSyncedDevices();
+ 
             if (PreferencesManager.IsAutoSyncEnable)
-                PreferencesView.AutoSyncFrequency = PreferencesManager.AutoSyncFrequency;
+                PreferencesView.AutoSyncFrequency = PreferencesManager.AutoSyncFrequency;            
             PreferencesView.ShowDialog();
         }
 
@@ -170,5 +219,33 @@
             PreferencesManager.Save();
         }
 
+        /// <summary>
+        /// Removes the device with the given token from the system.
+        /// </summary>
+        /// <param name="deviceType">The type of the device to remove.</param>
+        /// <param name="token">The token of the device to remove.</param>
+        public bool RemoveDevice(DeviceType deviceType, string token)
+        {
+            var currentMachine = DeviceManager.IsCurrentMachine(token); 
+            if(currentMachine)
+            {
+                // we need to remove the current machine, we should tell the user
+                if(MessageBox.ShowYesNo("Are you sure you want to remove this machine?",MessageBoxImage.Question) == MessageBoxResult.No)
+                {
+                    return false;
+                }
+            }
+            // just use the device manager for thise
+            DeviceManager.RemoveDevice(deviceType == DeviceType.COMPUTER ? "computer" : "phone", token);
+            // we remove the tokens in our machine
+            if (currentMachine)
+            {
+                SSOCredentialsProvider.RemoveCredentials("UbuntuOne");
+                // we tell the user we will close the preferences since the 
+                MessageBox.ShowInformation("Preferences dialog will be closed because your removed the machine.");
+                PreferencesView.Hide();
+            }
+            return true;
+        }
     }
 }

=== modified file 'src/Canonical.UbuntuOne.Client/objects.xml'
--- src/Canonical.UbuntuOne.Client/objects.xml	2010-10-19 12:34:50 +0000
+++ src/Canonical.UbuntuOne.Client/objects.xml	2010-11-14 21:31:15 +0000
@@ -14,4 +14,11 @@
             type="Canonical.UbuntuOne.Client.Preferences.LoadPreferencesStartupTask, Canonical.UbuntuOne.Client"
             autowire="autodetect"/>
 
+  <object id="DeviceManager"
+            type="Canonical.UbuntuOne.Client.DeviceManager, Canonical.UbuntuOne.Client"
+            autowire="autodetect"/>
+
+  <object id="DeviceFactory"
+            type="Canonical.UbuntuOne.Client.DeviceFactory, Canonical.UbuntuOne.Client"
+            autowire="autodetect"/>
 </objects>
\ No newline at end of file

=== modified file 'src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj'
--- src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj	2010-10-21 10:17:18 +0000
+++ src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj	2010-11-14 21:31:15 +0000
@@ -106,7 +106,9 @@
     <Compile Include="Net\HttpWebRequestFactory.cs" />
     <Compile Include="Net\IHttpWebRequestFactory.cs" />
     <Compile Include="Net\IHttpWebRequest.cs" />
+    <Compile Include="Net\IOAuth.cs" />
     <Compile Include="Net\IServiceCaller.cs" />
+    <Compile Include="Net\OAuth.cs" />
     <Compile Include="Net\ServiceCaller.cs" />
     <Compile Include="OperationContracts\IEventNotifier.cs" />
     <Compile Include="OperationContracts\IPostInitDirectoryTask.cs" />
@@ -213,6 +215,7 @@
     <Reference Include="System" />
     <Reference Include="System.Runtime.Serialization">
     </Reference>
+    <Reference Include="System.Web" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase">

=== renamed file 'src/Canonical.Ubuntu.SSO/IOAuth.cs' => 'src/Canonical.UbuntuOne.Common/Net/IOAuth.cs'
--- src/Canonical.Ubuntu.SSO/IOAuth.cs	2010-10-05 09:49:29 +0000
+++ src/Canonical.UbuntuOne.Common/Net/IOAuth.cs	2010-11-14 21:31:15 +0000
@@ -20,8 +20,11 @@
 using System.Collections.Generic;
 using System.Security.Cryptography;
 
-namespace Canonical.Ubuntu.SSO
+namespace Canonical.UbuntuOne.Common.Net
 {
+    ///<summary>
+    /// Interface to be implemented by those objects that allows to perform Oauth operations.
+    ///</summary>
     public interface IOAuth
     {
         /// <summary>
@@ -118,5 +121,18 @@
         /// </summary>
         /// <returns></returns>
         string GenerateNonce();
+
+        /// <summary>
+        /// Returns a request with an Oauth header that can be used to acess a secured resource.
+        /// </summary>
+        /// <param name="uri">The uri to be accessed.</param>
+        /// <param name="httpMethod">The http method of the request.</param>
+        /// <param name="consumerKey">The consumer key of the oauth.</param>
+        /// <param name="consumerSecret">The consumer secret of the oauth.</param>
+        /// <param name="token">The token of the oauth,</param>
+        /// <param name="tokenSecret">The token secret of the oauth.</param>
+        /// <returns>Returns a request that can be used to access a secure resource.</returns>
+        IHttpWebRequest MakeRequest(string uri, string httpMethod, string consumerKey, string consumerSecret,
+                                    string token, string tokenSecret);
     }
 }
\ No newline at end of file

=== renamed file 'src/Canonical.Ubuntu.SSO/OAuth.cs' => 'src/Canonical.UbuntuOne.Common/Net/OAuth.cs'
--- src/Canonical.Ubuntu.SSO/OAuth.cs	2010-10-05 09:49:29 +0000
+++ src/Canonical.UbuntuOne.Common/Net/OAuth.cs	2010-11-14 21:31:15 +0000
@@ -1,13 +1,36 @@
-using System;
+/* 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 System.Security.Cryptography;
 using System.Collections.Generic;
 using System.Text;
 using System.Web;
 
-namespace Canonical.Ubuntu.SSO
+namespace Canonical.UbuntuOne.Common.Net
 {
     public class OAuth : IOAuth
     {
+        #region Di properties
+
+        public IHttpWebRequestFactory HttpWebRequestFactory { get; set; }
+
+        #endregion
 
         /// <summary>
         /// Provides a predefined set of algorithms that are supported officially by the protocol
@@ -387,5 +410,32 @@
             return Random.Next(123400, 9999999).ToString();
         }
 
+
+        /// <summary>
+        /// Creates an oauth request that can access a protected web resource.
+        /// </summary>
+        /// <param name="uri">The uri where the resource is found.</param>
+        /// <param name="httpMethod">The request berb to be used.</param>
+        /// <param name="consumerKey">Consumer key from oauth.</param>
+        /// <param name="consumerSecret">Consumer secret from oauth.</param>
+        /// <param name="token">Token from oauth.</param>
+        /// <param name="tokenSecret">Token secret from oauth.</param>
+        /// <returns>A webrequest that can be used to access the resource.</returns>
+        public IHttpWebRequest MakeRequest(string uri, string httpMethod, string consumerKey, string consumerSecret, string token, string tokenSecret)
+        {
+            // Form the full REST request url
+            var url = new Uri(uri);
+            string normUrl;
+            string normParams;
+
+            // get oauth header
+            var authHeader = GenerateHeaderWithSignature(url, string.Empty, consumerKey, consumerSecret,
+                token, tokenSecret, httpMethod, GenerateTimeStamp(), GenerateNonce(), SignatureTypes.HMACSHA1,
+                out normUrl, out normParams);
+
+            var request = HttpWebRequestFactory.Create(url);
+            request.Headers.Add(authHeader.Key, authHeader.Value);
+            return request;
+        }
     }
 }
\ No newline at end of file

=== modified file 'src/Canonical.UbuntuOne.Common/objects.xml'
--- src/Canonical.UbuntuOne.Common/objects.xml	2010-10-21 10:17:18 +0000
+++ src/Canonical.UbuntuOne.Common/objects.xml	2010-11-14 21:31:15 +0000
@@ -56,6 +56,10 @@
   <!--                             Net Objects                                                  -->
   <!-- ######################################################################################## -->
 
+  <object id="OAuth"
+          type="Canonical.UbuntuOne.Common.Net.OAuth , Canonical.UbuntuOne.Common"
+          autowire="autodetect"/>
+
   <object id="HttpWebRequestFactory"
           type="Canonical.UbuntuOne.Common.Net.HttpWebRequestFactory, Canonical.UbuntuOne.Common" />