Skip to content

Commit 0b2a4e0

Browse files
committed
Make sure we still support parsing config without ADB tunnels
1 parent 2ba582e commit 0b2a4e0

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies {
4848
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
4949
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
5050
implementation 'me.dm7.barcodescanner:zxing:1.9.13'
51-
implementation 'com.beust:klaxon:5.0.1'
51+
implementation 'com.beust:klaxon:5.5'
5252
implementation 'com.squareup.okhttp3:okhttp:4.3.0'
5353
implementation 'com.google.android.material:material:1.1.0-beta02'
5454
implementation 'net.swiftzer.semver:semver:1.1.1'

app/src/main/java/tech/httptoolkit/android/ProxyDetails.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.os.Parcelable
44
import android.util.Base64
55
import android.util.Log
66
import com.beust.klaxon.Converter
7+
import com.beust.klaxon.Json
78
import com.beust.klaxon.JsonValue
89
import kotlinx.android.parcel.Parcelize
910
import java.io.ByteArrayInputStream
@@ -32,6 +33,7 @@ data class ProxyInfo(
3233
* direct network connection, since it's dependent on the ADB server, but it's a useful fallback
3334
* especially if the proxy computer has a firewall or the network blocks connections.
3435
*/
36+
@Json(serializeNull = false)
3537
val localTunnelPort: Int?,
3638

3739
/**

0 commit comments

Comments
 (0)