Skip to content

Remove a ton of redundant code #1207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 26, 2018
Merged

Remove a ton of redundant code #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c9eb9a
Remove a ton of redundant code
SUPERCILEX Mar 24, 2018
4b222dc
Lock custom observer
SUPERCILEX Mar 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/main/java/com/firebase/uidemo/ChooserActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
Expand All @@ -38,7 +39,7 @@ public class ChooserActivity extends AppCompatActivity {
RecyclerView mActivities;

@Override
protected void onCreate(Bundle savedInstanceState) {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_chooser);
ButterKnife.bind(this);
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.DrawableRes;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.support.annotation.StyleRes;
import android.support.design.widget.Snackbar;
Expand Down Expand Up @@ -100,7 +101,7 @@ public static Intent createIntent(Context context) {
}

@Override
public void onCreate(Bundle savedInstanceState) {
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.auth_ui_layout);
ButterKnife.bind(this);
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ public class SignedInActivity extends AppCompatActivity {

public static Intent createIntent(Context context, IdpResponse idpResponse) {
return new Intent().setClass(context, SignedInActivity.class)
.putExtra(ExtraConstants.EXTRA_IDP_RESPONSE, idpResponse);
.putExtra(ExtraConstants.IDP_RESPONSE, idpResponse);
}

@Override
public void onCreate(Bundle savedInstanceState) {
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

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

IdpResponse response = getIntent().getParcelableExtra(ExtraConstants.EXTRA_IDP_RESPONSE);
IdpResponse response = getIntent().getParcelableExtra(ExtraConstants.IDP_RESPONSE);

setContentView(R.layout.signed_in_layout);
ButterKnife.bind(this);
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/firebase/uidemo/database/firestore/FirestoreChatActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
Expand Down Expand Up @@ -64,7 +65,7 @@ public class FirestoreChatActivity extends AppCompatActivity
TextView mEmptyListMessage;

@Override
protected void onCreate(Bundle savedInstanceState) {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_chat);
ButterKnife.bind(this);
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/firebase/uidemo/database/realtime/RealtimeDbChatActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
Expand Down Expand Up @@ -61,7 +62,7 @@ public class RealtimeDbChatActivity extends AppCompatActivity
TextView mEmptyListMessage;

@Override
protected void onCreate(Bundle savedInstanceState) {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_chat);
ButterKnife.bind(this);
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import android.os.Bundle;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.View;
Expand Down Expand Up @@ -54,7 +55,7 @@ public class ImageActivity extends AppCompatActivity implements EasyPermissions.
ImageView mImageView;

@Override
protected void onCreate(Bundle savedInstanceState) {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_image);
ButterKnife.bind(this);
Expand Down
42 changes: 21 additions & 21 deletions auth/src/main/java/com/firebase/ui/auth/AuthUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public class AuthUI {
* instead.
*/
@Deprecated
public static final String EXTRA_DEFAULT_PHONE_NUMBER = ExtraConstants.EXTRA_PHONE;
public static final String EXTRA_DEFAULT_PHONE_NUMBER = ExtraConstants.PHONE;

/**
* Bundle key for the default phone country code parameter.
Expand All @@ -158,7 +158,7 @@ public class AuthUI {
* String)} instead.
*/
@Deprecated
public static final String EXTRA_DEFAULT_COUNTRY_CODE = ExtraConstants.EXTRA_COUNTRY_ISO;
public static final String EXTRA_DEFAULT_COUNTRY_CODE = ExtraConstants.COUNTRY_ISO;

/**
* Bundle key for the default national phone number parameter.
Expand All @@ -167,7 +167,7 @@ public class AuthUI {
* String)} instead.
*/
@Deprecated
public static final String EXTRA_DEFAULT_NATIONAL_NUMBER = ExtraConstants.EXTRA_NATIONAL_NUMBER;
public static final String EXTRA_DEFAULT_NATIONAL_NUMBER = ExtraConstants.NATIONAL_NUMBER;

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

List<String> scopes = new ArrayList<>();
Expand All @@ -459,7 +459,7 @@ public List<String> getScopes() {
}
permissions = scopes;
} else if (mProviderId.equals(FacebookAuthProvider.PROVIDER_ID)) {
permissions = mParams.getStringArrayList(ExtraConstants.EXTRA_FACEBOOK_PERMISSIONS);
permissions = mParams.getStringArrayList(ExtraConstants.FACEBOOK_PERMISSIONS);
} else {
permissions = null;
}
Expand Down Expand Up @@ -618,7 +618,7 @@ public EmailBuilder() {
*/
@NonNull
public EmailBuilder setAllowNewAccounts(boolean allow) {
getParams().putBoolean(ExtraConstants.EXTRA_ALLOW_NEW_EMAILS, allow);
getParams().putBoolean(ExtraConstants.ALLOW_NEW_EMAILS, allow);
return this;
}

Expand All @@ -630,7 +630,7 @@ public EmailBuilder setAllowNewAccounts(boolean allow) {
*/
@NonNull
public EmailBuilder setRequireName(boolean requireName) {
getParams().putBoolean(ExtraConstants.EXTRA_REQUIRE_NAME, requireName);
getParams().putBoolean(ExtraConstants.REQUIRE_NAME, requireName);
return this;
}
}
Expand All @@ -652,13 +652,13 @@ public PhoneBuilder() {
public PhoneBuilder setDefaultNumber(@NonNull String number) {
Preconditions.checkUnset(getParams(),
"Cannot overwrite previously set phone number",
ExtraConstants.EXTRA_COUNTRY_ISO,
ExtraConstants.EXTRA_NATIONAL_NUMBER);
ExtraConstants.COUNTRY_ISO,
ExtraConstants.NATIONAL_NUMBER);
if (!PhoneNumberUtils.isValid(number)) {
throw new IllegalStateException("Invalid phone number: " + number);
}

getParams().putString(ExtraConstants.EXTRA_PHONE, number);
getParams().putString(ExtraConstants.PHONE, number);

return this;
}
Expand All @@ -674,13 +674,13 @@ public PhoneBuilder setDefaultNumber(@NonNull String number) {
public PhoneBuilder setDefaultNumber(@NonNull String iso, @NonNull String number) {
Preconditions.checkUnset(getParams(),
"Cannot overwrite previously set phone number",
ExtraConstants.EXTRA_PHONE);
ExtraConstants.PHONE);
if (!PhoneNumberUtils.isValidIso(iso)) {
throw new IllegalStateException("Invalid country iso: " + iso);
}

getParams().putString(ExtraConstants.EXTRA_COUNTRY_ISO, iso);
getParams().putString(ExtraConstants.EXTRA_NATIONAL_NUMBER, number);
getParams().putString(ExtraConstants.COUNTRY_ISO, iso);
getParams().putString(ExtraConstants.NATIONAL_NUMBER, number);

return this;
}
Expand All @@ -695,14 +695,14 @@ public PhoneBuilder setDefaultNumber(@NonNull String iso, @NonNull String number
public PhoneBuilder setDefaultCountryIso(@NonNull String iso) {
Preconditions.checkUnset(getParams(),
"Cannot overwrite previously set phone number",
ExtraConstants.EXTRA_PHONE,
ExtraConstants.EXTRA_COUNTRY_ISO,
ExtraConstants.EXTRA_NATIONAL_NUMBER);
ExtraConstants.PHONE,
ExtraConstants.COUNTRY_ISO,
ExtraConstants.NATIONAL_NUMBER);
if (!PhoneNumberUtils.isValidIso(iso)) {
throw new IllegalStateException("Invalid country iso: " + iso);
}

getParams().putString(ExtraConstants.EXTRA_COUNTRY_ISO, iso);
getParams().putString(ExtraConstants.COUNTRY_ISO, iso);

return this;
}
Expand Down Expand Up @@ -748,21 +748,21 @@ public GoogleBuilder setScopes(@NonNull List<String> scopes) {
public GoogleBuilder setSignInOptions(@NonNull GoogleSignInOptions options) {
Preconditions.checkUnset(getParams(),
"Cannot overwrite previously set sign-in options.",
ExtraConstants.EXTRA_GOOGLE_SIGN_IN_OPTIONS);
ExtraConstants.GOOGLE_SIGN_IN_OPTIONS);

GoogleSignInOptions.Builder builder = new GoogleSignInOptions.Builder(options);
builder.requestEmail().requestIdToken(getApplicationContext()
.getString(R.string.default_web_client_id));
getParams().putParcelable(
ExtraConstants.EXTRA_GOOGLE_SIGN_IN_OPTIONS, builder.build());
ExtraConstants.GOOGLE_SIGN_IN_OPTIONS, builder.build());

return this;
}

@NonNull
@Override
public IdpConfig build() {
if (!getParams().containsKey(ExtraConstants.EXTRA_GOOGLE_SIGN_IN_OPTIONS)) {
if (!getParams().containsKey(ExtraConstants.GOOGLE_SIGN_IN_OPTIONS)) {
setScopes(Collections.<String>emptyList());
}

Expand Down Expand Up @@ -805,7 +805,7 @@ public FacebookBuilder() {
@NonNull
public FacebookBuilder setPermissions(@NonNull List<String> permissions) {
getParams().putStringArrayList(
ExtraConstants.EXTRA_FACEBOOK_PERMISSIONS, new ArrayList<>(permissions));
ExtraConstants.FACEBOOK_PERMISSIONS, new ArrayList<>(permissions));
return this;
}
}
Expand Down
15 changes: 2 additions & 13 deletions auth/src/main/java/com/firebase/ui/auth/IdpResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import android.support.annotation.RestrictTo;
import android.text.TextUtils;

import com.firebase.ui.auth.data.model.Resource;
import com.firebase.ui.auth.data.model.User;
import com.firebase.ui.auth.util.ExtraConstants;
import com.google.firebase.auth.GoogleAuthProvider;
Expand Down Expand Up @@ -92,22 +91,12 @@ private IdpResponse(
@Nullable
public static IdpResponse fromResultIntent(@Nullable Intent resultIntent) {
if (resultIntent != null) {
return resultIntent.getParcelableExtra(ExtraConstants.EXTRA_IDP_RESPONSE);
return resultIntent.getParcelableExtra(ExtraConstants.IDP_RESPONSE);
} else {
return null;
}
}

@NonNull
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
public static IdpResponse from(@NonNull Resource<IdpResponse> resource) {
IdpResponse response = resource.getValue();
if (resource.getException() != null) {
response = from(resource.getException());
}
return response;
}

@NonNull
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
public static IdpResponse from(@NonNull Exception e) {
Expand All @@ -127,7 +116,7 @@ public static Intent getErrorIntent(@NonNull Exception e) {
@NonNull
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
public Intent toIntent() {
return new Intent().putExtra(ExtraConstants.EXTRA_IDP_RESPONSE, this);
return new Intent().putExtra(ExtraConstants.IDP_RESPONSE, this);
}

@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
Expand Down
38 changes: 16 additions & 22 deletions auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
package com.firebase.ui.auth;

import android.arch.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RestrictTo;

import com.firebase.ui.auth.data.model.FlowParameters;
import com.firebase.ui.auth.data.model.Resource;
import com.firebase.ui.auth.data.model.State;
import com.firebase.ui.auth.data.model.UserCancellationException;
import com.firebase.ui.auth.data.remote.SignInKickstarter;
import com.firebase.ui.auth.ui.HelperActivityBase;
import com.firebase.ui.auth.util.PlayServicesHelper;
import com.firebase.ui.auth.util.ui.FlowUtils;
import com.firebase.ui.auth.viewmodel.RequestCodes;
import com.firebase.ui.auth.viewmodel.ResourceObserver;

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

public static Intent createIntent(Context context, FlowParameters flowParams) {
return HelperActivityBase.createBaseIntent(context, KickoffActivity.class, flowParams);
return createBaseIntent(context, KickoffActivity.class, flowParams);
}

@Override
protected void onCreate(Bundle savedInstanceState) {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mKickstarter = ViewModelProviders.of(this).get(SignInKickstarter.class);
mKickstarter.init(getFlowParams());
mKickstarter.getOperation().observe(this, new Observer<Resource<IdpResponse>>() {
mKickstarter.getOperation().observe(this, new ResourceObserver<IdpResponse>(
this, R.string.fui_progress_dialog_loading) {
@Override
public void onChanged(Resource<IdpResponse> resource) {
if (resource.getState() == State.LOADING) {
getDialogHolder().showLoadingDialog(R.string.fui_progress_dialog_loading);
return;
}
getDialogHolder().dismissDialog();
protected void onSuccess(@NonNull IdpResponse response) {
finish(RESULT_OK, response.toIntent());
}

if (resource.getState() == State.SUCCESS) {
finish(RESULT_OK, resource.getValue().toIntent());
} else if (resource.getState() == State.FAILURE) {
Exception e = resource.getException();
if (!FlowUtils.handleError(KickoffActivity.this, e)) {
finish(RESULT_CANCELED, IdpResponse.getErrorIntent(e));
} else if (e instanceof UserCancellationException) {
finish(RESULT_CANCELED, null);
}
@Override
protected void onFailure(@NonNull Exception e) {
if (e instanceof UserCancellationException) {
finish(RESULT_CANCELED, null);
} else {
finish(RESULT_CANCELED, IdpResponse.getErrorIntent(e));
}
}
});
Expand Down
4 changes: 2 additions & 2 deletions auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ public FlowParameters(
* Extract FlowParameters from an Intent.
*/
public static FlowParameters fromIntent(Intent intent) {
return intent.getParcelableExtra(ExtraConstants.EXTRA_FLOW_PARAMS);
return intent.getParcelableExtra(ExtraConstants.FLOW_PARAMS);
}

/**
* Extract FlowParameters from a Bundle.
*/
public static FlowParameters fromBundle(Bundle bundle) {
return bundle.getParcelable(ExtraConstants.EXTRA_FLOW_PARAMS);
return bundle.getParcelable(ExtraConstants.FLOW_PARAMS);
}

@Override
Expand Down
Loading