From ae3f55df87cf2cebd7dd73ec2e3694335b9a2a5c Mon Sep 17 00:00:00 2001
From: Mahdi Ghorbani <mahdi.ghorbani@gmail.com>
Date: Mon, 10 Oct 2022 10:34:59 +0330
Subject: [PATCH] fix(android): filter by timestamp

---
 .../cameraroll/CameraRollModule.java                   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/android/src/main/java/com/reactnativecommunity/cameraroll/CameraRollModule.java b/android/src/main/java/com/reactnativecommunity/cameraroll/CameraRollModule.java
index 02a3170..d6af5ff 100644
--- a/android/src/main/java/com/reactnativecommunity/cameraroll/CameraRollModule.java
+++ b/android/src/main/java/com/reactnativecommunity/cameraroll/CameraRollModule.java
@@ -398,12 +398,18 @@ public class CameraRollModule extends ReactContextBaseJavaModule {
       }
 
       if (mFromTime > 0) {
-        selection.append(" AND " + Images.Media.DATE_TAKEN + " > ?");
+        long addedDate = mFromTime / 1000;
+        selection.append(" AND (" + Images.Media.DATE_TAKEN + " > ? OR ( " + Images.Media.DATE_TAKEN
+                + " IS NULL AND " + Images.Media.DATE_ADDED + "> ? ))");
         selectionArgs.add(mFromTime + "");
+        selectionArgs.add(addedDate + "");
       }
       if (mToTime > 0) {
-        selection.append(" AND " + Images.Media.DATE_TAKEN + " <= ?");
+        long addedDate = mToTime / 1000;
+        selection.append(" AND (" + Images.Media.DATE_TAKEN + " <= ? OR ( " + Images.Media.DATE_TAKEN
+                + " IS NULL AND " + Images.Media.DATE_ADDED + " <= ? ))");
         selectionArgs.add(mToTime + "");
+        selectionArgs.add(addedDate + "");
       }
 
       WritableMap response = new WritableNativeMap();