Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CodeHealth] Replace ternary ops with logical expressions (#31558)

Browse Source 
This PR is part of a couple of changes correcting these redundant
ternary operations:

```
x ? y : false -> x && y
x ? false : y -> !x && y
x ? y : true - > !x || y
x ? true : y -> x || y
```

This PR mirrors upstream work being done in the same direction:
https://issues.chromium.org/issues/416294715

Bug: https://github.com/brave/brave-browser/issues/49819
This commit is contained in:
cdesouza-chromium
2025-10-01 21:17:34 +01:00
committed by GitHub
parent dcca1c7dcd
commit daef249ec0
21 changed files with 43 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java
+1 -3
View File
@@ -53,9 +53,7 @@ public class BraveExternalNavigationHandler extends ExternalNavigationHandler {
GURL browserFallbackUrl,
GURL intentTargetUrl) {
boolean isYoutubeDomain =
intentTargetUrl != null
? intentTargetUrl.domainIs(BraveConstants.YOUTUBE_DOMAIN)
: false;
intentTargetUrl != null && intentTargetUrl.domainIs(BraveConstants.YOUTUBE_DOMAIN);
if ((isYoutubeDomain
&& !BravePrefServiceBridge.getInstance().getPlayYTVideoInBrowserEnabled())
|| (!isYoutubeDomain
android/java/org/chromium/chrome/browser/notifications/BravePermissionUtils.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class BravePermissionUtils {
(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
NotificationChannelGroup notificationChannelGroup =
notificationManager.getNotificationChannelGroup(channelGroupName);
return notificationChannelGroup != null ? notificationChannelGroup.isBlocked() : false;
return notificationChannelGroup != null && notificationChannelGroup.isBlocked();
} else {
return !NotificationManagerCompat.from(context).areNotificationsEnabled();
}
android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java
+1 -2
View File
@@ -824,8 +824,7 @@ public class BraveShieldsHandler implements BraveRewardsHelper.LargeIconReadyCal
}
Tab currentActiveTab = mIconFetcher.getTab();
final boolean isPrivateWindow =
currentActiveTab != null ? currentActiveTab.isIncognito() : false;
final boolean isPrivateWindow = currentActiveTab != null && currentActiveTab.isIncognito();
TextView blockElementsText =
mSecondaryLayout.findViewById(R.id.brave_shields_block_element_text);
android/java/org/chromium/chrome/browser/util/TabUtils.java
+2 -3
View File
@@ -204,9 +204,8 @@ public class TabUtils {
public static void openNewTab() {
try {
BraveActivity braveActivity = BraveActivity.getBraveActivity();
boolean isIncognito = braveActivity != null
? braveActivity.getCurrentTabModel().isIncognito()
: false;
boolean isIncognito =
braveActivity != null && braveActivity.getCurrentTabModel().isIncognito();
openNewTab(braveActivity, isIncognito);
} catch (BraveActivity.BraveActivityNotFoundException e) {
Log.e(TAG, "openNewTab " + e);
android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnProfileUtils.java
+6 -5
View File
@@ -46,11 +46,12 @@ public class BraveVpnProfileUtils {
boolean isVpnConnected = false;
if (connectivityManager != null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(
connectivityManager.getActiveNetwork());
isVpnConnected = capabilities != null
? capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)
: false;
NetworkCapabilities capabilities =
connectivityManager.getNetworkCapabilities(
connectivityManager.getActiveNetwork());
isVpnConnected =
capabilities != null
&& capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN);
} else {
NetworkInfo activeNetwork = connectivityManager.getActiveNetworkInfo();
isVpnConnected = activeNetwork.getType() == ConnectivityManager.TYPE_VPN;