diff options
| author | Chris Wren <cwren@android.com> | 2013-08-27 13:48:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-27 13:48:39 -0700 |
| commit | 7e2828e0f1c31c60e828abb981918642457a9260 (patch) | |
| tree | 5752743f2e715290fe004db24d3d7ecbbbfd63e7 | |
| parent | e8dd8ba8426bbd90216b492084e4ecb25d419fbc (diff) | |
| parent | 44358fd113ad0ac82aa093e66d906ce40528d24f (diff) | |
| download | android_packages_screensavers_PhotoTable-7e2828e0f1c31c60e828abb981918642457a9260.tar.gz android_packages_screensavers_PhotoTable-7e2828e0f1c31c60e828abb981918642457a9260.tar.bz2 android_packages_screensavers_PhotoTable-7e2828e0f1c31c60e828abb981918642457a9260.zip | |
am 44358fd1: remove special handling for composite instant upload album.
* commit '44358fd113ad0ac82aa093e66d906ce40528d24f':
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; |