Move Log class to org.amnezia.vpn.util package
This commit is contained in:
parent
9297f877c4
commit
8ec105bee0
11 changed files with 11 additions and 4 deletions
|
|
@ -11,7 +11,7 @@ import androidx.annotation.RequiresApi
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.FileOutputStream
|
import java.io.FileOutputStream
|
||||||
import java.util.zip.ZipFile
|
import java.util.zip.ZipFile
|
||||||
import org.amnezia.vpn.Log
|
import org.amnezia.vpn.util.Log
|
||||||
import org.json.JSONObject
|
import org.json.JSONObject
|
||||||
|
|
||||||
private const val TAG = "Protocol"
|
private const val TAG = "Protocol"
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ import kotlinx.coroutines.launch
|
||||||
import org.amnezia.vpn.protocol.getStatistics
|
import org.amnezia.vpn.protocol.getStatistics
|
||||||
import org.amnezia.vpn.protocol.getStatus
|
import org.amnezia.vpn.protocol.getStatus
|
||||||
import org.amnezia.vpn.qt.QtAndroidController
|
import org.amnezia.vpn.qt.QtAndroidController
|
||||||
|
import org.amnezia.vpn.util.Log
|
||||||
import org.qtproject.qt.android.bindings.QtActivity
|
import org.qtproject.qt.android.bindings.QtActivity
|
||||||
|
|
||||||
private const val TAG = "AmneziaActivity"
|
private const val TAG = "AmneziaActivity"
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ import org.amnezia.vpn.protocol.awg.Awg
|
||||||
import org.amnezia.vpn.protocol.putStatistics
|
import org.amnezia.vpn.protocol.putStatistics
|
||||||
import org.amnezia.vpn.protocol.putStatus
|
import org.amnezia.vpn.protocol.putStatus
|
||||||
import org.amnezia.vpn.protocol.wireguard.Wireguard
|
import org.amnezia.vpn.protocol.wireguard.Wireguard
|
||||||
|
import org.amnezia.vpn.util.Log
|
||||||
import org.json.JSONException
|
import org.json.JSONException
|
||||||
import org.json.JSONObject
|
import org.json.JSONObject
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@ import com.google.mlkit.vision.barcode.common.Barcode
|
||||||
import com.google.mlkit.vision.common.InputImage
|
import com.google.mlkit.vision.common.InputImage
|
||||||
import org.amnezia.vpn.databinding.CameraPreviewBinding
|
import org.amnezia.vpn.databinding.CameraPreviewBinding
|
||||||
import org.amnezia.vpn.qt.QtAndroidController
|
import org.amnezia.vpn.qt.QtAndroidController
|
||||||
|
import org.amnezia.vpn.util.Log
|
||||||
|
|
||||||
private const val TAG = "CameraActivity"
|
private const val TAG = "CameraActivity"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import android.os.DeadObjectException
|
||||||
import android.os.Message
|
import android.os.Message
|
||||||
import android.os.Messenger
|
import android.os.Messenger
|
||||||
import android.os.RemoteException
|
import android.os.RemoteException
|
||||||
|
import org.amnezia.vpn.util.Log
|
||||||
|
|
||||||
private const val TAG = "IpcMessenger"
|
private const val TAG = "IpcMessenger"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@ import androidx.core.content.ContextCompat
|
||||||
import java.io.FileDescriptor
|
import java.io.FileDescriptor
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.lang.Exception
|
import java.lang.Exception
|
||||||
|
import org.amnezia.vpn.util.Log
|
||||||
|
|
||||||
class NetworkState(var service: AmneziaVpnService) {
|
class NetworkState(var service: AmneziaVpnService) {
|
||||||
private var mService: AmneziaVpnService = service
|
private var mService: AmneziaVpnService = service
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import android.content.Context
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import androidx.security.crypto.EncryptedSharedPreferences
|
import androidx.security.crypto.EncryptedSharedPreferences
|
||||||
import androidx.security.crypto.MasterKey
|
import androidx.security.crypto.MasterKey
|
||||||
|
import org.amnezia.vpn.util.Log
|
||||||
|
|
||||||
private const val TAG = "Prefs"
|
private const val TAG = "Prefs"
|
||||||
private const val PREFS_FILE = "org.amnezia.vpn.prefs"
|
private const val PREFS_FILE = "org.amnezia.vpn.prefs"
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ import androidx.activity.result.ActivityResult
|
||||||
import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
|
import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.core.content.getSystemService
|
import androidx.core.content.getSystemService
|
||||||
|
import org.amnezia.vpn.util.Log
|
||||||
|
|
||||||
private const val TAG = "VpnRequestActivity"
|
private const val TAG = "VpnRequestActivity"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ kotlin {
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "org.amnezia.vpn"
|
namespace = "org.amnezia.vpn.util"
|
||||||
|
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
// add BuildConfig class
|
// add BuildConfig class
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package org.amnezia.vpn
|
package org.amnezia.vpn.util
|
||||||
|
|
||||||
import android.util.Log as NativeLog
|
import android.util.Log as NativeLog
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,13 +4,13 @@ import android.content.Context
|
||||||
import android.net.VpnService.Builder
|
import android.net.VpnService.Builder
|
||||||
import java.util.TreeMap
|
import java.util.TreeMap
|
||||||
import com.wireguard.android.backend.GoBackend
|
import com.wireguard.android.backend.GoBackend
|
||||||
import org.amnezia.vpn.Log
|
|
||||||
import org.amnezia.vpn.protocol.InetEndpoint
|
import org.amnezia.vpn.protocol.InetEndpoint
|
||||||
import org.amnezia.vpn.protocol.InetNetwork
|
import org.amnezia.vpn.protocol.InetNetwork
|
||||||
import org.amnezia.vpn.protocol.Protocol
|
import org.amnezia.vpn.protocol.Protocol
|
||||||
import org.amnezia.vpn.protocol.Statistics
|
import org.amnezia.vpn.protocol.Statistics
|
||||||
import org.amnezia.vpn.protocol.VpnStartException
|
import org.amnezia.vpn.protocol.VpnStartException
|
||||||
import org.amnezia.vpn.protocol.parseInetAddress
|
import org.amnezia.vpn.protocol.parseInetAddress
|
||||||
|
import org.amnezia.vpn.util.Log
|
||||||
import org.json.JSONObject
|
import org.json.JSONObject
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue