Use SocialApp as the context param

android · Apr 25, 2024 · ec82897 · ec82897
1 parent fde7b55
commit ec82897
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/app/src/main/java/androidx/core/app/Person.java b/app/src/main/java/androidx/core/app/Person.java
@@ -28,6 +28,8 @@
 import androidx.annotation.RestrictTo;
 import androidx.core.graphics.drawable.IconCompat;
 
+import com.google.android.samples.socialite.SocialApp;
+
 import java.util.Objects;
 
 /**
@@ -424,7 +426,7 @@ static Person fromAndroidPerson(android.app.Person person) {
         static android.app.Person toAndroidPerson(Person person) {
             return new android.app.Person.Builder()
                 .setName(person.getName())
-                .setIcon((person.getIcon() != null) ? person.getIcon().toIcon() : null)
+                .setIcon((person.getIcon() != null) ? person.getIcon().toIcon(SocialApp.app) : null)
                 .setUri(person.getUri())
                 .setKey(person.getKey())
                 .setBot(person.isBot())

diff --git a/app/src/main/java/com/google/android/samples/socialite/SocialApp.kt b/app/src/main/java/com/google/android/samples/socialite/SocialApp.kt
@@ -19,4 +19,13 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class SocialApp : Application()
+class SocialApp : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        app = this
+    }
+
+    companion object {
+        lateinit var app: SocialApp
+    }
+}