Merge branch 'master' of github.com:firebase/firebase-android-sdk into enableRequestLimiter

Author: ankitaj224

encoders/firebase-encoders-json/gradle.properties

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=17.0.0
-latestReleasedVersion=16.1.0
+version=17.0.1
+latestReleasedVersion=17.0.0

encoders/firebase-encoders/gradle.properties

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=16.0.0
+version=16.0.1

firebase-common/firebase-common.gradle

@@ -84,17 +84,12 @@ dependencies {
 
     annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
 
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation project(':integ-testing')
+    androidTestImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
     androidTestImplementation 'org.mockito:mockito-core:2.25.0'
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.25.0'
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.25.0'
-    androidTestImplementation ('com.google.firebase:firebase-auth:17.0.0') {
-        exclude group: "com.google.firebase", module: "firebase-common"
-    }
-
-    androidTestImplementation ('com.google.firebase:firebase-core:16.0.9') {
-        exclude group: "com.google.firebase", module: "firebase-common"
-    }
 }

firebase-common/src/androidTest/java/com/google/firebase/FirebaseAppTest.java

@@ -39,9 +39,7 @@
 import androidx.test.runner.AndroidJUnit4;
 import com.google.android.gms.common.api.internal.BackgroundDetector;
 import com.google.common.base.Defaults;
-import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.components.EagerSdkVerifier;
-import com.google.firebase.components.InitTracker;
 import com.google.firebase.components.TestComponentOne;
 import com.google.firebase.components.TestComponentTwo;
 import com.google.firebase.components.TestUserAgentDependentComponent;
@@ -144,10 +142,8 @@ public void testInitializeApp_shouldPublishVersionForFirebaseCommon() {
 
     // After sorting the user agents are expected to be {"fire-android/", "fire-auth/x.y.z",
     // "fire-core/x.y.z", "test-component/1.2.3"}
-    assertThat(actualUserAgent[0]).contains("fire-analytics");
-    assertThat(actualUserAgent[1]).contains("fire-android");
-    assertThat(actualUserAgent[2]).contains("fire-auth");
-    assertThat(actualUserAgent[3]).contains("fire-core");
+    assertThat(actualUserAgent[0]).contains("fire-android");
+    assertThat(actualUserAgent[1]).contains("fire-core");
   }
 
   @Test
@@ -304,7 +300,7 @@ public void testPersistenceKeyIsBijective() {
   // Order of test cases matters.
   @Test(expected = IllegalStateException.class)
   public void testMissingInit() {
-    FirebaseAuth.getInstance();
+    FirebaseApp.getInstance();
   }
 
   @Test
@@ -313,10 +309,9 @@ public void testApiInitializedForNonDefaultApp() {
     assertThat(firebaseApp.isDefaultApp()).isFalse();
 
     EagerSdkVerifier sdkVerifier = firebaseApp.get(EagerSdkVerifier.class);
-    assertThat(sdkVerifier.isAuthInitialized()).isTrue();
-
-    // Analytics is only initialized for the default app.
-    assertThat(sdkVerifier.isAnalyticsInitialized()).isFalse();
+    assertThat(sdkVerifier.isEagerInitialized()).isTrue();
+    assertThat(sdkVerifier.isEagerInDefaultAppInitialized()).isFalse();
+    assertThat(sdkVerifier.isLazyInitialized()).isFalse();
   }
 
   @Test
@@ -326,8 +321,9 @@ public void testApiInitForDefaultApp() {
     assertThat(firebaseApp.isDefaultApp()).isTrue();
 
     EagerSdkVerifier sdkVerifier = firebaseApp.get(EagerSdkVerifier.class);
-    assertThat(sdkVerifier.isAuthInitialized()).isTrue();
-    assertThat(sdkVerifier.isAnalyticsInitialized()).isTrue();
+    assertThat(sdkVerifier.isEagerInitialized()).isTrue();
+    assertThat(sdkVerifier.isEagerInDefaultAppInitialized()).isTrue();
+    assertThat(sdkVerifier.isLazyInitialized()).isFalse();
   }
 
   @Test
@@ -372,25 +368,20 @@ public void testDirectBoot_shouldInitializeEagerComponentsOnDeviceUnlock() {
     isUserUnlocked.set(false);
     FirebaseApp firebaseApp = FirebaseApp.initializeApp(mockContext);
 
-    InitTracker tracker = firebaseApp.get(InitTracker.class);
     EagerSdkVerifier sdkVerifier = firebaseApp.get(EagerSdkVerifier.class);
 
-    // APIs are not initialized.
-    assertThat(tracker.isInitialized()).isFalse();
-
-    assertThat(sdkVerifier.isAuthInitialized()).isFalse();
-    assertThat(sdkVerifier.isAnalyticsInitialized()).isFalse();
+    assertThat(sdkVerifier.isEagerInitialized()).isFalse();
+    assertThat(sdkVerifier.isEagerInDefaultAppInitialized()).isFalse();
+    assertThat(sdkVerifier.isLazyInitialized()).isFalse();
 
     // User unlocks the device.
     isUserUnlocked.set(true);
     Intent userUnlockBroadcast = new Intent(Intent.ACTION_USER_UNLOCKED);
     localBroadcastManager.sendBroadcastSync(userUnlockBroadcast);
 
-    // APIs are initialized.
-    assertThat(tracker.isInitialized()).isTrue();
-
-    assertThat(sdkVerifier.isAuthInitialized()).isTrue();
-    assertThat(sdkVerifier.isAnalyticsInitialized()).isTrue();
+    assertThat(sdkVerifier.isEagerInitialized()).isTrue();
+    assertThat(sdkVerifier.isEagerInDefaultAppInitialized()).isTrue();
+    assertThat(sdkVerifier.isLazyInitialized()).isFalse();
   }
 
   @Test

firebase-common/src/androidTest/java/com/google/firebase/StrictModeTest.java

@@ -0,0 +1,45 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase;
+
+import androidx.test.core.app.ApplicationProvider;
+import com.google.firebase.FirebaseOptions.Builder;
+import com.google.firebase.testing.integ.StrictModeRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(androidx.test.ext.junit.runners.AndroidJUnit4.class)
+public class StrictModeTest {
+
+  @Rule public StrictModeRule strictMode = new StrictModeRule();
+
+  @Test
+  public void initializingFirebaseApp_shouldNotViolateStrictMode() {
+    strictMode.runOnMainThread(
+        () -> {
+          FirebaseApp app =
+              FirebaseApp.initializeApp(
+                  ApplicationProvider.getApplicationContext(),
+                  new Builder()
+                      .setApiKey("api")
+                      .setProjectId("123")
+                      .setApplicationId("appId")
+                      .build(),
+                  "hello");
+          app.initializeAllComponents();
+        });
+  }
+}

firebase-common/src/androidTest/java/com/google/firebase/components/EagerComponent.java

@@ -0,0 +1,22 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.components;
+
+class EagerComponent extends InitializingComponent {
+
+  EagerComponent(InitializationTracker tracker) {
+    super(tracker);
+  }
+}

firebase-common/src/androidTest/java/com/google/firebase/components/EagerInDefaultAppComponent.java

@@ -0,0 +1,22 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.components;
+
+class EagerInDefaultAppComponent extends InitializingComponent {
+
+  EagerInDefaultAppComponent(InitializationTracker tracker) {
+    super(tracker);
+  }
+}

firebase-common/src/androidTest/java/com/google/firebase/components/EagerSdkVerifier.java

@@ -14,24 +14,22 @@
 
 package com.google.firebase.components;
 
-import com.google.firebase.analytics.connector.AnalyticsConnector;
-import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.inject.Provider;
-
 public class EagerSdkVerifier {
-  private final Lazy<FirebaseAuth> authLazy;
-  private final Lazy<AnalyticsConnector> analyticsLazy;
+  private final InitializationTracker initializationTracker;
+
+  public EagerSdkVerifier(InitializationTracker initializationTracker) {
+    this.initializationTracker = initializationTracker;
+  }
 
-  EagerSdkVerifier(Provider<FirebaseAuth> authLazy, Provider<AnalyticsConnector> analyticsLazy) {
-    this.authLazy = (Lazy<FirebaseAuth>) authLazy;
-    this.analyticsLazy = (Lazy<AnalyticsConnector>) analyticsLazy;
+  public boolean isLazyInitialized() {
+    return initializationTracker.isInitialized(LazyComponent.class);
   }
 
-  public boolean isAuthInitialized() {
-    return authLazy.isInitialized();
+  public boolean isEagerInitialized() {
+    return initializationTracker.isInitialized(EagerComponent.class);
   }
 
-  public boolean isAnalyticsInitialized() {
-    return analyticsLazy.isInitialized();
+  public boolean isEagerInDefaultAppInitialized() {
+    return initializationTracker.isInitialized(EagerInDefaultAppComponent.class);
   }
 }

firebase-common/src/androidTest/java/com/google/firebase/components/EagerSdkVerifierRegistrar.java

@@ -14,23 +14,35 @@
 
 package com.google.firebase.components;
 
-import com.google.firebase.analytics.connector.AnalyticsConnector;
-import com.google.firebase.auth.FirebaseAuth;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 
 public class EagerSdkVerifierRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {
-    return Collections.singletonList(
-        Component.builder(EagerSdkVerifier.class)
-            .add(Dependency.requiredProvider(FirebaseAuth.class))
-            .add(Dependency.requiredProvider(AnalyticsConnector.class))
+    return Arrays.asList(
+        Component.builder(InitializationTracker.class)
+            .factory(container -> new InitializationTracker())
+            .build(),
+        Component.builder(EagerComponent.class)
+            .add(Dependency.required(InitializationTracker.class))
+            .factory(container -> new EagerComponent(container.get(InitializationTracker.class)))
+            .alwaysEager()
+            .build(),
+        Component.builder(EagerInDefaultAppComponent.class)
+            .add(Dependency.required(InitializationTracker.class))
             .factory(
                 container ->
-                    new EagerSdkVerifier(
-                        container.getProvider(FirebaseAuth.class),
-                        container.getProvider(AnalyticsConnector.class)))
+                    new EagerInDefaultAppComponent(container.get(InitializationTracker.class)))
+            .eagerInDefaultApp()
+            .build(),
+        Component.builder(LazyComponent.class)
+            .add(Dependency.required(InitializationTracker.class))
+            .factory(container -> new LazyComponent(container.get(InitializationTracker.class)))
+            .build(),
+        Component.builder(EagerSdkVerifier.class)
+            .add(Dependency.required(InitializationTracker.class))
+            .factory(container -> new EagerSdkVerifier(container.get(InitializationTracker.class)))
             .build());
   }
 }

firebase-common/src/androidTest/java/com/google/firebase/components/InitializationTracker.java

@@ -0,0 +1,30 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.components;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class InitializationTracker {
+  private final Set<Class<? extends InitializingComponent>> initialized = new HashSet<>();
+
+  synchronized void initialize(Class<? extends InitializingComponent> component) {
+    initialized.add(component);
+  }
+
+  synchronized boolean isInitialized(Class<? extends InitializingComponent> component) {
+    return initialized.contains(component);
+  }
+}

firebase-common/src/androidTest/java/com/google/firebase/components/InitializingComponent.java

@@ -0,0 +1,21 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.components;
+
+abstract class InitializingComponent {
+  InitializingComponent(InitializationTracker tracker) {
+    tracker.initialize(this.getClass());
+  }
+}

firebase-common/src/androidTest/java/com/google/firebase/components/LazyComponent.java

@@ -0,0 +1,22 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.components;
+
+class LazyComponent extends InitializingComponent {
+
+  LazyComponent(InitializationTracker tracker) {
+    super(tracker);
+  }
+}

firebase-common/src/main/java/com/google/firebase/FirebaseApp.java

@@ -29,6 +29,8 @@
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.annotation.VisibleForTesting;
 import androidx.collection.ArrayMap;
 import androidx.core.os.UserManagerCompat;
@@ -452,6 +454,13 @@ public boolean isDefaultApp() {
     return DEFAULT_APP_NAME.equals(getName());
   }
 
+  /** @hide */
+  @VisibleForTesting
+  @RestrictTo(Scope.TESTS)
+  void initializeAllComponents() {
+    componentRuntime.initializeAllComponentsForTests();
+  }
+
   private void notifyBackgroundStateChangeListeners(boolean background) {
     Log.d(LOG_TAG, "Notifying background state change listeners.");
     for (BackgroundStateChangeListener listener : backgroundStateChangeListeners) {