1 files changed, 30 insertions, 14 deletions

diff --git a/main/src/cgeo/geocaching/utils/ProcessUtils.java b/main/src/cgeo/geocaching/utils/ProcessUtils.java
index d80674b..6a57cbf 100644
--- a/main/src/cgeo/geocaching/utils/ProcessUtils.java
+++ b/main/src/cgeo/geocaching/utils/ProcessUtils.java
@@ -3,7 +3,10 @@ package cgeo.geocaching.utils;
 import cgeo.geocaching.CgeoApplication;
 
 import org.apache.commons.collections4.CollectionUtils;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -21,10 +24,8 @@ public final class ProcessUtils {
     /**
      * Preferred method to detect the availability of an external app
      *
-     * @param packageName
-     * @return
      */
-    public static boolean isLaunchable(final String packageName) {
+    public static boolean isLaunchable(@Nullable final String packageName) {
         return getLaunchIntent(packageName) != null;
     }
 
@@ -33,17 +34,15 @@ public final class ProcessUtils {
      * This function is relatively costly, so if you know that the package in question has
      * a launch intent, use isLaunchable() instead.
      *
-     * @param packageName
-     * @return
      */
-    public static boolean isInstalled(final String packageName) {
+    public static boolean isInstalled(@NonNull final String packageName) {
         return isLaunchable(packageName) || hasPackageInstalled(packageName);
     }
 
     /**
      * This will find installed applications even without launch intent (e.g. the streetview plugin).
      */
-    private static boolean hasPackageInstalled(final String packageName) {
+    private static boolean hasPackageInstalled(@NonNull final String packageName) {
         final List<PackageInfo> packs = CgeoApplication.getInstance().getPackageManager().getInstalledPackages(0);
         for (final PackageInfo packageInfo : packs) {
             if (packageName.equals(packageInfo.packageName)) {
@@ -56,7 +55,8 @@ public final class ProcessUtils {
     /**
      * This will find applications, which can be launched.
      */
-    public static Intent getLaunchIntent(final String packageName) {
+    @Nullable
+    public static Intent getLaunchIntent(@Nullable final String packageName) {
         if (packageName == null) {
             return null;
         }
@@ -65,12 +65,12 @@ public final class ProcessUtils {
             // This can throw an exception where the exception type is only defined on API Level > 3
             // therefore surround with try-catch
             return packageManager.getLaunchIntentForPackage(packageName);
-        } catch (final Exception e) {
+        } catch (final Exception ignored) {
             return null;
         }
     }
 
-    public static boolean isIntentAvailable(final String intent) {
+    public static boolean isIntentAvailable(@NonNull final String intent) {
         return isIntentAvailable(intent, null);
     }
 
@@ -79,16 +79,16 @@ public final class ProcessUtils {
      * method queries the package manager for installed packages that can
      * respond to an intent with the specified action. If no suitable package is
      * found, this method returns false.
-     * 
+     *
      * @param action
      *            The Intent action to check for availability.
      * @param uri
      *            The Intent URI to check for availability.
-     * 
+     *
      * @return True if an Intent with the specified action can be sent and
      *         responded to, false otherwise.
      */
-    public static boolean isIntentAvailable(final String action, final Uri uri) {
+    public static boolean isIntentAvailable(@NonNull final String action, @Nullable final Uri uri) {
         final PackageManager packageManager = CgeoApplication.getInstance().getPackageManager();
         final Intent intent;
         if (uri == null) {
@@ -98,7 +98,23 @@ public final class ProcessUtils {
         }
         final List<ResolveInfo> list = packageManager.queryIntentActivities(intent,
                 PackageManager.MATCH_DEFAULT_ONLY);
-        return CollectionUtils.isNotEmpty(list);
+        final List<ResolveInfo> servicesList = packageManager.queryIntentServices(intent,
+                PackageManager.MATCH_DEFAULT_ONLY);
+        return CollectionUtils.isNotEmpty(list) || CollectionUtils.isNotEmpty(servicesList);
+    }
+
+    @SuppressWarnings("deprecation")
+    public static void openMarket(final Activity activity, @NonNull final String packageName) {
+        try {
+            final String url = "market://details?id=" + packageName;
+            final Intent marketIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            marketIntent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            activity.startActivity(marketIntent);
+
+        } catch (final RuntimeException ignored) {
+            // market not available, fall back to browser
+            activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://play.google.com/store/apps/details?id=" + packageName)));
+        }
     }
 
 }