Always send null in generation when peer is not available

thaliproject · Jan 16, 2017 · a486bdc · a486bdc
1 parent fc03971
commit a486bdc
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/android/java/io/jxcore/node/JXcoreExtension.java b/src/android/java/io/jxcore/node/JXcoreExtension.java
@@ -545,11 +545,8 @@ public void notifyPeerAvailabilityChanged(PeerProperties peerProperties, boolean
 
         try {
             jsonObject.put(EVENT_VALUE_PEER_ID, peerProperties.getId());
-            Integer gen = peerProperties.getExtraInformation();
-            if (!isAvailable) {
-                gen = (peerProperties.getExtraInformation() == PeerProperties.NO_EXTRA_INFORMATION) ?
-                    null : peerProperties.getExtraInformation();
-            }
+            Integer gen = (isAvailable && hasExtraInfo(peerProperties)) ?
+                peerProperties.getExtraInformation() : null;
             jsonObject.put(EVENT_VALUE_PEER_GENERATION, gen);
             jsonObject.put(EVENT_VALUE_PEER_AVAILABLE, isAvailable);
             jsonObjectCreated = true;
@@ -570,6 +567,10 @@ public void run() {
         }
     }
 
+    private boolean hasExtraInfo(PeerProperties peerProperties) {
+        return peerProperties.getExtraInformation() != PeerProperties.NO_EXTRA_INFORMATION;
+    }
+
     public void notifyDiscoveryAdvertisingStateUpdateNonTcp(boolean isDiscoveryActive, boolean isAdvertisingActive) {
         JSONObject jsonObject = new JSONObject();
         boolean jsonObjectCreated = false;