Skip to content

Commit 1f3402b

Browse files
committed
fix pmd issue
1 parent fae212f commit 1f3402b

File tree

1 file changed

+18
-25
lines changed

1 file changed

+18
-25
lines changed

common/src/main/java/com/microsoft/identity/common/internal/platform/AndroidPlatformUtil.java

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
import java.security.NoSuchAlgorithmException;
6161
import java.util.AbstractMap;
6262
import java.util.ArrayList;
63-
import java.util.Collections;
6463
import java.util.HashSet;
6564
import java.util.List;
6665
import java.util.Map;
@@ -85,21 +84,12 @@ public class AndroidPlatformUtil implements IPlatformUtil {
8584
* List of System Browsers which can be used from broker, currently only Chrome is supported.
8685
* This information here is populated from the default browser safe-list in MSAL.
8786
*
88-
* @return
87+
* @return List of BrowserDescriptors which are considered safe for the broker.
8988
*/
9089
@Override
9190
public List<BrowserDescriptor> getBrowserSafeListForBroker() {
9291
List<BrowserDescriptor> browserDescriptors = new ArrayList<>();
93-
final HashSet<String> signatureHashes = new HashSet<String>();
94-
signatureHashes.add("7fmduHKTdHHrlMvldlEqAIlSfii1tl35bxj1OXN5Ve8c4lU6URVu4xtSHc3BVZxS6WWJnxMDhIfQN0N0K2NDJg==");
95-
final BrowserDescriptor chrome = new BrowserDescriptor(
96-
"com.android.chrome",
97-
signatureHashes,
98-
null,
99-
null
100-
);
101-
browserDescriptors.add(chrome);
102-
92+
browserDescriptors.add(getBrowserDescriptorForChrome());
10393
return browserDescriptors;
10494
}
10595

@@ -109,28 +99,31 @@ public List<BrowserDescriptor> getBrowserSafeListForBroker() {
10999
@Override
110100
public List<BrowserDescriptor> getBrowserSafeListForSwitchBrowser() {
111101
List<BrowserDescriptor> browserDescriptors = new ArrayList<>();
112-
// Chrome
113-
final HashSet<String> chromeSignatureHashes = new HashSet<>();
114-
chromeSignatureHashes.add("7fmduHKTdHHrlMvldlEqAIlSfii1tl35bxj1OXN5Ve8c4lU6URVu4xtSHc3BVZxS6WWJnxMDhIfQN0N0K2NDJg==");
115-
final BrowserDescriptor chrome = new BrowserDescriptor(
102+
browserDescriptors.add(getBrowserDescriptorForChrome());
103+
browserDescriptors.add(getBrowserDescriptorForEdge());
104+
return browserDescriptors;
105+
}
106+
107+
private BrowserDescriptor getBrowserDescriptorForChrome() {
108+
final HashSet<String> signatureHashes = new HashSet<>();
109+
signatureHashes.add("7fmduHKTdHHrlMvldlEqAIlSfii1tl35bxj1OXN5Ve8c4lU6URVu4xtSHc3BVZxS6WWJnxMDhIfQN0N0K2NDJg==");
110+
return new BrowserDescriptor(
116111
"com.android.chrome",
117-
chromeSignatureHashes,
112+
signatureHashes,
118113
null,
119114
null
120115
);
121-
// Edge
116+
}
117+
118+
private BrowserDescriptor getBrowserDescriptorForEdge() {
122119
final HashSet<String> edgeSignatureHashes = new HashSet<>();
123-
chromeSignatureHashes.add("Ivy-Rk6ztai_IudfbyUrSHugzRqAtHWslFvHT0PTvLMsEKLUIgv7ZZbVxygWy_M5mOPpfjZrd3vOx3t-cA6fVQ==");
124-
final BrowserDescriptor edge = new BrowserDescriptor(
120+
edgeSignatureHashes.add("Ivy-Rk6ztai_IudfbyUrSHugzRqAtHWslFvHT0PTvLMsEKLUIgv7ZZbVxygWy_M5mOPpfjZrd3vOx3t-cA6fVQ==");
121+
return new BrowserDescriptor(
125122
"com.microsoft.emmx",
126-
chromeSignatureHashes,
123+
edgeSignatureHashes,
127124
null,
128125
null
129126
);
130-
// Add browsers
131-
browserDescriptors.add(chrome);
132-
browserDescriptors.add(edge);
133-
return browserDescriptors;
134127
}
135128

136129
@Nullable

0 commit comments

Comments
 (0)