From 3b61f13abd5ed00593baf124452c9de116bcca1e Mon Sep 17 00:00:00 2001 From: InfinityDeltaX Date: Thu, 21 Apr 2016 19:47:57 -0400 Subject: [PATCH 1/9] Refactored MessageListAdapter.bindGrouping() --- .../ui/messagelist/MessageListAdapter.java | 38 ++++++++++++++----- 1 file changed, 28 insertions(+), 10 deletions(-) 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 eaa8cf03..63c0e295 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 @@ -21,6 +21,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.RelativeLayout; + import com.android.mms.transaction.Transaction; import com.android.mms.transaction.TransactionBundle; import com.android.mms.transaction.TransactionService; @@ -44,13 +45,14 @@ import com.moez.QKSMS.ui.base.RecyclerCursorAdapter; import com.moez.QKSMS.ui.mms.MmsThumbnailPresenter; import com.moez.QKSMS.ui.settings.SettingsFragment; import com.moez.QKSMS.ui.view.AvatarView; -import ezvcard.Ezvcard; -import ezvcard.VCard; import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; +import ezvcard.Ezvcard; +import ezvcard.VCard; + public class MessageListAdapter extends RecyclerCursorAdapter { private final String TAG = "MessageListAdapter"; @@ -273,12 +275,8 @@ public class MessageListAdapter extends RecyclerCursorAdapter { if (messageItem.isMe()) { From dfb849d60209208800fd6f525449882fd9ff4bb0 Mon Sep 17 00:00:00 2001 From: InfinityDeltaX Date: Thu, 21 Apr 2016 20:20:51 -0400 Subject: [PATCH 2/9] Cleaned up more code in MessageListAdapter --- .../ui/messagelist/MessageListAdapter.java | 71 +++++++++---------- 1 file changed, 34 insertions(+), 37 deletions(-) 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 63c0e295..c844dfe4 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 @@ -275,59 +275,56 @@ public class MessageListAdapter extends RecyclerCursorAdapter= MAX_DURATION; - - - if (messageItem.mAddress != null && messageItem2.mAddress != null && - !messageItem.mAddress.equals(messageItem2.mAddress) && - !messageItem.isOutgoingMessage() && !messageItem2.isOutgoingMessage()) { - showTimestamp = true; - } + return (messageItem2.mDate - messageItem.mDate >= MAX_DURATION); } - return showTimestamp; } - private boolean shouldShowAvatar(MessageItem messageItem, int position){ - boolean showAvatar; - + private boolean shouldShowAvatar(MessageItem messageItem, int position) { if (position == 0) { - showAvatar = true; - } else { - int MAX_DURATION = 60 * 60 * 1000; - MessageItem messageItem2 = getItem(position - 1); - showAvatar = messageItem.getBoxId() != messageItem2.getBoxId() || messageItem.mDate - messageItem2.mDate >= MAX_DURATION; + return true; + } + MessageItem messageItem2 = getItem(position - 1); + + if (messagesFromDifferentPeople(messageItem, messageItem2)) { // If the messages are from different people, then we don't care about any of the other checks, // we need to show the avatar/timestamp. This is used for group chats, which is why we want // both to be incoming messages - if (messageItem.mAddress != null && messageItem2.mAddress != null && - !messageItem.mAddress.equals(messageItem2.mAddress) && - !messageItem.isOutgoingMessage() && !messageItem2.isOutgoingMessage()) { - showAvatar = true; - } + return true; + } else { + int MAX_DURATION = 60 * 60 * 1000; + return (messageItem.getBoxId() != messageItem2.getBoxId() || messageItem.mDate - messageItem2.mDate >= MAX_DURATION); } - - return showAvatar; } - private int getBubbleBackgroundResource(boolean showAvatar, boolean isMine){ - if(showAvatar && isMine) return ThemeManager.getSentBubbleRes(); - else if(showAvatar && !isMine) return ThemeManager.getReceivedBubbleRes(); - else if(!showAvatar && isMine) return ThemeManager.getSentBubbleAltRes(); - else if(!showAvatar && !isMine) return ThemeManager.getReceivedBubbleAltRes(); + private boolean messagesFromDifferentPeople(MessageItem a, MessageItem b) { + return (a.mAddress != null && b.mAddress != null && + !a.mAddress.equals(b.mAddress) && + !a.isOutgoingMessage() && !b.isOutgoingMessage()); + } + + private int getBubbleBackgroundResource(boolean showAvatar, boolean isMine) { + if (showAvatar && isMine) return ThemeManager.getSentBubbleRes(); + else if (showAvatar && !isMine) return ThemeManager.getReceivedBubbleRes(); + else if (!showAvatar && isMine) return ThemeManager.getSentBubbleAltRes(); + else if (!showAvatar && !isMine) return ThemeManager.getReceivedBubbleAltRes(); else return -1; } From 3ae6840cb63474d17cbedebcd7dfbc81de15e31f Mon Sep 17 00:00:00 2001 From: InfinityDeltaX Date: Thu, 21 Apr 2016 21:04:00 -0400 Subject: [PATCH 3/9] Added preferences for controlling the delay for a new timestamp and force-enabling timestamps for all messages. --- .../QKSMS/ui/messagelist/MessageListAdapter.java | 10 +++++++--- .../moez/QKSMS/ui/settings/SettingsFragment.java | 2 ++ QKSMS/src/main/res/values/strings.xml | 4 ++++ QKSMS/src/main/res/xml/settings_general.xml | 16 ++++++++++++++++ 4 files changed, 29 insertions(+), 3 deletions(-) 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 c844dfe4..cff56028 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 @@ -282,7 +282,9 @@ public class MessageListAdapter extends RecyclerCursorAdapter= MAX_DURATION); } } @@ -317,7 +319,9 @@ public class MessageListAdapter extends RecyclerCursorAdapterSent timestamps Show the timestamp for when a message was sent, not received + Force timestamps + Enable timestamps for all messages + New timestamp delay + The number of minutes which must elapse between two messages in order for a new timestamp to be shown. Starred contacts Show your starred contacts in the QK Compose window, making them only a tap away Proximity sensor diff --git a/QKSMS/src/main/res/xml/settings_general.xml b/QKSMS/src/main/res/xml/settings_general.xml index 31e8204a..c968353f 100644 --- a/QKSMS/src/main/res/xml/settings_general.xml +++ b/QKSMS/src/main/res/xml/settings_general.xml @@ -137,6 +137,22 @@ android:summary="@string/pref_sent_timestamps_summary" android:title="@string/pref_sent_timestamps" android:widgetLayout="@layout/view_switch" /> + + Date: Thu, 28 Apr 2016 21:08:32 -0400 Subject: [PATCH 4/9] Changed the default timestamp delay from 60 minutes to 5. --- .../java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cff56028..f5b800d5 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 @@ -293,7 +293,7 @@ public class MessageListAdapter extends RecyclerCursorAdapter= MAX_DURATION); } } From 116e4cbae8e3a6ebd160315df47d5bfb931b2abe Mon Sep 17 00:00:00 2001 From: The Gitter Badger Date: Thu, 5 May 2016 04:17:54 +0000 Subject: [PATCH 5/9] Add Gitter badge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4798fe07..507bba93 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # QKSMS +[![Join the chat at https://gitter.im/qklabs/qksms](https://badges.gitter.im/qklabs/qksms.svg)](https://gitter.im/qklabs/qksms?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + QKSMS is an open source replacement to the [stock messaging app](https://github.com/android/platform_packages_apps_mms) on Android. It is currently available on the Google Play Store. [![ZenHub] (https://raw.githubusercontent.com/ZenHubIO/support/master/zenhub-badge.png)] (https://zenhub.io) From 362f3ce28449c6e4465a2b7a32f8f316b6ec9d7b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 5 May 2016 00:20:46 -0400 Subject: [PATCH 6/9] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 507bba93..c5554327 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,11 @@ # QKSMS [![Join the chat at https://gitter.im/qklabs/qksms](https://badges.gitter.im/qklabs/qksms.svg)](https://gitter.im/qklabs/qksms?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -QKSMS is an open source replacement to the [stock messaging app](https://github.com/android/platform_packages_apps_mms) on Android. It is currently available on the Google Play Store. - [![ZenHub] (https://raw.githubusercontent.com/ZenHubIO/support/master/zenhub-badge.png)] (https://zenhub.io) [![Build Status](https://travis-ci.org/qklabs/qksms.svg?branch=master)](https://travis-ci.org/qklabs/qksms) +QKSMS is an open source replacement to the [stock messaging app](https://github.com/android/platform_packages_apps_mms) on Android. It is currently available on the Google Play Store. + [![Download on Google Play](http://i.imgur.com/rHhHvZw.png)](https://play.google.com/store/apps/details?id=com.moez.QKSMS) [![Download on F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdid=com.moez.QKSMS) From f4a99e6770e9c182104f3baecc478f3d8658eb0d Mon Sep 17 00:00:00 2001 From: laysionqet Date: Mon, 16 May 2016 13:30:16 +0800 Subject: [PATCH 7/9] Update LeakCanary version --- QKSMS/build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/QKSMS/build.gradle b/QKSMS/build.gradle index 4e613638..224db69f 100644 --- a/QKSMS/build.gradle +++ b/QKSMS/build.gradle @@ -81,6 +81,8 @@ buildscript { } } +String leakCanaryVersion = '1.4-beta2' + dependencies { // Open source libraries compile 'com.mcxiaoke.volley:library:1.0.19' @@ -91,8 +93,8 @@ dependencies { compile 'com.googlecode.libphonenumber:libphonenumber:6.2' compile 'com.nispok:snackbar:2.10.6' compile 'com.github.lzyzsd:circleprogress:1.1.0' - debugCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1' - releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1' + debugCompile "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion" + releaseCompile "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion" compile 'com.vdurmont:emoji-java:1.1.1' compile 'me.leolin:ShortcutBadger:1.1.1' compile 'com.googlecode.ez-vcard:ez-vcard:0.9.6' From 6b6aa02f3c546b65487469606e234d15bb5a7ff1 Mon Sep 17 00:00:00 2001 From: laysionqet Date: Mon, 16 May 2016 14:33:26 +0800 Subject: [PATCH 8/9] Fix DonationManager leak --- .../java/com/moez/QKSMS/common/DonationManager.java | 11 +++++++++++ .../java/com/moez/QKSMS/common/LifecycleHandler.java | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/DonationManager.java b/QKSMS/src/main/java/com/moez/QKSMS/common/DonationManager.java index af5255cd..100d84f1 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/DonationManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/DonationManager.java @@ -42,6 +42,13 @@ public class DonationManager { return sInstance; } + public static void clearInstance() { + if (null != sInstance) { + sInstance.destroy(); + } + sInstance = null; + } + private DonationManager(QKActivity context) { mContext = context; mRes = mContext.getResources(); @@ -77,6 +84,10 @@ public class DonationManager { if (mHelper != null) { mHelper.dispose(); } + mHelper = null; + mContext = null; + mRes = null; + mBillingServiceReady = false; } // Callback for when a purchase is finished diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/LifecycleHandler.java b/QKSMS/src/main/java/com/moez/QKSMS/common/LifecycleHandler.java index 284e886c..04c0dcc9 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/LifecycleHandler.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/LifecycleHandler.java @@ -15,13 +15,19 @@ public class LifecycleHandler implements Application.ActivityLifecycleCallbacks private static int sPaused; private static int sStarted; private static int sStopped; + private static int sActivityCounter; @Override public void onActivityCreated(Activity activity, Bundle savedInstanceState) { + sActivityCounter++; } @Override public void onActivityDestroyed(Activity activity) { + sActivityCounter--; + if (isNoActivitiesAlive()) { + DonationManager.clearInstance(); + } } @Override @@ -57,4 +63,8 @@ public class LifecycleHandler implements Application.ActivityLifecycleCallbacks public static boolean isApplicationInForeground() { return sResumed > sPaused; } + + public static boolean isNoActivitiesAlive() { + return sActivityCounter <= 0; + } } \ No newline at end of file From 7844e8c6ec9f443a5817bc167e53c7ffe9263037 Mon Sep 17 00:00:00 2001 From: laysionqet Date: Mon, 16 May 2016 14:34:03 +0800 Subject: [PATCH 9/9] Fix ConversationListFragment leak --- .../ConversationListFragment.java | 16 ++++++++++++++++ .../ConversationListViewHolder.java | 11 ++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java index 93be149b..47e31299 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java @@ -26,6 +26,7 @@ import com.moez.QKSMS.R; import com.moez.QKSMS.common.BlockedConversationHelper; import com.moez.QKSMS.common.DialogHelper; import com.moez.QKSMS.common.LiveViewManager; +import com.moez.QKSMS.data.Contact; import com.moez.QKSMS.ui.dialog.conversationdetails.ConversationDetailsDialog; import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.common.utils.ColorUtils; @@ -282,6 +283,21 @@ public class ConversationListFragment extends QKFragment implements LoaderManage public void onDestroy() { super.onDestroy(); BlockedConversationHelper.FutureBlockedConversationObservable.getInstance().deleteObserver(this); + + if (null == mRecyclerView) { + return; + } + try { + for (int i = 0; i < mRecyclerView.getChildCount(); i++) { + View child = mRecyclerView.getChildAt(i); + RecyclerView.ViewHolder holder = mRecyclerView.getChildViewHolder(child); + if (holder instanceof ConversationListViewHolder) { + Contact.removeListener((ConversationListViewHolder) holder); + } + } + } catch (Exception ignored) { + // + } } public Loader onCreateLoader(int id, Bundle args) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListViewHolder.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListViewHolder.java index ae2a9519..2e7d3712 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListViewHolder.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListViewHolder.java @@ -85,13 +85,10 @@ public class ConversationListViewHolder extends ClickyViewHolder i final ConversationLegacy conversationLegacy = new ConversationLegacy(mContext, mData.getThreadId()); if (shouldUpdate) { - ((MainActivity) mContext).runOnUiThread(new Runnable() { - @Override - public void run() { - mAvatarView.setImageDrawable(drawable); - mAvatarView.setContactName(name); - fromView.setText(formatMessage(mData, conversationLegacy)); - } + mContext.runOnUiThread(() -> { + mAvatarView.setImageDrawable(drawable); + mAvatarView.setContactName(name); + fromView.setText(formatMessage(mData, conversationLegacy)); }); } }