X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/58c569b968a829975b4767b7396d4b55c896fd03..77ddd1ccb62e8b70580b8f410dda703a269f224f:/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java?ds=inline diff --git a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java index d39f8ce7..8d3912d9 100644 --- a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java +++ b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java @@ -30,6 +30,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; @@ -40,7 +42,7 @@ import android.util.Log; * * @author David A. Velasco */ -public class ChunkFromFileChannelRequestEntity implements RequestEntity { +public class ChunkFromFileChannelRequestEntity implements RequestEntity, ProgressiveDataTransferer { private static final String TAG = ChunkFromFileChannelRequestEntity.class.getSimpleName(); @@ -90,16 +92,25 @@ public class ChunkFromFileChannelRequestEntity implements RequestEntity { 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); + } } @@ -116,9 +127,11 @@ public class ChunkFromFileChannelRequestEntity implements RequestEntity { out.write(mBuffer.array(), 0, readCount); mBuffer.clear(); mTransferred += readCount; - it = mDataTransferListeners.iterator(); - while (it.hasNext()) { - it.next().onTransferProgress(readCount, mTransferred, size, mFile.getName()); + synchronized (mDataTransferListeners) { + it = mDataTransferListeners.iterator(); + while (it.hasNext()) { + it.next().onTransferProgress(readCount, mTransferred, size, mFile.getName()); + } } }