fix facebook login

HabitRPG · Aug 23, 2018 · b8f51de · b8f51de
1 parent b944478
commit b8f51de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="1987"
+    android:versionCode="1989"
     android:versionName="1.4.5"
     android:screenOrientation="portrait"
     android:installLocation="auto" >

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
@@ -248,9 +248,9 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
     }
 
     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)