diff --git a/samples/user-interface/share/src/main/java/com/example/platform/ui/share/sender/ShareResultReceiver.kt b/samples/user-interface/share/src/main/java/com/example/platform/ui/share/sender/ShareResultReceiver.kt
index 3801b8b9..eaf094bf 100644
--- a/samples/user-interface/share/src/main/java/com/example/platform/ui/share/sender/ShareResultReceiver.kt
+++ b/samples/user-interface/share/src/main/java/com/example/platform/ui/share/sender/ShareResultReceiver.kt
@@ -25,7 +25,6 @@ import android.service.chooser.ChooserResult
 import android.service.chooser.ChooserResult.CHOOSER_RESULT_COPY
 import android.service.chooser.ChooserResult.CHOOSER_RESULT_EDIT
 import android.service.chooser.ChooserResult.CHOOSER_RESULT_SELECTED_COMPONENT
-import android.service.chooser.ChooserResult.CHOOSER_RESULT_UNKNOWN
 import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.content.IntentCompat
@@ -43,13 +42,12 @@ class ShareResultReceiver : BroadcastReceiver() {
                 Intent.EXTRA_CHOOSER_RESULT,
                 ChooserResult::class.java,
             )
-            if (chooserResult != null) {
-                Log.i(TAG, "isShortcut: ${chooserResult.isShortcut}")
-                Log.i(TAG, "type: ${typeToString(chooserResult.type)}")
-                Log.i(TAG, "componentName: ${chooserResult.selectedComponent}")
-            } else {
-                Log.i(TAG, "chooserResult is null")
-            }
+            chooserResult?.let {
+                Log.i(
+                    TAG,
+                    "Share callback: isShortcut: ${it.isShortcut}, type: ${typeToString(it.type)}, componentName: ${it.selectedComponent}",
+                )
+            } ?: Log.i(TAG, "chooserResult is null")
         } else {
             // This ComponentName represents the Activity that has received the data we shared.
             val componentName: ComponentName? = IntentCompat.getParcelableExtra(
@@ -66,7 +64,6 @@ class ShareResultReceiver : BroadcastReceiver() {
             CHOOSER_RESULT_SELECTED_COMPONENT -> "SELECTED_COMPONENT"
             CHOOSER_RESULT_COPY -> "COPY"
             CHOOSER_RESULT_EDIT -> "EDIT"
-            CHOOSER_RESULT_UNKNOWN -> "UNKNOWN"
             else -> "UNKNOWN"
         }
     }
diff --git a/samples/user-interface/share/src/main/java/com/example/platform/ui/share/sender/ShareSender.kt b/samples/user-interface/share/src/main/java/com/example/platform/ui/share/sender/ShareSender.kt
index a0165890..50e9ac6f 100644
--- a/samples/user-interface/share/src/main/java/com/example/platform/ui/share/sender/ShareSender.kt
+++ b/samples/user-interface/share/src/main/java/com/example/platform/ui/share/sender/ShareSender.kt
@@ -99,6 +99,10 @@ private val filenames = listOf(
     "night_highrise.jpg",
 )
 
+private const val PLAIN_TEXT_CONTENT = "Hello, world!"
+private const val PLAIN_TEXT_TYPE = "text/plain"
+private const val SHARE_TEXT_REQUEST_CODE = 1234
+
 /**
  * Shares a text message and demonstrates how to set up a BroadcastReceiver to be
  * notified who has received the data we shared. See [ShareResultReceiver].
@@ -106,10 +110,10 @@ private val filenames = listOf(
 private fun sharePlainText(context: Context) {
     if (Build.VERSION.SDK_INT >= 22) {
         val share = Intent(Intent.ACTION_SEND)
-        share.setType("text/plain")
-        share.putExtra(Intent.EXTRA_TEXT,"Hello, world!")
+        share.setType(PLAIN_TEXT_TYPE)
+        share.putExtra(Intent.EXTRA_TEXT, PLAIN_TEXT_CONTENT)
         val pendingIntent = PendingIntent.getBroadcast(
-            context, 1234,
+            context, SHARE_TEXT_REQUEST_CODE,
             Intent(context, ShareResultReceiver::class.java),
             PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
         )
@@ -118,8 +122,8 @@ private fun sharePlainText(context: Context) {
         )
     } else {
         context.startActivity(ShareCompat.IntentBuilder(context)
-            .setType("text/plain")
-            .setText("Hello, world!")
+            .setType(PLAIN_TEXT_TYPE)
+            .setText(PLAIN_TEXT_CONTENT)
             .createChooserIntent()
         )
     }