brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix real-time traffic not accumulating all results

Browse Source
This commit is contained in:
Mygod
2018-10-03 15:06:37 +08:00
parent 913e21328e
commit 043fcae56a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt
View File

@@ -163,9 +163,14 @@ class ClientsFragment : Fragment(), ServiceConnection {
fun updateTraffic(newRecords: Collection<TrafficRecord>, oldRecords: LongSparseArray<TrafficRecord>) { fun updateTraffic(newRecords: Collection<TrafficRecord>, oldRecords: LongSparseArray<TrafficRecord>) {
val clientsLookup = clientsLookup ?: return val clientsLookup = clientsLookup ?: return
val seenClients = HashSet<Client>()
for (newRecord in newRecords) { for (newRecord in newRecords) {
val oldRecord = oldRecords[newRecord.previousId ?: continue] ?: continue val oldRecord = oldRecords[newRecord.previousId ?: continue] ?: continue
val client = clientsLookup[newRecord.mac] val client = clientsLookup[newRecord.mac]
if (seenClients.add(client)) {
client.sendRate = 0
client.receiveRate = 0
}
val elapsed = newRecord.timestamp - oldRecord.timestamp val elapsed = newRecord.timestamp - oldRecord.timestamp
if (elapsed == 0L) { if (elapsed == 0L) {
check(newRecord.sentPackets == oldRecord.sentPackets) check(newRecord.sentPackets == oldRecord.sentPackets)
@@ -173,8 +178,8 @@ class ClientsFragment : Fragment(), ServiceConnection {
check(newRecord.receivedPackets == oldRecord.receivedPackets) check(newRecord.receivedPackets == oldRecord.receivedPackets)
check(newRecord.receivedBytes == oldRecord.receivedBytes) check(newRecord.receivedBytes == oldRecord.receivedBytes)
} else { } else {
client.sendRate = (newRecord.sentBytes - oldRecord.sentBytes) * 1000 / elapsed client.sendRate += (newRecord.sentBytes - oldRecord.sentBytes) * 1000 / elapsed
client.receiveRate = (newRecord.receivedBytes - oldRecord.receivedBytes) * 1000 / elapsed client.receiveRate += (newRecord.receivedBytes - oldRecord.receivedBytes) * 1000 / elapsed
client.notifyPropertyChanged(BR.description) client.notifyPropertyChanged(BR.description)
} }
} }