Merge pull request #595 from SUPERCILEX/miscellaneous-improvements

Lock IdpConfigs and scopes

Author: samtstern

.idea/codeStyleSettings.xml

@@ -316,13 +316,13 @@ public static class IdpConfig implements Parcelable {
         private final List<String> mScopes;
 
         private IdpConfig(@NonNull String providerId, List<String> scopes) {
-            mScopes = scopes;
             mProviderId = providerId;
+            mScopes = Collections.unmodifiableList(scopes);
         }
 
         private IdpConfig(Parcel in) {
             mProviderId = in.readString();
-            mScopes = in.createStringArrayList();
+            mScopes = Collections.unmodifiableList(in.createStringArrayList());
         }
 
         public String getProviderId() {

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

@@ -24,6 +24,7 @@
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.util.Preconditions;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -60,7 +61,8 @@ public FlowParameters(
             boolean smartLockEnabled,
             boolean allowNewEmailAccounts) {
         this.appName = Preconditions.checkNotNull(appName, "appName cannot be null");
-        this.providerInfo = Preconditions.checkNotNull(providerInfo, "providerInfo cannot be null");
+        this.providerInfo = Collections.unmodifiableList(
+                Preconditions.checkNotNull(providerInfo, "providerInfo cannot be null"));
         this.themeId = themeId;
         this.logoId = logoId;
         this.termsOfServiceUrl = termsOfServiceUrl;
@@ -92,11 +94,8 @@ public FlowParameters createFromParcel(Parcel in) {
             int themeId = in.readInt();
             int logoId = in.readInt();
             String termsOfServiceUrl = in.readString();
-            int smartLockEnabledInt = in.readInt();
-            int allowNewEmailAccountsInt = in.readInt();
-
-            boolean smartLockEnabled = smartLockEnabledInt != 0;
-            boolean allowNewEmailAccounts = allowNewEmailAccountsInt != 0;
+            boolean smartLockEnabled = in.readInt() != 0;
+            boolean allowNewEmailAccounts = in.readInt() != 0;
 
             return new FlowParameters(
                     appName,