Skip to content

Commit 7cc914b

Browse files
author
tanpengcheng
committed
[fix] Fix qr code scan devices name wrong.
1 parent ce323fe commit 7cc914b

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

app/src/main/java/com/tans/tfiletransporter/ui/activity/connection/localconnetion/LocalNetworkConnectionFragment.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import android.os.Bundle
99
import com.afollestad.inlineactivityresult.coroutines.startActivityAwaitResult
1010
import com.jakewharton.rxbinding4.view.clicks
1111
import com.tans.rxutils.ignoreSeveralClicks
12-
import com.tans.rxutils.switchThread
1312
import com.tans.tfiletransporter.R
1413
import com.tans.tfiletransporter.databinding.LocalNetworkConnectionFragmentBinding
14+
import com.tans.tfiletransporter.file.LOCAL_DEVICE
1515
import com.tans.tfiletransporter.logs.AndroidLog
1616
import com.tans.tfiletransporter.netty.toInetAddress
1717
import com.tans.tfiletransporter.toBytes
@@ -25,7 +25,6 @@ import com.tans.tfiletransporter.ui.activity.filetransport.FileTransportActivity
2525
import com.tans.tfiletransporter.ui.activity.qrcodescan.ScanQrCodeActivity
2626
import com.tans.tfiletransporter.utils.fromJson
2727
import com.tans.tfiletransporter.utils.showToastShort
28-
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
2928
import io.reactivex.rxjava3.core.Single
3029
import io.reactivex.rxjava3.kotlin.withLatestFrom
3130
import kotlinx.coroutines.Dispatchers
@@ -108,7 +107,7 @@ class LocalNetworkConnectionFragment : BaseFragment<LocalNetworkConnectionFragme
108107
val serverAddress = qrcodeShare.address.toInetAddress()
109108
scanClient.startQRCodeScanClientSuspend(serverAddress)
110109
AndroidLog.d(TAG, "Client connect address: $serverAddress success.")
111-
scanClient.requestFileTransferSuspend(targetAddress = serverAddress, deviceName = qrcodeShare.deviceName)
110+
scanClient.requestFileTransferSuspend(targetAddress = serverAddress, deviceName = LOCAL_DEVICE)
112111
serverAddress
113112
}.onSuccess { serverAddress ->
114113
withContext(Dispatchers.Main) {

0 commit comments

Comments
 (0)