Merge pull request #19764 from rng70-or/trunk

ParaskP7 · web-flow · commit 502a11a1f7ef · 2024-07-10T14:45:55.000+03:00
fix: potential null dereference on serviceId
diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/PublicizeTable.java b/WordPress/src/main/java/org/wordpress/android/datasets/PublicizeTable.java
@@ -157,7 +157,7 @@ private static PublicizeService getServiceFromCursor(Cursor c) {
     }
 
     public static boolean onlyExternalConnections(String serviceId) {
-        if (serviceId == null && serviceId.isEmpty()) {
+        if (serviceId == null || serviceId.isEmpty()) {
             return false;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ private static PublicizeService getServiceFromCursor(Cursor c) {`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`public static boolean onlyExternalConnections(String serviceId) {`
`160`		`- if (serviceId == null && serviceId.isEmpty()) {`
	`160`	`+ if (serviceId == null \|\| serviceId.isEmpty()) {`
`161`	`161`	`return false;`
`162`	`162`	`}`
`163`	`163`