Skip to content

Commit f2bc049

Browse files
author
Nick Bopp
committed
Merge remote-tracking branch 'origin/dev' into nichbop/fix-application-cancelled
2 parents 77b0313 + 5e3a6a6 commit f2bc049

File tree

3 files changed

+4
-173
lines changed

3 files changed

+4
-173
lines changed

changelog.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ V.Next
55
- [PATCH] Add exception handling in Content Provider strategy, for broker communication (#1722)
66
- [MINOR] Support TenantID value from eSTS in PKeyAuth flows (#1712)
77
- [MINOR] Implement cert loader for both multiple and legacy WPJ data store in PKeyAuth (#1711)
8-
- [MINOR] Added support for broadcasting to applications installed on the device.
8+
- [PATCH] Fix SDK Cancel when using authorization in current task (#1743)
9+
- [MINOR] Added support for broadcasting to applications installed on the device. (#1744)
910
- [PATCH] Fix APPLICATION_CANCELLED by handling back button press (#1725)
1011

1112
Version 4.1.0

common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/CurrentTaskAuthorizationFragment.java

-170
This file was deleted.

common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/CurrentTaskBrowserAuthorizationFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
/**
5151
* Authorization fragment with customTabs or browsers.
5252
*/
53-
public class CurrentTaskBrowserAuthorizationFragment extends CurrentTaskAuthorizationFragment {
53+
public class CurrentTaskBrowserAuthorizationFragment extends AuthorizationFragment {
5454

55-
private static final String TAG = BrowserAuthorizationFragment.class.getSimpleName();
55+
private static final String TAG = CurrentTaskBrowserAuthorizationFragment.class.getSimpleName();
5656

5757
private static final String BROWSER_FLOW_STARTED = "browserFlowStarted";
5858

0 commit comments

Comments
 (0)