mirror
/
aprsdroid
kopia lustrzana https://github.com/ge0rg/aprsdroid
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix Android 6.0 Crash & Incompatibilities

pull/369/head
Mike 2024-12-21 14:08:04 -08:00
rodzic 69f8ddc737
commit b223d5946b
2 zmienionych plików z 8 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
src/AprsService.scala
Wyświetl plik

@ -10,7 +10,6 @@ import _root_.android.widget.Toast
import _root_.net.ab0oo.aprs.parser._ import _root_.net.ab0oo.aprs.parser._
import scala.collection.mutable import scala.collection.mutable
import java.time.Instant
object AprsService { object AprsService {
val PACKAGE = "org.aprsdroid.app" val PACKAGE = "org.aprsdroid.app"

15
src/DigipeaterService.scala
Wyświetl plik

@ -2,7 +2,7 @@ package org.aprsdroid.app
import _root_.android.util.Log import _root_.android.util.Log
import scala.collection.mutable import scala.collection.mutable
import _root_.net.ab0oo.aprs.parser._ import _root_.net.ab0oo.aprs.parser._
import java.time.Instant import java.util.Date
class DigipeaterService(prefs: PrefsWrapper, TAG: String, sendDigipeatedPacket: String => Unit) { class DigipeaterService(prefs: PrefsWrapper, TAG: String, sendDigipeatedPacket: String => Unit) {
private val recentDigipeats: mutable.Map[String, Instant] = mutable.Map() private val recentDigipeats: mutable.Map[String, Instant] = mutable.Map()
@ -14,7 +14,7 @@ class DigipeaterService(prefs: PrefsWrapper, TAG: String, sendDigipeatedPacket:
def storeDigipeat(sourceCall: String, destinationCall: String, payload: String): Unit = { def storeDigipeat(sourceCall: String, destinationCall: String, payload: String): Unit = {
// Unique identifier using source call, destination call, and payload // Unique identifier using source call, destination call, and payload
val key = s"$sourceCall>$destinationCall:$payload" val key = s"$sourceCall>$destinationCall:$payload"
recentDigipeats(key) = Instant.now() // Store the current timestamp recentDigipeats(key) = new.Date() // Store the current timestamp
} }
// Function to filter digipeats that are older than dedupeTime seconds // Function to filter digipeats that are older than dedupeTime seconds
@ -23,8 +23,9 @@ class DigipeaterService(prefs: PrefsWrapper, TAG: String, sendDigipeatedPacket:
val key = s"$sourceCall>$destinationCall:$payload" val key = s"$sourceCall>$destinationCall:$payload"
recentDigipeats.get(key) match { recentDigipeats.get(key) match {
case Some(timestamp) => case Some(timestamp) =>
// Check if the packet was heard within the last 30 seconds // Check if the packet was heard within the last dedupeTime seconds
Instant.now().isBefore(timestamp.plusSeconds(dedupeTime)) val now = new Date()
now.getTime - timestamp.getTime < (dedupeTime * 1000)
case None => case None =>
false // Not found in recent digipeats false // Not found in recent digipeats
} }
@ -32,10 +33,10 @@ class DigipeaterService(prefs: PrefsWrapper, TAG: String, sendDigipeatedPacket:
// Function to clean up old entries // Function to clean up old entries
def cleanupOldDigipeats(): Unit = { def cleanupOldDigipeats(): Unit = {
val now = Instant.now() val now = new Date()
// Retain only those digipeats that are within the last 30 seconds // Retain only those digipeats that are within the last dedupeTime seconds
recentDigipeats.retain { case (_, timestamp) => recentDigipeats.retain { case (_, timestamp) =>
now.isBefore(timestamp.plusSeconds(dedupeTime)) now.getTime - timestamp.getTime < (dedupeTime * 1000)
} }
} }