Skip to content

Commit 8658ce5

Browse files
samtsternsamtstern
committed
Merge branch 'version-3.3.0-dev' into fix-issue-1210
Change-Id: Iff4ddc1ff40cb6d83e0f57ba835a057012384a62
2 parents ba87420 + 2f8112f commit 8658ce5

34 files changed

+290
-298
lines changed

‎app/src/main/java/com/firebase/uidemo/ChooserActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import android.content.Intent;
1818
import android.os.Bundle;
19+
import android.support.annotation.Nullable;
1920
import android.support.annotation.StringRes;
2021
import android.support.v7.app.AppCompatActivity;
2122
import android.support.v7.widget.LinearLayoutManager;
@@ -38,7 +39,7 @@ public class ChooserActivity extends AppCompatActivity {
3839
RecyclerView mActivities;
3940

4041
@Override
41-
protected void onCreate(Bundle savedInstanceState) {
42+
protected void onCreate(@Nullable Bundle savedInstanceState) {
4243
super.onCreate(savedInstanceState);
4344
setContentView(R.layout.activity_chooser);
4445
ButterKnife.bind(this);

‎app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import android.content.Intent;
1919
import android.os.Bundle;
2020
import android.support.annotation.DrawableRes;
21+
import android.support.annotation.Nullable;
2122
import android.support.annotation.StringRes;
2223
import android.support.annotation.StyleRes;
2324
import android.support.design.widget.Snackbar;
@@ -100,7 +101,7 @@ public static Intent createIntent(Context context) {
100101
}
101102

102103
@Override
103-
public void onCreate(Bundle savedInstanceState) {
104+
public void onCreate(@Nullable Bundle savedInstanceState) {
104105
super.onCreate(savedInstanceState);
105106
setContentView(R.layout.auth_ui_layout);
106107
ButterKnife.bind(this);

‎app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ public class SignedInActivity extends AppCompatActivity {
6565

6666
public static Intent createIntent(Context context, IdpResponse idpResponse) {
6767
return new Intent().setClass(context, SignedInActivity.class)
68-
.putExtra(ExtraConstants.EXTRA_IDP_RESPONSE, idpResponse);
68+
.putExtra(ExtraConstants.IDP_RESPONSE, idpResponse);
6969
}
7070

7171
@Override
72-
public void onCreate(Bundle savedInstanceState) {
72+
public void onCreate(@Nullable Bundle savedInstanceState) {
7373
super.onCreate(savedInstanceState);
7474

7575
FirebaseUser currentUser = FirebaseAuth.getInstance().getCurrentUser();
@@ -79,7 +79,7 @@ public void onCreate(Bundle savedInstanceState) {
7979
return;
8080
}
8181

82-
IdpResponse response = getIntent().getParcelableExtra(ExtraConstants.EXTRA_IDP_RESPONSE);
82+
IdpResponse response = getIntent().getParcelableExtra(ExtraConstants.IDP_RESPONSE);
8383

8484
setContentView(R.layout.signed_in_layout);
8585
ButterKnife.bind(this);

‎app/src/main/java/com/firebase/uidemo/database/firestore/FirestoreChatActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.os.Bundle;
44
import android.support.annotation.NonNull;
5+
import android.support.annotation.Nullable;
56
import android.support.v7.app.AppCompatActivity;
67
import android.support.v7.widget.LinearLayoutManager;
78
import android.support.v7.widget.RecyclerView;
@@ -64,7 +65,7 @@ public class FirestoreChatActivity extends AppCompatActivity
6465
TextView mEmptyListMessage;
6566

6667
@Override
67-
protected void onCreate(Bundle savedInstanceState) {
68+
protected void onCreate(@Nullable Bundle savedInstanceState) {
6869
super.onCreate(savedInstanceState);
6970
setContentView(R.layout.activity_chat);
7071
ButterKnife.bind(this);

‎app/src/main/java/com/firebase/uidemo/database/realtime/RealtimeDbChatActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.os.Bundle;
44
import android.support.annotation.NonNull;
5+
import android.support.annotation.Nullable;
56
import android.support.v7.app.AppCompatActivity;
67
import android.support.v7.widget.LinearLayoutManager;
78
import android.support.v7.widget.RecyclerView;
@@ -61,7 +62,7 @@ public class RealtimeDbChatActivity extends AppCompatActivity
6162
TextView mEmptyListMessage;
6263

6364
@Override
64-
protected void onCreate(Bundle savedInstanceState) {
65+
protected void onCreate(@Nullable Bundle savedInstanceState) {
6566
super.onCreate(savedInstanceState);
6667
setContentView(R.layout.activity_chat);
6768
ButterKnife.bind(this);

‎app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.os.Bundle;
77
import android.provider.MediaStore;
88
import android.support.annotation.NonNull;
9+
import android.support.annotation.Nullable;
910
import android.support.v7.app.AppCompatActivity;
1011
import android.util.Log;
1112
import android.view.View;
@@ -54,7 +55,7 @@ public class ImageActivity extends AppCompatActivity implements EasyPermissions.
5455
ImageView mImageView;
5556

5657
@Override
57-
protected void onCreate(Bundle savedInstanceState) {
58+
protected void onCreate(@Nullable Bundle savedInstanceState) {
5859
super.onCreate(savedInstanceState);
5960
setContentView(R.layout.activity_image);
6061
ButterKnife.bind(this);

‎auth/src/main/java/com/firebase/ui/auth/AuthUI.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public class AuthUI {
149149
* instead.
150150
*/
151151
@Deprecated
152-
public static final String EXTRA_DEFAULT_PHONE_NUMBER = ExtraConstants.EXTRA_PHONE;
152+
public static final String EXTRA_DEFAULT_PHONE_NUMBER = ExtraConstants.PHONE;
153153

154154
/**
155155
* Bundle key for the default phone country code parameter.
@@ -158,7 +158,7 @@ public class AuthUI {
158158
* String)} instead.
159159
*/
160160
@Deprecated
161-
public static final String EXTRA_DEFAULT_COUNTRY_CODE = ExtraConstants.EXTRA_COUNTRY_ISO;
161+
public static final String EXTRA_DEFAULT_COUNTRY_CODE = ExtraConstants.COUNTRY_ISO;
162162

163163
/**
164164
* Bundle key for the default national phone number parameter.
@@ -167,7 +167,7 @@ public class AuthUI {
167167
* String)} instead.
168168
*/
169169
@Deprecated
170-
public static final String EXTRA_DEFAULT_NATIONAL_NUMBER = ExtraConstants.EXTRA_NATIONAL_NUMBER;
170+
public static final String EXTRA_DEFAULT_NATIONAL_NUMBER = ExtraConstants.NATIONAL_NUMBER;
171171

172172
/**
173173
* Default value for logo resource, omits the logo from the {@link AuthMethodPickerActivity}.
@@ -450,7 +450,7 @@ public List<String> getScopes() {
450450
List<String> permissions;
451451
if (mProviderId.equals(GoogleAuthProvider.PROVIDER_ID)) {
452452
Scope[] array = ((GoogleSignInOptions)
453-
mParams.getParcelable(ExtraConstants.EXTRA_GOOGLE_SIGN_IN_OPTIONS))
453+
mParams.getParcelable(ExtraConstants.GOOGLE_SIGN_IN_OPTIONS))
454454
.getScopeArray();
455455

456456
List<String> scopes = new ArrayList<>();
@@ -459,7 +459,7 @@ public List<String> getScopes() {
459459
}
460460
permissions = scopes;
461461
} else if (mProviderId.equals(FacebookAuthProvider.PROVIDER_ID)) {
462-
permissions = mParams.getStringArrayList(ExtraConstants.EXTRA_FACEBOOK_PERMISSIONS);
462+
permissions = mParams.getStringArrayList(ExtraConstants.FACEBOOK_PERMISSIONS);
463463
} else {
464464
permissions = null;
465465
}
@@ -618,7 +618,7 @@ public EmailBuilder() {
618618
*/
619619
@NonNull
620620
public EmailBuilder setAllowNewAccounts(boolean allow) {
621-
getParams().putBoolean(ExtraConstants.EXTRA_ALLOW_NEW_EMAILS, allow);
621+
getParams().putBoolean(ExtraConstants.ALLOW_NEW_EMAILS, allow);
622622
return this;
623623
}
624624

@@ -630,7 +630,7 @@ public EmailBuilder setAllowNewAccounts(boolean allow) {
630630
*/
631631
@NonNull
632632
public EmailBuilder setRequireName(boolean requireName) {
633-
getParams().putBoolean(ExtraConstants.EXTRA_REQUIRE_NAME, requireName);
633+
getParams().putBoolean(ExtraConstants.REQUIRE_NAME, requireName);
634634
return this;
635635
}
636636
}
@@ -652,13 +652,13 @@ public PhoneBuilder() {
652652
public PhoneBuilder setDefaultNumber(@NonNull String number) {
653653
Preconditions.checkUnset(getParams(),
654654
"Cannot overwrite previously set phone number",
655-
ExtraConstants.EXTRA_COUNTRY_ISO,
656-
ExtraConstants.EXTRA_NATIONAL_NUMBER);
655+
ExtraConstants.COUNTRY_ISO,
656+
ExtraConstants.NATIONAL_NUMBER);
657657
if (!PhoneNumberUtils.isValid(number)) {
658658
throw new IllegalStateException("Invalid phone number: " + number);
659659
}
660660

661-
getParams().putString(ExtraConstants.EXTRA_PHONE, number);
661+
getParams().putString(ExtraConstants.PHONE, number);
662662

663663
return this;
664664
}
@@ -674,13 +674,13 @@ public PhoneBuilder setDefaultNumber(@NonNull String number) {
674674
public PhoneBuilder setDefaultNumber(@NonNull String iso, @NonNull String number) {
675675
Preconditions.checkUnset(getParams(),
676676
"Cannot overwrite previously set phone number",
677-
ExtraConstants.EXTRA_PHONE);
677+
ExtraConstants.PHONE);
678678
if (!PhoneNumberUtils.isValidIso(iso)) {
679679
throw new IllegalStateException("Invalid country iso: " + iso);
680680
}
681681

682-
getParams().putString(ExtraConstants.EXTRA_COUNTRY_ISO, iso);
683-
getParams().putString(ExtraConstants.EXTRA_NATIONAL_NUMBER, number);
682+
getParams().putString(ExtraConstants.COUNTRY_ISO, iso);
683+
getParams().putString(ExtraConstants.NATIONAL_NUMBER, number);
684684

685685
return this;
686686
}
@@ -695,14 +695,14 @@ public PhoneBuilder setDefaultNumber(@NonNull String iso, @NonNull String number
695695
public PhoneBuilder setDefaultCountryIso(@NonNull String iso) {
696696
Preconditions.checkUnset(getParams(),
697697
"Cannot overwrite previously set phone number",
698-
ExtraConstants.EXTRA_PHONE,
699-
ExtraConstants.EXTRA_COUNTRY_ISO,
700-
ExtraConstants.EXTRA_NATIONAL_NUMBER);
698+
ExtraConstants.PHONE,
699+
ExtraConstants.COUNTRY_ISO,
700+
ExtraConstants.NATIONAL_NUMBER);
701701
if (!PhoneNumberUtils.isValidIso(iso)) {
702702
throw new IllegalStateException("Invalid country iso: " + iso);
703703
}
704704

705-
getParams().putString(ExtraConstants.EXTRA_COUNTRY_ISO, iso);
705+
getParams().putString(ExtraConstants.COUNTRY_ISO, iso);
706706

707707
return this;
708708
}
@@ -748,21 +748,21 @@ public GoogleBuilder setScopes(@NonNull List<String> scopes) {
748748
public GoogleBuilder setSignInOptions(@NonNull GoogleSignInOptions options) {
749749
Preconditions.checkUnset(getParams(),
750750
"Cannot overwrite previously set sign-in options.",
751-
ExtraConstants.EXTRA_GOOGLE_SIGN_IN_OPTIONS);
751+
ExtraConstants.GOOGLE_SIGN_IN_OPTIONS);
752752

753753
GoogleSignInOptions.Builder builder = new GoogleSignInOptions.Builder(options);
754754
builder.requestEmail().requestIdToken(getApplicationContext()
755755
.getString(R.string.default_web_client_id));
756756
getParams().putParcelable(
757-
ExtraConstants.EXTRA_GOOGLE_SIGN_IN_OPTIONS, builder.build());
757+
ExtraConstants.GOOGLE_SIGN_IN_OPTIONS, builder.build());
758758

759759
return this;
760760
}
761761

762762
@NonNull
763763
@Override
764764
public IdpConfig build() {
765-
if (!getParams().containsKey(ExtraConstants.EXTRA_GOOGLE_SIGN_IN_OPTIONS)) {
765+
if (!getParams().containsKey(ExtraConstants.GOOGLE_SIGN_IN_OPTIONS)) {
766766
setScopes(Collections.<String>emptyList());
767767
}
768768

@@ -805,7 +805,7 @@ public FacebookBuilder() {
805805
@NonNull
806806
public FacebookBuilder setPermissions(@NonNull List<String> permissions) {
807807
getParams().putStringArrayList(
808-
ExtraConstants.EXTRA_FACEBOOK_PERMISSIONS, new ArrayList<>(permissions));
808+
ExtraConstants.FACEBOOK_PERMISSIONS, new ArrayList<>(permissions));
809809
return this;
810810
}
811811
}

‎auth/src/main/java/com/firebase/ui/auth/IdpResponse.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import android.support.annotation.RestrictTo;
2424
import android.text.TextUtils;
2525

26-
import com.firebase.ui.auth.data.model.Resource;
2726
import com.firebase.ui.auth.data.model.User;
2827
import com.firebase.ui.auth.util.ExtraConstants;
2928
import com.google.firebase.auth.GoogleAuthProvider;
@@ -92,22 +91,12 @@ private IdpResponse(
9291
@Nullable
9392
public static IdpResponse fromResultIntent(@Nullable Intent resultIntent) {
9493
if (resultIntent != null) {
95-
return resultIntent.getParcelableExtra(ExtraConstants.EXTRA_IDP_RESPONSE);
94+
return resultIntent.getParcelableExtra(ExtraConstants.IDP_RESPONSE);
9695
} else {
9796
return null;
9897
}
9998
}
10099

101-
@NonNull
102-
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
103-
public static IdpResponse from(@NonNull Resource<IdpResponse> resource) {
104-
IdpResponse response = resource.getValue();
105-
if (resource.getException() != null) {
106-
response = from(resource.getException());
107-
}
108-
return response;
109-
}
110-
111100
@NonNull
112101
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
113102
public static IdpResponse from(@NonNull Exception e) {
@@ -127,7 +116,7 @@ public static Intent getErrorIntent(@NonNull Exception e) {
127116
@NonNull
128117
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
129118
public Intent toIntent() {
130-
return new Intent().putExtra(ExtraConstants.EXTRA_IDP_RESPONSE, this);
119+
return new Intent().putExtra(ExtraConstants.IDP_RESPONSE, this);
131120
}
132121

133122
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)

‎auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
package com.firebase.ui.auth;
22

3-
import android.arch.lifecycle.Observer;
43
import android.arch.lifecycle.ViewModelProviders;
54
import android.content.Context;
65
import android.content.DialogInterface;
76
import android.content.Intent;
87
import android.net.ConnectivityManager;
98
import android.os.Bundle;
9+
import android.support.annotation.NonNull;
10+
import android.support.annotation.Nullable;
1011
import android.support.annotation.RestrictTo;
1112

1213
import com.firebase.ui.auth.data.model.FlowParameters;
13-
import com.firebase.ui.auth.data.model.Resource;
14-
import com.firebase.ui.auth.data.model.State;
1514
import com.firebase.ui.auth.data.model.UserCancellationException;
1615
import com.firebase.ui.auth.data.remote.SignInKickstarter;
1716
import com.firebase.ui.auth.ui.HelperActivityBase;
1817
import com.firebase.ui.auth.util.PlayServicesHelper;
19-
import com.firebase.ui.auth.util.ui.FlowUtils;
2018
import com.firebase.ui.auth.viewmodel.RequestCodes;
19+
import com.firebase.ui.auth.viewmodel.ResourceObserver;
2120

2221
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
2322
public class KickoffActivity extends HelperActivityBase {
@@ -27,32 +26,27 @@ public class KickoffActivity extends HelperActivityBase {
2726
private boolean mIsWaitingForPlayServices = false;
2827

2928
public static Intent createIntent(Context context, FlowParameters flowParams) {
30-
return HelperActivityBase.createBaseIntent(context, KickoffActivity.class, flowParams);
29+
return createBaseIntent(context, KickoffActivity.class, flowParams);
3130
}
3231

3332
@Override
34-
protected void onCreate(Bundle savedInstanceState) {
33+
protected void onCreate(@Nullable Bundle savedInstanceState) {
3534
super.onCreate(savedInstanceState);
3635
mKickstarter = ViewModelProviders.of(this).get(SignInKickstarter.class);
3736
mKickstarter.init(getFlowParams());
38-
mKickstarter.getOperation().observe(this, new Observer<Resource<IdpResponse>>() {
37+
mKickstarter.getOperation().observe(this, new ResourceObserver<IdpResponse>(
38+
this, R.string.fui_progress_dialog_loading) {
3939
@Override
40-
public void onChanged(Resource<IdpResponse> resource) {
41-
if (resource.getState() == State.LOADING) {
42-
getDialogHolder().showLoadingDialog(R.string.fui_progress_dialog_loading);
43-
return;
44-
}
45-
getDialogHolder().dismissDialog();
40+
protected void onSuccess(@NonNull IdpResponse response) {
41+
finish(RESULT_OK, response.toIntent());
42+
}
4643

47-
if (resource.getState() == State.SUCCESS) {
48-
finish(RESULT_OK, resource.getValue().toIntent());
49-
} else if (resource.getState() == State.FAILURE) {
50-
Exception e = resource.getException();
51-
if (!FlowUtils.handleError(KickoffActivity.this, e)) {
52-
finish(RESULT_CANCELED, IdpResponse.getErrorIntent(e));
53-
} else if (e instanceof UserCancellationException) {
54-
finish(RESULT_CANCELED, null);
55-
}
44+
@Override
45+
protected void onFailure(@NonNull Exception e) {
46+
if (e instanceof UserCancellationException) {
47+
finish(RESULT_CANCELED, null);
48+
} else {
49+
finish(RESULT_CANCELED, IdpResponse.getErrorIntent(e));
5650
}
5751
}
5852
});

‎auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@ public FlowParameters(
8181
* Extract FlowParameters from an Intent.
8282
*/
8383
public static FlowParameters fromIntent(Intent intent) {
84-
return intent.getParcelableExtra(ExtraConstants.EXTRA_FLOW_PARAMS);
84+
return intent.getParcelableExtra(ExtraConstants.FLOW_PARAMS);
8585
}
8686

8787
/**
8888
* Extract FlowParameters from a Bundle.
8989
*/
9090
public static FlowParameters fromBundle(Bundle bundle) {
91-
return bundle.getParcelable(ExtraConstants.EXTRA_FLOW_PARAMS);
91+
return bundle.getParcelable(ExtraConstants.FLOW_PARAMS);
9292
}
9393

9494
@Override

0 commit comments

Comments
 (0)