From df2c5d38b0f8729ee35daa93e0364b3794dc4b5a Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Sat, 2 Jun 2018 09:38:20 -0400 Subject: [PATCH] Don't notify new users if there is a pending SQLCipher migration. If a user is upgrading to use the SQLCipher database (which happened back in 4.16, so this only applies to relatively dormant users who are just getting back into the app) and received a new "user X joind signal" message, then it could screw up the migration. So we're just dropping these notifications that happen in this narrow window. --- src/org/thoughtcrime/securesms/util/DirectoryHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/util/DirectoryHelper.java b/src/org/thoughtcrime/securesms/util/DirectoryHelper.java index 324393fc65..29cac22fe2 100644 --- a/src/org/thoughtcrime/securesms/util/DirectoryHelper.java +++ b/src/org/thoughtcrime/securesms/util/DirectoryHelper.java @@ -142,7 +142,7 @@ public class DirectoryHelper { ApplicationContext.getInstance(context).getJobManager().add(new MultiDeviceContactUpdateJob(context)); } - if (!activeUser && systemContact) { + if (!activeUser && systemContact && !TextSecurePreferences.getNeedsSqlCipherMigration(context)) { notifyNewUsers(context, Collections.singletonList(recipient.getAddress())); }