kopia lustrzana https://github.com/ge0rg/aprsdroid
Map: launch the correct map from menu
rodzic
62de815f33
commit
4a6dc267ad
|
@ -44,7 +44,7 @@ object MapModes {
|
||||||
def startMap(ctx : Context, prefs : PrefsWrapper, targetcall : String) {
|
def startMap(ctx : Context, prefs : PrefsWrapper, targetcall : String) {
|
||||||
val mm = defaultMapMode(ctx, prefs)
|
val mm = defaultMapMode(ctx, prefs)
|
||||||
val intent = new Intent(ctx, mm.viewClass)
|
val intent = new Intent(ctx, mm.viewClass)
|
||||||
if (targetcall != "")
|
if (targetcall != null && targetcall != "")
|
||||||
intent.setData(Uri.parse(targetcall))
|
intent.setData(Uri.parse(targetcall))
|
||||||
else
|
else
|
||||||
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
|
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
|
||||||
|
|
|
@ -321,7 +321,7 @@ trait UIHelper extends Activity
|
||||||
startActivity(new Intent(this, classOf[HubActivity]).addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
|
startActivity(new Intent(this, classOf[HubActivity]).addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
|
||||||
true
|
true
|
||||||
case R.id.map =>
|
case R.id.map =>
|
||||||
startActivity(new Intent(this, classOf[GoogleMapAct]).addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
|
MapModes.startMap(this, prefs, "")
|
||||||
true
|
true
|
||||||
case R.id.log =>
|
case R.id.log =>
|
||||||
startActivity(new Intent(this, classOf[LogActivity]).addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
|
startActivity(new Intent(this, classOf[LogActivity]).addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
|
||||||
|
|
Ładowanie…
Reference in New Issue