From 2e4264c16ce0e20d38f3605af22d4b90fd52683b Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Thu, 21 Mar 2013 00:35:26 +0530
Subject: [PATCH] Add constructor to StartUploadTask that takes a contribution

---
 .../main/java/org/wikimedia/commons/MultipleShareActivity.java | 2 +-
 .../src/main/java/org/wikimedia/commons/StartUploadTask.java   | 3 ++-
 .../java/org/wikimedia/commons/contributions/Contribution.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java b/commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java
index ac427a30f..b65073414 100644
--- a/commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java
@@ -82,7 +82,7 @@ public  class       MultipleShareActivity
                     }
                 }
 
-                StartUploadTask startUploadTask = new StartUploadTask(MultipleShareActivity.this, uploadService,  up.getFilename(),  up.getLocalUri(),  up.getDescription(), (String)up.getTag("mimeType"), Contribution.SOURCE_EXTERNAL);
+                StartUploadTask startUploadTask = new StartUploadTask(MultipleShareActivity.this, uploadService, up);
                 try {
                     Utils.executeAsyncTask(startUploadTask);
                     startUploadTask.get();
diff --git a/commons/src/main/java/org/wikimedia/commons/StartUploadTask.java b/commons/src/main/java/org/wikimedia/commons/StartUploadTask.java
index 6e3d62739..cefd055f0 100644
--- a/commons/src/main/java/org/wikimedia/commons/StartUploadTask.java
+++ b/commons/src/main/java/org/wikimedia/commons/StartUploadTask.java
@@ -41,6 +41,7 @@ public class StartUploadTask extends AsyncTask<Void, Void, Contribution> {
     public StartUploadTask(Activity context, UploadService uploadService, Contribution contribution) {
         this.context = context;
         this.uploadService = uploadService;
+        this.contribution = contribution;
 
         app = (CommonsApplication)context.getApplicationContext();
     }
@@ -52,7 +53,7 @@ public class StartUploadTask extends AsyncTask<Void, Void, Contribution> {
 
         long length;
         try {
-            if(contribution.getDataLength() == -1) {
+            if(contribution.getDataLength() <= 0) {
                 length = context.getContentResolver().openAssetFileDescriptor(contribution.getLocalUri(), "r").getLength();
                 if(length == -1) {
                     // Let us find out the long way!
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java b/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
index abf581e64..2c3c4f316 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
@@ -177,7 +177,7 @@ public class Contribution extends Media {
     }
 
     public Contribution() {
-        // Empty constructor for being constructed by our static methods
+        timestamp = new Date(System.currentTimeMillis());
     }
 
     public static Contribution fromCursor(Cursor cursor) {