From e51cb3c7809d87e7e7b0e7513068b7b46a741b42 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 14 Nov 2024 11:23:13 +0100
Subject: [PATCH] fix NPE in equals method of Provider class
---
.../java/se/leap/bitmaskclient/base/models/Provider.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java b/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java
index b826d338a..ff9c48c0f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java
@@ -53,6 +53,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Locale;
+import java.util.Objects;
import java.util.Set;
import de.blinkt.openvpn.core.connection.Connection.TransportProtocol;
@@ -689,8 +690,8 @@ public final class Provider implements Parcelable {
vpnCertificate.equals(p.getVpnCertificate()) &&
allowAnonymous == p.allowsAnonymous() &&
allowRegistered == p.allowsRegistered() &&
- modelsProvider.equals(p.modelsProvider) &&
- modelsEIPService.equals(p.modelsEIPService) &&
+ Objects.equals(modelsProvider, p.modelsProvider) &&
+ Objects.equals(modelsEIPService, p.modelsEIPService) &&
Arrays.equals(modelsBridges, p.modelsBridges) &&
Arrays.equals(modelsGateways, p.modelsGateways);
} else return false;
--
GitLab