From cad50fb4c68d75c57626c37be39641a0258c166a Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Thu, 21 Mar 2013 21:16:55 +0530 Subject: [PATCH] Set user name properly for multiple uploads! --- commons/src/main/java/org/wikimedia/commons/Media.java | 8 ++++++++ .../main/java/org/wikimedia/commons/StartUploadTask.java | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/commons/src/main/java/org/wikimedia/commons/Media.java b/commons/src/main/java/org/wikimedia/commons/Media.java index 181f70def..cfe177cb3 100644 --- a/commons/src/main/java/org/wikimedia/commons/Media.java +++ b/commons/src/main/java/org/wikimedia/commons/Media.java @@ -95,6 +95,10 @@ public class Media implements Parcelable { return creator; } + public void setCreator(String creator) { + this.creator = creator; + } + public String getThumbnailUrl(int width) { return Utils.makeThumbUrl(imageUrl, filename, width); } @@ -149,4 +153,8 @@ public class Media implements Parcelable { creator = in.readString(); tags = (HashMap)in.readSerializable(); } + + public void setDescription(String description) { + this.description = description; + } } diff --git a/commons/src/main/java/org/wikimedia/commons/StartUploadTask.java b/commons/src/main/java/org/wikimedia/commons/StartUploadTask.java index d48467aed..706c0c140 100644 --- a/commons/src/main/java/org/wikimedia/commons/StartUploadTask.java +++ b/commons/src/main/java/org/wikimedia/commons/StartUploadTask.java @@ -5,6 +5,7 @@ import android.database.Cursor; import android.net.*; import android.os.*; import android.provider.*; +import android.text.TextUtils; import android.webkit.MimeTypeMap; import java.io.*; @@ -60,6 +61,14 @@ public class StartUploadTask extends AsyncTask { throw new RuntimeException(e); } + if(TextUtils.isEmpty(contribution.getCreator())) { + contribution.setCreator(app.getCurrentAccount().name); + } + + if(contribution.getDescription() == null) { + contribution.setDescription(""); + } + String mimeType = (String)contribution.getTag("mimeType"); String extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType);