From 5313f8c6a870b8d6405753daa93a141d630fc12a Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Thu, 23 Feb 2023 05:46:32 +0000 Subject: [PATCH] Revert "Gallery2: Try to extract datetaken from exif if mediastore returns 0" Opening gallery with many images and videos is taking lots of time so revert it for now. This reverts commit 0769f9d71a84e11d9c6c03843817085e107df2fb. --- src/com/android/gallery3d/data/LocalImage.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java index 9ae42f752..1b5c88b26 100755 --- a/src/com/android/gallery3d/data/LocalImage.java +++ b/src/com/android/gallery3d/data/LocalImage.java @@ -46,7 +46,6 @@ import com.android.gallery3d.util.UpdateHelper; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import java.lang.Exception; // LocalImage represents an image in the local storage. public class LocalImage extends LocalMediaItem { @@ -147,7 +146,6 @@ public class LocalImage extends LocalMediaItem { fileSize = cursor.getLong(INDEX_SIZE); width = cursor.getInt(INDEX_WIDTH); height = cursor.getInt(INDEX_HEIGHT); - dateTakenInMs = extractDateTaken(dateTakenInMs); } @Override @@ -158,7 +156,7 @@ public class LocalImage extends LocalMediaItem { latitude = uh.update(latitude, cursor.getDouble(INDEX_LATITUDE)); longitude = uh.update(longitude, cursor.getDouble(INDEX_LONGITUDE)); dateTakenInMs = uh.update( - dateTakenInMs, extractDateTaken(cursor.getLong(INDEX_DATE_TAKEN))); + dateTakenInMs, cursor.getLong(INDEX_DATE_TAKEN)); dateAddedInSec = uh.update( dateAddedInSec, cursor.getLong(INDEX_DATE_ADDED)); dateModifiedInSec = uh.update( @@ -179,18 +177,6 @@ public class LocalImage extends LocalMediaItem { type, filePath, mimeType); } - private long extractDateTaken(long dateTaken) { - if (dateTaken == 0) { - MediaDetails details = super.getDetails(); - MediaDetails.extractExifInfo(details, filePath); - try { - return ExifInterface.DATETIME_FORMAT.parse( - details.getDetail(MediaDetails.INDEX_DATETIME_ORIGINAL).toString()).getTime(); - } catch (Exception e) {} - } - return dateTaken; - } - public static class LocalImageRequest extends ImageCacheRequest { private String mLocalFilePath; -- GitLab