Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 03:58:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only prompt for importing system SMS db when we're the SMS app

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-10-28 16:50:45 -07:00
parent 02c781eb25
commit bd280ec895
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/thoughtcrime/securesms/ConversationListFragment.java
View File

@@ -58,6 +58,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.loaders.ConversationListLoader; import org.thoughtcrime.securesms.database.loaders.ConversationListLoader;
import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.recipients.Recipients; import org.thoughtcrime.securesms.recipients.Recipients;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libaxolotl.util.guava.Optional; import org.whispersystems.libaxolotl.util.guava.Optional;
import java.util.Locale; import java.util.Locale;
@@ -144,7 +145,7 @@ public class ConversationListFragment extends Fragment
return Optional.of(new ExpiredBuildReminder(context)); return Optional.of(new ExpiredBuildReminder(context));
} else if (DefaultSmsReminder.isEligible(context)) { } else if (DefaultSmsReminder.isEligible(context)) {
return Optional.of(new DefaultSmsReminder(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))); return Optional.of((new SystemSmsImportReminder(context, masterSecret)));
} else if (PushRegistrationReminder.isEligible(context)) { } else if (PushRegistrationReminder.isEligible(context)) {
return Optional.of((new PushRegistrationReminder(context, masterSecret))); return Optional.of((new PushRegistrationReminder(context, masterSecret)));