Skip to content

Commit 2e4264c

Browse files
committed
Add constructor to StartUploadTask that takes a contribution
1 parent 90eb0d8 commit 2e4264c

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ protected Void doInBackground(Void... voids) {
8282
}
8383
}
8484

85-
StartUploadTask startUploadTask = new StartUploadTask(MultipleShareActivity.this, uploadService, up.getFilename(), up.getLocalUri(), up.getDescription(), (String)up.getTag("mimeType"), Contribution.SOURCE_EXTERNAL);
85+
StartUploadTask startUploadTask = new StartUploadTask(MultipleShareActivity.this, uploadService, up);
8686
try {
8787
Utils.executeAsyncTask(startUploadTask);
8888
startUploadTask.get();

commons/src/main/java/org/wikimedia/commons/StartUploadTask.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public StartUploadTask(Activity context, UploadService uploadService, String raw
4141
public StartUploadTask(Activity context, UploadService uploadService, Contribution contribution) {
4242
this.context = context;
4343
this.uploadService = uploadService;
44+
this.contribution = contribution;
4445

4546
app = (CommonsApplication)context.getApplicationContext();
4647
}
@@ -52,7 +53,7 @@ protected Contribution doInBackground(Void... voids) {
5253

5354
long length;
5455
try {
55-
if(contribution.getDataLength() == -1) {
56+
if(contribution.getDataLength() <= 0) {
5657
length = context.getContentResolver().openAssetFileDescriptor(contribution.getLocalUri(), "r").getLength();
5758
if(length == -1) {
5859
// Let us find out the long way!

commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public void setImageUrl(String imageUrl) {
177177
}
178178

179179
public Contribution() {
180-
// Empty constructor for being constructed by our static methods
180+
timestamp = new Date(System.currentTimeMillis());
181181
}
182182

183183
public static Contribution fromCursor(Cursor cursor) {

0 commit comments

Comments
 (0)