diff --git a/QKSMS/build.gradle b/QKSMS/build.gradle index ae62e91a..6c0770cf 100644 --- a/QKSMS/build.gradle +++ b/QKSMS/build.gradle @@ -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 diff --git a/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java index 8c189aad..8c4c0601 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java @@ -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 diff --git a/QKSMS/src/main/java/com/moez/QKSMS/service/NotificationService.java b/QKSMS/src/main/java/com/moez/QKSMS/service/NotificationService.java index 98736552..1782d134 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/service/NotificationService.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/service/NotificationService.java @@ -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); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java b/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java index 447ccb3d..b3e47d13 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java @@ -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 { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java index d649320d..e6b84abe 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java @@ -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); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java index 83995f3b..5b869aa1 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java @@ -22,12 +22,16 @@ public class AutoCompleteContactView extends RecipientEditTextView { public AutoCompleteContactView(Context context) { this(context, null); - init(context); + if (!isInEditMode()) { + init(context); + } } public AutoCompleteContactView(Context context, AttributeSet attrs) { super(context, attrs); - init(context); + if (!isInEditMode()) { + init(context); + } } private void init(Context context) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/StarredContactsView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/StarredContactsView.java index d615a411..a2025d89 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/StarredContactsView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/StarredContactsView.java @@ -40,12 +40,16 @@ public class StarredContactsView extends LinearLayout implements LoaderManager.L public StarredContactsView(Context context) { super(context); - init(context); + if (!isInEditMode()) { + init(context); + } } public StarredContactsView(Context context, AttributeSet attrs) { super(context, attrs); - init(context); + if (!isInEditMode()) { + init(context); + } } private void init(Context context) { diff --git a/QKSMS/src/main/res/layout/fragment_compose.xml b/QKSMS/src/main/res/layout/fragment_compose.xml index 153f0a7a..dfed9964 100644 --- a/QKSMS/src/main/res/layout/fragment_compose.xml +++ b/QKSMS/src/main/res/layout/fragment_compose.xml @@ -1,33 +1,35 @@ - - - - - - + android:layout_weight="1"> - + + + + + + + + + + + \ No newline at end of file diff --git a/QKSMS/src/main/res/values-v23/bools.xml b/QKSMS/src/main/res/values-v24/bools.xml similarity index 100% rename from QKSMS/src/main/res/values-v23/bools.xml rename to QKSMS/src/main/res/values-v24/bools.xml