Updated Android integration, added build instructions to make-mac

2016-06-21 16:26:38 -07:00
parent bc14b532ed
commit ae7eb359a0
13 changed files with 192 additions and 82 deletions
--- a/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/ZeroTierOneService.java
+++ b/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/ZeroTierOneService.java
@@ -93,7 +93,7 @@ public class ZeroTierOneService extends VpnService implements Runnable, EventLis
        networkConfigs = new HashMap<>();
        eventBus.register(this);

-        Netcon.NetconWrapper wrapper = new Netcon.NetconWrapper();
+        Netcon.ZT_SDK_Wrapper wrapper = new Netcon.ZT_SDK_Wrapper();


        wrapper.startOneService();