diff --git a/changelog b/changelog index e2539dac5..7f85f0223 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,7 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki V.NEXT ---------- +- [MINOR] Use Active Broker cache specifically for Client SDK (#1892) - [MINOR] MSA UI tests for Brokered Auth (#1856) - [MINOR] Updated target, compile SDK, AGP and gradle versions(#1882) diff --git a/common b/common index 0a606d026..14c2fd6f3 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 0a606d026008cc7cb451ad8e1b6c30759baf420b +Subproject commit 14c2fd6f3c482abe3f7b891fe950c681c549a223 diff --git a/msal/src/main/java/com/microsoft/identity/client/PublicClientApplication.java b/msal/src/main/java/com/microsoft/identity/client/PublicClientApplication.java index 0ece38d31..54deaa10a 100644 --- a/msal/src/main/java/com/microsoft/identity/client/PublicClientApplication.java +++ b/msal/src/main/java/com/microsoft/identity/client/PublicClientApplication.java @@ -2301,7 +2301,7 @@ public boolean isValidBrokerPackage(@NonNull final Context context, **/ @Nullable public String getActiveBrokerPackageName(@NonNull final Context context) { - final BrokerData activeBroker = BrokerDiscoveryClientFactory.getInstance(context, + final BrokerData activeBroker = BrokerDiscoveryClientFactory.getInstanceForClientSdk(context, AndroidPlatformComponentsFactory.createFromContext(context)) .getActiveBroker(false); diff --git a/msal/src/main/java/com/microsoft/identity/client/internal/controllers/MSALControllerFactory.kt b/msal/src/main/java/com/microsoft/identity/client/internal/controllers/MSALControllerFactory.kt index 0fa2f340b..a370d9aca 100644 --- a/msal/src/main/java/com/microsoft/identity/client/internal/controllers/MSALControllerFactory.kt +++ b/msal/src/main/java/com/microsoft/identity/client/internal/controllers/MSALControllerFactory.kt @@ -43,7 +43,7 @@ class MSALControllerFactory( private val platformComponents: IPlatformComponents, private val applicationConfiguration: PublicClientApplicationConfiguration) { - private val discoveryClient = BrokerDiscoveryClientFactory.getInstance( + private val discoveryClient = BrokerDiscoveryClientFactory.getInstanceForClientSdk( context = applicationContext, platformComponents = platformComponents ) diff --git a/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/AcquireTokenFragment.java b/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/AcquireTokenFragment.java index 01690f17d..85588cfbb 100644 --- a/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/AcquireTokenFragment.java +++ b/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/AcquireTokenFragment.java @@ -180,7 +180,7 @@ public void onClick(View v) { mDebugBrokers.setTextOn("Debug Brokers"); mDebugBrokers.setChecked(BrokerData.getShouldTrustDebugBrokers()); - mCache = ClientActiveBrokerCache.Companion.getCache( + mCache = ClientActiveBrokerCache.getClientSdkCache( AndroidPlatformComponentsFactory.createFromContext(getContext()).getStorageSupplier() );