From bd280ec8954c5fba7b43da9396dba3cbb0638ff8 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Wed, 28 Oct 2015 16:50:45 -0700 Subject: [PATCH] Only prompt for importing system SMS db when we're the SMS app // FREEBIE --- src/org/thoughtcrime/securesms/ConversationListFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index 4bf50e2c70..9b4a100327 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -58,6 +58,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.loaders.ConversationListLoader; import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.recipients.Recipients; +import org.thoughtcrime.securesms.util.Util; import org.whispersystems.libaxolotl.util.guava.Optional; import java.util.Locale; @@ -144,7 +145,7 @@ public class ConversationListFragment extends Fragment return Optional.of(new ExpiredBuildReminder(context)); } else if (DefaultSmsReminder.isEligible(context)) { return Optional.of(new DefaultSmsReminder(context)); - } else if (SystemSmsImportReminder.isEligible(context)) { + } else if (Util.isDefaultSmsProvider(context) && SystemSmsImportReminder.isEligible(context)) { return Optional.of((new SystemSmsImportReminder(context, masterSecret))); } else if (PushRegistrationReminder.isEligible(context)) { return Optional.of((new PushRegistrationReminder(context, masterSecret)));