From 19084d577e10977a36ad0db5ff5349e11687009e Mon Sep 17 00:00:00 2001
From: Georg Lukas <georg@op-co.de>
Date: Sat, 2 Jul 2011 17:23:05 +0200
Subject: [PATCH] intents: make call the data, not an extra

---
 src/MapAct.scala          | 4 ++--
 src/MessageActivity.scala | 2 +-
 src/StationActivity.scala | 2 +-
 src/UIHelper.scala        | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/MapAct.scala b/src/MapAct.scala
index b92c2ff..720e2c8 100644
--- a/src/MapAct.scala
+++ b/src/MapAct.scala
@@ -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 ""
 	}
 
diff --git a/src/MessageActivity.scala b/src/MessageActivity.scala
index e7b5a45..d887202 100644
--- a/src/MessageActivity.scala
+++ b/src/MessageActivity.scala
@@ -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)
 			
diff --git a/src/StationActivity.scala b/src/StationActivity.scala
index 9905d43..df588bc 100644
--- a/src/StationActivity.scala
+++ b/src/StationActivity.scala
@@ -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]
diff --git a/src/UIHelper.scala b/src/UIHelper.scala
index feda641..267b1eb 100644
--- a/src/UIHelper.scala
+++ b/src/UIHelper.scala
@@ -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) {