diff --git a/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/MsalWrapper.java b/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/MsalWrapper.java index 3fe01808bd..151682b76c 100644 --- a/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/MsalWrapper.java +++ b/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/MsalWrapper.java @@ -25,6 +25,8 @@ import com.microsoft.identity.client.exception.MsalException; import com.microsoft.identity.client.exception.MsalServiceException; import com.microsoft.identity.client.exception.MsalUiRequiredException; +import com.microsoft.identity.common.internal.ui.browser.AndroidBrowserSelector; +import com.microsoft.identity.common.java.browser.Browser; import com.microsoft.identity.common.java.exception.BaseException; import com.microsoft.identity.common.java.ui.PreferredAuthMethod; import com.microsoft.identity.common.java.util.StringUtil; @@ -68,7 +70,14 @@ public void onError(MsalException exception) { }); } - public abstract String getDefaultBrowser(); + public String getDefaultBrowser() { + final Browser browser = + new AndroidBrowserSelector(getApp().getConfiguration().getAppContext()).selectBrowser( + getApp().getConfiguration().getBrowserSafeList(), + getApp().getConfiguration().getPreferredBrowser() + ); + return browser == null ? "Unknown" : browser.getPackageName(); + } public abstract String getMode(); diff --git a/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/MultipleAccountModeWrapper.java b/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/MultipleAccountModeWrapper.java index 875f771949..42bdb013da 100644 --- a/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/MultipleAccountModeWrapper.java +++ b/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/MultipleAccountModeWrapper.java @@ -35,10 +35,7 @@ import com.microsoft.identity.client.PoPAuthenticationScheme; import com.microsoft.identity.client.PublicClientApplication; import com.microsoft.identity.client.claims.ClaimsRequest; -import com.microsoft.identity.client.exception.MsalClientException; import com.microsoft.identity.client.exception.MsalException; -import com.microsoft.identity.common.internal.ui.browser.BrowserSelector; -import com.microsoft.identity.common.java.exception.ClientException; import java.util.List; @@ -62,17 +59,6 @@ public IPublicClientApplication getApp() { return mApp; } - @Override - public String getDefaultBrowser() { - try { - return BrowserSelector.select(mApp.getConfiguration().getAppContext(), - mApp.getConfiguration().getBrowserSafeList(), - mApp.getConfiguration().getPreferredBrowser()).getPackageName(); - } catch (ClientException e) { - return "Unknown"; - } - } - @Override public void loadAccounts(@NonNull final INotifyOperationResultCallback> callback) { mApp.getAccounts(new IPublicClientApplication.LoadAccountsCallback() { diff --git a/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/SingleAccountModeWrapper.java b/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/SingleAccountModeWrapper.java index f545d0bb86..2ead87f453 100644 --- a/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/SingleAccountModeWrapper.java +++ b/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/SingleAccountModeWrapper.java @@ -35,10 +35,7 @@ import com.microsoft.identity.client.PoPAuthenticationScheme; import com.microsoft.identity.client.PublicClientApplication; import com.microsoft.identity.client.claims.ClaimsRequest; -import com.microsoft.identity.client.exception.MsalClientException; import com.microsoft.identity.client.exception.MsalException; -import com.microsoft.identity.common.internal.ui.browser.BrowserSelector; -import com.microsoft.identity.common.java.exception.ClientException; import java.util.ArrayList; import java.util.List; @@ -65,17 +62,6 @@ public IPublicClientApplication getApp() { return mApp; } - @Override - public String getDefaultBrowser() { - try { - return BrowserSelector.select(mApp.getConfiguration().getAppContext(), - mApp.getConfiguration().getBrowserSafeList(), - mApp.getConfiguration().getPreferredBrowser()).getPackageName(); - } catch (ClientException e) { - return "Unknown"; - } - } - @Override public void loadAccounts(final @NonNull INotifyOperationResultCallback> callback) { mApp.getCurrentAccountAsync(new ISingleAccountPublicClientApplication.CurrentAccountCallback() {