experimental tweaked version on weupnp

Author: cyberb

android.iml

@@ -7,7 +7,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <output url="file://$MODULE_DIR$/build/classes/main" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />

common/build.gradle

@@ -6,6 +6,7 @@ dependencies {
     compile 'log4j:log4j:1.2.17'
     compile 'org.fourthline.cling:cling-core:2.0.1'
     compile 'org.fourthline.cling:cling-support:2.0.1'
+    compile 'org.bitlet:weupnp:0.1.2'
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.10'
 }

common/common.iml

@@ -31,6 +31,7 @@
     <orderEntry type="library" exported="" name="log4j-1.2.17" level="project" />
     <orderEntry type="library" exported="" name="cling-core-2.0.1" level="project" />
     <orderEntry type="library" exported="" name="cling-support-2.0.1" level="project" />
+    <orderEntry type="library" exported="" name="weupnp-0.1.2" level="project" />
     <orderEntry type="library" exported="" name="jackson-annotations-2.3.0" level="project" />
     <orderEntry type="library" exported="" name="jackson-core-2.3.3" level="project" />
     <orderEntry type="library" exported="" name="seamless-util-1.1.0" level="project" />

common/src/main/java/org/syncloud/common/upnp/Router.java

@@ -9,5 +9,5 @@ public interface Router {
 
     int getPortMappingsCount();
 
-    boolean canToManipulatePorts(String myIp);
+    boolean canManipulatePorts(String myIp);
 }

common/src/main/java/org/syncloud/common/upnp/UPnPFactory.java

@@ -2,9 +2,17 @@
 
 import org.fourthline.cling.android.AndroidUpnpServiceConfiguration;
 import org.syncloud.common.upnp.cling.ClingUPnP;
+import org.syncloud.common.upnp.weupnp.WeUPnP;
 
 public class UPnPFactory {
-    public static UPnP createUPnP(String name) {
-        return new ClingUPnP(new AndroidUpnpServiceConfiguration());
+    public enum TYPE {CLING, WEUPNP}
+    public static UPnP createUPnP(TYPE type) {
+        switch (type) {
+            case CLING:
+                return new ClingUPnP(new AndroidUpnpServiceConfiguration());
+            case WEUPNP:
+            default:
+                return new WeUPnP();
+        }
     }
 }

common/src/main/java/org/syncloud/common/upnp/cling/ClingRouter.java

@@ -119,7 +119,7 @@ private <T extends ActionCallback> T sync(UpnpService upnpService, T callback) {
     }
 
     @Override
-    public boolean canToManipulatePorts(String myIp) {
+    public boolean canManipulatePorts(String myIp) {
 
         final Optional<Long> availableExternalPort = getAvailableExternalPort();
         if(!availableExternalPort.isPresent())

common/src/main/java/org/syncloud/common/upnp/cling/ClingUPnP.java

@@ -6,8 +6,9 @@
 import org.fourthline.cling.UpnpService;
 import org.fourthline.cling.UpnpServiceConfiguration;
 import org.fourthline.cling.UpnpServiceImpl;
+import org.syncloud.common.upnp.UPnP;
 
-public class ClingUPnP implements org.syncloud.common.upnp.UPnP {
+public class ClingUPnP implements UPnP {
 
     public static final int TIMEOUT = 60;
     private static Logger logger = Logger.getLogger(ClingUPnP.class);