Crashlytics: Add support for setUserId (#59)

Author: findjigar

.gitignore

@@ -70,4 +70,3 @@ fastlane/test_output
 
 buildboth.sh
 Pods
-GoogleService-Info.plist

crashlytics/src/androidMain/kotlin/co/touchlab/crashkios/crashlytics/CrashlyticsCallsActual.kt

@@ -28,4 +28,8 @@ actual class CrashlyticsCallsActual : CrashlyticsCalls {
             }
         }
     }
+
+    override fun setUserId(identifier: String) {
+        FirebaseCrashlytics.getInstance().setUserId(identifier)
+    }
 }

crashlytics/src/commonMain/kotlin/co/touchlab/crashkios/crashlytics/CrashlyticsCalls.kt

@@ -5,6 +5,7 @@ interface CrashlyticsCalls {
     fun sendHandledException(throwable: Throwable)
     fun sendFatalException(throwable: Throwable)
     fun setCustomValue(key: String, value: Any)
+    fun setUserId(identifier: String)
 }
 
-expect class CrashlyticsCallsActual() : CrashlyticsCalls
+expect class CrashlyticsCallsActual() : CrashlyticsCalls

crashlytics/src/commonMain/kotlin/co/touchlab/crashkios/crashlytics/CrashlyticsKotlin.kt

@@ -20,6 +20,10 @@ object CrashlyticsKotlin {
     fun setCustomValue(key: String, value: Any) {
         implementation.setCustomValue(key, value)
     }
+
+    fun setUserId(identifier: String) {
+        implementation.setUserId(identifier)
+    }
 }
 
 /**
@@ -46,4 +50,8 @@ internal object EmptyCalls : CrashlyticsCalls {
     override fun setCustomValue(key: String, value: Any) {
 
     }
+
+    override fun setUserId(identifier: String) {
+
+    }
 }

crashlytics/src/darwinMain/kotlin/co/touchlab/crashkios/crashlytics/CrashlyticsCallsActual.kt

@@ -27,4 +27,8 @@ actual class CrashlyticsCallsActual : CrashlyticsCalls {
     override fun setCustomValue(key: String, value: Any) {
         FIRCrashlytics.crashlytics().setCustomValue(value, key)
     }
+
+    override fun setUserId(identifier: String) {
+        FIRCrashlytics.crashlytics().setUserID(identifier)
+    }
 }

crashlytics/src/include/FIRCrashlytics.h

@@ -27,4 +27,5 @@
 - (void)setCustomValue:(nullable id)value forKey:(NSString *)key;
 - (void)recordExceptionModel:(FIRExceptionModel *)exceptionModel
     NS_SWIFT_NAME(record(exceptionModel:));
+- (void)setUserID:(nullable NSString *)userID;
 @end

gradle.properties

@@ -5,7 +5,7 @@ kotlin.code.style=official
 SONATYPE_HOST=DEFAULT
 RELEASE_SIGNING_ENABLED=true
 GROUP=co.touchlab.crashkios
-VERSION_NAME=0.8.4
+VERSION_NAME=0.8.5
 
 POM_URL=https://github.com/touchlab/CrashKios
 POM_DESCRIPTION=Kotlin Native iOS Crash Report Library

samples/sample-crashlytics/app/build.gradle.kts

@@ -29,7 +29,7 @@ android {
         resources.excludes.add("META-INF/*.kotlin_module")
     }
     buildTypes {
-        getByName("release")  {
+        getByName("release") {
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }

samples/sample-crashlytics/app/src/main/java/co/touchlab/crashkiossamplecrashlog/MainActivity.kt

@@ -10,8 +10,8 @@
 
 package co.touchlab.crashkiossamplecrashlog
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import co.touchlab.crashkiossample.CrashBot
 import co.touchlab.crashkiossample.SampleCommon
 import co.touchlab.crashkiossamplecrashlog.databinding.ActivityMainBinding
@@ -23,10 +23,13 @@ class MainActivity : AppCompatActivity() {
         setContentView(binding.root)
 
         val sampleCommon = SampleCommon()
-        binding.clickCount.setOnClickListener{
-           sampleCommon.onClick()
+        binding.userId.setOnClickListener {
+            sampleCommon.setUserId("123")
+        }
+        binding.clickCount.setOnClickListener {
+            sampleCommon.onClick()
         }
-        binding.logException.setOnClickListener{
+        binding.logException.setOnClickListener {
             sampleCommon.logException()
         }
         binding.crash.setOnClickListener {

samples/sample-crashlytics/app/src/main/res/layout/activity_main.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2021 Touchlab
+  ~ Copyright (c) 2023 Touchlab
   ~ 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
   ~
@@ -10,36 +10,43 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:layout_gravity="center_vertical"
-    tools:context=".MainActivity">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:layout_gravity="center_vertical"
+              tools:context=".MainActivity">
 
     <Button
-        android:id="@+id/click_count"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="32dp"
-        android:layout_gravity="center_horizontal"
-        android:text="Click Count" />
+            android:id="@+id/user_id"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="32dp"
+            android:layout_gravity="center_horizontal"
+            android:text="Set User Id"/>
 
     <Button
-        android:id="@+id/log_exception"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_margin="32dp"
-        android:text="Log Exception" />
+            android:id="@+id/click_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="32dp"
+            android:layout_gravity="center_horizontal"
+            android:text="Click Count"/>
 
     <Button
-        android:id="@+id/crash"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_margin="32dp"
-        android:text="Crash" />
+            android:id="@+id/log_exception"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_margin="32dp"
+            android:text="Log Exception"/>
+
+    <Button
+            android:id="@+id/crash"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_margin="32dp"
+            android:text="Crash"/>
 
 </LinearLayout>