From 6a8ded56f04fdac34bad34bc22f34df69228b9e6 Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 7 Mar 2013 15:50:38 -0800 Subject: Fix stuff Change-Id: Ib263a00a13f169388e6ee796359255fda2a26b37 --- src/com/android/photos/AlbumSetFragment.java | 7 ++++++- src/com/android/photos/PhotoSetFragment.java | 7 ++++++- src/com/android/photos/shims/BitmapJobDrawable.java | 11 +++++++---- src/com/android/photos/shims/MediaItemsLoader.java | 13 ++++++++----- src/com/android/photos/shims/MediaSetLoader.java | 20 ++++++++++---------- 5 files changed, 37 insertions(+), 21 deletions(-) diff --git a/src/com/android/photos/AlbumSetFragment.java b/src/com/android/photos/AlbumSetFragment.java index 3c51bbac3..6a3760779 100644 --- a/src/com/android/photos/AlbumSetFragment.java +++ b/src/com/android/photos/AlbumSetFragment.java @@ -53,6 +53,12 @@ public class AlbumSetFragment extends Fragment implements OnItemClickListener, private static final int LOADER_ALBUMSET = 1; + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + mAdapter = new AlbumSetCursorAdapter(getActivity()); + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -60,7 +66,6 @@ public class AlbumSetFragment extends Fragment implements OnItemClickListener, mAlbumSetView = (GridView) root.findViewById(android.R.id.list); mEmptyView = root.findViewById(android.R.id.empty); mEmptyView.setVisibility(View.GONE); - mAdapter = new AlbumSetCursorAdapter(getActivity()); mAlbumSetView.setAdapter(mAdapter); mAlbumSetView.setOnItemClickListener(this); getLoaderManager().initLoader(LOADER_ALBUMSET, null, this); diff --git a/src/com/android/photos/PhotoSetFragment.java b/src/com/android/photos/PhotoSetFragment.java index 1de8de5a7..5911ad0c8 100644 --- a/src/com/android/photos/PhotoSetFragment.java +++ b/src/com/android/photos/PhotoSetFragment.java @@ -46,6 +46,12 @@ public class PhotoSetFragment extends Fragment implements LoaderCallbacks implements Drawabl } }; - private MediaSet mMediaSet; + private final MediaSet mMediaSet; private Future mSyncTask = null; private ContentListener mObserver = new ContentListener() { @Override @@ -55,7 +54,7 @@ public class MediaItemsLoader extends AsyncTaskLoader implements Drawabl onContentChanged(); } }; - private ArrayList mMediaItems = new ArrayList(); + private SparseArray mMediaItems; public MediaItemsLoader(Context context) { super(context); @@ -104,6 +103,7 @@ public class MediaItemsLoader extends AsyncTaskLoader implements Drawabl mMediaSet.loadIfDirty(); final MatrixCursor cursor = new MatrixCursor(PhotoSetLoader.PROJECTION); final Object[] row = new Object[PhotoSetLoader.PROJECTION.length]; + final SparseArray mediaItems = new SparseArray(); mMediaSet.enumerateTotalMediaItems(new ItemConsumer() { @Override public void consume(int index, MediaItem item) { @@ -122,9 +122,12 @@ public class MediaItemsLoader extends AsyncTaskLoader implements Drawabl } row[PhotoSetLoader.INDEX_MEDIA_TYPE] = mappedMediaType; cursor.addRow(row); - mMediaItems.add(item); + mediaItems.append(index, item); } }); + synchronized (mMediaSet) { + mMediaItems = mediaItems; + } return cursor; } diff --git a/src/com/android/photos/shims/MediaSetLoader.java b/src/com/android/photos/shims/MediaSetLoader.java index 7a6fcb865..87039c209 100644 --- a/src/com/android/photos/shims/MediaSetLoader.java +++ b/src/com/android/photos/shims/MediaSetLoader.java @@ -21,22 +21,16 @@ import android.content.Context; import android.database.Cursor; import android.database.MatrixCursor; import android.graphics.drawable.Drawable; -import android.provider.MediaStore.Files.FileColumns; import com.android.gallery3d.data.ContentListener; import com.android.gallery3d.data.DataManager; -import com.android.gallery3d.data.MediaDetails; import com.android.gallery3d.data.MediaItem; import com.android.gallery3d.data.MediaSet; -import com.android.gallery3d.data.MediaSet.ItemConsumer; import com.android.gallery3d.data.MediaSet.SyncListener; import com.android.gallery3d.util.Future; import com.android.photos.data.AlbumSetLoader; -import com.android.photos.data.PhotoSetLoader; import com.android.photos.drawables.DrawableFactory; -import java.text.DateFormat; -import java.text.ParseException; import java.util.ArrayList; /** @@ -51,7 +45,7 @@ public class MediaSetLoader extends AsyncTaskLoader implements DrawableF } }; - private MediaSet mMediaSet; + private final MediaSet mMediaSet; private Future mSyncTask = null; private ContentListener mObserver = new ContentListener() { @Override @@ -60,7 +54,7 @@ public class MediaSetLoader extends AsyncTaskLoader implements DrawableF } }; - private ArrayList mCoverItems = new ArrayList(); + private ArrayList mCoverItems; public MediaSetLoader(Context context) { super(context); @@ -110,6 +104,7 @@ public class MediaSetLoader extends AsyncTaskLoader implements DrawableF final MatrixCursor cursor = new MatrixCursor(AlbumSetLoader.PROJECTION); final Object[] row = new Object[AlbumSetLoader.PROJECTION.length]; int count = mMediaSet.getSubMediaSetCount(); + ArrayList coverItems = new ArrayList(count); for (int i = 0; i < count; i++) { MediaSet m = mMediaSet.getSubMediaSet(i); m.loadIfDirty(); @@ -117,10 +112,15 @@ public class MediaSetLoader extends AsyncTaskLoader implements DrawableF row[AlbumSetLoader.INDEX_TITLE] = m.getName(); row[AlbumSetLoader.INDEX_COUNT] = m.getMediaItemCount(); MediaItem coverItem = m.getCoverMediaItem(); - row[AlbumSetLoader.INDEX_TIMESTAMP] = coverItem.getDateInMs(); - mCoverItems.add(coverItem); + if (coverItem != null) { + row[AlbumSetLoader.INDEX_TIMESTAMP] = coverItem.getDateInMs(); + } + coverItems.add(coverItem); cursor.addRow(row); } + synchronized (mMediaSet) { + mCoverItems = coverItems; + } return cursor; } -- cgit v1.2.3