Skip to content

Commit e006a1c

Browse files
rohitluthraAzure DevOps Pipelineshahzaibjp3dr0rv
authored
Manual merging working/release/23.0.0 to release/23.0.0, Fixes AB#3397730 (#2782)
Manual merging working/release/23.0.0 to release/23.0.0 for octoebr release process. PBI Item - [AB#3397730](https://dev.azure.com/IdentityDivision/Engineering/_workitems/edit/3397730) --------- Co-authored-by: Azure DevOps Pipeline <[email protected]> Co-authored-by: Shahzaib <[email protected]> Co-authored-by: p3dr0rv <[email protected]>
1 parent 6f36921 commit e006a1c

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

changelog.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
vNext
22
----------
3+
4+
Version 23.0.2
5+
----------
36
- [MAJOR] Add KeyStoreBackedSecretKeyProvider (#2674)
47
- [MINOR] Add Open Id configuration issuer validation reporting in OpenIdProviderConfigurationClient (#2751)
58
- [MINOR] Add helper method to record elapsed time (#2768)
@@ -11,6 +14,7 @@ vNext
1114
- [MINOR] SDK now handles SMS as strong authentication method #2766
1215
- [MINOR] Added error handling when webcp redirects have browser protocol #2767
1316
- [PATCH] Fix for app link redirect from CCT due to forced browser preference (#2775)
17+
- [PATCH] Don't set browser pkg name in CustomTabIntent (#2778)
1418

1519
Version 22.1.0
1620
----------

common/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ codeCoverageReport {
2525

2626
// In dev, we want to keep the dependencies(common4j, broker4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline.
2727
// In release/*, we change these to specific versions being consumed.
28-
def common4jVersion = "1.0.+"
28+
def common4jVersion = "23.0.2"
2929
if (project.hasProperty("distCommon4jVersion") && project.distCommon4jVersion != '') {
3030
common4jVersion = project.distCommon4jVersion
3131
}
@@ -376,10 +376,10 @@ tasks.configureEach { task ->
376376
task.dependsOn 'bundleDistReleaseAar'
377377
}
378378
if (task.name == "generateMetadataFileForDistDebugPublication") {
379-
task.mustRunAfter 'bundleDistReleaseAar'
379+
task.mustRunAfter 'bundleDistDebugAar'
380380
}
381381
if (task.name == "generateMetadataFileForDistReleasePublication") {
382-
task.dependsOn 'bundleDistDebugAar'
382+
task.dependsOn 'bundleDistReleaseAar'
383383
}
384384
}
385385

common/src/main/java/com/microsoft/identity/common/internal/ui/browser/BrowserAuthorizationStrategy.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ public Future<AuthorizationResult> requestAuthorization(
9999
if (!mCustomTabManager.bind(context, mBrowser.getPackageName())) {
100100
//create browser auth intent
101101
authIntent = new Intent(Intent.ACTION_VIEW);
102+
authIntent.setPackage(mBrowser.getPackageName());
102103
} else {
103104
authIntent = mCustomTabManager.getCustomTabsIntent().intent;
104105
}
@@ -109,9 +110,9 @@ public Future<AuthorizationResult> requestAuthorization(
109110
);
110111
//create browser auth intent
111112
authIntent = new Intent(Intent.ACTION_VIEW);
113+
authIntent.setPackage(mBrowser.getPackageName());
112114
}
113115

114-
authIntent.setPackage(mBrowser.getPackageName());
115116
final URI requestUrl = authorizationRequest.getAuthorizationRequestAsHttpRequest();
116117

117118
authIntent.setData(Uri.parse(requestUrl.toString()));
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#Wed May 12 20:08:39 UTC 2021
2-
versionName=22.1.0
2+
versionName=23.0.2
33
versionCode=1
44
latestPatchVersion=227

versioning/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#Tue Apr 06 22:55:08 UTC 2021
2-
versionName=22.1.0
2+
versionName=23.0.2
33
versionCode=1
44
latestPatchVersion=234

0 commit comments

Comments
 (0)