Skip to content

Commit b23a86e

Browse files
committed
[Android] Fixes for NoStreams lint errors
For now we just suppress them as there is no uniform fix for all of them. Follow up issue is created to address this brave/brave-browser#42632 Chromium change: https://chromium.googlesource.com/chromium/src/+/31928c984432e9d2f7c71438a716a417f378dff5 Reland "Android: Add Error Prone warning against Java stream() apis" This reverts commit 8ff33dbc1ddcaabcf4da1b92868bfa26ae34ba8f. Reason for reland: Internal fix landed Original change's description: > Revert "Android: Add Error Prone warning against Java stream() apis" > > This reverts commit e910d272c026bf1463f54ea17ce6fb16f55513cf. > > Reason for revert: crbug.com/344943957#comment13 > > Original change's description: > > Android: Add Error Prone warning against Java stream() apis > > > > And minor clarifying tweaks to style guide wrt streams > > > > Bug: 344943957 > > Change-Id: I90b976866c8f3f71826459b7d3097692e1f533b4 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6042674 > > Auto-Submit: Andrew Grieve <[email protected]> > > Commit-Queue: Andrew Grieve <[email protected]> > > Reviewed-by: Henrique Nakashima <[email protected]> > > Cr-Commit-Position: refs/heads/main@{#1388426} > > Bug: 344943957 > Change-Id: Ib9b3d8db9f47383eaced5192a15e7cac6427da35 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6051419 > Reviewed-by: Henrique Nakashima <[email protected]> > Auto-Submit: Keigo Oka <[email protected]> > Commit-Queue: Henrique Nakashima <[email protected]> > Bot-Commit: Rubber Stamper <[email protected]> > Reviewed-by: Andrew Grieve <[email protected]> > Cr-Commit-Position: refs/heads/main@{#1388467} Bug: 344943957
1 parent 4608819 commit b23a86e

File tree

15 files changed

+19
-0
lines changed

15 files changed

+19
-0
lines changed

android/java/org/chromium/chrome/browser/app/domain/NetworkModel.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.chromium.brave_wallet.mojom.JsonRpcService;
2222
import org.chromium.brave_wallet.mojom.JsonRpcServiceObserver;
2323
import org.chromium.brave_wallet.mojom.NetworkInfo;
24+
import org.chromium.chrome.browser.app.domain.NetworkModel.NetworkLists;
2425
import org.chromium.chrome.browser.crypto_wallet.util.AndroidUtils;
2526
import org.chromium.chrome.browser.crypto_wallet.util.JavaUtils;
2627
import org.chromium.chrome.browser.crypto_wallet.util.NetworkUtils;
@@ -65,6 +66,7 @@ public class NetworkModel implements JsonRpcServiceObserver {
6566
public final LiveData<List<NetworkInfo>> mSecondaryNetworks;
6667
public final LiveData<NetworkLists> mNetworkLists;
6768

69+
@SuppressWarnings("NoStreams")
6870
public NetworkModel(
6971
BraveWalletService braveWalletService,
7072
@NonNull JsonRpcService jsonRpcService,
@@ -228,6 +230,7 @@ public void refreshNetworks() {
228230
init();
229231
}
230232

233+
@SuppressWarnings("NoStreams")
231234
static void getAllNetworks(
232235
JsonRpcService jsonRpcService, Callbacks.Callback1<List<NetworkInfo>> callback) {
233236
if (jsonRpcService == null) {

android/java/org/chromium/chrome/browser/crypto_wallet/activities/NetworkSelectorActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ private void initState() {
115115
}
116116

117117
@NonNull
118+
@SuppressWarnings("NoStreams")
118119
private NetworkModel.NetworkLists filterSupportedDapp(
119120
@NonNull final NetworkModel.NetworkLists networkLists) {
120121
final Predicate<NetworkInfo> supportedNetworkFilter =

android/java/org/chromium/chrome/browser/crypto_wallet/adapters/OnboardingNetworkSelectorGridAdapter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ public void filter(@NonNull final String text) {
330330
mHandler.postDelayed(mFilteringRunnable, DEBOUNCE_SEARCH_MILLIS);
331331
}
332332

333+
@SuppressWarnings("NoStreams")
333334
private void performFiltering(
334335
@NonNull final List<NetworkInfo> source,
335336
@NonNull final List<NetworkInfo> filtered,

android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SiweMessageFragment.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ private void updateDetails(String chainId, AccountId accountId) {
236236
mTwoLineAdapter.notifyItemRangeChanged(0, items.size());
237237
}
238238

239+
@SuppressWarnings("NoStreams")
239240
private String getSiweResources(Url[] urls) {
240241
if (urls == null || urls.length == 0) return "";
241242
return Arrays.stream(urls)

android/java/org/chromium/chrome/browser/crypto_wallet/util/AccountsPermissionsHelper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public HashSet<AccountInfo> getAccountsWithPermissions() {
3131
return mAccountsWithPermissions;
3232
}
3333

34+
@SuppressWarnings("NoStreams")
3435
private static boolean containsAccount(AccountId[] accounts, AccountId searchFor) {
3536
return Arrays.stream(accounts)
3637
.anyMatch(
@@ -39,6 +40,7 @@ private static boolean containsAccount(AccountId[] accounts, AccountId searchFor
3940
});
4041
}
4142

43+
@SuppressWarnings("NoStreams")
4244
public void checkAccounts(Runnable runWhenDone) {
4345
AccountId[] allAccountIds =
4446
Arrays.stream(mAccounts).map(acc -> acc.accountId).toArray(AccountId[]::new);

android/java/org/chromium/chrome/browser/crypto_wallet/util/AssetUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public static boolean isSameToken(
6363
}
6464
}
6565

66+
@SuppressWarnings("NoStreams")
6667
public static AccountInfo[] filterAccountsByNetwork(
6768
AccountInfo[] accounts, @CoinType.EnumType int coinType, @Nullable String chainId) {
6869
@KeyringId.EnumType int keyringId = AssetUtils.getKeyring(coinType, chainId);

android/java/org/chromium/chrome/browser/crypto_wallet/util/JavaUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ public static <T> T[] asArray(T... items) {
109109
* @param items of string values.
110110
* @return a combined or empty string.
111111
*/
112+
@SuppressWarnings("NoStreams")
112113
public static String concatStrings(String separator, String... items) {
113114
if (items == null) return "";
114115
return Arrays.stream(items)

android/java/org/chromium/chrome/browser/crypto_wallet/util/NetworkUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public static boolean isAllNetwork(@Nullable final NetworkInfo networkInfo) {
7272
return networkInfo.chainId.equals("all");
7373
}
7474

75+
@SuppressWarnings("NoStreams")
7576
public static List<NetworkInfo> nonTestNetwork(List<NetworkInfo> networkInfos) {
7677
if (networkInfos == null) return Collections.emptyList();
7778
return networkInfos.stream()

android/java/org/chromium/chrome/browser/crypto_wallet/util/TokenUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public enum TokenType {
7272
*
7373
* <p>See `refreshVisibleTokenInfo` in components/brave_wallet_ui/common/async/lib.ts.
7474
*/
75+
@SuppressWarnings("NoStreams")
7576
private static BlockchainToken[] filterTokens(
7677
NetworkInfo selectedNetwork,
7778
BlockchainToken[] tokens,

android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,6 +1052,7 @@ public static AccountInfo findAccount(AccountInfo[] accounts, AccountId accountI
10521052
return null;
10531053
}
10541054

1055+
@SuppressWarnings("NoStreams")
10551056
public static List<AccountInfo> filterAccountsByCoin(
10561057
AccountInfo[] accounts, @CoinType.EnumType int coinType) {
10571058
return Arrays.stream(accounts)

0 commit comments

Comments
 (0)