fix flag passed when querying browser apps for post marshmallow

nicbell · Sep 25, 2020 · 77367e0 · 77367e0
1 parent 18dc928
commit 77367e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/auth0/src/main/java/com/auth0/android/provider/BrowserPicker.java b/auth0/src/main/java/com/auth0/android/provider/BrowserPicker.java
@@ -110,14 +110,13 @@ public BrowserPicker build() {
  @Nullable
  String getBestBrowserPackage(@NonNull PackageManager pm) {
  Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http:https://www.example.com"));
- ResolveInfo webHandler = pm.resolveActivity(browserIntent,
- Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PackageManager.MATCH_ALL : PackageManager.MATCH_DEFAULT_ONLY);
+ ResolveInfo webHandler = pm.resolveActivity(browserIntent, PackageManager.MATCH_DEFAULT_ONLY);
  String defaultBrowser = null;
  if (webHandler != null) {
  defaultBrowser = webHandler.activityInfo.packageName;
  }
 
- final List<ResolveInfo> availableBrowsers = pm.queryIntentActivities(browserIntent, 0);
+ final List<ResolveInfo> availableBrowsers = pm.queryIntentActivities(browserIntent, Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PackageManager.MATCH_ALL : 0);
  final List<String> regularBrowsers = new ArrayList<>();
  final List<String> customTabsBrowsers = new ArrayList<>();
  final boolean isFilterEnabled = allowedPackages != null;

diff --git a/auth0/src/test/java/com/auth0/android/provider/BrowserPickerTest.java b/auth0/src/test/java/com/auth0/android/provider/BrowserPickerTest.java
@@ -26,11 +26,12 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isOneOf;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.IsNull.notNullValue;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.intThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -327,7 +328,7 @@ static void setupBrowserContext(@NonNull Context context, @NonNull List<String>
  PackageManager pm = mock(PackageManager.class);
  when(context.getPackageManager()).thenReturn(pm);
  ResolveInfo defaultPackage = resolveInfoForPackageName(defaultBrowserPackage);
- when(pm.resolveActivity(any(Intent.class), anyInt())).thenReturn(defaultPackage);
+ when(pm.resolveActivity(any(Intent.class), eq(PackageManager.MATCH_DEFAULT_ONLY))).thenReturn(defaultPackage);
 
  List<ResolveInfo> allBrowsers = new ArrayList<>();
  for (String browser : browserPackages) {
@@ -337,7 +338,7 @@ static void setupBrowserContext(@NonNull Context context, @NonNull List<String>
  }
  allBrowsers.add(info);
  }
- when(pm.queryIntentActivities(any(Intent.class), eq(0))).thenReturn(allBrowsers);
+ when(pm.queryIntentActivities(any(Intent.class), intThat(isOneOf(0, PackageManager.MATCH_ALL)))).thenReturn(allBrowsers);
  }
 
  private static ResolveInfo resolveInfoForPackageName(@Nullable String packageName) {