Fix rebase errors

This commit is contained in:
Moxie Marlinspike
2014-01-06 18:52:18 -08:00
parent 71664926e9
commit dde2d2564a
7 changed files with 31 additions and 24 deletions

View File

@@ -111,8 +111,7 @@ public class SmsListener extends BroadcastReceiver {
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT ||
PreferenceManager.getDefaultSharedPreferences(context)
.getBoolean(ApplicationPreferencesActivity.ALL_SMS_PREF, true))
TextSecurePreferences.isInterceptAllSmsEnabled(context))
{
return true;
}