From da3e40b7913f949ab77944ccb516856b69ec6ce5 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Sun, 17 Mar 2013 15:15:04 +0530 Subject: [PATCH] Make sequence numbers work for multiple uploads --- .../java/org/wikimedia/commons/MultipleShareActivity.java | 4 +++- .../org/wikimedia/commons/MultipleUploadListFragment.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java b/commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java index 1728d43eb..66cc0b450 100644 --- a/commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java +++ b/commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java @@ -148,10 +148,12 @@ public class MultipleShareActivity extends AuthenticatedActivity { if(intent.getAction() == Intent.ACTION_SEND_MULTIPLE) { ArrayList urisList = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM); - for(Uri uri: urisList) { + for(int i=0; i < urisList.size(); i++) { Contribution up = new Contribution(); + Uri uri = urisList.get(i); up.setLocalUri(uri); up.setTag("mimeType", intent.getType()); + up.setTag("sequence", i); photosList.add(up); } diff --git a/commons/src/main/java/org/wikimedia/commons/MultipleUploadListFragment.java b/commons/src/main/java/org/wikimedia/commons/MultipleUploadListFragment.java index daf283a42..d3c4464ec 100644 --- a/commons/src/main/java/org/wikimedia/commons/MultipleUploadListFragment.java +++ b/commons/src/main/java/org/wikimedia/commons/MultipleUploadListFragment.java @@ -125,7 +125,7 @@ public class MultipleUploadListFragment extends SherlockFragment { Boolean isDirty = (Boolean)up.getTag("isDirty"); if(isDirty == null || !isDirty) { if(!TextUtils.isEmpty(charSequence)) { - up.setFilename(charSequence.toString() + " - " + i); + up.setFilename(charSequence.toString() + " - " + ((Integer)up.getTag("sequence") + 1)); } else { up.setFilename(""); }