X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/58c569b968a829975b4767b7396d4b55c896fd03..77ddd1ccb62e8b70580b8f410dda703a269f224f:/src/eu/alefzero/webdav/FileRequestEntity.java diff --git a/src/eu/alefzero/webdav/FileRequestEntity.java b/src/eu/alefzero/webdav/FileRequestEntity.java index 3adaa3a8..d60eabf1 100644 --- a/src/eu/alefzero/webdav/FileRequestEntity.java +++ b/src/eu/alefzero/webdav/FileRequestEntity.java @@ -32,6 +32,8 @@ import java.util.Set; import org.apache.commons.httpclient.methods.RequestEntity; +import com.owncloud.android.network.ProgressiveDataTransferer; + import eu.alefzero.webdav.OnDatatransferProgressListener; import android.util.Log; @@ -41,7 +43,7 @@ import android.util.Log; * A RequestEntity that represents a File. * */ -public class FileRequestEntity implements RequestEntity { +public class FileRequestEntity implements RequestEntity, ProgressiveDataTransferer { final File mFile; final String mContentType; @@ -70,17 +72,26 @@ public class FileRequestEntity implements RequestEntity { public boolean isRepeatable() { return true; } - - public void addOnDatatransferProgressListener(OnDatatransferProgressListener listener) { - mDataTransferListeners.add(listener); + + @Override + public void addDatatransferProgressListener(OnDatatransferProgressListener listener) { + synchronized (mDataTransferListeners) { + mDataTransferListeners.add(listener); + } } - public void addOnDatatransferProgressListeners(Collection listeners) { - mDataTransferListeners.addAll(listeners); + @Override + public void addDatatransferProgressListeners(Collection listeners) { + synchronized (mDataTransferListeners) { + mDataTransferListeners.addAll(listeners); + } } - public void removeOnDatatransferProgressListener(OnDatatransferProgressListener listener) { - mDataTransferListeners.remove(listener); + @Override + public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) { + synchronized (mDataTransferListeners) { + mDataTransferListeners.remove(listener); + } } @@ -103,9 +114,11 @@ public class FileRequestEntity implements RequestEntity { out.write(tmp.array(), 0, readResult); tmp.clear(); transferred += readResult; - it = mDataTransferListeners.iterator(); - while (it.hasNext()) { - it.next().onTransferProgress(readResult, transferred, size, mFile.getName()); + synchronized (mDataTransferListeners) { + it = mDataTransferListeners.iterator(); + while (it.hasNext()) { + it.next().onTransferProgress(readResult, transferred, size, mFile.getName()); + } } }