From 7334ebfce12899f821f3dfc4b974ea3ebbc5eefc Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 30 Mar 2026 14:15:08 -0300
Subject: [PATCH] Fix NPE in canUserAccessUnifiedBackupDirectory when backup
 directory is null.

Co-authored-by: Greyson Parrelli <greyson@signal.org>
---
 .../java/org/thoughtcrime/securesms/util/BackupUtil.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java
index 79514c818d..de47bf70df 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java
@@ -75,7 +75,12 @@ public class BackupUtil {
 
   public static boolean canUserAccessUnifiedBackupDirectory(@NonNull Context context) {
     if (isUserSelectionRequired(context)) {
-      Uri backupDirectoryUri = Uri.parse(SignalStore.backup().getNewLocalBackupsDirectory());
+      String backupDirectoryPath = SignalStore.backup().getNewLocalBackupsDirectory();
+      if (backupDirectoryPath == null) {
+        return false;
+      }
+
+      Uri backupDirectoryUri = Uri.parse(backupDirectoryPath);
       if (backupDirectoryUri == null) {
         return false;
       }