Update initializeApp snippets (firebase#180)

samtstern · web-flow · commit 37bb175b23c1 · 2020-02-28T12:52:05.000-08:00
diff --git a/firebaseoptions/app/src/main/java/devrel/firebase/google/com/firebaseoptions/MainActivity.java b/firebaseoptions/app/src/main/java/devrel/firebase/google/com/firebaseoptions/MainActivity.java
@@ -17,7 +17,6 @@
 
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
-import com.google.firebase.database.FirebaseDatabase;
 
 import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
@@ -30,22 +29,25 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         // [START firebase_options]
-        // Manually configure Firebase Options
+        // Manually configure Firebase Options. The following fields are REQUIRED:
+        //   - Project ID
+        //   - App ID
+        //   - API Key
         FirebaseOptions options = new FirebaseOptions.Builder()
-                .setApplicationId("1:27992087142:android:ce3b6448250083d1") // Required for Analytics.
-                .setApiKey("AIzaSyADUe90ULnQDuGShD9W23RDP0xmeDc6Mvw") // Required for Auth.
-                .setDatabaseUrl("https://myproject.firebaseio.com") // Required for RTDB.
+                .setProjectId("my-firebase-project")
+                .setApplicationId("1:27992087142:android:ce3b6448250083d1")
+                .setApiKey("AIzaSyADUe90ULnQDuGShD9W23RDP0xmeDc6Mvw")
+                // setDatabaseURL(...)
+                // setStorageBucket(...)
                 .build();
         // [END firebase_options]
 
         // [START firebase_secondary]
-        // Initialize with secondary app.
+        // Initialize with secondary app
         FirebaseApp.initializeApp(this /* Context */, options, "secondary");
 
-        // Retrieve secondary app.
+        // Retrieve secondary FirebaseApp
         FirebaseApp secondary = FirebaseApp.getInstance("secondary");
-        // Get the database for the other app.
-        FirebaseDatabase secondaryDatabase = FirebaseDatabase.getInstance(secondary);
         // [END firebase_secondary]
     }
 }
diff --git a/firebaseoptions/app/src/main/java/devrel/firebase/google/com/firebaseoptions/kotlin/MainActivity.kt b/firebaseoptions/app/src/main/java/devrel/firebase/google/com/firebaseoptions/kotlin/MainActivity.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.google.firebase.FirebaseApp
 import com.google.firebase.FirebaseOptions
-import com.google.firebase.database.FirebaseDatabase
 import devrel.firebase.google.com.firebaseoptions.R
 
 class MainActivity : AppCompatActivity() {
@@ -14,22 +13,25 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
 
         // [START firebase_options]
-        // Manually configure Firebase Options
+        // Manually configure Firebase Options. The following fields are REQUIRED:
+        //   - Project ID
+        //   - App ID
+        //   - API Key
         val options = FirebaseOptions.Builder()
-                .setApplicationId("1:27992087142:android:ce3b6448250083d1") // Required for Analytics.
-                .setApiKey("AIzaSyADUe90ULnQDuGShD9W23RDP0xmeDc6Mvw") // Required for Auth.
-                .setDatabaseUrl("https://myproject.firebaseio.com") // Required for RTDB.
+                .setProjectId("my-firebase-project")
+                .setApplicationId("1:27992087142:android:ce3b6448250083d1")
+                .setApiKey("AIzaSyADUe90ULnQDuGShD9W23RDP0xmeDc6Mvw")
+                // setDatabaseURL(...)
+                // setStorageBucket(...)
                 .build()
         // [END firebase_options]
 
         // [START firebase_secondary]
-        // Initialize with secondary app.
+        // Initialize with secondary app
         FirebaseApp.initializeApp(this /* Context */, options, "secondary")
 
-        // Retrieve secondary app.
+        // Retrieve secondary FirebaseApp
         val secondary = FirebaseApp.getInstance("secondary")
-        // Get the database for the other app.
-        val secondaryDatabase = FirebaseDatabase.getInstance(secondary)
         // [END firebase_secondary]
     }
 }
