mirror of
https://github.com/oxen-io/session-android.git
synced 2025-12-05 09:32:15 +00:00
Fix rebase errors
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user