Updated to avoid warning.

Updated samples to use 2.0 validation. Renamed upload-image.cs to upload-images.cs and make it take a directory instead of a file.
mono · Aug 24, 2010 · 972ce30 · 972ce30
1 parent adf2eeb
commit 972ce30
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/sample/Makefile.am b/sample/Makefile.am
@@ -1,4 +1,4 @@
-SAMPLES=list-albums.cs create-album.cs upload-image.cs tag-image.cs
+SAMPLES=list-albums.cs create-album.cs upload-images.cs tag-image.cs
 MCSFLAGS= -debug+ -debug:full -nologo -r:Mono.Google.dll
 
 EXTRA_DIST=$(SAMPLES)

diff --git a/sample/create-album.cs b/sample/create-album.cs
@@ -36,7 +36,7 @@ class Test {
 	// args [0] -> user name, args [1] -> album title
 	static void Main (string [] args)
 	{
-		ServicePointManager.CertificatePolicy = new NoCheckCertificatePolicy ();
+		ServicePointManager.ServerCertificateValidationCallback +=  delegate { return true; };
 		GoogleConnection conn = new GoogleConnection (GoogleService.Picasa);
 		Console.Write ("Password: ");
 		string pass = Console.ReadLine ();

diff --git a/sample/list-albums.cs b/sample/list-albums.cs
@@ -40,7 +40,7 @@ static void Main (string [] args)
 		Console.Write ("Password: ");
 		string password = Console.ReadLine ();
 
-		ServicePointManager.CertificatePolicy = new NoCheckCertificatePolicy ();
+		ServicePointManager.ServerCertificateValidationCallback +=  delegate { return true; };
 		GoogleConnection conn = new GoogleConnection (GoogleService.Picasa);
 		PicasaWeb picasa;
 		if (password == null || password.Trim () == "")

diff --git a/sample/tag-image.cs b/sample/tag-image.cs
@@ -44,7 +44,7 @@ static void Main (string [] args)
 		if (password == null || password.Trim () == "")
 			password = null;
 
-		ServicePointManager.CertificatePolicy = new NoCheckCertificatePolicy ();
+		ServicePointManager.ServerCertificateValidationCallback +=  delegate { return true; };
 		GoogleConnection conn = new GoogleConnection (GoogleService.Picasa);
 		conn.Authenticate (user, password);
 		PicasaPicture picture = new PicasaPicture (conn, albumid, imageid);

diff --git a/sample/upload-image.cs → sample/upload-images.cs b/sample/upload-image.cs → sample/upload-images.cs
@@ -28,6 +28,7 @@
 //
 
 using System;
+using System.IO;
 using System.Net;
 using Mono.Google;
 using Mono.Google.Picasa;
@@ -43,12 +44,19 @@ static void Main (string [] args)
 		if (password == null || password.Trim () == "")
 			password = null;
 
-		ServicePointManager.CertificatePolicy = new NoCheckCertificatePolicy ();
+		ServicePointManager.ServerCertificateValidationCallback +=  delegate { return true; };
 		GoogleConnection conn = new GoogleConnection (GoogleService.Picasa);
 		conn.Authenticate (user, password);
 		PicasaAlbum album = new PicasaAlbum (conn, albumid);
 		Console.WriteLine ("  Album Title: {0} ID: {1}", album.Title, album.UniqueID);
-		album.UploadPicture (filepath);
+		string [] files = Directory.GetFiles (filepath, "*.jpg");
+		int count = files.Length;
+		int i = 0;
+		foreach (string f in files) {
+			i++;
+			Console.WriteLine ("Uploading {0} ({1} of {2})", Path.GetFileName (f), i, count);
+			album.UploadPicture (f);
+		}
 	}
 }