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

[Manuel de la Peña]

Made the context menu smarter to show diff content according to the status of the user credentials.

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

178. By Manuel de la Peña on 2010-11-12

Ensures that method is executed in the correct thread.

[John Lenton (chipaca)]

review: Approve

=== 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-12 14:29:04 +0000
@@ -72,6 +72,13 @@
         /// </summary>
         void LoginOrRegisterToGetCredentials();
 
+        /// <summary>
+        /// Gets if the credentials are present in the system.
+        /// </summary>
+        /// <param name="applicationName">The name of the applications whose credentials we want to 
+        /// get.</param>
+        bool CredentialsArePresent(string applicationName);
+
         #endregion
 
     }

=== 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-12 14:29:04 +0000
@@ -82,12 +82,12 @@
                     if (LoginView.ViewDispatcher.Dispatch(() => LoginView.IsShown))
                         return;
 
-                    if (LoginView.ViewDispatcher.Dispatch( () => LoginView.ShowDialog() != MessageBoxResult.Cancel))
+                    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), 
+                            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
@@ -101,10 +101,10 @@
                         }
                         return;
                     }
-                    
+
                 }
                 // we execute the credentials found event
-                if(!string.IsNullOrEmpty(secret) && OnCredentialsFound != null)
+                if (!string.IsNullOrEmpty(secret) && OnCredentialsFound != null)
                 {
                     string token;
                     string tokenSecret;
@@ -157,6 +157,21 @@
             throw new NotImplementedException();
         }
 
+        /// <summary>
+        /// Returns if the credentials of a given application are present.
+        /// </summary>
+        /// <param name="applicationName">The name of the application whose credentials we want
+        /// to get.</param>
+        /// <returns>A bool value stating if the credentials are present.</returns>
+        public bool CredentialsArePresent(string applicationName)
+        {
+            //TODO: Currently application name is hardcoded!!!!
+            // try to get the credentials from the keyring
+            var secret = Keyring.GetSecretByName(KeyringName, ApplicationName);
+            return secret != null;
+
+        }
+
         #endregion
     }
 }

=== modified file 'src/Canonical.UbuntuOne.Client.Views.Tests/NotifyIconFixture.cs'
--- src/Canonical.UbuntuOne.Client.Views.Tests/NotifyIconFixture.cs	2010-10-20 23:27:32 +0000
+++ src/Canonical.UbuntuOne.Client.Views.Tests/NotifyIconFixture.cs	2010-11-12 14:29:04 +0000
@@ -43,7 +43,8 @@
         {
             _moks = new MockRepository();
             _presenter = _moks.StrictMock<INotificationIconPresenter>();
-            _icon = new UbuntuOneNotifyIcon {NotificationIconPresenter = _presenter};
+            _icon = new UbuntuOneNotifyIcon (_presenter);
+            _moks.BackToRecordAll();
         }
 
         #endregion

=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml'
--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml	2010-10-21 11:41:25 +0000
+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml	2010-11-12 14:29:04 +0000
@@ -70,7 +70,11 @@
             <av:NotifyIcon Name="NotifyIcon" Icon="/Canonical.UbuntuOne.Client.Views;component/Resources/ubuntu-logo-22x22.png" 
                            Text="Ubuntu One"> <!-- TODO: Add icon Icon="/AvalonLibraryTestPages;component/Properties/App.ico" Open preferences when click -->
                 <FrameworkElement.ContextMenu >
-                    <ContextMenu StaysOpen="False">
+                    <ContextMenu StaysOpen="False" >
+                        <MenuItem x:Uid="AddComputer"  
+                                  Name="AddComputer" 
+                                  Header="{x:Static resx:Resources.NotificationIconAddComputerLabel}" 
+                                  Click="OnAddComputerClick"/>
                         <MenuItem x:Uid="UbuntuOneManualSync"  
                                   Name="UbuntuOneManualSync" 
                                   Header="{x:Static resx:Resources.NotificationIconUbuntuOneManualSyncLabel}" 
@@ -87,10 +91,10 @@
                                   Name="OpenSyncMenuItem" 
                                   Header="{x:Static resx:Resources.NotificationIconOpenSyncLabel}" 
                                   Click="OnOpenSyncMenuItemClick"/>
-                        <Separator />
-                        <MenuItem Name="StateMenuItem" 
-                                  Header="State"/> 
-                        <Separator />
+                        <Separator Name="OptionsSeparator" />
+                        <Label Name="StateMenuItem" 
+                               Content="State: Idle"/> 
+                        <Separator Name="HelpSeparator" />
                         <MenuItem x:Uid="HelpMenuItem" 
                                   Name="HelpMenuItem" 
                                   Header="{x:Static resx:Resources.NotificationIconHelpLabel}" 

=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-10-21 13:11:36 +0000
+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-11-12 14:29:04 +0000
@@ -36,25 +36,18 @@
         private IDispatcher _dispatcher;
         private readonly object _dispatcherLock = new object();
         private Storyboard _iconAnimation;
-
-        #endregion
-
-        #region DI Properties
-
-        /// <summary>
-        /// Gets and sets the presenter that contains the logic that is used by the notification icon.
-        /// </summary>
-        public INotificationIconPresenter NotificationIconPresenter { get; set; }
-
+        private INotificationIconPresenter _presenter;
         #endregion
 
         /// <summary>
         /// Initializes a new instance of the UbuntuOneNotifyIcon class.
         /// </summary>
-        public UbuntuOneNotifyIcon()
+        public UbuntuOneNotifyIcon(INotificationIconPresenter presenter)
         {
             InitializeComponent();
             _iconAnimation = Resources["IconAnimation"] as Storyboard;
+            _presenter = presenter;
+            _presenter.InitializeView();
         }
 
         #region Implementation of INotificationIconView
@@ -114,6 +107,34 @@
             NotifyIcon.ShowBalloonTip(timeout, title, text, icon);
         }
 
+        public void ShowAsAddedComputer(bool isAddedComputer)
+        {
+            if(isAddedComputer)
+            {
+                // show all the menu items
+                UbuntuOneManualSync.Visibility = System.Windows.Visibility.Visible;
+                UbuntuOnePreferencesMenuItem.Visibility = System.Windows.Visibility.Visible;
+                OpenShareManueItem.Visibility = System.Windows.Visibility.Visible;
+                OpenSyncMenuItem.Visibility = System.Windows.Visibility.Visible;
+                OptionsSeparator.Visibility = System.Windows.Visibility.Visible;
+                HelpSeparator.Visibility = System.Windows.Visibility.Visible;
+                // we do not need to add the computer
+                AddComputer.Visibility = System.Windows.Visibility.Collapsed;
+            }
+            else
+            {
+                // Hide all the diff menu items
+                UbuntuOneManualSync.Visibility = System.Windows.Visibility.Collapsed;
+                UbuntuOnePreferencesMenuItem.Visibility = System.Windows.Visibility.Collapsed;
+                OpenShareManueItem.Visibility = System.Windows.Visibility.Collapsed;
+                OpenSyncMenuItem.Visibility = System.Windows.Visibility.Collapsed;
+                OptionsSeparator.Visibility = System.Windows.Visibility.Collapsed;
+                HelpSeparator.Visibility = System.Windows.Visibility.Collapsed;
+                // provide the user a way to add the computer
+                AddComputer.Visibility = System.Windows.Visibility.Visible;
+            }
+        }
+
         /// <summary>
         /// Gets and sets the list of recently modified files.
         /// </summary>
@@ -128,10 +149,10 @@
         /// </summary>
         public string State
         {
-            get { return (string)StateMenuItem.Header; }
+            get { return (string)StateMenuItem.Content; }
             set
             {
-                StateMenuItem.Header = value;
+                StateMenuItem.Content = value;
                 Title = value;
             }
         }
@@ -169,34 +190,40 @@
 
         internal void OnUbuntuOneManualSyncClick(object sender, System.Windows.RoutedEventArgs e)
         {
-            var thread = new Thread(NotificationIconPresenter.ManualSync);
+            var thread = new Thread(_presenter.ManualSync);
             thread.Start();
         }
 
         internal void OnExitMenuItemClick(object sender, System.Windows.RoutedEventArgs e)
         {
-            NotificationIconPresenter.Exit();
+            _presenter.Exit();
         }
 
         internal void OnHelpMenuItemClick(object sender, System.Windows.RoutedEventArgs e)
         {
-            NotificationIconPresenter.OpenHelp();
+            _presenter.OpenHelp();
         }
 
         internal void OnMoreSpaceMenuItemClick(object sender, System.Windows.RoutedEventArgs e)
         {
-            NotificationIconPresenter.OpenUpgradeOption();
+            _presenter.OpenUpgradeOption();
         }
 
         internal void OnOpenSyncMenuItemClick(object sender, System.Windows.RoutedEventArgs e)
         {
-            NotificationIconPresenter.OpenSyncsLocation();
+            _presenter.OpenSyncsLocation();
         }
 
         internal void OnUbuntuOnePreferencesMenuItemClick(object sender, System.Windows.RoutedEventArgs e)
         {
-            NotificationIconPresenter.OpenUbuntuOnePreferences();
-        }
+            _presenter.OpenUbuntuOnePreferences();
+        }
+
+        private void OnAddComputerClick(object sender, System.Windows.RoutedEventArgs e)
+        {
+            _presenter.AddComputer();
+        }
+
 
     }
 }

=== modified file 'src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx'
--- src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx	2010-10-13 09:56:20 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx	2010-11-12 14:29:04 +0000
@@ -155,6 +155,9 @@
     <value>Downloading updates...</value>
     <comment>The title of the downloading dialog.</comment>
   </data>
+  <data name="NotificationIconAddComputerLabel" xml:space="preserve">
+    <value>Add this computer</value>
+  </data>
   <data name="NotificationIconExitLabel" xml:space="preserve">
     <value>Exit</value>
     <comment>The title of the exit menu item.</comment>

=== modified file 'src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs'
--- src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs	2010-10-13 09:56:20 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs	2010-11-12 14:29:04 +0000
@@ -151,6 +151,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Add this computer.
+        /// </summary>
+        public static string NotificationIconAddComputerLabel {
+            get {
+                return ResourceManager.GetString("NotificationIconAddComputerLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Exit.
         /// </summary>
         public static string NotificationIconExitLabel {

=== modified file 'src/Canonical.UbuntuOne.Client.Views/objects.xml'
--- src/Canonical.UbuntuOne.Client.Views/objects.xml	2010-10-13 10:38:57 +0000
+++ src/Canonical.UbuntuOne.Client.Views/objects.xml	2010-11-12 14:29:04 +0000
@@ -8,9 +8,8 @@
           type="Canonical.UbuntuOne.Client.Views.Update.UpdatingView, Canonical.UbuntuOne.Client.Views" />
 
   <object id="UbuntuOneNotifyIcon"
-          type="Canonical.UbuntuOne.Client.Views.UbuntuOneNotifyIcon, Canonical.UbuntuOne.Client.Views" >
-    <property name="NotificationIconPresenter"
-              ref="NotificationIconPresenter" />
+          type="Canonical.UbuntuOne.Client.Views.UbuntuOneNotifyIcon, Canonical.UbuntuOne.Client.Views" depends-on="NotificationIconPresenter">
+    <constructor-arg name="presenter" ref="NotificationIconPresenter"/>
   </object>
 
   <object id="PreferencesView"

=== modified file 'src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs	2010-10-21 13:11:36 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs	2010-11-12 14:29:04 +0000
@@ -26,6 +26,16 @@
     public interface INotificationIconPresenter
     {
         /// <summary>
+        /// Initializes the view to ensure that shows the correct data.
+        /// </summary>
+        void InitializeView();
+
+        /// <summary>
+        /// Action taken when the user wants to add the current computer to his machine.
+        /// </summary>
+        void AddComputer();
+
+        /// <summary>
         /// When implemented this method should for the sync of the ubuntu one folder.
         /// </summary>
         void ManualSync();

=== modified file 'src/Canonical.UbuntuOne.Client/Notification/INotificationIconView.cs'
--- src/Canonical.UbuntuOne.Client/Notification/INotificationIconView.cs	2010-10-21 13:11:36 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/INotificationIconView.cs	2010-11-12 14:29:04 +0000
@@ -50,6 +50,12 @@
         void ShowNotification(int timeout, string title, string text, NotificationType type);
 
         /// <summary>
+        /// Tells the view to display as if the computer was already added to the service.
+        /// </summary>
+        /// <param name="isAddedComputer">States if the computer was added.</param>
+        void ShowAsAddedComputer(bool isAddedComputer);
+
+        /// <summary>
         /// Gets and sets the list of recently modified files.
         /// </summary>
         IList<string> RecentlyModifiedFiles { get; set; }

=== modified file 'src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-11-11 11:43:38 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-11-12 14:29:04 +0000
@@ -51,9 +51,16 @@
         private ISSOCredentialsProvider _ssoProvider;
         private ILog _logger;
         private readonly object _loggerLock = new object();
+<<<<<<< TREE
         private const string EventName = "UbuntuOneNotificationIconPresenter";
         private const string ApplicationName = "UbuntuOne";
 
+=======
+        private static string ManualSyncEvent = "UbuntuOneNotificationIconPresenter.ManualSync";
+        private static string AddComputerEvent = "UbuntuOneNotificationIconPresenter.AddComputer";
+        private static string ApplicationName = "UbuntuOne";
+        private INotificationIconView _view;
+>>>>>>> MERGE-SOURCE
         #endregion
 
         #region Di properties
@@ -107,6 +114,7 @@
                 _ssoProvider.OnCredentialsFound += OnCredentialsFound;
                 _ssoProvider.OnCredentialsError += OnCredentialsError;
                 _ssoProvider.OnCredetialsDenied += OnCredentialsDenied;
+                InitializeView();
             }
         }
 
@@ -229,16 +237,18 @@
         [DebugLogged]
         private void OnCredentialsFound(object sender, CredentialsFoundEventArgs args)
         {
-            // check if the credentials are for us
-            if (args.ApplicationName != EventName) return;
+            // we got credentials, no matter what we tell the ui to be ready
+            NotificationIconView.ViewDispatcher.Dispatch(() => NotificationIconView.ShowAsAddedComputer(true));
+            // check if the credentials are for us);
+            if (args.ApplicationName != ManualSyncEvent) return;
             NotificationIconView.ViewDispatcher.Dispatch(
                 () =>
-                    {
-                        NotificationIconView.IsManualSyncEnabled = false;
-                        NotificationIconView.State = "Syncing";
-                    }
+                {
+                    NotificationIconView.IsManualSyncEnabled = false;
+                    NotificationIconView.State = "Syncing";
+                }
             );
-            
+
             Logger.Info("Got the UbuntuOne credentials!");
             var oneDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
                                       Resources.DefaulDirectoryName);
@@ -262,14 +272,14 @@
         [DebugLogged]
         private void OnCredentialsDenied(object sender, CredentialsDeniedEventArgs args)
         {
-            if (args.ApplicationName != EventName) return;
+            if (args.ApplicationName != ManualSyncEvent) return;
             MessageBox.ShowWarning("You need to login to be able to sync your files.");
         }
 
         [DebugLogged]
         private void OnCredentialsError(object sender, CredentialsErrorEventArgs args)
         {
-            if (args.ApplicationName != EventName) return;
+            if (args.ApplicationName != ManualSyncEvent) return;
             MessageBox.ShowError(string.Format("An error courred when trying to retrieve your credentials: {0}", args.ErrorMessage));
             Logger.ErrorFormat("The error was {0}, {1}", args.ErrorMessage, args.DetailedErrorMessage);
         }
@@ -278,14 +288,28 @@
 
         #region Implementation of INotificationIconPresenter
 
+        public void InitializeView()
+        {
+            if (SSOCredentialsProvider != null)
+                if (SSOCredentialsProvider.CredentialsArePresent(ApplicationName))
+                    NotificationIconView.ShowAsAddedComputer(true);
+                else
+                    NotificationIconView.ShowAsAddedComputer(false);
+        }
+
+        public void AddComputer()
+        {
+            // call the sso credentials provider but with a diff event so that we do not perform a manual sync
+            SSOCredentialsProvider.LoginToGetCredentials(AddComputerEvent, ApplicationName);
+        }
+
         /// <summary>
         /// When implemented this method should for the sync of the ubuntu one folder.
         /// </summary>
         public void ManualSync()
         {
-
             // we get the credentials, because we have register an action to the credetials aquired, we do nothing besides this
-            SSOCredentialsProvider.LoginToGetCredentials(EventName, ApplicationName);
+            SSOCredentialsProvider.LoginToGetCredentials(ManualSyncEvent, ApplicationName);
         }
 
         /// <summary>