From bab2aca58481d681be923c9c3e6bdf3a1ef02db4 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 5 Dec 2013 21:21:43 +0000 Subject: [PATCH] Patched Weupnp to support older Android devices. Older devices such as the Huawei U8210 don't completely support the Java 1.6 API. Calling an unsupported method crashes the app. --- briar-core/.classpath | 2 +- ...OT.jar => weupnp-0.1.3-SNAPSHOT-briar.jar} | Bin 28660 -> 28586 bytes weupnp-0.1.3-SNAPSHOT.patch | 40 ++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) rename briar-core/libs/{weupnp-0.1.3-SNAPSHOT.jar => weupnp-0.1.3-SNAPSHOT-briar.jar} (80%) create mode 100644 weupnp-0.1.3-SNAPSHOT.patch diff --git a/briar-core/.classpath b/briar-core/.classpath index 3eb489879..9e7ecd15e 100644 --- a/briar-core/.classpath +++ b/briar-core/.classpath @@ -5,8 +5,8 @@ - + diff --git a/briar-core/libs/weupnp-0.1.3-SNAPSHOT.jar b/briar-core/libs/weupnp-0.1.3-SNAPSHOT-briar.jar similarity index 80% rename from briar-core/libs/weupnp-0.1.3-SNAPSHOT.jar rename to briar-core/libs/weupnp-0.1.3-SNAPSHOT-briar.jar index 01e0cc9cf8beed17ec08e46168fad90151928ce7..fbcc8a9e710d802e4a960dd335b63b7302957da4 100644 GIT binary patch delta 4044 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 delta 4029 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 Z|5gM5A|mJ9E;Kg~={{FUv)upg{10V^jMV@D diff --git a/weupnp-0.1.3-SNAPSHOT.patch b/weupnp-0.1.3-SNAPSHOT.patch new file mode 100644 index 000000000..686fac927 --- /dev/null +++ b/weupnp-0.1.3-SNAPSHOT.patch @@ -0,0 +1,40 @@ +diff -Bbur weupnp-0.1.3-SNAPSHOT/src/main/java/org/bitlet/weupnp/GatewayDiscover.java weupnp-0.1.3-SNAPSHOT-briar/src/main/java/org/bitlet/weupnp/GatewayDiscover.java +--- weupnp-0.1.3-SNAPSHOT/src/main/java/org/bitlet/weupnp/GatewayDiscover.java 2013-05-01 21:09:27.000000000 +0100 ++++ weupnp-0.1.3-SNAPSHOT-briar/src/main/java/org/bitlet/weupnp/GatewayDiscover.java 2013-12-05 20:49:00.000000000 +0000 +@@ -253,7 +253,7 @@ + while (st.hasMoreTokens()) { + String line = st.nextToken().trim(); + +- if (line.isEmpty()) ++ if (line.equals("")) + continue; + + if (line.startsWith("HTTP/1.") || line.startsWith("NOTIFY *")) +@@ -331,16 +331,6 @@ + // For every suitable network interface, get all IP addresses + while (networkInterfaces.hasMoreElements()) { + NetworkInterface card = networkInterfaces.nextElement(); +- +- try { +- // skip devices, not suitable to search gateways for +- if (card.isLoopback() || card.isPointToPoint() || +- card.isVirtual() || !card.isUp()) +- continue; +- } catch (SocketException e) { +- continue; +- } +- + Enumeration addresses = card.getInetAddresses(); + + if (addresses == null) +@@ -348,6 +338,10 @@ + + while (addresses.hasMoreElements()) { + InetAddress inetAddress = addresses.nextElement(); ++ ++ if (inetAddress.isLoopbackAddress()) ++ continue; ++ + int index = arrayIPAddress.size(); + + if (!getIPv4 || !getIPv6) {