intents: make call the data, not an extra

messaging
Georg Lukas 2011-07-02 17:23:05 +02:00
rodzic f5f0eac22e
commit 19084d577e
4 zmienionych plików z 8 dodań i 8 usunięć

Wyświetl plik

@ -82,8 +82,8 @@ class MapAct extends MapActivity with UIHelper {
def getTargetCall() : String = {
val i = getIntent()
if (i != null && i.getStringExtra("call") != null) {
i.getStringExtra("call")
if (i != null && i.getDataString() != null) {
i.getDataString()
} else ""
}

Wyświetl plik

@ -14,7 +14,7 @@ import _root_.android.widget.{Button, EditText, ListView}
class MessageActivity extends LoadingListActivity
with OnClickListener with OnKeyListener with TextWatcher {
val TAG = "APRSdroid.Message"
lazy val targetcall = getIntent().getStringExtra("call")
lazy val targetcall = getIntent().getDataString()
lazy val storage = StorageDatabase.open(this)

Wyświetl plik

@ -12,7 +12,7 @@ import _root_.android.widget.{ListView,SimpleCursorAdapter}
class StationActivity extends LoadingListActivity
with OnClickListener {
lazy val targetcall = getIntent().getStringExtra("call")
lazy val targetcall = getIntent().getDataString()
lazy val storage = StorageDatabase.open(this)
lazy val postlist = findViewById(R.id.postlist).asInstanceOf[ListView]

Wyświetl plik

@ -25,21 +25,21 @@ trait UIHelper extends Activity
}
def openDetails(call : String) {
startActivity(new Intent(this, classOf[StationActivity]).putExtra("call", call))
startActivity(new Intent(this, classOf[StationActivity]).setData(Uri.parse(call)))
}
def openMessaging(call : String) {
startActivity(new Intent(this, classOf[MessageActivity]).putExtra("call", call))
startActivity(new Intent(this, classOf[MessageActivity]).setData(Uri.parse(call)))
}
def openMessageSend(call : String, message : String) {
startActivity(new Intent(this, classOf[MessageActivity]).putExtra("call", call).putExtra("message", message))
startActivity(new Intent(this, classOf[MessageActivity]).setData(Uri.parse(call)).putExtra("message", message))
}
def trackOnMap(call : String) {
val text = getString(R.string.map_track_call, call)
Toast.makeText(this, text, Toast.LENGTH_SHORT).show()
startActivity(new Intent(this, classOf[MapAct]).putExtra("call", call))
startActivity(new Intent(this, classOf[MapAct]).setData(Uri.parse(call)))
}
def openPrefs(toastId : Int) {