Merge pull request #694 from SUPERCILEX/save-creds-npe

samtstern · web-flow · commit fb2bf1dd26df · 2017-05-09T12:26:58.000-04:00
Fix NPE when saving smart lock
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java
@@ -47,7 +47,7 @@ public void startLogin(Activity activity) {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode == ResultCodes.OK) {
+        if (requestCode == RC_EMAIL_FLOW && resultCode == ResultCodes.OK) {
             mHelper.finishActivity(mActivity, ResultCodes.OK, data);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void startLogin(Activity activity) {`
`47`	`47`
`48`	`48`	`@Override`
`49`	`49`	`public void onActivityResult(int requestCode, int resultCode, Intent data) {`
`50`		`- if (resultCode == ResultCodes.OK) {`
	`50`	`+ if (requestCode == RC_EMAIL_FLOW && resultCode == ResultCodes.OK) {`
`51`	`51`	`mHelper.finishActivity(mActivity, ResultCodes.OK, data);`
`52`	`52`	`}`
`53`	`53`	`}`