From c0d11f91d95f5e22654b6ab015a4e3ea51cec692 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 9 Dec 2015 16:49:01 -0500 Subject: [PATCH 01/23] Added binder --- .../muzutozvednout/ShouldIAnswerBinder.java | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 QKSMS/src/main/java/org/mistergroup/muzutozvednout/ShouldIAnswerBinder.java diff --git a/QKSMS/src/main/java/org/mistergroup/muzutozvednout/ShouldIAnswerBinder.java b/QKSMS/src/main/java/org/mistergroup/muzutozvednout/ShouldIAnswerBinder.java new file mode 100644 index 00000000..864762a8 --- /dev/null +++ b/QKSMS/src/main/java/org/mistergroup/muzutozvednout/ShouldIAnswerBinder.java @@ -0,0 +1,97 @@ +package org.mistergroup.muzutozvednout; + +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.ServiceConnection; +import android.os.Bundle; +import android.os.Handler; +import android.os.IBinder; +import android.os.Message; +import android.os.Messenger; +import android.os.RemoteException; + +/** + * Created by Mister Group s.r.o. on 30.11.2015. + */ +public class ShouldIAnswerBinder { + static final int RATING_UNKNOWN = 0; + static final int RATING_POSITIVE = 1; + static final int RATING_NEGATIVE = 2; + static final int RATING_NEUTRAL = 3; + + private Callback callback; + public boolean isBound; + + public interface Callback { + void onNumberRating(String number, int rating); + + void onServiceConnected(); + + void onServiceDisconnected(); + } + + public void setCallback(Callback callback) { + this.callback = callback; + } + + public void bind(Context context) { + Intent intent = new Intent("org.mistergroup.muzutozvednout.PublicService"); + context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE); + } + + public void unbind(Context context) { + if ((isBound) && (serviceMessenger != null)) { + context.unbindService(mConnection); + } + } + + public void getNumberRating(String number) throws RemoteException { + Message msg = new Message(); + msg.what = 1; + Bundle data = new Bundle(); + data.putString("number", number); + msg.setData(data); + msg.replyTo = messenger; + serviceMessenger.send(msg); + } + + private final Messenger messenger = new Messenger(new IncomingHandler()); + private static Messenger serviceMessenger = null; + + private ServiceConnection mConnection = new ServiceConnection() { + public void onServiceConnected(ComponentName className, IBinder service) { + serviceMessenger = new Messenger(service); + isBound = true; + if (callback != null) + callback.onServiceConnected(); + } + + public void onServiceDisconnected(ComponentName className) { + serviceMessenger = null; + isBound = false; + if (callback != null) + callback.onServiceDisconnected(); + } + }; + + private class IncomingHandler extends Handler { + static final int GET_NUMBER_RATING = 1; + + @Override + public void handleMessage(Message msg) { + switch (msg.what) { + case GET_NUMBER_RATING: + Bundle inData = msg.getData(); + String number = inData.getString("number"); + int rating = inData.getInt("rating"); + if (callback != null) + callback.onNumberRating(number, rating); + + break; + default: + super.handleMessage(msg); + } + } + } +} From 5e437f0015faf2ba7381e9ff6f6bbc9f892c7c7b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 9 Dec 2015 17:02:57 -0500 Subject: [PATCH 02/23] Fixed binder intent --- .../org/mistergroup/muzutozvednout/ShouldIAnswerBinder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/QKSMS/src/main/java/org/mistergroup/muzutozvednout/ShouldIAnswerBinder.java b/QKSMS/src/main/java/org/mistergroup/muzutozvednout/ShouldIAnswerBinder.java index 864762a8..36d396ed 100644 --- a/QKSMS/src/main/java/org/mistergroup/muzutozvednout/ShouldIAnswerBinder.java +++ b/QKSMS/src/main/java/org/mistergroup/muzutozvednout/ShouldIAnswerBinder.java @@ -36,7 +36,8 @@ public class ShouldIAnswerBinder { } public void bind(Context context) { - Intent intent = new Intent("org.mistergroup.muzutozvednout.PublicService"); + Intent intent=new Intent("org.mistergroup.muzutozvednout.PublicService"); + intent.setPackage("org.mistergroup.muzutozvednout"); context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE); } From 00a66c3525343e88e7c694184f553eb8043dde6a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 9 Dec 2015 23:30:04 -0500 Subject: [PATCH 03/23] Successfully check if number is blocked in SIA --- .../QKSMS/receiver/MessagingReceiver.java | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java index d3a4f5e0..f6b87e5d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java @@ -15,6 +15,7 @@ import com.moez.QKSMS.data.Message; import com.moez.QKSMS.service.NotificationService; import com.moez.QKSMS.transaction.NotificationManager; import com.moez.QKSMS.transaction.SmsHelper; +import org.mistergroup.muzutozvednout.ShouldIAnswerBinder; public class MessagingReceiver extends BroadcastReceiver { private final String TAG = "MessagingReceiver"; @@ -63,7 +64,6 @@ public class MessagingReceiver extends BroadcastReceiver { BlockedConversationHelper.blockConversation(prefs, message.getThreadId()); message.markSeen(); BlockedConversationHelper.FutureBlockedConversationObservable.getInstance().futureBlockedConversationReceived(); - } else if (conversationPrefs.getNotificationsEnabled() && !BlockedConversationHelper.getBlockedConversationIds( PreferenceManager.getDefaultSharedPreferences(context)).contains(message.getThreadId())) { Intent messageHandlerIntent = new Intent(context, NotificationService.class); @@ -84,5 +84,27 @@ public class MessagingReceiver extends BroadcastReceiver { wakeLock.release(); } } + + ShouldIAnswerBinder shouldIAnswerBinder = new ShouldIAnswerBinder(); + shouldIAnswerBinder.setCallback(new ShouldIAnswerBinder.Callback() { + @Override + public void onNumberRating(String number, int rating) { + Log.d("APP", "onNumberRating " + number + ": " + String.valueOf(rating)); + shouldIAnswerBinder.unbind(context.getApplicationContext()); + } + + @Override + public void onServiceConnected() { + try { + shouldIAnswerBinder.getNumberRating(address); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public void onServiceDisconnected() {} + }); + shouldIAnswerBinder.bind(context.getApplicationContext()); } } From cccd66e1fb812ca242af8ec8b0488e25d307bfe7 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 9 Dec 2015 23:49:02 -0500 Subject: [PATCH 04/23] Method for finding out if package is installed --- .../moez/QKSMS/common/utils/PackageUtils.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/common/utils/PackageUtils.java diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/PackageUtils.java b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/PackageUtils.java new file mode 100644 index 00000000..be77740e --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/PackageUtils.java @@ -0,0 +1,16 @@ +package com.moez.QKSMS.common.utils; + +import android.content.Context; +import android.content.pm.PackageManager; + +public class PackageUtils { + + public static boolean isAppInstalled(Context context, String packageName) { + try { + context.getPackageManager().getPackageInfo(packageName, PackageManager.GET_ACTIVITIES); + return true; + } catch (PackageManager.NameNotFoundException e) { + return false; + } + } +} From 2204f48675aedef10d1e797da9e4c3eca2d6fe5e Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 10 Dec 2015 00:22:39 -0500 Subject: [PATCH 05/23] Use proper TAG --- .../main/java/com/moez/QKSMS/receiver/MessagingReceiver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java index f6b87e5d..6b9e7e86 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java @@ -89,7 +89,7 @@ public class MessagingReceiver extends BroadcastReceiver { shouldIAnswerBinder.setCallback(new ShouldIAnswerBinder.Callback() { @Override public void onNumberRating(String number, int rating) { - Log.d("APP", "onNumberRating " + number + ": " + String.valueOf(rating)); + Log.d(TAG, "onNumberRating " + number + ": " + String.valueOf(rating)); shouldIAnswerBinder.unbind(context.getApplicationContext()); } From db6cff27431ee12b1d6e66c329d25bb304c12753 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 10 Dec 2015 00:31:11 -0500 Subject: [PATCH 06/23] Refactor MessagingReceiver fields --- .../QKSMS/receiver/MessagingReceiver.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java index 6b9e7e86..8628c275 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java @@ -20,11 +20,11 @@ import org.mistergroup.muzutozvednout.ShouldIAnswerBinder; public class MessagingReceiver extends BroadcastReceiver { private final String TAG = "MessagingReceiver"; - String address; - String body; - long date; + private String mAddress; + private String mBody; + private long mDate; - Uri uri; + private Uri mUri; @Override public void onReceive(Context context, Intent intent) { @@ -41,26 +41,26 @@ public class MessagingReceiver extends BroadcastReceiver { SmsMessage sms = messages[0]; if (messages.length == 1 || sms.isReplace()) { - body = sms.getDisplayMessageBody(); + mBody = sms.getDisplayMessageBody(); } else { StringBuilder bodyText = new StringBuilder(); for (SmsMessage message : messages) { bodyText.append(message.getMessageBody()); } - body = bodyText.toString(); + mBody = bodyText.toString(); } - address = sms.getDisplayOriginatingAddress(); - date = sms.getTimestampMillis(); + mAddress = sms.getDisplayOriginatingAddress(); + mDate = sms.getTimestampMillis(); - uri = SmsHelper.addMessageToInbox(context, address, body, date); + mUri = SmsHelper.addMessageToInbox(context, mAddress, mBody, mDate); - Message message = new Message(context, uri); + Message message = new Message(context, mUri); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); ConversationPrefsHelper conversationPrefs = new ConversationPrefsHelper(context, message.getThreadId()); - if (BlockedConversationHelper.isFutureBlocked(prefs, address)) { - BlockedConversationHelper.unblockFutureConversation(prefs, address); + if (BlockedConversationHelper.isFutureBlocked(prefs, mAddress)) { + BlockedConversationHelper.unblockFutureConversation(prefs, mAddress); BlockedConversationHelper.blockConversation(prefs, message.getThreadId()); message.markSeen(); BlockedConversationHelper.FutureBlockedConversationObservable.getInstance().futureBlockedConversationReceived(); @@ -68,7 +68,7 @@ public class MessagingReceiver extends BroadcastReceiver { PreferenceManager.getDefaultSharedPreferences(context)).contains(message.getThreadId())) { Intent messageHandlerIntent = new Intent(context, NotificationService.class); messageHandlerIntent.putExtra(NotificationService.EXTRA_POPUP, true); - messageHandlerIntent.putExtra(NotificationService.EXTRA_URI, uri.toString()); + messageHandlerIntent.putExtra(NotificationService.EXTRA_URI, mUri.toString()); context.startService(messageHandlerIntent); UnreadBadgeService.update(context); @@ -96,7 +96,7 @@ public class MessagingReceiver extends BroadcastReceiver { @Override public void onServiceConnected() { try { - shouldIAnswerBinder.getNumberRating(address); + shouldIAnswerBinder.getNumberRating(mAddress); } catch (Exception e) { e.printStackTrace(); } From ddae079bf927ccd280d4b7325d8546cba7097250 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 10 Dec 2015 00:38:19 -0500 Subject: [PATCH 07/23] Commented some code in MessagingReceiver --- .../com/moez/QKSMS/receiver/MessagingReceiver.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java index 8628c275..48c30021 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java @@ -59,11 +59,16 @@ public class MessagingReceiver extends BroadcastReceiver { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); ConversationPrefsHelper conversationPrefs = new ConversationPrefsHelper(context, message.getThreadId()); + // The user has set messages from this address to be blocked, but we at the time there weren't any + // messages from them already in the database, so we couldn't block any thread URI. Now that we have one, + // we can block it, so that the conversation list adapter knows to ignore this thread in the main list if (BlockedConversationHelper.isFutureBlocked(prefs, mAddress)) { BlockedConversationHelper.unblockFutureConversation(prefs, mAddress); BlockedConversationHelper.blockConversation(prefs, message.getThreadId()); message.markSeen(); BlockedConversationHelper.FutureBlockedConversationObservable.getInstance().futureBlockedConversationReceived(); + + // If we have notifications enabled and this conversation isn't blocked } else if (conversationPrefs.getNotificationsEnabled() && !BlockedConversationHelper.getBlockedConversationIds( PreferenceManager.getDefaultSharedPreferences(context)).contains(message.getThreadId())) { Intent messageHandlerIntent = new Intent(context, NotificationService.class); @@ -73,7 +78,8 @@ public class MessagingReceiver extends BroadcastReceiver { UnreadBadgeService.update(context); NotificationManager.create(context); - } else { + + } else { // We shouldn't show a notification for this message message.markSeen(); } @@ -103,7 +109,8 @@ public class MessagingReceiver extends BroadcastReceiver { } @Override - public void onServiceDisconnected() {} + public void onServiceDisconnected() { + } }); shouldIAnswerBinder.bind(context.getApplicationContext()); } From a1705b21d541a1c528d0a954d6e40143f1fb3ca8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 10 Dec 2015 00:54:12 -0500 Subject: [PATCH 08/23] Add preference for SIA integration --- .../java/com/moez/QKSMS/ui/settings/SettingsFragment.java | 1 + QKSMS/src/main/res/values/strings.xml | 2 ++ QKSMS/src/main/res/xml/settings_general.xml | 7 +++++++ 3 files changed, 10 insertions(+) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java index 3bbb50a9..bc369add 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java @@ -107,6 +107,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O public static final String BLOCKED_ENABLED = "pref_key_blocked_enabled"; public static final String BLOCKED_SENDERS = "pref_key_blocked_senders"; public static final String BLOCKED_FUTURE = "pref_key_block_future"; + public static final String SHOULD_I_ANSWER = "pref_key_should_i_answer"; public static final String MOBILE_ONLY = "pref_key_mobile_only"; public static final String COMPOSE_GROUP = "pref_key_compose_group"; public static final String SPLIT_SMS = "pref_key_split"; diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index ac825bb1..3db9621e 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -170,6 +170,8 @@ Long-press on a conversation and block to move to blocked inbox and stop notifications Block future messages Add additional phone numbers to block + Should I Answer? Integration + Automatically delete incoming messages from numbers which are blocked through Should I Answer? Mobile numbers Only show mobile numbers in contact suggestions Automatic emoji diff --git a/QKSMS/src/main/res/xml/settings_general.xml b/QKSMS/src/main/res/xml/settings_general.xml index 166af425..7c193852 100644 --- a/QKSMS/src/main/res/xml/settings_general.xml +++ b/QKSMS/src/main/res/xml/settings_general.xml @@ -103,6 +103,13 @@ android:layout="@layout/list_item_preference" android:summary="@string/pref_block_future_summary" android:title="@string/pref_block_future" /> + Date: Thu, 10 Dec 2015 01:08:35 -0500 Subject: [PATCH 09/23] Only use SIA service when setting enabled and app installed --- .../QKSMS/receiver/MessagingReceiver.java | 122 ++++++++++-------- .../muzutozvednout/ShouldIAnswerBinder.java | 8 +- 2 files changed, 74 insertions(+), 56 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java index 48c30021..6808232f 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java @@ -11,15 +11,20 @@ import android.telephony.SmsMessage; import android.util.Log; import com.moez.QKSMS.common.BlockedConversationHelper; import com.moez.QKSMS.common.ConversationPrefsHelper; +import com.moez.QKSMS.common.utils.PackageUtils; import com.moez.QKSMS.data.Message; import com.moez.QKSMS.service.NotificationService; import com.moez.QKSMS.transaction.NotificationManager; import com.moez.QKSMS.transaction.SmsHelper; +import com.moez.QKSMS.ui.settings.SettingsFragment; import org.mistergroup.muzutozvednout.ShouldIAnswerBinder; public class MessagingReceiver extends BroadcastReceiver { private final String TAG = "MessagingReceiver"; + private Context mContext; + private SharedPreferences mPrefs; + private String mAddress; private String mBody; private long mDate; @@ -28,9 +33,11 @@ public class MessagingReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { + Log.i(TAG, "onReceive"); abortBroadcast(); - Log.i(TAG, "Received text message"); + mContext = context; + mPrefs = PreferenceManager.getDefaultSharedPreferences(context); if (intent.getExtras() != null) { Object[] pdus = (Object[]) intent.getExtras().get("pdus"); @@ -53,65 +60,76 @@ public class MessagingReceiver extends BroadcastReceiver { mAddress = sms.getDisplayOriginatingAddress(); mDate = sms.getTimestampMillis(); - mUri = SmsHelper.addMessageToInbox(context, mAddress, mBody, mDate); + if (mPrefs.getBoolean(SettingsFragment.SHOULD_I_ANSWER, false) && + PackageUtils.isAppInstalled(mContext, "org.mistergroup.muzutozvednout")) { - Message message = new Message(context, mUri); - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - ConversationPrefsHelper conversationPrefs = new ConversationPrefsHelper(context, message.getThreadId()); + ShouldIAnswerBinder shouldIAnswerBinder = new ShouldIAnswerBinder(); + shouldIAnswerBinder.setCallback(new ShouldIAnswerBinder.Callback() { + @Override + public void onNumberRating(String number, int rating) { + Log.i(TAG, "onNumberRating " + number + ": " + String.valueOf(rating)); + shouldIAnswerBinder.unbind(context.getApplicationContext()); + if (rating != ShouldIAnswerBinder.RATING_NEGATIVE) { + insertMessageAndNotify(); + } + } - // The user has set messages from this address to be blocked, but we at the time there weren't any - // messages from them already in the database, so we couldn't block any thread URI. Now that we have one, - // we can block it, so that the conversation list adapter knows to ignore this thread in the main list - if (BlockedConversationHelper.isFutureBlocked(prefs, mAddress)) { - BlockedConversationHelper.unblockFutureConversation(prefs, mAddress); - BlockedConversationHelper.blockConversation(prefs, message.getThreadId()); - message.markSeen(); - BlockedConversationHelper.FutureBlockedConversationObservable.getInstance().futureBlockedConversationReceived(); + @Override + public void onServiceConnected() { + try { + shouldIAnswerBinder.getNumberRating(mAddress); + } catch (Exception e) { + e.printStackTrace(); + } + } - // If we have notifications enabled and this conversation isn't blocked - } else if (conversationPrefs.getNotificationsEnabled() && !BlockedConversationHelper.getBlockedConversationIds( - PreferenceManager.getDefaultSharedPreferences(context)).contains(message.getThreadId())) { - Intent messageHandlerIntent = new Intent(context, NotificationService.class); - messageHandlerIntent.putExtra(NotificationService.EXTRA_POPUP, true); - messageHandlerIntent.putExtra(NotificationService.EXTRA_URI, mUri.toString()); - context.startService(messageHandlerIntent); + @Override + public void onServiceDisconnected() { + } + }); - UnreadBadgeService.update(context); - NotificationManager.create(context); - - } else { // We shouldn't show a notification for this message - message.markSeen(); - } - - if (conversationPrefs.getWakePhoneEnabled()) { - PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE); - PowerManager.WakeLock wakeLock = pm.newWakeLock((PowerManager.SCREEN_DIM_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP), "MessagingReceiver"); - wakeLock.acquire(); - wakeLock.release(); + shouldIAnswerBinder.bind(context.getApplicationContext()); + } else { + insertMessageAndNotify(); } } + } - ShouldIAnswerBinder shouldIAnswerBinder = new ShouldIAnswerBinder(); - shouldIAnswerBinder.setCallback(new ShouldIAnswerBinder.Callback() { - @Override - public void onNumberRating(String number, int rating) { - Log.d(TAG, "onNumberRating " + number + ": " + String.valueOf(rating)); - shouldIAnswerBinder.unbind(context.getApplicationContext()); - } + private void insertMessageAndNotify() { + mUri = SmsHelper.addMessageToInbox(mContext, mAddress, mBody, mDate); - @Override - public void onServiceConnected() { - try { - shouldIAnswerBinder.getNumberRating(mAddress); - } catch (Exception e) { - e.printStackTrace(); - } - } + Message message = new Message(mContext, mUri); + ConversationPrefsHelper conversationPrefs = new ConversationPrefsHelper(mContext, message.getThreadId()); - @Override - public void onServiceDisconnected() { - } - }); - shouldIAnswerBinder.bind(context.getApplicationContext()); + // The user has set messages from this address to be blocked, but we at the time there weren't any + // messages from them already in the database, so we couldn't block any thread URI. Now that we have one, + // we can block it, so that the conversation list adapter knows to ignore this thread in the main list + if (BlockedConversationHelper.isFutureBlocked(mPrefs, mAddress)) { + BlockedConversationHelper.unblockFutureConversation(mPrefs, mAddress); + BlockedConversationHelper.blockConversation(mPrefs, message.getThreadId()); + message.markSeen(); + BlockedConversationHelper.FutureBlockedConversationObservable.getInstance().futureBlockedConversationReceived(); + + // If we have notifications enabled and this conversation isn't blocked + } else if (conversationPrefs.getNotificationsEnabled() && !BlockedConversationHelper.getBlockedConversationIds( + PreferenceManager.getDefaultSharedPreferences(mContext)).contains(message.getThreadId())) { + Intent messageHandlerIntent = new Intent(mContext, NotificationService.class); + messageHandlerIntent.putExtra(NotificationService.EXTRA_POPUP, true); + messageHandlerIntent.putExtra(NotificationService.EXTRA_URI, mUri.toString()); + mContext.startService(messageHandlerIntent); + + UnreadBadgeService.update(mContext); + NotificationManager.create(mContext); + + } else { // We shouldn't show a notification for this message + message.markSeen(); + } + + if (conversationPrefs.getWakePhoneEnabled()) { + PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); + PowerManager.WakeLock wakeLock = pm.newWakeLock((PowerManager.SCREEN_DIM_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP), "MessagingReceiver"); + wakeLock.acquire(); + wakeLock.release(); + } } } diff --git a/QKSMS/src/main/java/org/mistergroup/muzutozvednout/ShouldIAnswerBinder.java b/QKSMS/src/main/java/org/mistergroup/muzutozvednout/ShouldIAnswerBinder.java index 36d396ed..8524f814 100644 --- a/QKSMS/src/main/java/org/mistergroup/muzutozvednout/ShouldIAnswerBinder.java +++ b/QKSMS/src/main/java/org/mistergroup/muzutozvednout/ShouldIAnswerBinder.java @@ -15,10 +15,10 @@ import android.os.RemoteException; * Created by Mister Group s.r.o. on 30.11.2015. */ public class ShouldIAnswerBinder { - static final int RATING_UNKNOWN = 0; - static final int RATING_POSITIVE = 1; - static final int RATING_NEGATIVE = 2; - static final int RATING_NEUTRAL = 3; + public static final int RATING_UNKNOWN = 0; + public static final int RATING_POSITIVE = 1; + public static final int RATING_NEGATIVE = 2; + public static final int RATING_NEUTRAL = 3; private Callback callback; public boolean isBound; From ef3c6c62c327938335bf923d3d1e4e1300ebfac4 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 10 Dec 2015 01:39:47 -0500 Subject: [PATCH 10/23] Prompt user to install SIA if not installed and they try enabling the setting --- .../transaction/NotificationManager.java | 4 +++ .../QKSMS/ui/settings/SettingsFragment.java | 26 +++++++++++++++++++ QKSMS/src/main/res/values/strings.xml | 2 ++ 3 files changed, 32 insertions(+) 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 d1d0bedf..e0b6c88a 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java @@ -665,6 +665,10 @@ public class NotificationManager { */ public static void initQuickCompose(Context context, boolean override, boolean overrideCancel) { + if (sPrefs == null) { + init(context); + } + if (sPrefs.getBoolean(SettingsFragment.QUICKCOMPOSE, false) || override) { Intent composeIntent = new Intent(context, QKComposeActivity.class); PendingIntent composePI = PendingIntent.getActivity(context, 9, composeIntent, PendingIntent.FLAG_UPDATE_CURRENT); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java index bc369add..9521a806 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java @@ -12,6 +12,8 @@ import android.content.res.Resources; import android.net.Uri; import android.os.Build; import android.os.Bundle; +import android.os.Handler; +import android.preference.CheckBoxPreference; import android.preference.EditTextPreference; import android.preference.ListPreference; import android.preference.Preference; @@ -36,6 +38,7 @@ import com.moez.QKSMS.common.ListviewHelper; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.utils.DateFormatter; import com.moez.QKSMS.common.utils.KeyboardUtils; +import com.moez.QKSMS.common.utils.PackageUtils; import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.receiver.NightModeAutoReceiver; import com.moez.QKSMS.transaction.EndlessJabber; @@ -531,6 +534,29 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O case BLOCKED_FUTURE: BlockedNumberDialog.showDialog(mContext); break; + case SHOULD_I_ANSWER: + final String packageName = "org.mistergroup.muzutozvednout"; + if (!PackageUtils.isAppInstalled(mContext, packageName)) { + new QKDialog() + .setContext(mContext) + .setTitle(R.string.dialog_should_i_answer_title) + .setMessage(R.string.dialog_should_i_answer_message) + .setNegativeButton(R.string.cancel, null) + .setPositiveButton(R.string.okay, v -> { + try { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + packageName))); + } catch (android.content.ActivityNotFoundException anfe) { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + packageName))); + } + }) + .show(); + + new Handler().postDelayed(() -> { + mPrefs.edit().putBoolean(SHOULD_I_ANSWER, false).commit(); + ((CheckBoxPreference) preference).setChecked(false); + }, 500); + } + break; case NOTIFICATION_LED_COLOR: mLedColorPickerDialog.show(getActivity().getFragmentManager(), "colorpicker"); break; diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index 3db9621e..a59920a7 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -577,6 +577,8 @@ Last message date Message count Recipients (%s) + Should I Answer? not installed + Would you like to download the app from Google Play now? Choose audio From 3424e1d4e851e0310a08c16ac55116b61f964310 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 10 Dec 2015 01:43:32 -0500 Subject: [PATCH 11/23] Settings category for message blocking --- QKSMS/src/main/res/values/strings.xml | 1 + QKSMS/src/main/res/xml/settings_general.xml | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index a59920a7..d2ada51a 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -110,6 +110,7 @@ Themes, fonts, colors, avatars, and more General Delivery, message sending, formatting + Message blocking Notifications Sounds, LED, privacy MMS diff --git a/QKSMS/src/main/res/xml/settings_general.xml b/QKSMS/src/main/res/xml/settings_general.xml index 7c193852..35d16d88 100644 --- a/QKSMS/src/main/res/xml/settings_general.xml +++ b/QKSMS/src/main/res/xml/settings_general.xml @@ -88,7 +88,7 @@ + android:title="@string/pref_category_blocking"> + + Date: Sun, 13 Dec 2015 00:29:47 -0500 Subject: [PATCH 12/23] Added service to respond to SIA enabled requests --- QKSMS/src/main/AndroidManifest.xml | 8 +++ .../QKSMS/service/ShouldIAnswerService.java | 57 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/service/ShouldIAnswerService.java diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index a315488a..f660fd23 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -450,6 +450,14 @@ android:name=".receiver.UnreadBadgeService" android:exported="false" /> + + + + + + Date: Sun, 13 Dec 2015 01:13:53 -0500 Subject: [PATCH 13/23] Allow setting of SIA setting via intent --- .../moez/QKSMS/service/ShouldIAnswerService.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/service/ShouldIAnswerService.java b/QKSMS/src/main/java/com/moez/QKSMS/service/ShouldIAnswerService.java index 63e2c880..84d7fdd7 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/service/ShouldIAnswerService.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/service/ShouldIAnswerService.java @@ -1,5 +1,6 @@ package com.moez.QKSMS.service; +import android.annotation.SuppressLint; import android.app.Service; import android.content.Context; import android.content.Intent; @@ -31,19 +32,24 @@ public class ShouldIAnswerService extends Service { mContext = context; } + @SuppressLint("CommitPrefEdits") @Override public void handleMessage(Message msg) { super.handleMessage(msg); Messenger messenger = msg.replyTo; - if (messenger != null && msg.what == 918) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext); - + if (messenger != null && (msg.what == 918 || msg.what == 919)) { Bundle data = new Bundle(); + + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext); + if (msg.what == 919) { + prefs.edit().putBoolean(SettingsFragment.SHOULD_I_ANSWER, true).commit(); + } + data.putBoolean("blocking_enabled", prefs.getBoolean(SettingsFragment.SHOULD_I_ANSWER, false)); Message message = new Message(); - message.what = 918; + message.what = msg.what; message.setData(data); try { From 71b2c9901322d7713bec406f89747abbfcdac5d7 Mon Sep 17 00:00:00 2001 From: mistercz Date: Mon, 14 Dec 2015 09:33:41 +0100 Subject: [PATCH 14/23] External process does not play well with preferences.. Stored values has been ignored. All works great after removing process attribute --- QKSMS/src/main/AndroidManifest.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index f660fd23..8604acc9 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -451,8 +451,7 @@ android:exported="false" /> + android:name=".service.ShouldIAnswerService"> From 6406e938692b3a8ff3a5b135aec943d70c2d0292 Mon Sep 17 00:00:00 2001 From: mistercz Date: Mon, 14 Dec 2015 09:34:11 +0100 Subject: [PATCH 15/23] Added option to disable filtering --- .../main/java/com/moez/QKSMS/service/ShouldIAnswerService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/service/ShouldIAnswerService.java b/QKSMS/src/main/java/com/moez/QKSMS/service/ShouldIAnswerService.java index 84d7fdd7..0b471de8 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/service/ShouldIAnswerService.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/service/ShouldIAnswerService.java @@ -43,7 +43,8 @@ public class ShouldIAnswerService extends Service { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext); if (msg.what == 919) { - prefs.edit().putBoolean(SettingsFragment.SHOULD_I_ANSWER, true).commit(); + boolean enabled=msg.getData().getBoolean("enabled"); + prefs.edit().putBoolean(SettingsFragment.SHOULD_I_ANSWER, enabled).commit(); } data.putBoolean("blocking_enabled", prefs.getBoolean(SettingsFragment.SHOULD_I_ANSWER, false)); From 0385a52ae48cfb202237e5eaa03483a6d38de757 Mon Sep 17 00:00:00 2001 From: mistercz Date: Mon, 14 Dec 2015 09:56:20 +0100 Subject: [PATCH 16/23] Added installation referrer --- .../java/com/moez/QKSMS/ui/settings/SettingsFragment.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java index 9521a806..30671687 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java @@ -537,6 +537,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O case SHOULD_I_ANSWER: final String packageName = "org.mistergroup.muzutozvednout"; if (!PackageUtils.isAppInstalled(mContext, packageName)) { + String referrer="referrer=utm_source%3Dqksms%26utm_medium%3Dapp%26utm_campaign%3Dqksmssettings"; new QKDialog() .setContext(mContext) .setTitle(R.string.dialog_should_i_answer_title) @@ -544,9 +545,9 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O .setNegativeButton(R.string.cancel, null) .setPositiveButton(R.string.okay, v -> { try { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + packageName))); + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + packageName + "&" + referrer))); } catch (android.content.ActivityNotFoundException anfe) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + packageName))); + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + packageName + "&" + referrer))); } }) .show(); From 5193d66245b86d670cc1b083e365622a88e82d8d Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 20 Dec 2015 23:37:59 -0500 Subject: [PATCH 17/23] Increment to 2.4.0 --- QKSMS/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QKSMS/build.gradle b/QKSMS/build.gradle index b7249429..9c0cf8a2 100644 --- a/QKSMS/build.gradle +++ b/QKSMS/build.gradle @@ -30,8 +30,8 @@ android { buildToolsVersion '23.0.2' defaultConfig { - versionCode 119 - versionName "2.3.1" + versionCode 120 + versionName "2.4.0" minSdkVersion 15 targetSdkVersion 22 multiDexEnabled true From 2f01da7fc4ec79ae9d9b9368f64c35d1879579d4 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 22 Dec 2015 13:05:09 -0500 Subject: [PATCH 18/23] Fixed notification icon color --- QKSMS/src/main/res/drawable/ic_notification.xml | 2 +- QKSMS/src/main/res/drawable/ic_notification_failed.xml | 2 +- QKSMS/src/main/res/drawable/ic_notification_mms.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/QKSMS/src/main/res/drawable/ic_notification.xml b/QKSMS/src/main/res/drawable/ic_notification.xml index f81ed0bf..3bc7b925 100644 --- a/QKSMS/src/main/res/drawable/ic_notification.xml +++ b/QKSMS/src/main/res/drawable/ic_notification.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/QKSMS/src/main/res/drawable/ic_notification_failed.xml b/QKSMS/src/main/res/drawable/ic_notification_failed.xml index 4b1898b3..f216814e 100644 --- a/QKSMS/src/main/res/drawable/ic_notification_failed.xml +++ b/QKSMS/src/main/res/drawable/ic_notification_failed.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/QKSMS/src/main/res/drawable/ic_notification_mms.xml b/QKSMS/src/main/res/drawable/ic_notification_mms.xml index b201cced..3c5dfe15 100644 --- a/QKSMS/src/main/res/drawable/ic_notification_mms.xml +++ b/QKSMS/src/main/res/drawable/ic_notification_mms.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> From f66595dd67184c2464504b63385ebe7c1a3265f9 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 22 Dec 2015 13:05:26 -0500 Subject: [PATCH 19/23] Crashlytics #16 --- .../com/moez/QKSMS/ui/messagelist/MessageListAdapter.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java index 0850acb7..45196a64 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java @@ -412,6 +412,10 @@ public class MessageListAdapter extends RecyclerCursorAdapter { + if (mCursor == null) { + // The pdu has probably loaded after shutting down the fragment. Don't try to bind anything now + return; + } if (messageItem1 != null && messageItem1.getMessageId() == messageItem1.getMessageId()) { messageItem1.setCachedFormattedMessage(null); bindGrouping(holder, messageItem); From d9eaf0ad2389c46c571dc636f06edc0a5abe850b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 22 Dec 2015 13:23:18 -0500 Subject: [PATCH 20/23] Crashlytics #4 --- .../src/main/java/com/moez/QKSMS/transaction/SmsHelper.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java index 60113467..78ddb2bb 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java @@ -458,7 +458,10 @@ public class SmsHelper { do { Uri threadUri = Uri.withAppendedPath(Message.MMS_SMS_CONTENT_PROVIDER, conversationCursor.getString(Conversation.ID)); Cursor messageCursor = context.getContentResolver().query(threadUri, MessageColumns.PROJECTION, SmsHelper.UNREAD_SELECTION, null, SmsHelper.sortDateDesc); - result += messageCursor.getCount(); + if (messageCursor != null) { + result += messageCursor.getCount(); + messageCursor.close(); + } } while (conversationCursor.moveToNext()); } From b919ea2164aa73e4ffc8932aa2b37abfa123344f Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 22 Dec 2015 13:48:11 -0500 Subject: [PATCH 21/23] Crashlytics #47 --- .../java/com/moez/QKSMS/transaction/NotificationManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e0b6c88a..ee788e2b 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java @@ -535,7 +535,7 @@ public class NotificationManager { SlideshowModel model = message.mSlideshow; - if (model != null && model.isSimple()) { + if (model != null && model.isSimple() && model.get(0).getImage() != null) { Log.d(TAG, "MMS type: image"); ImageModel imageModel = model.get(0).getImage(); Bitmap image = imageModel.getBitmap(imageModel.getWidth(), imageModel.getHeight()); From a46956d1987905f4106ac7202534bc9ed76872de Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 22 Dec 2015 13:55:11 -0500 Subject: [PATCH 22/23] Fixed notification action color --- QKSMS/src/main/res/drawable/ic_accept.xml | 2 +- QKSMS/src/main/res/drawable/ic_call.xml | 2 +- QKSMS/src/main/res/drawable/ic_compose.xml | 2 +- QKSMS/src/main/res/drawable/ic_reply.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/QKSMS/src/main/res/drawable/ic_accept.xml b/QKSMS/src/main/res/drawable/ic_accept.xml index 1d3d920b..f672338b 100644 --- a/QKSMS/src/main/res/drawable/ic_accept.xml +++ b/QKSMS/src/main/res/drawable/ic_accept.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/QKSMS/src/main/res/drawable/ic_call.xml b/QKSMS/src/main/res/drawable/ic_call.xml index ebf9de60..28914c6f 100644 --- a/QKSMS/src/main/res/drawable/ic_call.xml +++ b/QKSMS/src/main/res/drawable/ic_call.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/QKSMS/src/main/res/drawable/ic_compose.xml b/QKSMS/src/main/res/drawable/ic_compose.xml index b49930dd..231ae2ad 100644 --- a/QKSMS/src/main/res/drawable/ic_compose.xml +++ b/QKSMS/src/main/res/drawable/ic_compose.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/QKSMS/src/main/res/drawable/ic_reply.xml b/QKSMS/src/main/res/drawable/ic_reply.xml index bac2f916..3fa79ab6 100644 --- a/QKSMS/src/main/res/drawable/ic_reply.xml +++ b/QKSMS/src/main/res/drawable/ic_reply.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> From f22badeaae92a0d87ae72d3fa06e5f26637aea95 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 22 Dec 2015 14:18:58 -0500 Subject: [PATCH 23/23] Increment to 2.4.1 --- QKSMS/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QKSMS/build.gradle b/QKSMS/build.gradle index 9c0cf8a2..9bc04125 100644 --- a/QKSMS/build.gradle +++ b/QKSMS/build.gradle @@ -30,8 +30,8 @@ android { buildToolsVersion '23.0.2' defaultConfig { - versionCode 120 - versionName "2.4.0" + versionCode 121 + versionName "2.4.1" minSdkVersion 15 targetSdkVersion 22 multiDexEnabled true