Skip to content

M
Mirai
Commit 002136ee authored by Him188's avatar Him188
Browse files
Options

Fix NPE

parent 4ea98e1a
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
mirai-demos/mirai-demo-android/src/main/kotlin/net/mamoe/mirai/demo/MiraiService.kt
View file @ 002136ee
...@@ -22,14 +22,14 @@ import java.lang.ref.WeakReference ...@@ -22,14 +22,14 @@ import java.lang.ref.WeakReference
class MiraiService : Service() { class MiraiService : Service() {
private var mCaptchaDeferred: CompletableDeferred<String>? = null private lateinit var mCaptchaDeferred: CompletableDeferred<String>
private lateinit var mBot: Bot private lateinit var mBot: Bot
private var mCaptcha = "" private var mCaptcha = ""
set(value) { set(value) {
field = value field = value
mCaptchaDeferred?.complete(value) mCaptchaDeferred.complete(value)
} }
private var mBinder: MiraiBinder? = null private var mBinder: MiraiBinder? = null
...@@ -49,8 +49,9 @@ class MiraiService : Service() { ...@@ -49,8 +49,9 @@ class MiraiService : Service() {
captchaSolver = { captchaSolver = {
val bytes = it.readBytes() val bytes = it.readBytes()
val bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.size) val bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.size)
mCaptchaDeferred = CompletableDeferred()
mCallback?.get()?.onCaptcha(bitmap) mCallback?.get()?.onCaptcha(bitmap)
mCaptchaDeferred?.await() mCaptchaDeferred.await()
} }
} }
if (loginResult == LoginResult.SUCCESS) { if (loginResult == LoginResult.SUCCESS) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment