mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #123 from domdomegg/fix-creationdate

Browse source 
Fix date being set to start of unix time
This commit is contained in:
Josephine Lim 2016-06-13 00:08:16 +12:00 • committed by GitHub
commit bafcfd46ca
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
commons/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java
View file

@ -1,7 +1,11 @@
package fr.free.nrw.commons.upload; package fr.free.nrw.commons.upload;
import android.app.Activity; import android.app.Activity;
import android.content.*; import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.content.SharedPreferences;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
@ -10,14 +14,15 @@ import android.preference.PreferenceManager;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.text.TextUtils; import android.text.TextUtils;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
import fr.free.nrw.commons.contributions.Contribution;
import java.io.IOException;
import java.util.Date;
import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.HandlerService; import fr.free.nrw.commons.HandlerService;
import fr.free.nrw.commons.Prefs; import fr.free.nrw.commons.Prefs;
import fr.free.nrw.commons.Utils; import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.contributions.Contribution;
import java.io.IOException;
import java.util.Date;
public class UploadController { public class UploadController {
private UploadService uploadService; private UploadService uploadService;
@ -130,8 +135,15 @@ public class UploadController {
new String[]{MediaStore.Images.ImageColumns.DATE_TAKEN}, null, null, null); new String[]{MediaStore.Images.ImageColumns.DATE_TAKEN}, null, null, null);
if(cursor != null && cursor.getCount() != 0) { if(cursor != null && cursor.getCount() != 0) {
cursor.moveToFirst(); cursor.moveToFirst();
contribution.setDateCreated(new Date(cursor.getLong(0))); Date dateCreated = new Date(cursor.getLong(0));
} // FIXME: Alternate way of setting dateCreated if this data is not found if(dateCreated.equals(new Date(0))) {
// If date is incorrect (1st second of unix time) then set it to the current date
dateCreated = new Date();
}
contribution.setDateCreated(dateCreated);
} else {
contribution.setDateCreated(new Date());
}
} }
return contribution; return contribution;