handle some edge cases: many albums, deleted albums, and slow network.

Bug: 7258024
Change-Id: If9ab2ecf6bc12881854df83a637dc1fdb685552c

1 files changed, 11 insertions, 0 deletions

diff --git a/src/com/android/dreams/phototable/AlbumSettings.java b/src/com/android/dreams/phototable/AlbumSettings.java
index a719d4f..23dda46 100644
--- a/src/com/android/dreams/phototable/AlbumSettings.java
+++ b/src/com/android/dreams/phototable/AlbumSettings.java
@@ -17,6 +17,7 @@ package com.android.dreams.phototable;
 
 import android.content.SharedPreferences;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
@@ -69,6 +70,16 @@ public class AlbumSettings {
         }
     }
 
+    public void pruneObsoleteSettings(Collection<String> validAlbums) {
+        if (!validAlbums.containsAll(mEnabledAlbums)) {
+            synchronized (mEnabledAlbums) {
+                readEnabledAlbumsLocked();
+                mEnabledAlbums.retainAll(validAlbums);
+                writeEnabledAlbumsLocked();
+            }
+        }
+    }
+
     public  boolean isConfigured() {
         synchronized (mEnabledAlbums) {
             return mEnabledAlbums.size() != 0;