Ubuntu One Windows Installer

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

  1. add_storage_protocol_certificates
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: John Lenton
Approved revision: 65
Merged at revision: 75
Proposed branch: lp:~mandel/ubuntuone-windows-installer/add_storage_protocol_certificates
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/connect_u1sync_gui
Diff against target: 446 lines (+186/-60)
17 files modified
data/UbuntuOne-Go_Daddy_CA.pem (+29/-0)
data/UbuntuOne-Go_Daddy_Class_2_CA.pem (+25/-0)
install/UbuntuOne.wxs (+25/-0)
main.build (+7/-0)
src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs (+10/-53)
src/Canonical.UbuntuOne.Client.Views/objects.xml (+5/-2)
src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj (+3/-0)
src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs (+1/-1)
src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs (+55/-2)
src/Canonical.UbuntuOne.Client/objects.xml (+6/-0)
src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj (+1/-1)
src/Canonical.UbuntuOne.Common/OperationContracts/ISyncDaemon.cs (+6/-0)
src/Canonical.UbuntuOne.Common/ProcessManager.cs (+1/-0)
src/Canonical.UbuntuOne.Common/Security/IAuthentication.cs (+1/-1)
src/Canonical.UbuntuOne.Common/SyncDaemonAuthentication.cs (+1/-0)
src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonService.cs (+9/-0)
src/UbuntuOneClient/App.config (+1/-0)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/add_storage_protocol_certificates
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Rodrigo Moya (community) Approve
Review via email: mp+34275@code.launchpad.net

Description of the change

Ensures that the installer copies the storage protocol certificates in the windows machine in the Common Appdata.

To post a comment you must log in.
Revision history for this message
Rodrigo Moya (rodrigo-moya) :
review: Approve
Revision history for this message
John Lenton (chipaca) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'data'
2=== added file 'data/UbuntuOne-Go_Daddy_CA.pem'
3--- data/UbuntuOne-Go_Daddy_CA.pem 1970-01-01 00:00:00 +0000
4+++ data/UbuntuOne-Go_Daddy_CA.pem 2010-09-01 14:47:00 +0000
5@@ -0,0 +1,29 @@
6+-----BEGIN CERTIFICATE-----
7+MIIE3jCCA8agAwIBAgICAwEwDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCVVMx
8+ITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
9+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMTYw
10+MTU0MzdaFw0yNjExMTYwMTU0MzdaMIHKMQswCQYDVQQGEwJVUzEQMA4GA1UECBMH
11+QXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5j
12+b20sIEluYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5j
13+b20vcmVwb3NpdG9yeTEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlcnRpZmlj
14+YXRpb24gQXV0aG9yaXR5MREwDwYDVQQFEwgwNzk2OTI4NzCCASIwDQYJKoZIhvcN
15+AQEBBQADggEPADCCAQoCggEBAMQt1RWMnCZM7DI161+4WQFapmGBWTtwY6vj3D3H
16+KrjJM9N55DrtPDAjhI6zMBS2sofDPZVUBJ7fmd0LJR4h3mUpfjWoqVTr9vcyOdQm
17+VZWt7/v+WIbXnvQAjYwqDL1CBM6nPwT27oDyqu9SoWlm2r4arV3aLGbqGmu75RpR
18+SgAvSMeYddi5Kcju+GZtCpyz8/x4fKL4o/K1w/O5epHBp+YlLpyo7RJlbmr2EkRT
19+cDCVw5wrWCs9CHRK8r5RsL+H0EwnWGu1NcWdrxcx+AuP7q2BNgWJCJjPOq8lh8BJ
20+6qf9Z/dFjpfMFDniNoW1fho3/Rb2cRGadDAW/hOUoz+EDU8CAwEAAaOCATIwggEu
21+MB0GA1UdDgQWBBT9rGEyk2xF1uLuhV+auud2mWjM5zAfBgNVHSMEGDAWgBTSxLDS
22+kdRMEXGzYcs9of7dqGrU4zASBgNVHRMBAf8ECDAGAQH/AgEAMDMGCCsGAQUFBwEB
23+BCcwJTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuZ29kYWRkeS5jb20wRgYDVR0f
24+BD8wPTA7oDmgN4Y1aHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNvbS9yZXBv
25+c2l0b3J5L2dkcm9vdC5jcmwwSwYDVR0gBEQwQjBABgRVHSAAMDgwNgYIKwYBBQUH
26+AgEWKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeTAO
27+BgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBANKGwOy9+aG2Z+5mC6IG
28+OgRQjhVyrEp0lVPLN8tESe8HkGsz2ZbwlFalEzAFPIUyIXvJxwqoJKSQ3kbTJSMU
29+A2fCENZvD117esyfxVgqwcSeIaha86ykRvOe5GPLL5CkKSkB2XIsKd83ASe8T+5o
30+0yGPwLPk9Qnt0hCqU7S+8MxZC9Y7lhyVJEnfzuz9p0iRFEUOOjZv2kWzRaJBydTX
31+RE4+uXR21aITVSzGh6O1mawGhId/dQb8vxRMDsxuxN89txJx9OjxUUAiKEngHUuH
32+qDTMBqLdElrRhjZkAzVvb3du6/KFUJheqwNTrZEjYx8WnM25sgVjOuH0aBsXBTWV
33+U+4=
34+-----END CERTIFICATE-----
35
36=== added file 'data/UbuntuOne-Go_Daddy_Class_2_CA.pem'
37--- data/UbuntuOne-Go_Daddy_Class_2_CA.pem 1970-01-01 00:00:00 +0000
38+++ data/UbuntuOne-Go_Daddy_Class_2_CA.pem 2010-09-01 14:47:00 +0000
39@@ -0,0 +1,25 @@
40+-----BEGIN CERTIFICATE-----
41+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJV
42+UzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQL
43+EyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
44+DTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMx
45+ITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMo
46+R28gRGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAw
47+DQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d
48+/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9
49+S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32qRe3H3I2
50+TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVl
51+OARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFA
52+pMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44
53+dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLEsNKR1EwRcbNh
54+yz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2oatTj
55+oWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdy
56+b3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
57+YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
58+BQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYX
59+MP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
60+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheab
61+IZ0KbIIOqPjCDPoQHmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzr
62+Tia2cyvk0/ZM/iZx4mERdEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBD
63+pqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/bvZ8=
64+-----END CERTIFICATE-----
65
66=== modified file 'install/UbuntuOne.wxs'
67--- install/UbuntuOne.wxs 2010-09-01 14:47:00 +0000
68+++ install/UbuntuOne.wxs 2010-09-01 14:47:00 +0000
69@@ -40,6 +40,28 @@
70 Name="Programs" />
71 <Directory Id="DesktopFolder"
72 Name="Desktop" />
73+ <Directory Id="CommonAppDataFolder"
74+ Name="CommonAppDataFolder">
75+ <Directory Id="StoreageProtocol"
76+ Name="ubuntuone-storageprotocol">
77+ <Component Id="UbuntuOneGoDaddyCAComponent"
78+ Guid="84f40170-b5a1-11df-8d81-0800200c9a66">
79+ <File Id="UbuntuOne_Go_Daddy_CA"
80+ Name="UbuntuOne-Go_Daddy_CA.pem"
81+ DiskId="1"
82+ Source="build_results\data\UbuntuOne-Go_Daddy_CA.pem"
83+ KeyPath="yes"/>
84+ </Component>
85+ <Component Id="UbuntuOneGoDaddyClass2CAComponent"
86+ Guid="89d14680-b5a1-11df-8d81-0800200c9a66">
87+ <File Id="UbuntuOne_Go_Daddy_Class_2_CA"
88+ Name="UbuntuOne-Go_Daddy_Class_2_CA.pem"
89+ DiskId="1"
90+ Source="build_results\data\UbuntuOne-Go_Daddy_Class_2_CA.pem"
91+ KeyPath="yes"/>
92+ </Component>
93+ </Directory>
94+ </Directory>
95 <Directory Id="ProgramFilesFolder"
96 Name="PFiles">
97 <Directory Id="Canonical"
98@@ -949,6 +971,9 @@
99 Level="1"
100 Title="Ubuntu One"
101 Description="Ubuntu One is the personal cloud service that simplifies your digital life.">
102+ <!-- common data -->
103+ <ComponentRef Id="UbuntuOneGoDaddyCAComponent" />
104+ <ComponentRef Id="UbuntuOneGoDaddyClass2CAComponent" />
105 <!-- Daemon components -->
106 <ComponentRef Id="DaemonCommonLibComponent" />
107 <ComponentRef Id="DaemonCommonPdbComponent" />
108
109=== modified file 'main.build'
110--- main.build 2010-09-01 14:47:00 +0000
111+++ main.build 2010-09-01 14:47:00 +0000
112@@ -193,6 +193,13 @@
113
114 <mkdir dir="${build_results}" />
115
116+ <!-- copy the data folder to add the certificates in the installer -->
117+ <copy todir="${build_results}/data" flatten="true">
118+ <fileset basedir="data">
119+ <include name="*.pem" />
120+ </fileset>
121+ </copy>
122+
123 <!-- The results from the build will have to be copied to a build result folder in install so that we do can build the msi -->
124 <copy todir="${build_results}/Daemon" flatten="true">
125 <fileset basedir="src/Canonical.UbuntuOne.ProcessDispatcher/bin/${enviroment}">
126
127=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs'
128--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs 2010-09-01 14:47:00 +0000
129+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs 2010-09-01 14:47:00 +0000
130@@ -28,6 +28,15 @@
131 /// </summary>
132 public partial class UbuntuOneNotifyIcon : INotificationIconView
133 {
134+ #region DI Properties
135+
136+ /// <summary>
137+ /// Gets and sets the presenter that contains the logic that is used by the notification icon.
138+ /// </summary>
139+ public INotificationIconPresenter NotificationIconPresenter { get; set; }
140+
141+ #endregion
142+
143 /// <summary>
144 /// Initializes a new instance of the UbuntuOneNotifyIcon class.
145 /// </summary>
146@@ -79,59 +88,7 @@
147
148 private void OnUbuntuOneManualSyncClick(object sender, System.Windows.RoutedEventArgs e)
149 {
150- // TODO: Used the bloddy presenter!!!!!
151- // TODO: This has to be fixed, we should not call the command directly, user the
152- // process dispatcher to prepare for the syncdaemon!!!!
153- // TODO: Do not hardcode the folder, use an object to store that
154- // TODO: Do not store oauth in the env vars!!!!
155- var oneDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
156- "UbuntuOne");
157- if(!Directory.Exists(oneDir))
158- {
159- Directory.CreateDirectory(oneDir);
160- }
161-
162- if(!Directory.Exists(Path.Combine(oneDir, ".ubuntuone-sync")))
163- {
164- // init the directory
165- var init = new Process
166- {
167- StartInfo =
168- {
169- WorkingDirectory = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync",
170- FileName = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync\main.exe",
171- Arguments = String.Format(" --init {0} --oauth {1}",
172- oneDir,
173- Environment.GetEnvironmentVariable("UbuntuOne", EnvironmentVariableTarget.User)),
174- UseShellExecute = false,
175- RedirectStandardOutput = false,
176- RedirectStandardError = false,
177- CreateNoWindow = true,
178- WindowStyle = ProcessWindowStyle.Hidden
179- }
180- };
181- init.Start();
182- init.WaitForExit();
183- init.Close();
184- }
185-
186- var proc = new Process
187- {
188- StartInfo =
189- {
190- WorkingDirectory = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync",
191- FileName = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync\main.exe",
192- Arguments = String.Format("{0} --oauth {1}",
193- oneDir,
194- Environment.GetEnvironmentVariable("UbuntuOne", EnvironmentVariableTarget.User)),
195- UseShellExecute = false,
196- RedirectStandardOutput = false,
197- RedirectStandardError = false,
198- CreateNoWindow = true,
199- WindowStyle = ProcessWindowStyle.Hidden
200- }
201- };
202- proc.Start();
203+ NotificationIconPresenter.ManualSync();
204 }
205 }
206 }
207
208=== modified file 'src/Canonical.UbuntuOne.Client.Views/objects.xml'
209--- src/Canonical.UbuntuOne.Client.Views/objects.xml 2010-07-30 16:32:54 +0000
210+++ src/Canonical.UbuntuOne.Client.Views/objects.xml 2010-09-01 14:47:00 +0000
211@@ -6,9 +6,12 @@
212
213 <object id="UpdatingView"
214 type="Canonical.UbuntuOne.Client.Views.Update.UpdatingView, Canonical.UbuntuOne.Client.Views" />
215-
216+
217 <object id="UbuntuOneNotifyIcon"
218- type="Canonical.UbuntuOne.Client.Views.UbuntuOneNotifyIcon, Canonical.UbuntuOne.Client.Views" />
219+ type="Canonical.UbuntuOne.Client.Views.UbuntuOneNotifyIcon, Canonical.UbuntuOne.Client.Views" >
220+ <property name="NotificationIconPresenter"
221+ ref="NotificationIconPresenter" />
222+ </object>
223
224 <object id="MessageBox"
225 type="Canonical.UbuntuOne.Client.Views.UbuntuOneMessageBox, Canonical.UbuntuOne.Client.Views" />
226
227=== modified file 'src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj'
228--- src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj 2010-08-04 14:36:09 +0000
229+++ src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj 2010-09-01 14:47:00 +0000
230@@ -82,5 +82,8 @@
231 <SubType>Designer</SubType>
232 </EmbeddedResource>
233 </ItemGroup>
234+ <ItemGroup>
235+ <EmbeddedResource Include="objects.xml" />
236+ </ItemGroup>
237 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
238 </Project>
239\ No newline at end of file
240
241=== modified file 'src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs'
242--- src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs 2010-09-01 14:47:00 +0000
243+++ src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs 2010-09-01 14:47:00 +0000
244@@ -26,7 +26,7 @@
245 /// <summary>
246 /// When implemented this method should for the sync of the ubuntu one folder.
247 /// </summary>
248- void ManuelSync();
249+ void ManualSync();
250
251 /// <summary>
252 /// When implemented this method should open the Preferences window of Ubuntu One.
253
254=== modified file 'src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs'
255--- src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs 2010-09-01 14:47:00 +0000
256+++ src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs 2010-09-01 14:47:00 +0000
257@@ -17,6 +17,7 @@
258 // Authors: Manuel de la Peña <manuel.delapena@canonical.com>
259 using System;
260 using System.Diagnostics;
261+using System.IO;
262 using Canonical.UbuntuOne.Client.Preferences;
263 using Canonical.UbuntuOne.Common.Aop;
264 using Canonical.UbuntuOne.Common.Utils;
265@@ -194,9 +195,61 @@
266 /// <summary>
267 /// When implemented this method should for the sync of the ubuntu one folder.
268 /// </summary>
269- public void ManuelSync()
270+ public void ManualSync()
271 {
272- throw new NotImplementedException();
273+ // TODO: Use the service rather than do it here.
274+ // TODO: This has to be fixed, we should not call the command directly, user the
275+ // process dispatcher to prepare for the syncdaemon!!!!
276+ // TODO: Do not hardcode the folder, use an object to store that
277+ // TODO: Do not store oauth in the env vars!!!!
278+ var oneDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
279+ "UbuntuOne");
280+ if (!Directory.Exists(oneDir))
281+ {
282+ Directory.CreateDirectory(oneDir);
283+ }
284+
285+ if (!Directory.Exists(Path.Combine(oneDir, ".ubuntuone-sync")))
286+ {
287+ // init the directory
288+ var init = new Process
289+ {
290+ StartInfo =
291+ {
292+ WorkingDirectory = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync",
293+ FileName = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync\main.exe",
294+ Arguments = String.Format(" --init {0} --oauth {1}",
295+ oneDir,
296+ Environment.GetEnvironmentVariable("UbuntuOne", EnvironmentVariableTarget.User)),
297+ UseShellExecute = false,
298+ RedirectStandardOutput = false,
299+ RedirectStandardError = false,
300+ CreateNoWindow = true,
301+ WindowStyle = ProcessWindowStyle.Hidden
302+ }
303+ };
304+ init.Start();
305+ init.WaitForExit();
306+ init.Close();
307+ }
308+
309+ var proc = new Process
310+ {
311+ StartInfo =
312+ {
313+ WorkingDirectory = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync",
314+ FileName = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync\main.exe",
315+ Arguments = String.Format("{0} --oauth {1}",
316+ oneDir,
317+ Environment.GetEnvironmentVariable("UbuntuOne", EnvironmentVariableTarget.User)),
318+ UseShellExecute = false,
319+ RedirectStandardOutput = false,
320+ RedirectStandardError = false,
321+ CreateNoWindow = true,
322+ WindowStyle = ProcessWindowStyle.Hidden
323+ }
324+ };
325+ proc.Start();
326
327 }
328
329
330=== added file 'src/Canonical.UbuntuOne.Client/objects.xml'
331--- src/Canonical.UbuntuOne.Client/objects.xml 1970-01-01 00:00:00 +0000
332+++ src/Canonical.UbuntuOne.Client/objects.xml 2010-09-01 14:47:00 +0000
333@@ -0,0 +1,6 @@
334+<?xml version="1.0" encoding="utf-8" ?>
335+<objects xmlns="http://www.springframework.net">
336+ <!-- Define the different presenters to be used -->
337+ <object id="NotificationIconPresenter"
338+ type="Canonical.UbuntuOne.Client.Notification.NotificationIconPresenter, Canonical.UbuntuOne.Client" />
339+</objects>
340\ No newline at end of file
341
342=== modified file 'src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj'
343--- src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj 2010-08-19 16:57:06 +0000
344+++ src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj 2010-09-01 14:47:00 +0000
345@@ -57,8 +57,8 @@
346 <Compile Include="Container\ObjectsContainer.cs" />
347 <Compile Include="Container\SpringContainer.cs" />
348 <Compile Include="Container\UnsatisfiedDependencyException.cs" />
349- <Compile Include="IAuthentication.cs" />
350 <Compile Include="OperationContracts\IEventNotifier.cs" />
351+ <Compile Include="Security\IAuthentication.cs" />
352 <Compile Include="Threading\IDispatcher.cs" />
353 <Compile Include="Threading\WpfDispatcher.cs" />
354 <Compile Include="Utils\ApplicationWrapper.cs" />
355
356=== modified file 'src/Canonical.UbuntuOne.Common/OperationContracts/ISyncDaemon.cs'
357--- src/Canonical.UbuntuOne.Common/OperationContracts/ISyncDaemon.cs 2010-08-16 12:46:11 +0000
358+++ src/Canonical.UbuntuOne.Common/OperationContracts/ISyncDaemon.cs 2010-09-01 14:47:00 +0000
359@@ -57,6 +57,12 @@
360 bool TryStop();
361
362 /// <summary>
363+ /// Allows the user to perform a manual sync of his machine with the ubuntu one server.
364+ /// </summary>
365+ [OperationContract]
366+ void ManualSync();
367+
368+ /// <summary>
369 /// Returns the port number of the socket that the synd daemo is listening to for communication.
370 /// </summary>
371 /// <returns></returns>
372
373=== modified file 'src/Canonical.UbuntuOne.Common/ProcessManager.cs'
374--- src/Canonical.UbuntuOne.Common/ProcessManager.cs 2010-07-07 10:41:49 +0000
375+++ src/Canonical.UbuntuOne.Common/ProcessManager.cs 2010-09-01 14:47:00 +0000
376@@ -19,6 +19,7 @@
377 */
378 using System;
379 using System.Diagnostics;
380+using Canonical.UbuntuOne.Common.Security;
381 using Canonical.UbuntuOne.Common.Validation;
382 using log4net;
383
384
385=== added directory 'src/Canonical.UbuntuOne.Common/Security'
386=== renamed file 'src/Canonical.UbuntuOne.Common/IAuthentication.cs' => 'src/Canonical.UbuntuOne.Common/Security/IAuthentication.cs'
387--- src/Canonical.UbuntuOne.Common/IAuthentication.cs 2010-07-07 10:41:49 +0000
388+++ src/Canonical.UbuntuOne.Common/Security/IAuthentication.cs 2010-09-01 14:47:00 +0000
389@@ -17,7 +17,7 @@
390 *
391 * Authors: Manuel de la Peña <manuel.delapena@canonical.com>
392 */
393-namespace Canonical.UbuntuOne.Common
394+namespace Canonical.UbuntuOne.Common.Security
395 {
396 /// <summary>
397 /// Interface to be implemented by those objects that are able to authenticate user against the system.
398
399=== modified file 'src/Canonical.UbuntuOne.Common/SyncDaemonAuthentication.cs'
400--- src/Canonical.UbuntuOne.Common/SyncDaemonAuthentication.cs 2010-07-04 20:05:17 +0000
401+++ src/Canonical.UbuntuOne.Common/SyncDaemonAuthentication.cs 2010-09-01 14:47:00 +0000
402@@ -1,4 +1,5 @@
403 using System.ServiceModel;
404+using Canonical.UbuntuOne.Common.Security;
405
406 namespace Canonical.UbuntuOne.Common
407 {
408
409=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonService.cs'
410--- src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonService.cs 2010-08-24 15:10:09 +0000
411+++ src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonService.cs 2010-09-01 14:47:00 +0000
412@@ -21,6 +21,7 @@
413 using System.Collections.Generic;
414 using Canonical.UbuntuOne.Common;
415 using Canonical.UbuntuOne.Common.Aop;
416+using Canonical.UbuntuOne.Common.Security;
417 using Canonical.UbuntuOne.Common.Validation;
418 using log4net;
419
420@@ -195,6 +196,14 @@
421 }
422
423 /// <summary>
424+ /// Allows the user to perform a manual sync of his machine with the ubuntu one server.
425+ /// </summary>
426+ public void ManualSync()
427+ {
428+ throw new NotImplementedException();
429+ }
430+
431+ /// <summary>
432 /// Returns the port number of the socket that the synd daemo is listening to for communication.
433 /// </summary>
434 /// <returns></returns>
435
436=== modified file 'src/UbuntuOneClient/App.config'
437--- src/UbuntuOneClient/App.config 2010-07-30 16:32:54 +0000
438+++ src/UbuntuOneClient/App.config 2010-09-01 14:47:00 +0000
439@@ -33,6 +33,7 @@
440 <spring>
441 <context>
442 <resource uri="assembly://UbuntuOneClient/UbuntuOneClient/objects.xml" />
443+ <resource uri="assembly://Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client/objects.xml" />
444 <resource uri="assembly://Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views/objects.xml" />
445 <resource uri="assembly://Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common/objects.xml" />
446 </context>

Subscribers

People subscribed via source and target branches

to all changes: