sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-08-01 03:30:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix potential crashes

Browse source
This commit is contained in:
Phillip Thelen 2018-08-10 11:49:53 +02:00
parent 9b201be18b
commit 9191303fd5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
View file

@ -247,7 +247,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
this.resetLayout()
}
public override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent) {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, intent)
callbackManager.onActivityResult(requestCode, resultCode, intent)
val scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent)

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.kt
View file

@ -127,7 +127,7 @@ class PartyInviteActivity : BaseActivity() {
tabLayout.setupWithViewPager(viewPager)
}
public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
val scanningResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data)