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

Commit 55bb6a4e authored by searchy2's avatar searchy2 Committed by GitHub
Browse files

Merge pull request #1 from moezbhatti/master 

Sync with master
parents d189ff05 5241b377

QKSMS/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ android { 
    buildToolsVersion '23.0.2'



    defaultConfig {

        versionCode 130

        versionName "2.6.2"

        versionCode 131

        versionName "2.6.3"

        minSdkVersion 15

        targetSdkVersion 22

        multiDexEnabled true

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

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

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

+3 −3
Original line number Diff line number Diff line
@@ -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 {

QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ public class ComposeFragment extends QKFragment implements ActivityLauncher, Rec 
        mRecipients = (AutoCompleteContactView) view.findViewById(R.id.compose_recipients);

        mRecipients.setOnItemClickListener(this);



        view.findViewById(R.id.compose_view_stub).setVisibility(View.VISIBLE);

        mComposeView = (ComposeView) view.findViewById(R.id.compose_view);

        mComposeView.onOpenConversation(null, null);

        mComposeView.setActivityLauncher(this);