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

trim whitespace from callsign

itemized2sql
Georg Lukas 2010-10-27 00:42:54 +02:00
rodzic 3061fcd139
commit e5516f0263
2 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
src/APRSdroid.scala
Wyświetl plik

@ -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)

4
src/AprsService.scala
Wyświetl plik

@ -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)