From edbfcda197710a798b6515a080b4b08cb2a0c73c Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Fri, 1 Oct 2021 12:18:48 -0700
Subject: [PATCH] Fixes for android and wg

---
 client/android/build.gradle                     |  6 +++---
 client/android/src/org/amnezia/vpn/VPNLogger.kt |  4 ++--
 client/android/wireguard/CMakeLists.txt         |  4 ++--
 client/android/wireguard/libwg-go/jni.c         | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/client/android/build.gradle b/client/android/build.gradle
index 28ad7666..d27ddb07 100644
--- a/client/android/build.gradle
+++ b/client/android/build.gradle
@@ -119,11 +119,11 @@ android {
            }
        }
        debug {
-           applicationIdSuffix ".debug"
-           versionNameSuffix "-debug"
+           //applicationIdSuffix ".debug"
+           //versionNameSuffix "-debug"
            externalNativeBuild {
                cmake {
-                   arguments "-DANDROID_PACKAGE_NAME=${groupName}.debug", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}"
+                   arguments "-DANDROID_PACKAGE_NAME=${groupName}", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}"
                }
            }
        }
diff --git a/client/android/src/org/amnezia/vpn/VPNLogger.kt b/client/android/src/org/amnezia/vpn/VPNLogger.kt
index 05c9f79d..d30dd92f 100644
--- a/client/android/src/org/amnezia/vpn/VPNLogger.kt
+++ b/client/android/src/org/amnezia/vpn/VPNLogger.kt
@@ -66,7 +66,7 @@ class Log {
         }
     }
     private fun write(message: String) {
-        LocalDateTime.now()
-        file.appendText("[${LocalDateTime.now()}] $message  \n")
+        //LocalDateTime.now()
+        //file.appendText("[${LocalDateTime.now()}] $message  \n")
     }
 }
diff --git a/client/android/wireguard/CMakeLists.txt b/client/android/wireguard/CMakeLists.txt
index 00389300..c5560c85 100644
--- a/client/android/wireguard/CMakeLists.txt
+++ b/client/android/wireguard/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.4.1)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 
 message("PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}")
-set( CMAKE_WG_TOOLS_DIR ../../../desktop-client/client/3rd/wireguard-tools )
+set( CMAKE_WG_TOOLS_DIR ../../../../desktop-client/client/3rd/wireguard-tools )
 
 
 find_program(CCACHE_FOUND ccache)
@@ -27,7 +27,7 @@ add_executable(libwg.so ${WG_SOURCES})
 target_include_directories(libwg.so PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_WG_TOOLS_DIR}/src/uapi/linux/" "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_WG_TOOLS_DIR}/src/")
 target_compile_options(libwg.so PUBLIC -O3 -std=gnu11 -D_GNU_SOURCE -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DHAVE_VISIBILITY_HIDDEN -DRUNSTATEDIR=\"/data/data/${ANDROID_PACKAGE_NAME}/cache\")
 
-add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libwg-go" COMMENT "Building wireguard-go"
+add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libwg-go" COMMENT "Building wireguard-go" VERBATIM COMMAND make
     ANDROID_ARCH_NAME=${ANDROID_ARCH_NAME}
     ANDROID_C_COMPILER=${ANDROID_C_COMPILER}
     ANDROID_TOOLCHAIN_ROOT=${ANDROID_TOOLCHAIN_ROOT}
diff --git a/client/android/wireguard/libwg-go/jni.c b/client/android/wireguard/libwg-go/jni.c
index 372c788b..b2483d99 100644
--- a/client/android/wireguard/libwg-go/jni.c
+++ b/client/android/wireguard/libwg-go/jni.c
@@ -20,7 +20,7 @@ extern int wgGetSocketV6(int handle);
 extern char* wgGetConfig(int handle);
 extern char* wgVersion();
 
-JNIEXPORT jint JNICALL Java_org_mozilla_firefox_vpn_VPNService_wgTurnOn(
+JNIEXPORT jint JNICALL Java_org_amnezia_vpn_VPNService_wgTurnOn(
     JNIEnv* env, jclass c, jstring ifname, jint tun_fd, jstring settings) {
   const char* ifname_str = (*env)->GetStringUTFChars(env, ifname, 0);
   size_t ifname_len = (*env)->GetStringUTFLength(env, ifname);
@@ -34,22 +34,22 @@ JNIEXPORT jint JNICALL Java_org_mozilla_firefox_vpn_VPNService_wgTurnOn(
   return ret;
 }
 
-JNIEXPORT void JNICALL Java_org_mozilla_firefox_vpn_VPNService_wgTurnOff(
+JNIEXPORT void JNICALL Java_org_amnezia_vpn_VPNService_wgTurnOff(
     JNIEnv* env, jclass c, jint handle) {
   wgTurnOff(handle);
 }
 
-JNIEXPORT jint JNICALL Java_org_mozilla_firefox_vpn_VPNService_wgGetSocketV4(
+JNIEXPORT jint JNICALL Java_org_amnezia_vpn_VPNService_wgGetSocketV4(
     JNIEnv* env, jclass c, jint handle) {
   return wgGetSocketV4(handle);
 }
 
-JNIEXPORT jint JNICALL Java_org_mozilla_firefox_vpn_VPNService_wgGetSocketV6(
+JNIEXPORT jint JNICALL Java_org_amnezia_vpn_VPNService_wgGetSocketV6(
     JNIEnv* env, jclass c, jint handle) {
   return wgGetSocketV6(handle);
 }
 
-JNIEXPORT jstring JNICALL Java_org_mozilla_firefox_vpn_VPNService_wgGetConfig(
+JNIEXPORT jstring JNICALL Java_org_amnezia_vpn_VPNService_wgGetConfig(
     JNIEnv* env, jclass c, jint handle) {
   jstring ret;
   char* config = wgGetConfig(handle);
@@ -60,7 +60,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_firefox_vpn_VPNService_wgGetConfig(
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_mozilla_firefox_vpn_VPNService_wgVersion(JNIEnv* env, jclass c) {
+Java_org_amnezia_vpn_VPNService_wgVersion(JNIEnv* env, jclass c) {
   jstring ret;
   char* version = wgVersion();
   if (!version) return NULL;