Cleanup

Author: seladb

.github/workflows/builtAndTest.yml

@@ -66,11 +66,11 @@ jobs:
           api-level: ${{ matrix.api-level }}
           arch: x86_64
           script: ./gradlew -is connectedCheck
-  # Uncomment to enable logs
-  #          script: |
-  #            adb logcat -c
-  #            adb logcat &
-  #            gradle -is connectedCheck
+# Uncomment to enable logs
+#          script: |
+#            adb logcat -c
+#            adb logcat &
+#            gradle -is connectedCheck
 
   build-server:
     runs-on: ubuntu-latest

app/src/androidTest/java/com/pcapplusplus/toyvpn/ToyVpnServiceManagerTest.kt

@@ -4,7 +4,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.util.Log
 import androidx.activity.result.ActivityResultLauncher
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -134,19 +133,12 @@ class ToyVpnServiceManagerTest {
                     putExtra("clientAddress", "10.0.0.1")
                 }
 
-            Log.e("TestReceiveVpnStartedAndStoppedEvent", "Before sending first broadcast")
             context.sendBroadcast(intent)
-            Log.e("TestReceiveVpnStartedAndStoppedEvent", "After sending first broadcast")
             waitFor { serviceManager.vpnServiceState.value == VpnConnectionState.CONNECTED }
-            Log.e("TestReceiveVpnStartedAndStoppedEvent", "Passed first waitFor")
             waitFor { serviceManager.clientAddress.value == "10.0.0.1" }
-            Log.e("TestReceiveVpnStartedAndStoppedEvent", "Passed second waitFor")
 
-            Log.e("TestReceiveVpnStartedAndStoppedEvent", "Before sending second broadcast")
             context.sendBroadcast(Intent(BroadcastActions.VPN_SERVICE_STOPPED))
-            Log.e("TestReceiveVpnStartedAndStoppedEvent", "After sending second broadcast")
             waitFor { serviceManager.vpnServiceState.value == VpnConnectionState.DISCONNECTED }
-            Log.e("TestReceiveVpnStartedAndStoppedEvent", "Passed third waitFor")
         }
 
     @Test

app/src/main/java/com/pcapplusplus/toyvpn/ToyVpnServiceManager.kt

@@ -7,7 +7,6 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.net.VpnService
 import android.os.Build
-import android.util.Log
 import androidx.activity.result.ActivityResultLauncher
 import com.pcapplusplus.toyvpn.model.BroadcastActions
 import com.pcapplusplus.toyvpn.model.PacketData
@@ -57,24 +56,13 @@ class ToyVpnServiceManager(
             ) {
                 when (intent?.action) {
                     BroadcastActions.VPN_SERVICE_STARTED -> {
-                        Log.e("TestReceiveVpnStartedAndStoppedEvent", "Got VPN_SERVICE_STARTED event")
                         _vpnServiceState.value = VpnConnectionState.CONNECTED
                         _clientAddress.value = intent.getStringExtra("clientAddress")
-                        Log.e("TestReceiveVpnStartedAndStoppedEvent", "VPN_SERVICE_STARTED: _clientAddress.value = ${_clientAddress.value}")
-                        Log.e(
-                            "TestReceiveVpnStartedAndStoppedEvent",
-                            "VPN_SERVICE_STARTED: _vpnServiceState.value = ${_vpnServiceState.value}",
-                        )
                     }
 
                     BroadcastActions.VPN_SERVICE_STOPPED -> {
-                        Log.e("TestReceiveVpnStartedAndStoppedEvent", "Got VPN_SERVICE_STOPPED event")
                         _vpnServiceState.value = VpnConnectionState.DISCONNECTED
                         _clientAddress.value = null
-                        Log.e(
-                            "TestReceiveVpnStartedAndStoppedEvent",
-                            "VPN_SERVICE_STOPPED: _vpnServiceState.value = ${_vpnServiceState.value}",
-                        )
                     }
 
                     BroadcastActions.VPN_SERVICE_PACKET_ARRIVED -> {