From e7517c23add73b4c09628f90d722b1583f3055ea Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Mon, 10 Mar 2025 18:20:28 +0100
Subject: [PATCH] avoid ANR in ProfileSettingsFragment.onActivityResult

---
 .../securesms/ProfileSettingsFragment.java          | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileSettingsFragment.java b/src/main/java/org/thoughtcrime/securesms/ProfileSettingsFragment.java
index ef1d6f424..c701bf5d4 100644
--- a/src/main/java/org/thoughtcrime/securesms/ProfileSettingsFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/ProfileSettingsFragment.java
@@ -319,12 +319,15 @@ public class ProfileSettingsFragment extends Fragment
     super.onActivityResult(requestCode, resultCode, data);
     if (requestCode==REQUEST_CODE_PICK_CONTACT && resultCode==Activity.RESULT_OK && data!=null) {
       List<String> selected = data.getStringArrayListExtra("contacts");
-      for (String addr : selected) {
-        if (addr!=null) {
-          int toAddId = dcContext.createContact(null, addr);
-          dcContext.addContactToChat(chatId, toAddId);
+      if(selected == null) return;
+      Util.runOnAnyBackgroundThread(() -> {
+        for (String addr : selected) {
+          if (addr!=null) {
+            int toAddId = dcContext.createContact(null, addr);
+            dcContext.addContactToChat(chatId, toAddId);
+          }
         }
-      }
+      });
     }
   }
 }