From 8ec105bee0040e8434fc52444ba5651e293b2e10 Mon Sep 17 00:00:00 2001 From: albexk Date: Tue, 28 Nov 2023 19:01:44 +0300 Subject: [PATCH] Move Log class to org.amnezia.vpn.util package --- client/android/protocolApi/src/main/kotlin/Protocol.kt | 2 +- client/android/src/org/amnezia/vpn/AmneziaActivity.kt | 1 + client/android/src/org/amnezia/vpn/AmneziaVpnService.kt | 1 + client/android/src/org/amnezia/vpn/CameraActivity.kt | 1 + client/android/src/org/amnezia/vpn/IpcMessenger.kt | 1 + client/android/src/org/amnezia/vpn/NetworkState.kt | 1 + client/android/src/org/amnezia/vpn/Prefs.kt | 1 + client/android/src/org/amnezia/vpn/VpnRequestActivity.kt | 1 + client/android/utils/build.gradle.kts | 2 +- client/android/utils/src/main/kotlin/Log.kt | 2 +- .../main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt | 2 +- 11 files changed, 11 insertions(+), 4 deletions(-) diff --git a/client/android/protocolApi/src/main/kotlin/Protocol.kt b/client/android/protocolApi/src/main/kotlin/Protocol.kt index b3a902b58..effaaa75b 100644 --- a/client/android/protocolApi/src/main/kotlin/Protocol.kt +++ b/client/android/protocolApi/src/main/kotlin/Protocol.kt @@ -11,7 +11,7 @@ import androidx.annotation.RequiresApi import java.io.File import java.io.FileOutputStream import java.util.zip.ZipFile -import org.amnezia.vpn.Log +import org.amnezia.vpn.util.Log import org.json.JSONObject private const val TAG = "Protocol" diff --git a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt index 40b504530..048cb88bd 100644 --- a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt +++ b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt @@ -27,6 +27,7 @@ import kotlinx.coroutines.launch import org.amnezia.vpn.protocol.getStatistics import org.amnezia.vpn.protocol.getStatus import org.amnezia.vpn.qt.QtAndroidController +import org.amnezia.vpn.util.Log import org.qtproject.qt.android.bindings.QtActivity private const val TAG = "AmneziaActivity" diff --git a/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt b/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt index d51850926..a1a4d65f7 100644 --- a/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt +++ b/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt @@ -39,6 +39,7 @@ import org.amnezia.vpn.protocol.awg.Awg import org.amnezia.vpn.protocol.putStatistics import org.amnezia.vpn.protocol.putStatus import org.amnezia.vpn.protocol.wireguard.Wireguard +import org.amnezia.vpn.util.Log import org.json.JSONException import org.json.JSONObject diff --git a/client/android/src/org/amnezia/vpn/CameraActivity.kt b/client/android/src/org/amnezia/vpn/CameraActivity.kt index 16f847d37..5af560884 100644 --- a/client/android/src/org/amnezia/vpn/CameraActivity.kt +++ b/client/android/src/org/amnezia/vpn/CameraActivity.kt @@ -25,6 +25,7 @@ import com.google.mlkit.vision.barcode.common.Barcode import com.google.mlkit.vision.common.InputImage import org.amnezia.vpn.databinding.CameraPreviewBinding import org.amnezia.vpn.qt.QtAndroidController +import org.amnezia.vpn.util.Log private const val TAG = "CameraActivity" diff --git a/client/android/src/org/amnezia/vpn/IpcMessenger.kt b/client/android/src/org/amnezia/vpn/IpcMessenger.kt index 7599834aa..218a165be 100644 --- a/client/android/src/org/amnezia/vpn/IpcMessenger.kt +++ b/client/android/src/org/amnezia/vpn/IpcMessenger.kt @@ -4,6 +4,7 @@ import android.os.DeadObjectException import android.os.Message import android.os.Messenger import android.os.RemoteException +import org.amnezia.vpn.util.Log private const val TAG = "IpcMessenger" diff --git a/client/android/src/org/amnezia/vpn/NetworkState.kt b/client/android/src/org/amnezia/vpn/NetworkState.kt index e1696fa92..7b896bc31 100644 --- a/client/android/src/org/amnezia/vpn/NetworkState.kt +++ b/client/android/src/org/amnezia/vpn/NetworkState.kt @@ -46,6 +46,7 @@ import androidx.core.content.ContextCompat import java.io.FileDescriptor import java.io.IOException import java.lang.Exception +import org.amnezia.vpn.util.Log class NetworkState(var service: AmneziaVpnService) { private var mService: AmneziaVpnService = service diff --git a/client/android/src/org/amnezia/vpn/Prefs.kt b/client/android/src/org/amnezia/vpn/Prefs.kt index 4b4262cb2..1d2920212 100644 --- a/client/android/src/org/amnezia/vpn/Prefs.kt +++ b/client/android/src/org/amnezia/vpn/Prefs.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.SharedPreferences import androidx.security.crypto.EncryptedSharedPreferences import androidx.security.crypto.MasterKey +import org.amnezia.vpn.util.Log private const val TAG = "Prefs" private const val PREFS_FILE = "org.amnezia.vpn.prefs" diff --git a/client/android/src/org/amnezia/vpn/VpnRequestActivity.kt b/client/android/src/org/amnezia/vpn/VpnRequestActivity.kt index 4fa878e10..9dce3d788 100644 --- a/client/android/src/org/amnezia/vpn/VpnRequestActivity.kt +++ b/client/android/src/org/amnezia/vpn/VpnRequestActivity.kt @@ -13,6 +13,7 @@ import androidx.activity.result.ActivityResult import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult import androidx.core.content.ContextCompat import androidx.core.content.getSystemService +import org.amnezia.vpn.util.Log private const val TAG = "VpnRequestActivity" diff --git a/client/android/utils/build.gradle.kts b/client/android/utils/build.gradle.kts index 792d43d66..ac5d1efb5 100644 --- a/client/android/utils/build.gradle.kts +++ b/client/android/utils/build.gradle.kts @@ -8,7 +8,7 @@ kotlin { } android { - namespace = "org.amnezia.vpn" + namespace = "org.amnezia.vpn.util" buildFeatures { // add BuildConfig class diff --git a/client/android/utils/src/main/kotlin/Log.kt b/client/android/utils/src/main/kotlin/Log.kt index 5b2657ba4..82180c3d9 100644 --- a/client/android/utils/src/main/kotlin/Log.kt +++ b/client/android/utils/src/main/kotlin/Log.kt @@ -1,4 +1,4 @@ -package org.amnezia.vpn +package org.amnezia.vpn.util import android.util.Log as NativeLog diff --git a/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt b/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt index c24facc04..1500fffd6 100644 --- a/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt +++ b/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt @@ -4,13 +4,13 @@ import android.content.Context import android.net.VpnService.Builder import java.util.TreeMap import com.wireguard.android.backend.GoBackend -import org.amnezia.vpn.Log import org.amnezia.vpn.protocol.InetEndpoint import org.amnezia.vpn.protocol.InetNetwork import org.amnezia.vpn.protocol.Protocol import org.amnezia.vpn.protocol.Statistics import org.amnezia.vpn.protocol.VpnStartException import org.amnezia.vpn.protocol.parseInetAddress +import org.amnezia.vpn.util.Log import org.json.JSONObject /**