This commit is contained in:
Moez Bhatti
2016-06-18 22:11:31 -04:00
parent d189ff0570
commit 72a83200d3
4 changed files with 5 additions and 5 deletions
@@ -86,7 +86,7 @@ public enum QKPreference {
MMS_PROXY("mms_proxy", true),
// QK Reply
QK_REPLY("pref_key_quickreply_enabled", Build.VERSION.SDK_INT < 23),
QK_REPLY("pref_key_quickreply_enabled", Build.VERSION.SDK_INT < 24),
TAP_DISMISS("pref_key_quickreply_dismiss", true),
// QK Compose
@@ -54,7 +54,7 @@ public class NotificationService extends Service {
if (conversationPrefs.getNotificationsEnabled()) {
// Only show QuickReply if we're outside of the app, and they have popups and QuickReply enabled.
if (!LifecycleHandler.isApplicationVisible() &&
intent.getBooleanExtra(EXTRA_POPUP, false) && prefs.getBoolean(SettingsFragment.QUICKREPLY, Build.VERSION.SDK_INT < 23)) {
intent.getBooleanExtra(EXTRA_POPUP, false) && prefs.getBoolean(SettingsFragment.QUICKREPLY, Build.VERSION.SDK_INT < 24)) {
popupIntent = new Intent(context, QKReplyActivity.class);
popupIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -514,7 +514,7 @@ public class NotificationManager {
.extend(RemoteMessagingReceiver.getConversationExtender(context, message.mContact, message.mAddress, threadId))
.setDeleteIntent(seenPI);
if (Build.VERSION.SDK_INT < 23) {
if (Build.VERSION.SDK_INT < 24) {
Intent replyIntent = new Intent(context, QKReplyActivity.class);
replyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
replyIntent.putExtra(QKReplyActivity.EXTRA_THREAD_ID, threadId);
@@ -607,7 +607,7 @@ public class NotificationManager {
.extend(RemoteMessagingReceiver.getConversationExtender(context, message.mContact, message.mAddress, threadId))
.setDeleteIntent(seenPI);
if (Build.VERSION.SDK_INT < 23) {
if (Build.VERSION.SDK_INT < 24) {
Intent replyIntent = new Intent(context, QKReplyActivity.class);
replyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
replyIntent.putExtra(QKReplyActivity.EXTRA_THREAD_ID, threadId);
@@ -749,7 +749,7 @@ public class NotificationManager {
*/
private static int getNotificationPriority(Context context) {
boolean qkreplyEnabled = PreferenceManager.getDefaultSharedPreferences(context)
.getBoolean(SettingsFragment.QUICKREPLY, Build.VERSION.SDK_INT < 23);
.getBoolean(SettingsFragment.QUICKREPLY, Build.VERSION.SDK_INT < 24);
if (qkreplyEnabled) {
return NotificationCompat.PRIORITY_DEFAULT;
} else {