Skip to content

Update browser selector #2250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
p3dr0rv merged 1 commit into from
Jan 24, 2025
Merged

Update browser selector #2250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/MsalWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();

Expand Down
14 changes: 0 additions & 14 deletions ...stapp/src/main/java/com/microsoft/identity/client/testapp/MultipleAccountModeWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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<List<IAccount>> callback) {
mApp.getAccounts(new IPublicClientApplication.LoadAccountsCallback() {
Expand Down
14 changes: 0 additions & 14 deletions ...testapp/src/main/java/com/microsoft/identity/client/testapp/SingleAccountModeWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<List<IAccount>> callback) {
mApp.getCurrentAccountAsync(new ISingleAccountPublicClientApplication.CurrentAccountCallback() {
Expand Down
Loading