Fix deeplinks for Android 11 (#455)

* Fix deeplink for Android 11 support

* Remove redundant test

Author: hborisoff

AndroidSDKCore/src/main/java/com/leanplum/messagetemplates/actions/OpenUrlAction.java

@@ -59,17 +59,16 @@ private static void openUriIntent(Context context, Intent uriIntent) {
     List<ResolveInfo> resolveInfoList =
         context.getPackageManager().queryIntentActivities(uriIntent, 0);
 
-    if (resolveInfoList.isEmpty())
-      return;
-
     // If url can be handled by current app - set package name to intent, so url
     // will be open by current app. Skip chooser dialog.
-    for (ResolveInfo resolveInfo : resolveInfoList) {
-      if (resolveInfo != null && resolveInfo.activityInfo != null &&
-          resolveInfo.activityInfo.name != null) {
-        if (resolveInfo.activityInfo.name.contains(
-            context.getPackageName())) {
-          uriIntent.setPackage(resolveInfo.activityInfo.packageName);
+    if (!resolveInfoList.isEmpty()) {
+      for (ResolveInfo resolveInfo : resolveInfoList) {
+        if (resolveInfo != null && resolveInfo.activityInfo != null &&
+            resolveInfo.activityInfo.name != null) {
+          if (resolveInfo.activityInfo.name.contains(
+              context.getPackageName())) {
+            uriIntent.setPackage(resolveInfo.activityInfo.packageName);
+          }
         }
       }
     }

AndroidSDKPush/src/main/java/com/leanplum/LeanplumPushService.java

@@ -26,6 +26,7 @@
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -579,13 +580,18 @@ private static boolean isActivityWithIntentStarted(Context context, Bundle notif
     String action = notification.getString(Keys.PUSH_MESSAGE_ACTION);
     if (action != null && action.contains(OPEN_URL)) {
       Intent deepLinkIntent = getDeepLinkIntent(notification);
-      if (deepLinkIntent != null && activityHasIntent(context, deepLinkIntent)) {
+      if (deepLinkIntent != null) {
+        resolveIntentActivity(context, deepLinkIntent);
         String messageId = LeanplumPushService.getMessageId(notification);
         if (messageId != null) {
           ActionContext actionContext = new ActionContext(
               ActionManager.PUSH_NOTIFICATION_ACTION_NAME, null, messageId);
           actionContext.track(OPEN_ACTION, 0.0, null);
-          context.startActivity(deepLinkIntent);
+          try {
+            context.startActivity(deepLinkIntent);
+          }  catch (ActivityNotFoundException e) {
+            return false;
+          }
           return true;
         }
       }
@@ -612,25 +618,22 @@ private static Intent getDeepLinkIntent(Bundle notification) {
   }
 
   /**
-   * Checks if there is some activity that can handle intent.
+   * Checks if url can be handled by current app to skip chooser dialog.
    */
-  private static Boolean activityHasIntent(Context context, Intent deepLinkIntent) {
+  private static void resolveIntentActivity(Context context, Intent deepLinkIntent) {
     List<ResolveInfo> resolveInfoList =
         context.getPackageManager().queryIntentActivities(deepLinkIntent, 0);
     if (resolveInfoList != null && !resolveInfoList.isEmpty()) {
       for (ResolveInfo resolveInfo : resolveInfoList) {
         if (resolveInfo != null && resolveInfo.activityInfo != null &&
             resolveInfo.activityInfo.name != null) {
           if (resolveInfo.activityInfo.name.contains(context.getPackageName())) {
-            // If url can be handled by current app - set package name to intent, so url will be
-            // open by current app. Skip chooser dialog.
             deepLinkIntent.setPackage(resolveInfo.activityInfo.packageName);
           }
-          return true;
+          return;
         }
       }
     }
-    return false;
   }
 
   private static Intent getActionIntent(Context context) {

AndroidSDKTests/src/test/java/com/leanplum/LeanplumPushServiceTest.java

@@ -28,6 +28,7 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
 
@@ -248,25 +249,6 @@ public void getDeepLinkIntentTest() throws Exception {
     assertEquals(deepLinkIntent.toString().trim(), result.toString().trim());
   }
 
-
-  /**
-   * Test for {@link LeanplumPushService#activityHasIntent(Context, Intent)}  that should return
-   * false if there is no activity that can handle intent.
-   *
-   * @throws Exception
-   */
-  @Test
-  public void activityHasIntentTest() throws Exception {
-    LeanplumPushService pushService = new LeanplumPushService();
-    Method activityHasIntentMethod = LeanplumPushService.class.
-        getDeclaredMethod("activityHasIntent", Context.class, Intent.class);
-    activityHasIntentMethod.setAccessible(true);
-    Intent deepLinkIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.google.com/"));
-    deepLinkIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-    Boolean result = (Boolean) activityHasIntentMethod.invoke(pushService, context, deepLinkIntent);
-    assertTrue(!result);
-  }
-
   @Test
   public void testHandleNotification() {
     Bundle bundle = new Bundle();