kopia lustrzana https://github.com/ge0rg/aprsdroid
use PrefsWrapper everywhere
rodzic
3240a5b309
commit
3c09dc782c
|
@ -128,7 +128,7 @@ class APRSdroid extends Activity with OnClickListener
|
||||||
|
|
||||||
def checkConfig() : Boolean = {
|
def checkConfig() : Boolean = {
|
||||||
val callsign = prefs.getCallsign()
|
val callsign = prefs.getCallsign()
|
||||||
val passcode = prefs.getString("passcode", "")
|
val passcode = prefs.getPasscode()
|
||||||
if (callsign == "") {
|
if (callsign == "") {
|
||||||
openPrefs(R.string.firstrun)
|
openPrefs(R.string.firstrun)
|
||||||
return false
|
return false
|
||||||
|
@ -138,8 +138,7 @@ class APRSdroid extends Activity with OnClickListener
|
||||||
return false
|
return false
|
||||||
} else passcodeWarning(callsign, passcode)
|
} else passcodeWarning(callsign, passcode)
|
||||||
|
|
||||||
val intval = prefs.getString("interval", "10")
|
if (prefs.getStringInt("interval", 10) < 1) {
|
||||||
if (intval == "" || intval.toInt < 1) {
|
|
||||||
openPrefs(R.string.mininterval)
|
openPrefs(R.string.mininterval)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
@ -202,7 +201,7 @@ class APRSdroid extends Activity with OnClickListener
|
||||||
|
|
||||||
view.getId match {
|
view.getId match {
|
||||||
case R.id.singlebtn =>
|
case R.id.singlebtn =>
|
||||||
passcodeWarning(prefs.getCallsign(), prefs.getString("passcode", ""))
|
passcodeWarning(prefs.getCallsign(), prefs.getPasscode())
|
||||||
startService(AprsService.intent(this, AprsService.SERVICE_ONCE))
|
startService(AprsService.intent(this, AprsService.SERVICE_ONCE))
|
||||||
case R.id.startstopbtn =>
|
case R.id.startstopbtn =>
|
||||||
val is_running = AprsService.running
|
val is_running = AprsService.running
|
||||||
|
|
|
@ -78,8 +78,8 @@ class AprsService extends Service with LocationListener {
|
||||||
running = true
|
running = true
|
||||||
|
|
||||||
// get update interval and distance
|
// get update interval and distance
|
||||||
val upd_int = prefs.getString("interval", "10").toInt
|
val upd_int = prefs.getStringInt("interval", 10)
|
||||||
val upd_dist = prefs.getString("distance", "10").toInt
|
val upd_dist = prefs.getStringInt("distance", 10)
|
||||||
|
|
||||||
// display notification (even though we are not actually started yet,
|
// display notification (even though we are not actually started yet,
|
||||||
// but we need this to prevent error message reordering)
|
// but we need this to prevent error message reordering)
|
||||||
|
@ -167,9 +167,8 @@ class AprsService extends Service with LocationListener {
|
||||||
|
|
||||||
// LocationListener interface
|
// LocationListener interface
|
||||||
override def onLocationChanged(location : Location) {
|
override def onLocationChanged(location : Location) {
|
||||||
Log.d(TAG, "onLocationChanged: " + location)
|
val upd_int = prefs.getStringInt("interval", 10) * 60000
|
||||||
val upd_int = prefs.getString("interval", "10").toInt * 60000
|
val upd_dist = prefs.getStringInt("distance", 10) * 1000
|
||||||
val upd_dist = prefs.getString("distance", "10").toInt * 1000
|
|
||||||
if (lastLoc != null &&
|
if (lastLoc != null &&
|
||||||
(location.getTime - lastLoc.getTime < upd_int ||
|
(location.getTime - lastLoc.getTime < upd_int ||
|
||||||
location.distanceTo(lastLoc) < upd_dist)) {
|
location.distanceTo(lastLoc) < upd_dist)) {
|
||||||
|
|
|
@ -18,4 +18,8 @@ class PrefsWrapper(val context : Context) {
|
||||||
// return commonly used prefs
|
// return commonly used prefs
|
||||||
def getCallsign() = prefs.getString("callsign", "").trim()
|
def getCallsign() = prefs.getString("callsign", "").trim()
|
||||||
|
|
||||||
|
def getPasscode() = prefs.getString("passcode", "") match {
|
||||||
|
case "" => "-1"
|
||||||
|
case s => s
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,12 +13,8 @@ object AprsIsUploader {
|
||||||
}
|
}
|
||||||
|
|
||||||
abstract class AprsIsUploader(prefs : PrefsWrapper) {
|
abstract class AprsIsUploader(prefs : PrefsWrapper) {
|
||||||
val passcode = prefs.getString("passcode", "") match {
|
val login = AprsPacket.formatLogin(prefs.getCallsign(),
|
||||||
case "" => "-1"
|
prefs.getString("ssid", null), prefs.getPasscode())
|
||||||
case s => s
|
|
||||||
}
|
|
||||||
val login = AprsPacket.formatLogin(prefs.getString("callsign", null).trim(),
|
|
||||||
prefs.getString("ssid", null), passcode)
|
|
||||||
|
|
||||||
def start()
|
def start()
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ class TcpUploader(service : AprsService, prefs : PrefsWrapper) extends AprsIsUpl
|
||||||
}
|
}
|
||||||
|
|
||||||
def setupFilter() : String = {
|
def setupFilter() : String = {
|
||||||
val filterdist = try { prefs.getString("tcp.filterdist", "10").trim.toInt } catch { case _ => 0 }
|
val filterdist = prefs.getStringInt("tcp.filterdist", 10)
|
||||||
val userfilter = prefs.getString("tcp.filter", "")
|
val userfilter = prefs.getString("tcp.filter", "")
|
||||||
val lastloc = AprsPacket.formatRangeFilter(
|
val lastloc = AprsPacket.formatRangeFilter(
|
||||||
service.locMan.getLastKnownLocation(LocationManager.GPS_PROVIDER), filterdist)
|
service.locMan.getLastKnownLocation(LocationManager.GPS_PROVIDER), filterdist)
|
||||||
|
|
Ładowanie…
Reference in New Issue