packages/apps/Gallery2
| 修订版 | 44bfdb4da97c9d3f0a4080542a5844a287dc4fdc (tree) |
|---|---|
| 时间 | 2010-02-26 01:09:37 |
| 作者 | Venkat Krishnaraj <venkatkrishnaraj@venk...> |
| Commiter | Dave Sparks |
Fix for deleted items not deleting sometimes.
src/com/cooliris/cache/CacheService.java (diff) src/com/cooliris/media/LocalDataSource.java (diff) src/com/cooliris/media/SingleDataSource.java (diff)| @@ -402,6 +402,7 @@ public final class CacheService extends IntentService { | ||
| 402 | 402 | final DataInputStream dis = new DataInputStream(new BufferedInputStream(new ByteArrayInputStream(albumData), 256)); |
| 403 | 403 | try { |
| 404 | 404 | final int numItems = dis.readInt(); |
| 405 | + Log.i(TAG, "Loading " + numItems + " into set " + set.mName + ":" + set); | |
| 405 | 406 | set.setNumExpectedItems(numItems); |
| 406 | 407 | set.mMinTimestamp = dis.readLong(); |
| 407 | 408 | set.mMaxTimestamp = dis.readLong(); |
| @@ -498,7 +499,6 @@ public final class CacheService extends IntentService { | ||
| 498 | 499 | if (!item.isDateTakenValid() && !item.mTriedRetrievingExifDateTaken |
| 499 | 500 | && (item.mFilePath.endsWith(".jpg") || item.mFilePath.endsWith(".jpeg"))) { |
| 500 | 501 | try { |
| 501 | - Log.i(TAG, "Parsing date taken from exif"); | |
| 502 | 502 | final ExifInterface exif = new ExifInterface(item.mFilePath); |
| 503 | 503 | final String dateTakenStr = exif.getAttribute(ExifInterface.TAG_DATETIME); |
| 504 | 504 | if (dateTakenStr != null) { |
| @@ -1012,12 +1012,14 @@ public final class CacheService extends IntentService { | ||
| 1012 | 1012 | } |
| 1013 | 1013 | Log.i(TAG, "Refreshing dirty albums"); |
| 1014 | 1014 | populateMediaItemsForSets(context, sets, acceleratedSets, true); |
| 1015 | - // Logic to refresh the UI for dirty sets | |
| 1016 | - if (context instanceof Gallery) { | |
| 1017 | - int numSets = sets.size(); | |
| 1018 | - for (int i = 0; i < numSets; ++i) { | |
| 1019 | - MediaSet set = sets.get(i); | |
| 1020 | - ((Gallery)context).refreshUIForSet(set); | |
| 1015 | + if (!Thread.interrupted()) { | |
| 1016 | + // Logic to refresh the UI for dirty sets | |
| 1017 | + if (context instanceof Gallery) { | |
| 1018 | + int numSets = sets.size(); | |
| 1019 | + for (int i = 0; i < numSets; ++i) { | |
| 1020 | + MediaSet set = sets.get(i); | |
| 1021 | + ((Gallery) context).refreshUIForSet(set); | |
| 1022 | + } | |
| 1021 | 1023 | } |
| 1022 | 1024 | } |
| 1023 | 1025 | } |
| @@ -171,7 +171,6 @@ public final class LocalDataSource implements DataSource { | ||
| 171 | 171 | final String whereVideos = Video.VideoColumns.BUCKET_ID + "=" + Long.toString(set.mId); |
| 172 | 172 | cr.delete(uriImages, whereImages, null); |
| 173 | 173 | cr.delete(uriVideos, whereVideos, null); |
| 174 | - CacheService.markDirty(mContext); | |
| 175 | 174 | } |
| 176 | 175 | if (set != null && items != null) { |
| 177 | 176 | // We need to remove these items from the set. |
| @@ -187,7 +186,6 @@ public final class LocalDataSource implements DataSource { | ||
| 187 | 186 | } |
| 188 | 187 | set.updateNumExpectedItems(); |
| 189 | 188 | set.generateTitle(true); |
| 190 | - CacheService.markDirty(mContext, set.mId); | |
| 191 | 189 | } |
| 192 | 190 | } |
| 193 | 191 | break; |
| @@ -292,7 +292,6 @@ public class SingleDataSource implements DataSource { | ||
| 292 | 292 | final String whereVideos = Video.VideoColumns.BUCKET_ID + "=" + Long.toString(set.mId); |
| 293 | 293 | cr.delete(uriImages, whereImages, null); |
| 294 | 294 | cr.delete(uriVideos, whereVideos, null); |
| 295 | - CacheService.markDirty(mContext); | |
| 296 | 295 | } |
| 297 | 296 | if (set != null && items != null) { |
| 298 | 297 | // We need to remove these items from the set. |
| @@ -303,7 +302,6 @@ public class SingleDataSource implements DataSource { | ||
| 303 | 302 | } |
| 304 | 303 | set.updateNumExpectedItems(); |
| 305 | 304 | set.generateTitle(true); |
| 306 | - CacheService.markDirty(mContext, set.mId); | |
| 307 | 305 | } |
| 308 | 306 | } |
| 309 | 307 | break; |
Fork