Skip to content

Remove unnecessary @MainThread annotations #1169

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
samtstern merged 1 commit into from
Feb 26, 2018
Merged

Remove unnecessary @MainThread annotations #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 0 additions & 15 deletions 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,7 +18,6 @@
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.DrawableRes;
import android.support.annotation.MainThread;
import android.support.annotation.StringRes;
import android.support.annotation.StyleRes;
import android.support.design.widget.Snackbar;
Expand Down Expand Up @@ -231,7 +230,6 @@ protected void onResume() {
}
}

@MainThread
private void handleSignInResponse(int resultCode, Intent data) {
IdpResponse response = IdpResponse.fromResultIntent(data);

Expand Down Expand Up @@ -276,14 +274,12 @@ private void startSignedInActivity(IdpResponse response) {
mEnableHintSelector.isChecked())));
}

@MainThread
private void setGoogleScopesEnabled(boolean enabled) {
mGoogleScopesLabel.setEnabled(enabled);
mGoogleScopeDriveFile.setEnabled(enabled);
mGoogleScopeYoutubeData.setEnabled(enabled);
}

@MainThread
private void setFacebookScopesEnabled(boolean enabled) {
mFacebookScopesLabel.setEnabled(enabled);
mFacebookScopeFriends.setEnabled(enabled);
Expand All @@ -298,7 +294,6 @@ public void toggleDarkTheme() {
getDelegate().setLocalNightMode(mode);
}

@MainThread
@StyleRes
private int getSelectedTheme() {
if (mUseGreenTheme.isChecked()) {
Expand All @@ -312,7 +307,6 @@ private int getSelectedTheme() {
return AuthUI.getDefaultTheme();
}

@MainThread
@DrawableRes
private int getSelectedLogo() {
if (mFirebaseLogo.isChecked()) {
Expand All @@ -323,7 +317,6 @@ private int getSelectedLogo() {
return AuthUI.NO_LOGO;
}

@MainThread
private List<IdpConfig> getSelectedProviders() {
List<IdpConfig> selectedProviders = new ArrayList<>();

Expand Down Expand Up @@ -356,7 +349,6 @@ private List<IdpConfig> getSelectedProviders() {
return selectedProviders;
}

@MainThread
private String getSelectedTosUrl() {
if (mUseGoogleTos.isChecked()) {
return GOOGLE_TOS_URL;
Expand All @@ -365,7 +357,6 @@ private String getSelectedTosUrl() {
return FIREBASE_TOS_URL;
}

@MainThread
private String getSelectedPrivacyPolicyUrl() {
if (mUseGooglePrivacyPolicy.isChecked()) {
return GOOGLE_PRIVACY_POLICY_URL;
Expand All @@ -374,17 +365,14 @@ private String getSelectedPrivacyPolicyUrl() {
return FIREBASE_PRIVACY_POLICY_URL;
}

@MainThread
private boolean isGoogleMisconfigured() {
return AuthUI.UNCONFIGURED_CONFIG_VALUE.equals(getString(R.string.default_web_client_id));
}

@MainThread
private boolean isFacebookMisconfigured() {
return AuthUI.UNCONFIGURED_CONFIG_VALUE.equals(getString(R.string.facebook_application_id));
}

@MainThread
private boolean isTwitterMisconfigured() {
List<String> twitterConfigs = Arrays.asList(
getString(R.string.twitter_consumer_key),
Expand All @@ -394,12 +382,10 @@ private boolean isTwitterMisconfigured() {
return twitterConfigs.contains(AuthUI.UNCONFIGURED_CONFIG_VALUE);
}

@MainThread
private void showSnackbar(@StringRes int errorMessageRes) {
Snackbar.make(mRootView, errorMessageRes, Snackbar.LENGTH_LONG).show();
}

@MainThread
private List<String> getFacebookPermissions() {
List<String> result = new ArrayList<>();
if (mFacebookScopeFriends.isChecked()) {
Expand All @@ -411,7 +397,6 @@ private List<String> getFacebookPermissions() {
return result;
}

@MainThread
private List<String> getGoogleScopes() {
List<String> result = new ArrayList<>();
if (mGoogleScopeYoutubeData.isChecked()) {
Expand Down
3 changes: 0 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 @@ -20,7 +20,6 @@
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.MainThread;
import android.support.annotation.NonNull;
import android.support.annotation.StringRes;
import android.support.design.widget.Snackbar;
Expand Down Expand Up @@ -166,7 +165,6 @@ public void onComplete(@NonNull Task<Void> task) {
});
}

@MainThread
private void populateProfile() {
FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
if (user.getPhotoUrl() != null) {
Expand Down Expand Up @@ -245,7 +243,6 @@ private void populateIdpToken() {
}
}

@MainThread
private void showSnackbar(@StringRes int errorMessageRes) {
Snackbar.make(mRootView, errorMessageRes, Snackbar.LENGTH_LONG).show();
}
Expand Down