From 6b21a4f4946a003f134fae2714c1559a418f92af Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Tue, 24 Nov 2020 13:51:00 -0800
Subject: [PATCH] fix dns equality check in Android

---
 java/src/com/zerotier/sdk/VirtualNetworkConfig.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
index b5e9041d7..867d013b0 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
@@ -151,6 +151,11 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
             }
         }
 
+        boolean dnsEquals = false;
+        if (this.dns != null && cfg.dns != null) {
+            dnsEquals = this.dns.equals(cfg.dns);
+        }
+
         return this.nwid == cfg.nwid &&
                this.mac == cfg.mac &&
                this.name.equals(cfg.name) &&
@@ -162,7 +167,7 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
                this.broadcastEnabled == cfg.broadcastEnabled &&
                this.portError == cfg.portError &&
                this.enabled == cfg.enabled &&
-               this.dns.equals(cfg.dns) &&
+               dnsEquals &&
                aaEqual && routesEqual;
     }