[WIP] Fix both timezone problem and saved date problem (#5019)

* Fix both timezone problem and saved date problem

* Fixaccidental test code and add comments

* Add issue link to the comments

* Fix format issue and null checks

Author: neslihanturan

app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt

@@ -38,6 +38,7 @@ data class Contribution constructor(
     val localUri: Uri? = null,
     var dataLength: Long = 0,
     var dateCreated: Date? = null,
+    var dateCreatedString: String? = null,
     var dateModified: Date? = null,
     var hasInvalidLocation : Int =  0,
     var contentUri: Uri? = null,
@@ -67,7 +68,8 @@ data class Contribution constructor(
         dateCreatedSource = "",
         depictedItems = depictedItems,
         wikidataPlace = from(item.place),
-        contentUri = item.contentUri
+        contentUri = item.contentUri,
+        dateCreatedString = item.fileCreatedDateString
     )
 
     /**

app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt

@@ -14,7 +14,7 @@ import fr.free.nrw.commons.upload.depicts.DepictsDao
  * The database for accessing the respective DAOs
  *
  */
-@Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class], version = 12, exportSchema = false)
+@Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class], version = 13, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun contributionDao(): ContributionDao

app/src/main/java/fr/free/nrw/commons/filepicker/UploadableFile.java

@@ -12,6 +12,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import fr.free.nrw.commons.upload.FileUtils;
@@ -124,13 +126,30 @@ private DateTimeWithSource getFileCreatedDateFromCP(Context context) {
     private DateTimeWithSource getDateTimeFromExif() {
         try {
             ExifInterface exif = new ExifInterface(file.getAbsolutePath());
-            @SuppressLint("RestrictedApi") Long dateTime = exif.getDateTime();
-            if(dateTime != null){
-                Date date = new Date(dateTime);
-                return new DateTimeWithSource(date, DateTimeWithSource.EXIF_SOURCE);
+            // TAG_DATETIME returns the last edited date, we need TAG_DATETIME_ORIGINAL for creation date
+            // See issue https://github.com/commons-app/apps-android-commons/issues/1971
+            String dateTimeSubString = exif.getAttribute(ExifInterface.TAG_DATETIME_ORIGINAL);
+            if (dateTimeSubString!=null) { //getAttribute may return null
+                String year = dateTimeSubString.substring(0,4);
+                String month = dateTimeSubString.substring(5,7);
+                String day = dateTimeSubString.substring(8,10);
+                // This date is stored as a string (not as a date), the rason is we don't want to include timezones
+                String dateCreatedString = String.format("%04d-%02d-%02d", Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day));
+                if (dateCreatedString.length() == 10) { //yyyy-MM-dd format of date is expected
+                    @SuppressLint("RestrictedApi") Long dateTime = exif.getDateTimeOriginal();
+                    if(dateTime != null){
+                        Date date = new Date(dateTime);
+                        return new DateTimeWithSource(date, dateCreatedString, DateTimeWithSource.EXIF_SOURCE);
+                    }
+                }
             }
+
         } catch (IOException e) {
             e.printStackTrace();
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        } catch (IndexOutOfBoundsException e) {
+            e.printStackTrace();
         }
         return null;
     }
@@ -149,6 +168,7 @@ public class DateTimeWithSource {
         public static final String EXIF_SOURCE = "exif";
 
         private final long epochDate;
+        private String dateString; // this does not includes timezone information
         private final String source;
 
         public DateTimeWithSource(long epochDate, String source) {
@@ -161,10 +181,20 @@ public DateTimeWithSource(Date date, String source) {
             this.source = source;
         }
 
+        public DateTimeWithSource(Date date, String dateString, String source) {
+            this.epochDate = date.getTime();
+            this.dateString = dateString;
+            this.source = source;
+        }
+
         public long getEpochDate() {
             return epochDate;
         }
 
+        public String getDateString() {
+            return dateString;
+        }
+
         public String getSource() {
             return source;
         }

app/src/main/java/fr/free/nrw/commons/upload/PageContentsCreator.java

@@ -48,7 +48,7 @@ public String createFrom(final Contribution contribution) {
             .append(media.getAuthor()).append("]]\n");
 
         final String templatizedCreatedDate = getTemplatizedCreatedDate(
-            contribution.getDateCreated(), contribution.getDateCreatedSource());
+            contribution.getDateCreatedString(), contribution.getDateCreated(), contribution.getDateCreatedSource());
         if (!StringUtils.isBlank(templatizedCreatedDate)) {
             buffer.append("|date=").append(templatizedCreatedDate);
         }
@@ -90,12 +90,12 @@ public String createFrom(final Contribution contribution) {
      * @param dateCreatedSource
      * @return
      */
-    private String getTemplatizedCreatedDate(Date dateCreated, String dateCreatedSource) {
+    private String getTemplatizedCreatedDate(String dateCreatedString, Date dateCreated, String dateCreatedSource) {
         if (dateCreated != null) {
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
             return String.format(Locale.ENGLISH,
                 isExif(dateCreatedSource) ? TEMPLATE_DATE_ACC_TO_EXIF : TEMPLATE_DATA_OTHER_SOURCE,
-                dateFormat.format(dateCreated)
+                isExif(dateCreatedSource) ? dateCreatedString: dateFormat.format(dateCreated)
             ) + "\n";
         }
         return "";

app/src/main/java/fr/free/nrw/commons/upload/UploadItem.java

@@ -25,6 +25,7 @@ public class UploadItem {
     private boolean hasInvalidLocation;
     private boolean isWLMUpload = false;
     private String countryCode;
+    private String fileCreatedDateString; //according to EXIF data
 
     /**
      * Uri of uploadItem
@@ -40,7 +41,8 @@ public class UploadItem {
         final Place place,
         final long createdTimestamp,
         final String createdTimestampSource,
-        final Uri contentUri) {
+        final Uri contentUri,
+        final String fileCreatedDateString) {
         this.createdTimestampSource = createdTimestampSource;
         uploadMediaDetails = new ArrayList<>(Collections.singletonList(new UploadMediaDetail()));
         this.place = place;
@@ -50,6 +52,7 @@ public class UploadItem {
         this.createdTimestamp = createdTimestamp;
         this.contentUri = contentUri;
         imageQuality = BehaviorSubject.createDefault(ImageUtils.IMAGE_WAIT);
+        this.fileCreatedDateString = fileCreatedDateString;
     }
 
     public String getCreatedTimestampSource() {
@@ -83,6 +86,8 @@ public int getImageQuality() {
      */
     public Uri getContentUri() { return contentUri; }
 
+    public String getFileCreatedDateString() { return fileCreatedDateString; }
+
     public void setImageQuality(final int imageQuality) {
       this.imageQuality.onNext(imageQuality);
     }

app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

@@ -102,8 +102,10 @@ private UploadItem createAndAddUploadItem(final UploadableFile uploadableFile,
                 .getFileCreatedDate(context);
         long fileCreatedDate = -1;
         String createdTimestampSource = "";
+        String fileCreatedDateString = "";
         if (dateTimeWithSource != null) {
             fileCreatedDate = dateTimeWithSource.getEpochDate();
+            fileCreatedDateString = dateTimeWithSource.getDateString();
             createdTimestampSource = dateTimeWithSource.getSource();
         }
         Timber.d("File created date is %d", fileCreatedDate);
@@ -113,7 +115,8 @@ private UploadItem createAndAddUploadItem(final UploadableFile uploadableFile,
             Uri.parse(uploadableFile.getFilePath()),
                 uploadableFile.getMimeType(context), imageCoordinates, place, fileCreatedDate,
                 createdTimestampSource,
-                uploadableFile.getContentUri());
+                uploadableFile.getContentUri(),
+                fileCreatedDateString);
         if (place != null) {
             uploadItem.getUploadMediaDetails().set(0, new UploadMediaDetail(place));
         }