Browse Source

fixing up data store stuff

Grant Limberg 10 years ago
parent
commit
6e998efd15

+ 6 - 3
java/src/com/zerotier/one/AndroidFileProvider.java

@@ -6,25 +6,28 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 
 import android.content.Context;
+import android.util.Log;
 
 public class AndroidFileProvider implements DataStoreFileProvider {
+	private static final String TAG = "AndroidFileProvider";
+
 	Context _ctx;
 		
-	AndroidFileProvider(Context ctx) {
+	public AndroidFileProvider(Context ctx) {
 		this._ctx = ctx;
 	}
 
 	@Override
 	public FileInputStream getInputFileStream(String name)
 			throws FileNotFoundException {
-		// TODO Auto-generated method stub
+		Log.d(TAG, "Returning FileInputStream for: " + name);
 		return _ctx.openFileInput(name);
 	}
 
 	@Override
 	public FileOutputStream getOutputFileStream(String name)
 			throws FileNotFoundException {
-		// TODO Auto-generated method stub
+		Log.d(TAG, "Returning FileOutputStream for: " + name);
 		return _ctx.openFileOutput(name, Context.MODE_PRIVATE);
 	}
 

+ 2 - 2
java/src/com/zerotier/one/DataStore.java

@@ -12,7 +12,7 @@ public class DataStore implements DataStoreGetListener, DataStorePutListener {
 
 	private DataStoreFileProvider _provider;
 
-	DataStore(DataStoreFileProvider provider) {
+	public DataStore(DataStoreFileProvider provider) {
 		this._provider = provider;
 	}
 	
@@ -23,7 +23,7 @@ public class DataStore implements DataStoreGetListener, DataStorePutListener {
 			FileOutputStream fos = _provider.getOutputFileStream(name);
             fos.write(buffer);
             fos.close();
-            return buffer.length;
+            return 0;
 		} catch (FileNotFoundException fnf) {
 			fnf.printStackTrace();
 			return -1;

+ 1 - 1
java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java

@@ -38,7 +38,7 @@ public interface VirtualNetworkFrameListener {
      * @param vlanId
      * @param frameData data to send
      */
-    void onVirtualNetworkFrame(
+    public void onVirtualNetworkFrame(
                 long nwid,
                 long srcMac,
                 long destMac,