android update
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
package ZeroTier;
|
||||
public class SDK {
|
||||
public native void startOneService();
|
||||
public native void startOneService(String homeDir);
|
||||
public native void joinNetwork(String nwid);
|
||||
public native void leaveNetwork(String nwid);
|
||||
public native boolean isRunning();
|
||||
|
||||
static { System.loadLibrary("ZeroTierOneJNI"); } // Loads JNI code
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package com.example.joseph.example_app;
|
||||
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
|
||||
import ZeroTier.SDK;
|
||||
|
||||
@@ -15,19 +16,28 @@ public class MainActivity extends AppCompatActivity {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
final SDK wrapper = new SDK();
|
||||
final String homeDir = "sdcard/zerotier";
|
||||
|
||||
// Service thread
|
||||
new Thread(new Runnable() {
|
||||
public void run() {
|
||||
SDK wrapper = new SDK();
|
||||
wrapper.startOneService(); // Calls to JNI code
|
||||
wrapper.startOneService(homeDir); // Calls to JNI code
|
||||
}
|
||||
}).start();
|
||||
|
||||
// Wait for service before joining network
|
||||
Log.d("SDK-Javaland", "Waiting for service to start...\n");
|
||||
while(!wrapper.isRunning()) {
|
||||
Log.d("SDK-Javaland", "Waiting...\n");
|
||||
}
|
||||
Log.d("SDK-Javaland","Joining network...\n");
|
||||
wrapper.joinNetwork("e5cd7a9e1c3511dd");
|
||||
|
||||
// Set up example proxy connection to SDK proxy server
|
||||
Log.d("ZTSDK-InJavaland", "Setting up connection to SDK proxy server");
|
||||
Socket s = new Socket();
|
||||
SocketAddress proxyAddr = new InetSocketAddress("0.0.0.0", 1337);
|
||||
Proxy proxy = new Proxy(Proxy.Type.SOCKS, proxyAddr);
|
||||
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,7 @@ buildscript {
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.2.0-alpha1'
|
||||
classpath 'com.android.tools.build:gradle:2.1.2'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
|
||||
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
|
||||
distributionUrl=https://downloads.gradle.org/distributions/gradle-2.14-all.zip
|
||||
|
||||
Reference in New Issue
Block a user