From e36a5c30ac25696204f96e9615579df170d61a4b Mon Sep 17 00:00:00 2001 From: Le Zhou <2428499107@qq.com> Date: Thu, 2 Jan 2025 17:47:24 +0800 Subject: [PATCH] rename file --- .../{HydraLabVpnLogger.kt => HydraLabVpnLoggerTemp.kt} | 2 +- .../hydralab/android/client/vpn/HydraLabVpnQueue.kt | 8 ++++---- .../hydralab/android/client/vpn/HydraLabVpnService.kt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/{HydraLabVpnLogger.kt => HydraLabVpnLoggerTemp.kt} (96%) diff --git a/android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/HydraLabVpnLogger.kt b/android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/HydraLabVpnLoggerTemp.kt similarity index 96% rename from android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/HydraLabVpnLogger.kt rename to android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/HydraLabVpnLoggerTemp.kt index 2339688da..1ea96b0cb 100644 --- a/android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/HydraLabVpnLogger.kt +++ b/android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/HydraLabVpnLoggerTemp.kt @@ -10,7 +10,7 @@ import java.io.FileWriter import java.io.IOException import kotlin.io.path.Path -class HydraLabVpnLogger(private var filePath: String?) { +class HydraLabVpnLoggerTemp(private var filePath: String?) { private var lines = mutableListOf() private var linesStaging = listOf() diff --git a/android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/HydraLabVpnQueue.kt b/android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/HydraLabVpnQueue.kt index dd80b95aa..3b902d4d6 100644 --- a/android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/HydraLabVpnQueue.kt +++ b/android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/HydraLabVpnQueue.kt @@ -38,11 +38,11 @@ object ToNetworkQueueWorker : Runnable { private lateinit var vpnInput: FileChannel - private lateinit var vpnLogger: HydraLabVpnLogger + private lateinit var vpnLogger: HydraLabVpnLoggerTemp var totalInputCount = 0L - fun start(vpnFileDescriptor: FileDescriptor, logger: HydraLabVpnLogger) { + fun start(vpnFileDescriptor: FileDescriptor, logger: HydraLabVpnLoggerTemp) { if (this::thread.isInitialized && thread.isAlive) throw IllegalStateException("Running already") vpnInput = FileInputStream(vpnFileDescriptor).channel vpnLogger = logger @@ -107,9 +107,9 @@ object ToDeviceQueueWorker : Runnable { private lateinit var vpnOutput: FileChannel - private lateinit var vpnLogger: HydraLabVpnLogger + private lateinit var vpnLogger: HydraLabVpnLoggerTemp - fun start(vpnFileDescriptor: FileDescriptor, logger: HydraLabVpnLogger) { + fun start(vpnFileDescriptor: FileDescriptor, logger: HydraLabVpnLoggerTemp) { if (this::thread.isInitialized && thread.isAlive) throw IllegalStateException("Is already running") vpnOutput = FileOutputStream(vpnFileDescriptor).channel vpnLogger = logger diff --git a/android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/HydraLabVpnService.kt b/android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/HydraLabVpnService.kt index aa96ba6d5..b2dc51fad 100644 --- a/android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/HydraLabVpnService.kt +++ b/android_client/app/src/main/java/com/microsoft/hydralab/android/client/vpn/HydraLabVpnService.kt @@ -27,7 +27,7 @@ class HydraLabVpnService : VpnService() { private lateinit var vpnInterface: ParcelFileDescriptor - private lateinit var vpnLogger: HydraLabVpnLogger + private lateinit var vpnLogger: HydraLabVpnLoggerTemp override fun onCreate() { UdpSendWorker.start(this) @@ -62,7 +62,7 @@ class HydraLabVpnService : VpnService() { private fun connect(config: VpnUserConfig) { vpnInterface = createVpnInterface(config) - vpnLogger = HydraLabVpnLogger(config.dumpPath) + vpnLogger = HydraLabVpnLoggerTemp(config.dumpPath) val fileDescriptor = vpnInterface.fileDescriptor ToNetworkQueueWorker.start(fileDescriptor, vpnLogger) ToDeviceQueueWorker.start(fileDescriptor, vpnLogger)