Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72a83200 authored by Moez Bhatti's avatar Moez Bhatti
Browse files

Fixed #528

parent d189ff05

QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ public enum QKPreference { 
    MMS_PROXY("mms_proxy", true),

    MMS_PROXY("mms_proxy", true),





    // QK Reply

    // 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),

    TAP_DISMISS("pref_key_quickreply_dismiss", true),





    // QK Compose

    // QK Compose

QKSMS/src/main/java/com/moez/QKSMS/service/NotificationService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ public class NotificationService extends Service { 
            if (conversationPrefs.getNotificationsEnabled()) {

            if (conversationPrefs.getNotificationsEnabled()) {

                // Only show QuickReply if we're outside of the app, and they have popups and QuickReply enabled.

                // Only show QuickReply if we're outside of the app, and they have popups and QuickReply enabled.

                if (!LifecycleHandler.isApplicationVisible() &&

                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 = new Intent(context, QKReplyActivity.class);

                    popupIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                    popupIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -514,7 +514,7 @@ public class NotificationManager { 
                .extend(RemoteMessagingReceiver.getConversationExtender(context, message.mContact, message.mAddress, threadId))

                .extend(RemoteMessagingReceiver.getConversationExtender(context, message.mContact, message.mAddress, threadId))

                .setDeleteIntent(seenPI);

                .setDeleteIntent(seenPI);





        if (Build.VERSION.SDK_INT < 23) {

        if (Build.VERSION.SDK_INT < 24) {

            Intent replyIntent = new Intent(context, QKReplyActivity.class);

            Intent replyIntent = new Intent(context, QKReplyActivity.class);

            replyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            replyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            replyIntent.putExtra(QKReplyActivity.EXTRA_THREAD_ID, threadId);

            replyIntent.putExtra(QKReplyActivity.EXTRA_THREAD_ID, threadId);
@@ -607,7 +607,7 @@ public class NotificationManager { 
                .extend(RemoteMessagingReceiver.getConversationExtender(context, message.mContact, message.mAddress, threadId))

                .extend(RemoteMessagingReceiver.getConversationExtender(context, message.mContact, message.mAddress, threadId))

                .setDeleteIntent(seenPI);

                .setDeleteIntent(seenPI);





        if (Build.VERSION.SDK_INT < 23) {

        if (Build.VERSION.SDK_INT < 24) {

            Intent replyIntent = new Intent(context, QKReplyActivity.class);

            Intent replyIntent = new Intent(context, QKReplyActivity.class);

            replyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            replyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            replyIntent.putExtra(QKReplyActivity.EXTRA_THREAD_ID, threadId);

            replyIntent.putExtra(QKReplyActivity.EXTRA_THREAD_ID, threadId);
@@ -749,7 +749,7 @@ public class NotificationManager { 
     */

     */

    private static int getNotificationPriority(Context context) {

    private static int getNotificationPriority(Context context) {

        boolean qkreplyEnabled = PreferenceManager.getDefaultSharedPreferences(context)

        boolean qkreplyEnabled = PreferenceManager.getDefaultSharedPreferences(context)

                .getBoolean(SettingsFragment.QUICKREPLY, Build.VERSION.SDK_INT < 23);

                .getBoolean(SettingsFragment.QUICKREPLY, Build.VERSION.SDK_INT < 24);

        if (qkreplyEnabled) {

        if (qkreplyEnabled) {

            return NotificationCompat.PRIORITY_DEFAULT;

            return NotificationCompat.PRIORITY_DEFAULT;

        } else {

        } else {