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' 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 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)); }); } }