From 91ee484aa3092135bf05b4d62e4fc025321ae62b Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Thu, 1 Nov 2012 10:40:22 -0700
Subject: Fix extra gray item in secure album.

 Bug 7454444

Change-Id: I83f40e7e74f658a7b9ada148932a231ef8c31f73
---
 src/com/android/gallery3d/data/SecureAlbum.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/com/android')

diff --git a/src/com/android/gallery3d/data/SecureAlbum.java b/src/com/android/gallery3d/data/SecureAlbum.java
index 0a8c5a827..204f848f8 100644
--- a/src/com/android/gallery3d/data/SecureAlbum.java
+++ b/src/com/android/gallery3d/data/SecureAlbum.java
@@ -64,17 +64,22 @@ public class SecureAlbum extends MediaSet implements StitchingChangeListener {
     }
 
     public void addMediaItem(boolean isVideo, int id) {
+        Path pathBase;
         if (isVideo) {
-            mAllItems.add(Path.fromString("/local/video/item/" + id));
+            pathBase = LocalVideo.ITEM_PATH;
             mMinVideoId = Math.min(mMinVideoId, id);
             mMaxVideoId = Math.max(mMaxVideoId, id);
         } else {
-            mAllItems.add(Path.fromString("/local/image/item/" + id));
+            pathBase = LocalImage.ITEM_PATH;
             mMinImageId = Math.min(mMinImageId, id);
             mMaxImageId = Math.max(mMaxImageId, id);
         }
-        mAllItemTypes.add(isVideo);
-        mNotifier.fakeChange();
+        Path path = pathBase.getChild(id);
+        if (!mAllItems.contains(path)) {
+            mAllItems.add(path);
+            mAllItemTypes.add(isVideo);
+            mNotifier.fakeChange();
+        }
     }
 
     // The sequence is stitching items, local media items, and unlock image.
-- 
cgit v1.2.3