X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/3a34911f3b39e2ed2188c09a7ac609c24ff74386..7f75f13f0c47b5cc4f5fe6a743a6fb8a9281fef7:/src/eu/alefzero/owncloud/files/services/FileUploader.java diff --git a/src/eu/alefzero/owncloud/files/services/FileUploader.java b/src/eu/alefzero/owncloud/files/services/FileUploader.java index 9f480fc0..8bdcedff 100644 --- a/src/eu/alefzero/owncloud/files/services/FileUploader.java +++ b/src/eu/alefzero/owncloud/files/services/FileUploader.java @@ -37,6 +37,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe public static final String KEY_REMOTE_FILE = "REMOTE_FILE"; public static final String KEY_ACCOUNT = "ACCOUNT"; public static final String KEY_UPLOAD_TYPE = "UPLOAD_TYPE"; + public static final String ACCOUNT_NAME = "ACCOUNT_NAME"; public static final int UPLOAD_SINGLE_FILE = 0; public static final int UPLOAD_MULTIPLE_FILES = 1; @@ -119,9 +120,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe if (mSuccessCounter == mLocalPaths.length) { message = getString(R.string.uploader_upload_succeed); } else { - message = getString(R.string.uploader_upload_failed); - if (mLocalPaths.length > 1) - message += " (" + mSuccessCounter + " / " + mLocalPaths.length + getString(R.string.uploader_files_uploaded_suffix) + ")"; + message = String.format(getString(R.string.uploader_upload_failed), mSuccessCounter, mLocalPaths.length); } Toast.makeText(this, message, Toast.LENGTH_SHORT).show(); } @@ -187,6 +186,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe Intent end = new Intent(UPLOAD_FINISH_MESSAGE); end.putExtra(EXTRA_PARENT_DIR_ID, parentDirId); + end.putExtra(ACCOUNT_NAME, mAccount.name); sendBroadcast(end); }