Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
002136ee
Commit
002136ee
authored
Nov 20, 2019
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix NPE
parent
4ea98e1a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
mirai-demos/mirai-demo-android/src/main/kotlin/net/mamoe/mirai/demo/MiraiService.kt
...roid/src/main/kotlin/net/mamoe/mirai/demo/MiraiService.kt
+4
-3
No files found.
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
class
MiraiService
:
Service
()
{
private
var
mCaptchaDeferred
:
CompletableDeferred
<
String
>?
=
null
private
lateinit
var
mCaptchaDeferred
:
CompletableDeferred
<
String
>
private
lateinit
var
mBot
:
Bot
private
var
mCaptcha
=
""
set
(
value
)
{
field
=
value
mCaptchaDeferred
?
.
complete
(
value
)
mCaptchaDeferred
.
complete
(
value
)
}
private
var
mBinder
:
MiraiBinder
?
=
null
...
...
@@ -49,8 +49,9 @@ class MiraiService : Service() {
captchaSolver
=
{
val
bytes
=
it
.
readBytes
()
val
bitmap
=
BitmapFactory
.
decodeByteArray
(
bytes
,
0
,
bytes
.
size
)
mCaptchaDeferred
=
CompletableDeferred
()
mCallback
?.
get
()
?.
onCaptcha
(
bitmap
)
mCaptchaDeferred
?
.
await
()
mCaptchaDeferred
.
await
()
}
}
if
(
loginResult
==
LoginResult
.
SUCCESS
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment