diff options
| author | Chris Wren <cwren@android.com> | 2013-08-27 13:50:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-27 13:50:33 -0700 |
| commit | 92bb65920b23ab151f8fe3bc3dd173ddef10fb33 (patch) | |
| tree | 970003687ae9dab7a00a2602613fa3c38c707e3a | |
| parent | ba7c5fcf9aa20920e083f518d945a041d4dd60cd (diff) | |
| parent | 7e2828e0f1c31c60e828abb981918642457a9260 (diff) | |
| download | android_packages_screensavers_PhotoTable-92bb65920b23ab151f8fe3bc3dd173ddef10fb33.tar.gz android_packages_screensavers_PhotoTable-92bb65920b23ab151f8fe3bc3dd173ddef10fb33.tar.bz2 android_packages_screensavers_PhotoTable-92bb65920b23ab151f8fe3bc3dd173ddef10fb33.zip | |
am 7e2828e0: am 44358fd1: remove special handling for composite instant upload album.
* commit '7e2828e0f1c31c60e828abb981918642457a9260':
remove special handling for composite instant upload album.
| -rw-r--r-- | src/com/android/dreams/phototable/PicasaSource.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/dreams/phototable/PicasaSource.java b/src/com/android/dreams/phototable/PicasaSource.java index 1dcd27d..26fd03e 100644 --- a/src/com/android/dreams/phototable/PicasaSource.java +++ b/src/com/android/dreams/phototable/PicasaSource.java @@ -371,8 +371,12 @@ public class PicasaSource extends CursorPhotoSource { } if (isUpload) { - log(TAG, "replacing " + id + " with " + PICASA_UPLOAD_TYPE); - id = constructId(PICASA_UPLOAD_TYPE + ":" + user); + // check for old-style name for this album, and upgrade settings. + String uploadId = constructId(PICASA_UPLOAD_TYPE + ":" + user); + if (mSettings.isAlbumEnabled(uploadId)) { + mSettings.setAlbumEnabled(uploadId, false); + mSettings.setAlbumEnabled(id, true); + } } String thumbnailUrl = null; |