kopia lustrzana https://github.com/ge0rg/aprsdroid
add PrefsWrapper.getCallSsid
rodzic
f9e5e83651
commit
9d873c3e0c
|
@ -87,9 +87,7 @@ class APRSdroid extends Activity with OnClickListener
|
||||||
}
|
}
|
||||||
if (!checkConfig())
|
if (!checkConfig())
|
||||||
return
|
return
|
||||||
val callsign = prefs.getCallsign()
|
setTitle(getString(R.string.app_name) + ": " + prefs.getCallSsid())
|
||||||
val callssid = AprsPacket.formatCallSsid(callsign, prefs.getString("ssid", ""))
|
|
||||||
setTitle(getString(R.string.app_name) + ": " + callssid)
|
|
||||||
setupButtons(AprsService.running)
|
setupButtons(AprsService.running)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -201,8 +201,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.getCallsign()
|
val callssid = prefs.getCallSsid()
|
||||||
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)
|
||||||
symbol = getString(R.string.default_symbol)
|
symbol = getString(R.string.default_symbol)
|
||||||
|
|
|
@ -22,4 +22,5 @@ class PrefsWrapper(val context : Context) {
|
||||||
case "" => "-1"
|
case "" => "-1"
|
||||||
case s => s
|
case s => s
|
||||||
}
|
}
|
||||||
|
def getCallSsid() = AprsPacket.formatCallSsid(getCallsign(), getString("ssid", ""))
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue