mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-03 23:55:08 +00:00
Code Issues Releases Wiki Activity

Fix mDNS broadcasting

Browse Source
This commit is contained in:
Simon Redman
2019-07-20 23:37:26 +02:00
committed by Albert Vaca Cintora
parent d939c18dd5
commit 8168ff53e6
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/org/kde/kdeconnect/Backends/MulticastBackend/MulticastLinkProvider.java
View File

@@ -18,7 +18,7 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.kde.kdeconnect.Backends.MulticastBackend; package org.kde.kdeconnect.Backends.MulticastBackend;
@@ -40,7 +40,6 @@ import org.kde.kdeconnect.Backends.BaseLinkProvider;
import org.kde.kdeconnect.BackgroundService; import org.kde.kdeconnect.BackgroundService;
import org.kde.kdeconnect.Device; import org.kde.kdeconnect.Device;
import org.kde.kdeconnect.Helpers.DeviceHelper; import org.kde.kdeconnect.Helpers.DeviceHelper;
import org.kde.kdeconnect.Helpers.NetworkHelper;
import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper; import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
import org.kde.kdeconnect.NetworkPacket; import org.kde.kdeconnect.NetworkPacket;
@@ -75,7 +74,6 @@ public class MulticastLinkProvider extends BaseLinkProvider implements Multicast
private NsdManager mNsdManager; private NsdManager mNsdManager;
private RegistrationListener mRegistrationListener; private RegistrationListener mRegistrationListener;
private ResolveListener mResolveListener;
private boolean mServiceRegistered = false; private boolean mServiceRegistered = false;
private final static int MIN_PORT = 1716; private final static int MIN_PORT = 1716;
@@ -100,7 +98,7 @@ public class MulticastLinkProvider extends BaseLinkProvider implements Multicast
connectionLost(brokenLink); connectionLost(brokenLink);
} }
//They received my UDP broadcast and are connecting to me. The first thing they send should be their identity. // They received my mDNS broadcast and are connecting to me. The first thing they send should be their identity.
private void tcpPacketReceived(Socket socket) { private void tcpPacketReceived(Socket socket) {
NetworkPacket networkPacket; NetworkPacket networkPacket;
@@ -361,7 +359,7 @@ public class MulticastLinkProvider extends BaseLinkProvider implements Multicast
} }
@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN) @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
public ResolveListener initializeResolveListener() { public ResolveListener createResolveListener() {
return new ResolveListener() { return new ResolveListener() {
@Override @Override
@@ -411,7 +409,7 @@ public class MulticastLinkProvider extends BaseLinkProvider implements Multicast
public void onServiceFound(NsdServiceInfo service) { public void onServiceFound(NsdServiceInfo service) {
// A service was found! Do something with it. // A service was found! Do something with it.
Log.d(LOG_TAG, "Service discovery success" + service); Log.d(LOG_TAG, "Service discovery success" + service);
mNsdManager.resolveService(service, mResolveListener); mNsdManager.resolveService(service, createResolveListener());
} }
@Override @Override
@@ -458,7 +456,6 @@ public class MulticastLinkProvider extends BaseLinkProvider implements Multicast
setupTcpListener(); setupTcpListener();
initializeRegistrationListener(); initializeRegistrationListener();
mResolveListener = initializeResolveListener();
initializeNsdManager(mRegistrationListener); initializeNsdManager(mRegistrationListener);
@@ -468,20 +465,8 @@ public class MulticastLinkProvider extends BaseLinkProvider implements Multicast
@Override @Override
public void onNetworkChange() { public void onNetworkChange() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { onStop();
// This backend does not work on older Android versions onStart();
return;
}
if (listening) {
mNsdManager.unregisterService(mRegistrationListener);
listening = false;
}
if (NetworkHelper.isOnMobileNetwork(context)) {
Log.i("LanLinkProvider", "On 3G network, disabling mDNS advertisements.");
} else {
this.initializeRegistrationListener();
}
} }
@Override @Override