From f755e132bac0159dbdafed408f00d96e77e4ae9b Mon Sep 17 00:00:00 2001 From: Venkat Krishnaraj Date: Fri, 4 Dec 2009 00:26:35 -0800 Subject: [PATCH] Date added bug fix Crop bug fix --- src/com/cooliris/cache/CacheService.java | 7 +++---- src/com/cooliris/media/LocalDataSource.java | 5 +++++ src/com/cooliris/media/MediaClustering.java | 2 +- src/com/cooliris/media/ReverseGeocoder.java | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/com/cooliris/cache/CacheService.java b/src/com/cooliris/cache/CacheService.java index bf20af23e..68c4ea52c 100644 --- a/src/com/cooliris/cache/CacheService.java +++ b/src/com/cooliris/cache/CacheService.java @@ -43,6 +43,7 @@ import android.util.Log; import com.cooliris.media.DataSource; import com.cooliris.media.DiskCache; import com.cooliris.media.Gallery; +import com.cooliris.media.ImageManager; import com.cooliris.media.LocalDataSource; import com.cooliris.media.LongSparseArray; import com.cooliris.media.MediaFeed; @@ -68,10 +69,8 @@ public final class CacheService extends IntentService { private static final int DEFAULT_THUMBNAIL_WIDTH = 128; private static final int DEFAULT_THUMBNAIL_HEIGHT = 96; - public static final String DEFAULT_IMAGE_SORT_ORDER = Images.ImageColumns.DATE_TAKEN + " ASC, " - + Images.ImageColumns.DATE_ADDED + " ASC"; - public static final String DEFAULT_VIDEO_SORT_ORDER = Video.VideoColumns.DATE_TAKEN + " ASC, " + Video.VideoColumns.DATE_ADDED - + " ASC"; + public static final String DEFAULT_IMAGE_SORT_ORDER = Images.ImageColumns.DATE_TAKEN + " ASC"; + public static final String DEFAULT_VIDEO_SORT_ORDER = Video.VideoColumns.DATE_TAKEN + " ASC"; public static final String DEFAULT_BUCKET_SORT_ORDER = "upper(" + Images.ImageColumns.BUCKET_DISPLAY_NAME + ") ASC"; // Must preserve order between these indices and the order of the terms in diff --git a/src/com/cooliris/media/LocalDataSource.java b/src/com/cooliris/media/LocalDataSource.java index e6b89ac6b..1ff37a3c2 100644 --- a/src/com/cooliris/media/LocalDataSource.java +++ b/src/com/cooliris/media/LocalDataSource.java @@ -65,6 +65,11 @@ public final class LocalDataSource implements DataSource { Handler handler = ((Gallery) mContext).getHandler(); ContentObserver observer = new ContentObserver(handler) { public void onChange(boolean selfChange) { + MediaSet mediaSet = feed.getCurrentSet(); + if (mediaSet != null) { + CacheService.markDirtyImmediate(mediaSet.mId); + refreshUI(feed, mediaSet.mId); + } CacheService.senseDirty(mContext, new CacheService.Observer() { public void onChange(long[] ids) { if (ids != null) { diff --git a/src/com/cooliris/media/MediaClustering.java b/src/com/cooliris/media/MediaClustering.java index fa45a984d..29b1cd43f 100644 --- a/src/com/cooliris/media/MediaClustering.java +++ b/src/com/cooliris/media/MediaClustering.java @@ -18,7 +18,7 @@ import android.content.res.Resources; public final class MediaClustering { // If 2 items are greater than 25 miles apart, they will be in different clusters. - private static final int GEOGRAPHIC_DISTANCE_CUTOFF_IN_MILES = 25; + private static final int GEOGRAPHIC_DISTANCE_CUTOFF_IN_MILES = 20; // Do not want to split based on anything under 1 min. private static final long MIN_CLUSTER_SPLIT_TIME_IN_MS = 60000L; diff --git a/src/com/cooliris/media/ReverseGeocoder.java b/src/com/cooliris/media/ReverseGeocoder.java index b49098799..aa8058380 100644 --- a/src/com/cooliris/media/ReverseGeocoder.java +++ b/src/com/cooliris/media/ReverseGeocoder.java @@ -19,7 +19,7 @@ public final class ReverseGeocoder extends Thread { private static final int MAX_COUNTRY_NAME_LENGTH = 8; // If two points are within 50 miles of each other, use "Around Palo Alto, CA" or "Around Mountain View, CA". // instead of directly jumping to the next level and saying "California, US". - private static final int MAX_LOCALITY_MILE_RANGE = 50; + private static final int MAX_LOCALITY_MILE_RANGE = 20; private static final Deque sQueue = new Deque(); private static final DiskCache sGeoCache = new DiskCache("geocoder-cache"); private static final String TAG = "ReverseGeocoder"; -- 2.11.0