Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't show LAUNCH if not available. Fix crashes.

Browse Source
This commit is contained in:
Daniel Martí 2013-05-04 13:14:30 +02:00
parent 26e7875c02
commit 18de950fae
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/org/fdroid/fdroid/AppDetails.java
View File

@ -502,10 +502,13 @@ public class AppDetails extends ListActivity {
toShow.add(menu.add(Menu.NONE, INSTALL, 1, R.string.menu_install).setIcon( toShow.add(menu.add(Menu.NONE, INSTALL, 1, R.string.menu_install).setIcon(
android.R.drawable.ic_menu_add)); android.R.drawable.ic_menu_add));
} else { } else {
toShow.add(menu.add( Menu.NONE, LAUNCH, 1, R.string.menu_launch ).setIcon(
android.R.drawable.ic_media_play));
menu.add(Menu.NONE, UNINSTALL, 1, R.string.menu_uninstall).setIcon( menu.add(Menu.NONE, UNINSTALL, 1, R.string.menu_uninstall).setIcon(
android.R.drawable.ic_menu_delete); android.R.drawable.ic_menu_delete);
if (mPm.getLaunchIntentForPackage(app.id) != null) {
toShow.add(menu.add( Menu.NONE, LAUNCH, 1, R.string.menu_launch ).setIcon(
android.R.drawable.ic_media_play));
}
} }
if (app.detail_webURL.length() > 0) { if (app.detail_webURL.length() > 0) {
menu.add(Menu.NONE, WEBSITE, 2, R.string.menu_website).setIcon( menu.add(Menu.NONE, WEBSITE, 2, R.string.menu_website).setIcon(
@ -534,6 +537,16 @@ public class AppDetails extends ListActivity {
return true; return true;
} }
public void tryOpenUri(String s) {
try {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(s)));
} catch (android.content.ActivityNotFoundException e) {
Toast toast = Toast.makeText(this,
"You don't have any app installed that can handle " + s, 3);
toast.show();
}
}
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
@ -555,28 +568,30 @@ public class AppDetails extends ListActivity {
return true; return true;
case WEBSITE: case WEBSITE:
startActivity(new Intent(Intent.ACTION_VIEW, tryOpenUri(app.detail_webURL);
Uri.parse(app.detail_webURL)));
return true; return true;
case ISSUES: case ISSUES:
startActivity(new Intent(Intent.ACTION_VIEW, tryOpenUri(app.detail_trackerURL);
Uri.parse(app.detail_trackerURL)));
return true; return true;
case SOURCE: case SOURCE:
startActivity(new Intent(Intent.ACTION_VIEW, tryOpenUri(app.detail_sourceURL);
Uri.parse(app.detail_sourceURL)));
return true; return true;
case MARKET: case MARKET:
startActivity(new Intent(Intent.ACTION_VIEW, try {
Uri.parse("http://market.android.com/details?id=" + app.id))); startActivity(new Intent(Intent.ACTION_VIEW,
Uri.parse("market://details?id=" + app.id)));
} catch (android.content.ActivityNotFoundException e) {
tryOpenUri("https://play.google.com/store/apps/details?id=" + app.id);
}
return true; return true;
// TODO: Separate donate links if there are many (e.g. paypal and
// bitcoin) and use their link schemas if possible.
case DONATE: case DONATE:
startActivity(new Intent(Intent.ACTION_VIEW, tryOpenUri(app.detail_donateURL);
Uri.parse(app.detail_donateURL)));
return true; return true;
} }