Skip to content

Commit f8a1d8b

Browse files
committed
fix
1 parent 5c5a95d commit f8a1d8b

File tree

2 files changed

+24
-17
lines changed

2 files changed

+24
-17
lines changed

auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.kt

+15-16
Original file line numberDiff line numberDiff line change
@@ -27,29 +27,28 @@ import androidx.lifecycle.ViewModelProvider
2727
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
2828
class CheckEmailFragment : FragmentBase(), View.OnClickListener, ImeHelper.DonePressedListener {
2929

30-
companion object {
31-
const val TAG = "CheckEmailFragment"
32-
@JvmStatic
33-
fun newInstance(email: String?): CheckEmailFragment {
34-
val fragment = CheckEmailFragment()
35-
val args = Bundle()
36-
args.putString(ExtraConstants.EMAIL, email)
37-
fragment.arguments = args
38-
return fragment
39-
}
40-
}
41-
4230
private lateinit var mHandler: CheckEmailHandler
31+
private lateinit var mListener: CheckEmailListener
32+
private lateinit var mEmailEditText: EditText
33+
private lateinit var mEmailLayout: TextInputLayout
4334
private lateinit var mSignInButton: Button
4435
private lateinit var mSignUpButton: Button
4536
private lateinit var mProgressBar: ProgressBar
46-
private lateinit var mEmailEditText: EditText
47-
private lateinit var mEmailLayout: TextInputLayout
4837
private lateinit var mEmailFieldValidator: EmailFieldValidator
49-
private lateinit var mListener: CheckEmailListener
38+
39+
companion object {
40+
const val TAG = "CheckEmailFragment"
41+
42+
@JvmStatic
43+
fun newInstance(): CheckEmailFragment {
44+
return CheckEmailFragment()
45+
}
46+
}
5047

5148
override fun onCreateView(
52-
inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
49+
inflater: LayoutInflater,
50+
container: ViewGroup?,
51+
savedInstanceState: Bundle?
5352
): View? {
5453
return inflater.inflate(R.layout.fui_check_email_layout, container, false)
5554
}

auth/src/main/java/com/firebase/ui/auth/ui/email/EmailActivity.kt

+9-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,15 @@ class EmailActivity : AppCompatBase(),
130130
showRegisterEmailLinkFragment(emailConfig, email)
131131
} else {
132132
if (user == null) {
133-
finishOnDeveloperError(IllegalStateException("User cannot be null for email/password sign in."))
133+
// Show CheckEmailFragment when no user is provided
134+
val fragment = CheckEmailFragment.newInstance()
135+
ft.replace(R.id.fragment_register_email, fragment, CheckEmailFragment.TAG)
136+
emailLayout?.let {
137+
val emailFieldName = getString(R.string.fui_email_field_name)
138+
ViewCompat.setTransitionName(it, emailFieldName)
139+
ft.addSharedElement(it, emailFieldName)
140+
}
141+
ft.disallowAddToBackStack().commit()
134142
return
135143
}
136144
val fragment = RegisterEmailFragment.newInstance(user)

0 commit comments

Comments
 (0)