diff --git a/src/main/java/jtorrent/domain/torrent/model/Torrent.java b/src/main/java/jtorrent/domain/torrent/model/Torrent.java index 11ca3f2e..3b95fb6a 100644 --- a/src/main/java/jtorrent/domain/torrent/model/Torrent.java +++ b/src/main/java/jtorrent/domain/torrent/model/Torrent.java @@ -253,7 +253,7 @@ public Observable getDownloadRateObservable() { return downloadRateObservable; } - public Observable getDownloadedObservable() { + public Observable getDownloadedObservable() { return torrentStatistics.getDownloadedObservable(); } @@ -267,7 +267,7 @@ public Observable getUploadRateObservable() { return uploadRateObservable; } - public Observable getUploadedObservable() { + public Observable getUploadedObservable() { return torrentStatistics.getUploadedObservable(); } diff --git a/src/main/java/jtorrent/domain/torrent/model/TorrentStatistics.java b/src/main/java/jtorrent/domain/torrent/model/TorrentStatistics.java index c6971132..55a0aa54 100644 --- a/src/main/java/jtorrent/domain/torrent/model/TorrentStatistics.java +++ b/src/main/java/jtorrent/domain/torrent/model/TorrentStatistics.java @@ -1,19 +1,19 @@ package jtorrent.domain.torrent.model; -import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.subjects.BehaviorSubject; public class TorrentStatistics { - private final AtomicInteger downloaded = new AtomicInteger(0); - private final BehaviorSubject downloadedSubject = BehaviorSubject.createDefault(0); + private final AtomicLong downloaded = new AtomicLong(0); + private final BehaviorSubject downloadedSubject = BehaviorSubject.createDefault(0L); - private final AtomicInteger uploaded = new AtomicInteger(0); - private final BehaviorSubject uploadedSubject = BehaviorSubject.createDefault(0); + private final AtomicLong uploaded = new AtomicLong(0); + private final BehaviorSubject uploadedSubject = BehaviorSubject.createDefault(0L); - public void incrementDownloaded(int bytes) { + public void incrementDownloaded(long bytes) { downloadedSubject.onNext(downloaded.addAndGet(bytes)); } @@ -25,7 +25,7 @@ public long getDownloaded() { return downloaded.get(); } - public Observable getDownloadedObservable() { + public Observable getDownloadedObservable() { return downloadedSubject; } @@ -33,7 +33,7 @@ public long getUploaded() { return uploaded.get(); } - public Observable getUploadedObservable() { + public Observable getUploadedObservable() { return uploadedSubject; } }