diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 5a15a1bc74..f9308e115e 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt index ce97803f88..a57a03ceb5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt @@ -248,9 +248,9 @@ class LoginActivity : BaseActivity(), Consumer { } 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) + super.onActivityResult(requestCode, resultCode, data) + callbackManager.onActivityResult(requestCode, resultCode, data) + val scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data) if (scanResult != null) { try { Log.d("scanresult", scanResult.contents)