diff --git a/docs/android_zt_sdk.md b/docs/android_zt_sdk.md index de5f92d..055360f 100644 --- a/docs/android_zt_sdk.md +++ b/docs/android_zt_sdk.md @@ -42,7 +42,7 @@ new Thread(new Runnable() { **Step 4: App permissions** - - In order for your application to write the auth keys to the internal storage you'll need to set a few permissions in your `AndroidManifest.xml` file: + - In order for your application to write the auth keys and network files to the internal storage you'll need to set a few permissions in your `AndroidManifest.xml` file at the same scope level as ``: ``` diff --git a/integrations/android/example_app/app/src/main/AndroidManifest.xml b/integrations/android/example_app/app/src/main/AndroidManifest.xml index cd21495..2faac4b 100644 --- a/integrations/android/example_app/app/src/main/AndroidManifest.xml +++ b/integrations/android/example_app/app/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ - + diff --git a/integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java b/integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java index 3964d41..b174bbf 100644 --- a/integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java +++ b/integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java @@ -5,6 +5,9 @@ import android.os.Bundle; import ZeroTier.SDK; +import java.net.InetSocketAddress; +import java.net.*; + public class MainActivity extends AppCompatActivity { @Override @@ -18,5 +21,10 @@ public class MainActivity extends AppCompatActivity { wrapper.startOneService(); // Calls to JNI code } }).start(); + + Socket s = new Socket(); + SocketAddress proxyAddr = new InetSocketAddress("0.0.0.0", 1337); + Proxy proxy = new Proxy(Proxy.Type.SOCKS, proxyAddr); + } } \ No newline at end of file diff --git a/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate index 08123fa..8075abe 100644 Binary files a/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate and b/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/src/SDK_EthernetTap.cpp b/src/SDK_EthernetTap.cpp index 9f4c69a..0f567e6 100644 --- a/src/SDK_EthernetTap.cpp +++ b/src/SDK_EthernetTap.cpp @@ -136,7 +136,7 @@ NetconEthernetTap::NetconEthernetTap( // Start SOCKS5 Proxy server // For use when traditional syscall hooking isn't available (ex. some APIs on iOS and Android) - #if defined(USE_SOCKS_PROXY) + #if defined(USE_SOCKS_PROXY) || defined(__ANDROID__) StartProxy(sockPath); #endif