mirrors
/
OpenLiveWriter
mirror of https://github.com/OpenLiveWriter/OpenLiveWriter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #789 from Leftopia/master 

Temporary fix for Picasa web requests
This commit is contained in:
Jon Galloway 2019-01-19 12:46:59 -08:00 committed by GitHub
parent 82b0be177a f31228ede3
commit cf8bd99017
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/managed/OpenLiveWriter.BlogClient/Clients/BloggerAtomClient.cs
View File

@ -460,7 +460,8 @@ namespace OpenLiveWriter.BlogClient.Clients
const string GPHOTO_NS_URI = "http://schemas.google.com/photos/2007";
//TransientCredentials transientCredentials = Credentials.TransientCredentials as TransientCredentials;
Uri picasaUri = new Uri("http://picasaweb.google.com/data/feed/api/user/default");
// TODO: HACK: The deprecation-extension flag keeps the deprecated Picasa API alive.
Uri picasaUri = new Uri("https://picasaweb.google.com/data/feed/api/user/default?deprecation-extension=true");
try
{

11
src/managed/OpenLiveWriter.BlogClient/Clients/GoogleBloggerv3Client.cs
View File

@ -731,9 +731,9 @@ namespace OpenLiveWriter.BlogClient.Clients
public string GetBlogImagesAlbum(string albumName, string blogId)
{
const string FEED_REL = "http://schemas.google.com/g/2005#feed";
Uri picasaUri = new Uri("https://picasaweb.google.com/data/feed/api/user/default");
// TODO: HACK: The deprecation-extension flag keeps the deprecated Picasa API alive.
Uri picasaUri = new Uri("https://picasaweb.google.com/data/feed/api/user/default?deprecation-extension=true");
var picasaId = string.Empty;
try
@ -767,7 +767,11 @@ namespace OpenLiveWriter.BlogClient.Clients
}
string selfHref = AtomEntry.GetLink(entryEl, _nsMgr, FEED_REL, "application/atom+xml", null, reqUri);
if (selfHref.Length > 1)
{
// TODO: HACK: This keeps the deprecated Picasa API alive.
selfHref += "&deprecation-extension=true";
return selfHref;
}
}
}
}
@ -835,7 +839,8 @@ namespace OpenLiveWriter.BlogClient.Clients
// for us to use.
if (userInfo.BlogUserInfoValue.PhotosAlbumKey != "0")
{
var bloggerPicasaUrl = $"https://picasaweb.google.com/data/feed/api/user/{picasaId}/albumid/{userInfo.BlogUserInfoValue.PhotosAlbumKey}";
// TODO: HACK: The deprecation-extension flag keeps the deprecated Picasa API alive.
var bloggerPicasaUrl = $"https://picasaweb.google.com/data/feed/api/user/{picasaId}/albumid/{userInfo.BlogUserInfoValue.PhotosAlbumKey}?deprecation-extension=true";
return bloggerPicasaUrl;
}
}