Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to latest jmDNS for more reliable detection

Browse Source 
closes #612
This commit is contained in:
Hans-Christoph Steiner 2018-04-11 14:04:11 +02:00
parent 6b4b85d396
commit 73ad5bd6b3
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@ -40,7 +40,7 @@ dependencies {
compile "info.guardianproject.panic:panic:0.5" compile "info.guardianproject.panic:panic:0.5"
compile 'commons-io:commons-io:2.5' compile 'commons-io:commons-io:2.5'
compile 'commons-net:commons-net:3.5' compile 'commons-net:commons-net:3.5'
compile 'org.openhab.jmdns:jmdns:3.4.2' compile 'org.jmdns:jmdns:3.5.3'
compile 'ch.acra:acra:4.9.1' compile 'ch.acra:acra:4.9.1'
compile 'io.reactivex:rxjava:1.1.0' compile 'io.reactivex:rxjava:1.1.0'
compile 'io.reactivex:rxandroid:0.23.0' compile 'io.reactivex:rxandroid:0.23.0'
@ -137,7 +137,8 @@ if (!hasProperty('sourceDeps')) {
'info.guardianproject.panic:panic:a7ed9439826db2e9901649892cf9afbe76f00991b768d8f4c26332d7c9406cb2', 'info.guardianproject.panic:panic:a7ed9439826db2e9901649892cf9afbe76f00991b768d8f4c26332d7c9406cb2',
'io.reactivex:rxandroid:35c1a90f8c1f499db3c1f3d608e1f191ac8afddb10c02dd91ef04c03a0a4bcda', 'io.reactivex:rxandroid:35c1a90f8c1f499db3c1f3d608e1f191ac8afddb10c02dd91ef04c03a0a4bcda',
'io.reactivex:rxjava:2c162afd78eba217cdfee78b60e85d3bfb667db61e12bc95e3cf2ddc5beeadf6', 'io.reactivex:rxjava:2c162afd78eba217cdfee78b60e85d3bfb667db61e12bc95e3cf2ddc5beeadf6',
'org.openhab.jmdns:jmdns:7a4b34b5606bbd2aff7fdfe629edcb0416fccd367fb59a099f210b9aba4f0bce', 'org.jmdns:jmdns:24e7e3a50a579136400e8c9b0750399eb3c7558918bdf52c0ffa5e0fa5aad503',
'org.slf4j:slf4j-api:e56288031f5e60652c06e7bb6e9fa410a61231ab54890f7b708fc6adc4107c5b',
] ]
} }

1
app/proguard-rules.pro vendored
View File

@ -7,6 +7,7 @@
-dontwarn com.android.support.test.** -dontwarn com.android.support.test.**
-dontwarn javax.naming.** -dontwarn javax.naming.**
-dontwarn org.slf4j.**
-dontnote org.apache.http.** -dontnote org.apache.http.**
-dontnote android.net.http.** -dontnote android.net.http.**
-dontnote android.support.** -dontnote android.support.**

6
app/src/main/java/javax/jmdns/impl/FDroidServiceInfo.java
View File

@ -4,12 +4,12 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.text.TextUtils; import android.text.TextUtils;
import javax.jmdns.ServiceInfo;
import javax.jmdns.impl.util.ByteWrangler;
import java.net.Inet4Address; import java.net.Inet4Address;
import java.net.Inet6Address; import java.net.Inet6Address;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import javax.jmdns.ServiceInfo;
/** /**
* The ServiceInfo class needs to be serialized in order to be sent as an Android broadcast. * The ServiceInfo class needs to be serialized in order to be sent as an Android broadcast.
* In order to make it Parcelable (or Serializable for that matter), there are some package-scope * In order to make it Parcelable (or Serializable for that matter), there are some package-scope
@ -32,7 +32,7 @@ public class FDroidServiceInfo extends ServiceInfoImpl implements Parcelable {
if (data == null || data.length == 0) { if (data == null || data.length == 0) {
return null; return null;
} }
String fingerprint = this.readUTF(data, 0, data.length); String fingerprint = ByteWrangler.readUTF(data, 0, data.length);
if (TextUtils.isEmpty(fingerprint)) { if (TextUtils.isEmpty(fingerprint)) {
return null; return null;
} }