Use Flower Logging

OperatorFoundation · Jul 26, 2022 · 7cb036a · 7cb036a
1 parent e96de39
commit 7cb036a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/moonbounceVPNService/build.gradle b/moonbounceVPNService/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.5.0'
-    implementation 'com.github.OperatorFoundation:FlowerAndroid:1.0.17'
+    implementation 'com.github.OperatorFoundation:FlowerAndroid:1.0.18'
     implementation 'com.github.OperatorFoundation:TransmissionAndroid:1.0.17'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

diff --git a/...nceVPNService/src/main/java/org/operatorfoundation/moonbouncevpnservice/MBAKVpnService.kt b/...nceVPNService/src/main/java/org/operatorfoundation/moonbouncevpnservice/MBAKVpnService.kt
@@ -53,7 +53,7 @@ class MBAKVpnService: VpnService()
                 val transmissionConnection = TransmissionConnection(transportServerIP, transportServerPort, ConnectionType.TCP, null)
                 protect(transmissionConnection.tcpConnection!!)
 
-                flowerConnection = FlowerConnection(transmissionConnection, null)
+                flowerConnection = FlowerConnection(transmissionConnection, null, true, true)
                 parcelFileDescriptor = handshake(flowerConnection!!)
 
                 if (parcelFileDescriptor == null)
@@ -67,18 +67,11 @@ class MBAKVpnService: VpnService()
                     outputStream = FileOutputStream(parcelFileDescriptor!!.fileDescriptor)
                     inputStream = FileInputStream(parcelFileDescriptor!!.fileDescriptor)
 
-                    println(">>>>>>>>>>>>>>> UDP test before ServerToVPN")
-                    //NetworkTests().udpTest(transportServerIP, 2233)
-                    println(">>>>>>>>>>>>>>> UDP test end")
-
                     println("ð MBAKVpnService: starting ServerToVPN loop")
                     thread(start = true)
                     {
                         runServerToVPN()
                     }
-                    println(">>>>>>>>>>>>>>> UDP test before VPNtoServer")
-                    //NetworkTests().udpTest(transportServerIP, 2233)
-                    println(">>>>>>>>>>>>>>> UDP test end")
 
                     println("🌙 MBAKVpnService: starting VPNtoServer loop")
                     thread(start = true)