remove special handling for composite instant upload album.

The old name is obsolete and it adds complexity (and bugs).
Watch for references to the old name in settings and upgrade them.

Bug: 10509455
Change-Id: Ifc50ee29fb8d69c369fdfad503efbfb4aec08a47

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;