Merge branch 'master' of https://github.com/clostra/newnode_private

android.c

@@ -310,7 +310,7 @@ sockaddr_in6 jbyteArray_to_addr(JNIEnv* env, jbyteArray je)
 {
     jbyte *buf = (*env)->GetByteArrayElements(env, je, NULL);
     jsize len = (*env)->GetArrayLength(env, je);
-    endpoint e = {0};
+    endpoint e = {.port = 0};
     memcpy(&e, buf, MIN((size_t)len, sizeof(e)));
     (*env)->ReleaseByteArrayElements(env, je, buf, JNI_ABORT);
     return endpoint_to_addr(&e);

android/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
     <application>
         <activity android:name=".internal.PermissionActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar">
         </activity>
-        <receiver android:name=".internal.NearbyHelper.BatteryLevelReceiver" android:exported="true">
+        <receiver android:name=".internal.NewNode$BatteryLevelReceiver" android:exported="true">
           <intent-filter>
             <action android:name="android.intent.action.BATTERY_LOW"/>
             <action android:name="android.intent.action.BATTERY_OKAY"/>

clean.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+set -x
+
+rm -rf libevent/native
+rm -rf libevent/*linux-android*
+rm -rf libevent/*apple*
+rm -rf blocksruntime/*linux-android*
+rm -rf libutp/libutp.a
+rm -rf libutp/*linux-android*
+rm -rf libutp/*apple*
+rm -rf android-toolchain*
+cd libsodium && git clean -fxd
+cd ..
+#rm libsodium/configure
+rm -rf libsodium/native
+rm -rf libsodium/libsodium-ios*
+rm -rf libsodium/libsodium-apple*
+rm -rf libsodium/libsodium-android*
+rm -rf libsodium/android-toolchain*
+rm -rf bugsnag-cocoa/iOS/*apple*
+rm -rf bugsnag-cocoa/*apple*
+rm -rf android/src/main/jniLibs
+rm -rf libunwind-ndk/*linux-android*
+rm *.o || true
+cd android
+rm -rf build
+gradle wrapper
+./gradlew clean
+cd examples/WebViewSample
+rm -rf build
+gradle wrapper
+./gradlew clean
+cd ../..
+cd vpn
+rm -rf build
+gradle wrapper
+./gradlew clean