Skip to content

Commit 64ccdc9

Browse files
clydebarrowsamtstern
authored andcommitted
Fix crash using email authentication on API 19. Fixes issue #1036 (#1082)
1 parent 944d1b7 commit 64ccdc9

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import android.support.annotation.RestrictTo;
2121
import android.support.design.widget.TextInputLayout;
2222
import android.support.v4.app.FragmentTransaction;
23+
import android.support.v4.view.ViewCompat;
2324

2425
import com.firebase.ui.auth.IdpResponse;
2526
import com.firebase.ui.auth.R;
@@ -123,7 +124,11 @@ public void onNewUser(User user) {
123124
FragmentTransaction ft = getSupportFragmentManager().beginTransaction()
124125
.replace(R.id.fragment_register_email, fragment, RegisterEmailFragment.TAG);
125126

126-
if (emailLayout != null) ft.addSharedElement(emailLayout, "email_field");
127+
if (emailLayout != null) {
128+
String emailFieldName = getString(R.string.fui_email_field_name);
129+
ViewCompat.setTransitionName(emailLayout, emailFieldName);
130+
ft.addSharedElement(emailLayout, emailFieldName);
131+
}
127132

128133
ft.disallowAddToBackStack().commit();
129134
} else {

auth/src/main/res/layout/fui_check_email_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
android:layout_height="wrap_content"
1919
android:layout_marginTop="@dimen/fui_field_padding_vert"
2020
android:transitionGroup="true"
21-
android:transitionName="email_field"
21+
android:transitionName="@string/fui_email_field_name"
2222
app:errorEnabled="true"
2323
tools:ignore="UnusedAttribute">
2424

auth/src/main/res/layout/fui_register_email_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
android:layout_height="wrap_content"
1919
android:layout_marginTop="@dimen/fui_field_padding_vert"
2020
android:transitionGroup="true"
21-
android:transitionName="email_field"
21+
android:transitionName="@string/fui_email_field_name"
2222
app:errorEnabled="true"
2323
tools:ignore="UnusedAttribute">
2424

auth/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<string name="fui_create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">By tapping <xliff:g example="SAVE" id="btn" translation_description="">%1$s</xliff:g> you are indicating that you agree to the <xliff:g example="https://google.com/privacy" id="pp" translation_description="">%2$s</xliff:g>.</string>
4848
<string name="fui_terms_of_service" translation_description="Link text to web url containing the app's terms of service">Terms of Service</string>
4949
<string name="fui_privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
50+
<string name="fui_email_field_name" translatable="false">email_field</string>
5051

5152
<!-- Idp/Email welcome back -->
5253
<string name="fui_title_welcome_back_idp_prompt" translatable="false">@string/fui_sign_in_default</string>

0 commit comments

Comments
 (0)