kopia lustrzana https://github.com/ge0rg/aprsdroid
trim whitespace from callsign
rodzic
3061fcd139
commit
e5516f0263
|
@ -88,7 +88,7 @@ class APRSdroid extends Activity with OnClickListener
|
||||||
}
|
}
|
||||||
if (!checkConfig())
|
if (!checkConfig())
|
||||||
return
|
return
|
||||||
val callsign = prefs.getString("callsign", "")
|
val callsign = prefs.getString("callsign", "").trim()
|
||||||
val callssid = AprsPacket.formatCallSsid(callsign, prefs.getString("ssid", ""))
|
val callssid = AprsPacket.formatCallSsid(callsign, prefs.getString("ssid", ""))
|
||||||
setTitle(getString(R.string.app_name) + ": " + callssid)
|
setTitle(getString(R.string.app_name) + ": " + callssid)
|
||||||
setupButtons(AprsService.running)
|
setupButtons(AprsService.running)
|
||||||
|
@ -114,7 +114,7 @@ class APRSdroid extends Activity with OnClickListener
|
||||||
}
|
}
|
||||||
|
|
||||||
def checkConfig() : Boolean = {
|
def checkConfig() : Boolean = {
|
||||||
val callsign = prefs.getString("callsign", "")
|
val callsign = prefs.getString("callsign", "").trim()
|
||||||
val passcode = prefs.getString("passcode", "")
|
val passcode = prefs.getString("passcode", "")
|
||||||
if (callsign == "" || passcode == "") {
|
if (callsign == "" || passcode == "") {
|
||||||
openPrefs(R.string.firstrun)
|
openPrefs(R.string.firstrun)
|
||||||
|
|
|
@ -77,7 +77,7 @@ class AprsService extends Service with LocationListener {
|
||||||
var hostname = prefs.getString("host", null)
|
var hostname = prefs.getString("host", null)
|
||||||
if (hostname == null || hostname == "")
|
if (hostname == null || hostname == "")
|
||||||
hostname = getString(R.string.aprs_server);
|
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))
|
prefs.getString("ssid", null), prefs.getString("passcode", null))
|
||||||
val filterdist = prefs.getString("filterdist", "10").toInt
|
val filterdist = prefs.getString("filterdist", "10").toInt
|
||||||
|
|
||||||
|
@ -177,7 +177,7 @@ class AprsService extends Service with LocationListener {
|
||||||
val i = new Intent(UPDATE)
|
val i = new Intent(UPDATE)
|
||||||
i.putExtra(LOCATION, location)
|
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", ""))
|
val callssid = AprsPacket.formatCallSsid(callsign, prefs.getString("ssid", ""))
|
||||||
var symbol = prefs.getString("symbol", "")
|
var symbol = prefs.getString("symbol", "")
|
||||||
if (symbol.length != 2)
|
if (symbol.length != 2)
|
||||||
|
|
Ładowanie…
Reference in New Issue