diff --git a/src/AprsService.scala b/src/AprsService.scala index afb5c08..33b7295 100644 --- a/src/AprsService.scala +++ b/src/AprsService.scala @@ -109,7 +109,7 @@ class AprsService extends Service with LocationListener { // continuous GPS tracking for single shot mode requestLocations(singleShot) - val callssid = AprsPacket.formatCallSsid(prefs.getCallsign(), prefs.getString("ssid", "")) + val callssid = prefs.getCallSsid() val message = "%s: %d min, %d km".format(callssid, upd_int, upd_dist) ServiceNotifier.instance.start(this, message) } diff --git a/src/PrefsWrapper.scala b/src/PrefsWrapper.scala index 82a29fb..cdb91a5 100644 --- a/src/PrefsWrapper.scala +++ b/src/PrefsWrapper.scala @@ -22,7 +22,8 @@ class PrefsWrapper(val context : Context) { case "" => "-1" case s => s } - def getCallSsid() = AprsPacket.formatCallSsid(getCallsign(), getString("ssid", "")) + def getSsid() = getString("ssid", "10") + def getCallSsid() = AprsPacket.formatCallSsid(getCallsign(), getSsid()) def toggleBoolean(name : String, default : Boolean) = { val new_val = !prefs.getBoolean(name, default) @@ -38,6 +39,6 @@ class PrefsWrapper(val context : Context) { // this is actually a hack! def getVersion() = context.getString(R.string.build_version).split(" ").take(2).mkString(" ") - def getLoginString() = AprsPacket.formatLogin(getCallsign(), getString("ssid", null), + def getLoginString() = AprsPacket.formatLogin(getCallsign(), getSsid(), getPasscode(), getVersion()) }