diff options
| author | Chris Wren <cwren@android.com> | 2013-08-27 13:53:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-27 13:53:24 -0700 |
| commit | efe3e6638fe0b9cb4166623250dd0371bb93511d (patch) | |
| tree | 21d02a02e411df658a8e815ee79e263648a3f947 | |
| parent | 0858513b25e02b86a7a4c211e877d2303cc13fbb (diff) | |
| parent | 92bb65920b23ab151f8fe3bc3dd173ddef10fb33 (diff) | |
| download | android_packages_screensavers_PhotoTable-efe3e6638fe0b9cb4166623250dd0371bb93511d.tar.gz android_packages_screensavers_PhotoTable-efe3e6638fe0b9cb4166623250dd0371bb93511d.tar.bz2 android_packages_screensavers_PhotoTable-efe3e6638fe0b9cb4166623250dd0371bb93511d.zip | |
am 92bb6592: am 7e2828e0: am 44358fd1: remove special handling for composite instant upload album.
* commit '92bb65920b23ab151f8fe3bc3dd173ddef10fb33':
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; |