From e5516f0263aef6bce80c6e7c1a1b237c3eeb2b38 Mon Sep 17 00:00:00 2001 From: Georg Lukas Date: Wed, 27 Oct 2010 00:42:54 +0200 Subject: [PATCH] trim whitespace from callsign --- src/APRSdroid.scala | 4 ++-- src/AprsService.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/APRSdroid.scala b/src/APRSdroid.scala index fc0ccde..c24dc8a 100644 --- a/src/APRSdroid.scala +++ b/src/APRSdroid.scala @@ -88,7 +88,7 @@ class APRSdroid extends Activity with OnClickListener } if (!checkConfig()) return - val callsign = prefs.getString("callsign", "") + val callsign = prefs.getString("callsign", "").trim() val callssid = AprsPacket.formatCallSsid(callsign, prefs.getString("ssid", "")) setTitle(getString(R.string.app_name) + ": " + callssid) setupButtons(AprsService.running) @@ -114,7 +114,7 @@ class APRSdroid extends Activity with OnClickListener } def checkConfig() : Boolean = { - val callsign = prefs.getString("callsign", "") + val callsign = prefs.getString("callsign", "").trim() val passcode = prefs.getString("passcode", "") if (callsign == "" || passcode == "") { openPrefs(R.string.firstrun) diff --git a/src/AprsService.scala b/src/AprsService.scala index 99f3fd3..c50b33b 100644 --- a/src/AprsService.scala +++ b/src/AprsService.scala @@ -77,7 +77,7 @@ class AprsService extends Service with LocationListener { var hostname = prefs.getString("host", null) if (hostname == null || hostname == "") hostname = getString(R.string.aprs_server); - val login = AprsPacket.formatLogin(prefs.getString("callsign", null), + val login = AprsPacket.formatLogin(prefs.getString("callsign", null).trim(), prefs.getString("ssid", null), prefs.getString("passcode", null)) val filterdist = prefs.getString("filterdist", "10").toInt @@ -177,7 +177,7 @@ class AprsService extends Service with LocationListener { val i = new Intent(UPDATE) i.putExtra(LOCATION, location) - val callsign = prefs.getString("callsign", null) + val callsign = prefs.getString("callsign", null).trim() val callssid = AprsPacket.formatCallSsid(callsign, prefs.getString("ssid", "")) var symbol = prefs.getString("symbol", "") if (symbol.length != 2)