From b0c27869b6f9910de3132f617181226a6f8652c2 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 22 May 2014 15:21:07 -0400
Subject: [PATCH] new tricks to improve mDNS/Bonjour resolution

Before, it didn't seem to find anything unless I ran this on my laptop:
`avahi-browse -a -v`

So added two recommended practices from other jmdns code for Android:

* force full resolution on receiving serviceAdded()
* feed the WiFi's IP address to jmdns when creating an instance

fixes #3379 https://dev.guardianproject.info/issues/3379
---
 src/org/fdroid/fdroid/net/MDnsHelper.java | 27 +++++++++++++++++------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/org/fdroid/fdroid/net/MDnsHelper.java b/src/org/fdroid/fdroid/net/MDnsHelper.java
index ab3404138..ae2799a46 100644
--- a/src/org/fdroid/fdroid/net/MDnsHelper.java
+++ b/src/org/fdroid/fdroid/net/MDnsHelper.java
@@ -8,7 +8,6 @@ import android.net.wifi.WifiManager.MulticastLock;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,7 +20,6 @@ import org.fdroid.fdroid.R;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.List;
 
 import javax.jmdns.*;
@@ -36,13 +34,14 @@ public class MDnsHelper implements ServiceListener {
     final RepoScanListAdapter mAdapter;
 
     private JmDNS mJmdns;
-    private MulticastLock mMulticastLock;
+    private final WifiManager wifiManager;
+    private final MulticastLock mMulticastLock;
 
     public MDnsHelper(Activity activity, final RepoScanListAdapter adapter) {
         mActivity = activity;
         mAdapter = adapter;
-        WifiManager wm = (WifiManager) activity.getSystemService(Context.WIFI_SERVICE);
-        mMulticastLock = wm.createMulticastLock(activity.getPackageName());
+        wifiManager = (WifiManager) activity.getSystemService(Context.WIFI_SERVICE);
+        mMulticastLock = wifiManager.createMulticastLock(activity.getPackageName());
         mMulticastLock.setReferenceCounted(false);
     }
 
@@ -59,8 +58,15 @@ public class MDnsHelper implements ServiceListener {
     }
 
     @Override
-    public void serviceAdded(ServiceEvent event) {
+    public void serviceAdded(final ServiceEvent event) {
         addFDroidService(event);
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                mJmdns.requestServiceInfo(event.getType(), event.getName(), true);
+                return null;
+            }
+        }.execute();
     }
 
     @Override
@@ -88,7 +94,14 @@ public class MDnsHelper implements ServiceListener {
             @Override
             protected Void doInBackground(Void... params) {
                 try {
-                    mJmdns = JmDNS.create();
+                    int ip = wifiManager.getConnectionInfo().getIpAddress();
+                    byte[] byteIp = new byte[] {
+                            (byte) (ip & 0xff),
+                            (byte) (ip >> 8 & 0xff),
+                            (byte) (ip >> 16 & 0xff),
+                            (byte) (ip >> 24 & 0xff)
+                    };
+                    mJmdns = JmDNS.create(InetAddress.getByAddress(byteIp));
                 } catch (IOException e) {
                     e.printStackTrace();
                 }