Crashlytics KTX snippets (firebase#204)

samtstern · web-flow · commit 44d12e7fd4b8 · 2020-06-25T11:10:12.000-04:00
diff --git a/crashlytics/app/build.gradle b/crashlytics/app/build.gradle
@@ -26,6 +26,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
 
     implementation 'com.google.firebase:firebase-crashlytics:17.1.0'
+    implementation 'com.google.firebase:firebase-crashlytics-ktx:17.1.0'
 
     // For an optimal experience using Crashlytics, add the Firebase SDK
     // for Google Analytics. This is recommended, but not required.
diff --git a/crashlytics/app/src/main/java/com/google/firebase/example/crashlytics/MainActivity.java b/crashlytics/app/src/main/java/com/google/firebase/example/crashlytics/MainActivity.java
@@ -16,19 +16,19 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
     }
 
-    public void setKeysBasic(String key) {
+    public void setKeysBasic() {
         // [START crash_set_keys_basic]
         FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance();
 
-        crashlytics.setCustomKey(key, "foo" /* string value */);
+        crashlytics.setCustomKey("my_string_key", "foo" /* string value */);
 
-        crashlytics.setCustomKey(key, true /* boolean value */);
+        crashlytics.setCustomKey("my_bool_key", true /* boolean value */);
 
-        crashlytics.setCustomKey(key, 1.0 /* double value */);
+        crashlytics.setCustomKey("my_double_key", 1.0 /* double value */);
 
-        crashlytics.setCustomKey(key, 1.0f /* float value */);
+        crashlytics.setCustomKey("my_float_key", 1.0f /* float value */);
 
-        crashlytics.setCustomKey(key, 1 /* int value */);
+        crashlytics.setCustomKey("my_int_key", 1 /* int value */);
         // [END crash_set_keys_basic]
     }
 
diff --git a/crashlytics/app/src/main/java/com/google/firebase/example/crashlytics/kotlin/MainActivity.kt b/crashlytics/app/src/main/java/com/google/firebase/example/crashlytics/kotlin/MainActivity.kt
@@ -4,59 +4,60 @@ import android.os.Bundle
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
-import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.firebase.crashlytics.ktx.crashlytics
+import com.google.firebase.crashlytics.ktx.setCustomKeys
+import com.google.firebase.ktx.Firebase
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
     }
 
-    fun setKeysBasic(key: String) {
+    fun setKeysBasic() {
         // [START crash_set_keys_basic]
-        val crashlytics = FirebaseCrashlytics.getInstance()
-
-        crashlytics.setCustomKey(key, "foo" /* string value */)
-
-        crashlytics.setCustomKey(key, true /* boolean value */)
-
-        crashlytics.setCustomKey(key, 1.0 /* double value */)
-
-        crashlytics.setCustomKey(key, 1.0f /* float value */)
-
-        crashlytics.setCustomKey(key, 1 /* int value */)
+        val crashlytics = Firebase.crashlytics
+        crashlytics.setCustomKeys {
+            key("my_string_key", "foo") // String value
+            key("my_bool_key", true)    // boolean value
+            key("my_double_key", 1.0)   // double value
+            key("my_float_key", 1.0f)   // float value
+            key("my_int_key", 1)        // int value
+        }
         // [END crash_set_keys_basic]
     }
 
     fun resetKey() {
         // [START crash_re_set_key]
-        val crashlytics = FirebaseCrashlytics.getInstance()
-        crashlytics.setCustomKey("current_level", 3)
-        crashlytics.setCustomKey("last_UI_action", "logged_in")
+        val crashlytics = Firebase.crashlytics
+        crashlytics.setCustomKeys {
+            key("current_level", 3)
+            key("last_UI_action", "logged_in")
+        }
         // [END crash_re_set_key]
     }
 
     fun logReportAndPrint() {
         // [START crash_log_report_and_print]
-        FirebaseCrashlytics.getInstance().log("message")
+        Firebase.crashlytics.log("message")
         // [END crash_log_report_and_print]
     }
 
     fun logReportOnly() {
         // [START crash_log_report_only]
-        FirebaseCrashlytics.getInstance().log("message")
+        Firebase.crashlytics.log("message")
         // [END crash_log_report_only]
     }
 
     fun enableAtRuntime() {
         // [START crash_enable_at_runtime]
-        FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true)
+        Firebase.crashlytics.setCrashlyticsCollectionEnabled(true)
         // [END crash_enable_at_runtime]
     }
 
     fun setUserId() {
         // [START crash_set_user_id]
-        FirebaseCrashlytics.getInstance().setUserId("user123456789")
+        Firebase.crashlytics.setUserId("user123456789")
         // [END crash_set_user_id]
     }
 
@@ -70,7 +71,7 @@ class MainActivity : AppCompatActivity() {
         try {
             methodThatThrows()
         } catch (e: Exception) {
-            FirebaseCrashlytics.getInstance().recordException(e)
+            Firebase.crashlytics.recordException(e)
             // handle your exception here
         }
         // [END crash_log_caught_ex]
