forked from upstream-mirrors/quik
Fixed GC issue with LiveViews in LiveViewManager
This commit is contained in:
@@ -6,8 +6,8 @@ import android.preference.PreferenceManager;
|
|||||||
import com.moez.QKSMS.common.preferences.QKPreference;
|
import com.moez.QKSMS.common.preferences.QKPreference;
|
||||||
import com.moez.QKSMS.interfaces.LiveView;
|
import com.moez.QKSMS.interfaces.LiveView;
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.WeakHashMap;
|
import java.util.WeakHashMap;
|
||||||
|
|
||||||
@@ -27,9 +27,9 @@ import java.util.WeakHashMap;
|
|||||||
* which will initialize it
|
* which will initialize it
|
||||||
*/
|
*/
|
||||||
public abstract class LiveViewManager {
|
public abstract class LiveViewManager {
|
||||||
private static final String TAG = "ThemedViewManager";
|
private static final String TAG = "LiveViewManager";
|
||||||
|
|
||||||
private static final HashMap<String, Set<LiveView>> sViews = new HashMap<>();
|
private static final HashMap<String, WeakHashMap<Object, Set<LiveView>>> sViews = new HashMap<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize preferences and register a listener for changes
|
* Initialize preferences and register a listener for changes
|
||||||
@@ -45,12 +45,17 @@ public abstract class LiveViewManager {
|
|||||||
* Convenience method for #registerView(QKPreference, ThemedView) to allow registering a single
|
* Convenience method for #registerView(QKPreference, ThemedView) to allow registering a single
|
||||||
* ThemedView to listen for multiple preferences
|
* ThemedView to listen for multiple preferences
|
||||||
*
|
*
|
||||||
* @param view The ThemedView
|
* @param view The LiveView
|
||||||
|
* @param parent The object to tie the lifecycle of the LiveView to. If we only reference
|
||||||
|
* a LiveView anonymous inner class, then it'll be quickly garbage collected
|
||||||
|
* and removed from the WeakHashMap. Instead, we should reference the parent
|
||||||
|
* object (ie. The Activity, Fragment, View, etc...) that this LiveView is
|
||||||
|
* concerned with. In most cases, it's acceptable to just pass in `this`
|
||||||
* @param preferences The preferences to listen for
|
* @param preferences The preferences to listen for
|
||||||
*/
|
*/
|
||||||
public static void registerView(LiveView view, QKPreference... preferences) {
|
public static void registerView(LiveView view, Object parent, QKPreference... preferences) {
|
||||||
for (QKPreference preference : preferences) {
|
for (QKPreference preference : preferences) {
|
||||||
registerView(preference, view);
|
registerView(preference, parent, view);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -59,16 +64,25 @@ public abstract class LiveViewManager {
|
|||||||
* We don't need to manually unregister the views because we're using weak sets
|
* We don't need to manually unregister the views because we're using weak sets
|
||||||
*
|
*
|
||||||
* @param preference The preference to listen for
|
* @param preference The preference to listen for
|
||||||
* @param view The view
|
* @param parent The object to tie the lifecycle of the LiveView to. If we only reference
|
||||||
|
* a LiveView anonymous inner class, then it'll be quickly garbage collected
|
||||||
|
* and removed from the WeakHashMap. Instead, we should reference the parent
|
||||||
|
* object (ie. The Activity, Fragment, View, etc...) that this LiveView is
|
||||||
|
* concerned with. In most cases, it's acceptable to just pass in `this`
|
||||||
|
* @param view The LiveView
|
||||||
*/
|
*/
|
||||||
public static void registerView(QKPreference preference, LiveView view) {
|
public static void registerView(QKPreference preference, Object parent, LiveView view) {
|
||||||
synchronized (sViews) {
|
synchronized (sViews) {
|
||||||
if (sViews.containsKey(preference.getKey())) {
|
if (sViews.containsKey(preference.getKey())) {
|
||||||
Set<LiveView> views = sViews.get(preference.getKey());
|
WeakHashMap<Object, Set<LiveView>> parents = sViews.get(preference.getKey());
|
||||||
views.add(view);
|
if (!parents.containsKey(parent)) {
|
||||||
|
parents.put(parent, new HashSet<>());
|
||||||
|
}
|
||||||
|
parents.get(parent).add(view);
|
||||||
} else {
|
} else {
|
||||||
Set<LiveView> set = Collections.newSetFromMap(new WeakHashMap<>());
|
WeakHashMap<Object, Set<LiveView>> set = new WeakHashMap<>();
|
||||||
set.add(view);
|
set.put(parent, new HashSet<>());
|
||||||
|
set.get(parent).add(view);
|
||||||
sViews.put(preference.getKey(), set);
|
sViews.put(preference.getKey(), set);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -94,12 +108,13 @@ public abstract class LiveViewManager {
|
|||||||
* @param key The preference key
|
* @param key The preference key
|
||||||
*/
|
*/
|
||||||
private static void refreshViews(String key) {
|
private static void refreshViews(String key) {
|
||||||
Set<LiveView> toRefresh = sViews.get(key);
|
synchronized (sViews) {
|
||||||
|
if (sViews.get(key) != null) {
|
||||||
// Refresh those views.
|
for (Set<LiveView> views : sViews.get(key).values()) {
|
||||||
if (toRefresh != null) {
|
for (LiveView view : views) {
|
||||||
for (LiveView view : toRefresh) {
|
view.refresh(key);
|
||||||
view.refresh(key);
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuL
|
|||||||
|
|
||||||
showDialogIfNeeded(savedInstanceState);
|
showDialogIfNeeded(savedInstanceState);
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.BACKGROUND, key -> {
|
LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> {
|
||||||
// Update the background color. This code is important during the welcome screen setup, when the activity
|
// Update the background color. This code is important during the welcome screen setup, when the activity
|
||||||
// in the ThemeManager isn't the MainActivity
|
// in the ThemeManager isn't the MainActivity
|
||||||
findViewById(R.id.menu_frame).getRootView().setBackgroundColor(ThemeManager.getBackgroundColor());
|
findViewById(R.id.menu_frame).getRootView().setBackgroundColor(ThemeManager.getBackgroundColor());
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import com.moez.QKSMS.QKSMSApp;
|
|||||||
import com.moez.QKSMS.R;
|
import com.moez.QKSMS.R;
|
||||||
import com.moez.QKSMS.common.LiveViewManager;
|
import com.moez.QKSMS.common.LiveViewManager;
|
||||||
import com.moez.QKSMS.common.preferences.QKPreference;
|
import com.moez.QKSMS.common.preferences.QKPreference;
|
||||||
|
import com.moez.QKSMS.interfaces.LiveView;
|
||||||
import com.moez.QKSMS.ui.ThemeManager;
|
import com.moez.QKSMS.ui.ThemeManager;
|
||||||
import com.moez.QKSMS.ui.view.QKTextView;
|
import com.moez.QKSMS.ui.view.QKTextView;
|
||||||
|
|
||||||
@@ -73,7 +74,7 @@ public abstract class QKActivity extends ActionBarActivity {
|
|||||||
setSupportActionBar(mToolbar);
|
setSupportActionBar(mToolbar);
|
||||||
}
|
}
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.ACTIVE_THEME, key -> {
|
LiveViewManager.registerView(QKPreference.ACTIVE_THEME, this, key -> {
|
||||||
mToolbar.setBackgroundColor(ThemeManager.getColor());
|
mToolbar.setBackgroundColor(ThemeManager.getColor());
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ public class QKFragment extends Fragment {
|
|||||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||||
super.onViewCreated(view, savedInstanceState);
|
super.onViewCreated(view, savedInstanceState);
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.BACKGROUND, key -> {
|
LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> {
|
||||||
if (getView() != null) {
|
if (getView() != null) {
|
||||||
getView().setBackgroundColor(ThemeManager.getBackgroundColor());
|
getView().setBackgroundColor(ThemeManager.getBackgroundColor());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ public class ConversationListAdapter extends RecyclerCursorAdapter<ConversationL
|
|||||||
mUnread = ContextCompat.getDrawable(context, R.drawable.ic_unread_indicator);
|
mUnread = ContextCompat.getDrawable(context, R.drawable.ic_unread_indicator);
|
||||||
mError = ContextCompat.getDrawable(context, R.drawable.ic_error);
|
mError = ContextCompat.getDrawable(context, R.drawable.ic_error);
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.THEME, key -> {
|
LiveViewManager.registerView(QKPreference.THEME, this, key -> {
|
||||||
mMuted.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP);
|
mMuted.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP);
|
||||||
mUnread.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP);
|
mUnread.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP);
|
||||||
mError.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP);
|
mError.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP);
|
||||||
|
|||||||
+1
-1
@@ -79,7 +79,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage
|
|||||||
mLayoutManager = new LinearLayoutManager(mContext);
|
mLayoutManager = new LinearLayoutManager(mContext);
|
||||||
mConversationDetailsDialog = new ConversationDetailsDialog(mContext, getFragmentManager());
|
mConversationDetailsDialog = new ConversationDetailsDialog(mContext, getFragmentManager());
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.THEME, key -> {
|
LiveViewManager.registerView(QKPreference.THEME, this, key -> {
|
||||||
if (!mViewHasLoaded) {
|
if (!mViewHasLoaded) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ public class MessageListViewHolder extends ClickyViewHolder<MessageItem> impleme
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void setLiveViewCallback(LiveView liveViewCallback) {
|
protected void setLiveViewCallback(LiveView liveViewCallback) {
|
||||||
LiveViewManager.registerView(QKPreference.ACTIVE_THEME, liveViewCallback);
|
LiveViewManager.registerView(QKPreference.ACTIVE_THEME, this, liveViewCallback);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -368,7 +368,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O
|
|||||||
KeyboardUtils.hide(mContext, view);
|
KeyboardUtils.hide(mContext, view);
|
||||||
mListView = (ListView) view.findViewById(android.R.id.list);
|
mListView = (ListView) view.findViewById(android.R.id.list);
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.BACKGROUND, key -> {
|
LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> {
|
||||||
ListviewHelper.applyCustomScrollbar(mContext, mListView);
|
ListviewHelper.applyCustomScrollbar(mContext, mListView);
|
||||||
|
|
||||||
View view1 = getView();
|
View view1 = getView();
|
||||||
|
|||||||
@@ -47,16 +47,16 @@ public class AutoCompleteContactView extends RecipientEditTextView {
|
|||||||
setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight));
|
setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight));
|
||||||
}, QKPreference.FONT_FAMILY, QKPreference.FONT_WEIGHT);
|
}, QKPreference.FONT_FAMILY, QKPreference.FONT_WEIGHT);
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.FONT_SIZE, key -> {
|
LiveViewManager.registerView(QKPreference.FONT_SIZE, this, key -> {
|
||||||
setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, FontManager.TEXT_TYPE_PRIMARY));
|
setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, FontManager.TEXT_TYPE_PRIMARY));
|
||||||
});
|
});
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.BACKGROUND, key -> {
|
LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> {
|
||||||
setTextColor(ThemeManager.getTextOnBackgroundPrimary());
|
setTextColor(ThemeManager.getTextOnBackgroundPrimary());
|
||||||
setHintTextColor(ThemeManager.getTextOnBackgroundSecondary());
|
setHintTextColor(ThemeManager.getTextOnBackgroundSecondary());
|
||||||
});
|
});
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.MOBILE_ONLY, key -> {
|
LiveViewManager.registerView(QKPreference.MOBILE_ONLY, this, key -> {
|
||||||
if (mAdapter != null) {
|
if (mAdapter != null) {
|
||||||
SharedPreferences prefs1 = mContext.getPrefs();
|
SharedPreferences prefs1 = mContext.getPrefs();
|
||||||
mAdapter.setShowMobileOnly(prefs1.getBoolean(SettingsFragment.MOBILE_ONLY, false));
|
mAdapter.setShowMobileOnly(prefs1.getBoolean(SettingsFragment.MOBILE_ONLY, false));
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ public class AvatarView extends ImageView implements View.OnClickListener {
|
|||||||
|
|
||||||
setOnClickListener(this);
|
setOnClickListener(this);
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.ACTIVE_THEME, key -> {
|
LiveViewManager.registerView(QKPreference.ACTIVE_THEME, this, key -> {
|
||||||
mPaint.setColor(ThemeManager.getTextOnColorPrimary());
|
mPaint.setColor(ThemeManager.getTextOnColorPrimary());
|
||||||
mDefaultDrawable.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP);
|
mDefaultDrawable.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP);
|
||||||
|
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ public class ComposeView extends LinearLayout implements View.OnClickListener {
|
|||||||
mCancel.setOnClickListener(this);
|
mCancel.setOnClickListener(this);
|
||||||
mDelay.setOnClickListener(this);
|
mDelay.setOnClickListener(this);
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.ACTIVE_THEME, key -> {
|
LiveViewManager.registerView(QKPreference.ACTIVE_THEME, this, key -> {
|
||||||
mButtonBackground.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP);
|
mButtonBackground.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP);
|
||||||
mButtonBar1.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP);
|
mButtonBar1.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP);
|
||||||
mButtonBar2.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP);
|
mButtonBar2.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP);
|
||||||
@@ -194,7 +194,7 @@ public class ComposeView extends LinearLayout implements View.OnClickListener {
|
|||||||
if (ThemeManager.getSentBubbleRes() != 0) mReplyText.setBackgroundResource(ThemeManager.getSentBubbleRes());
|
if (ThemeManager.getSentBubbleRes() != 0) mReplyText.setBackgroundResource(ThemeManager.getSentBubbleRes());
|
||||||
});
|
});
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.BACKGROUND, key -> {
|
LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> {
|
||||||
mReplyText.getBackground().setColorFilter(ThemeManager.getNeutralBubbleColor(), PorterDuff.Mode.SRC_ATOP);
|
mReplyText.getBackground().setColorFilter(ThemeManager.getNeutralBubbleColor(), PorterDuff.Mode.SRC_ATOP);
|
||||||
getBackground().setColorFilter(ThemeManager.getBackgroundColor(), PorterDuff.Mode.SRC_ATOP);
|
getBackground().setColorFilter(ThemeManager.getBackgroundColor(), PorterDuff.Mode.SRC_ATOP);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -56,11 +56,11 @@ public class QKEditText extends android.widget.EditText {
|
|||||||
setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight));
|
setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight));
|
||||||
}, QKPreference.FONT_FAMILY, QKPreference.FONT_WEIGHT);
|
}, QKPreference.FONT_FAMILY, QKPreference.FONT_WEIGHT);
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.FONT_SIZE, key -> {
|
LiveViewManager.registerView(QKPreference.FONT_SIZE, this, key -> {
|
||||||
setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, FontManager.TEXT_TYPE_PRIMARY));
|
setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, FontManager.TEXT_TYPE_PRIMARY));
|
||||||
});
|
});
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.BACKGROUND, key -> {
|
LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> {
|
||||||
setTextColor(ThemeManager.getTextOnBackgroundPrimary());
|
setTextColor(ThemeManager.getTextOnBackgroundPrimary());
|
||||||
setHintTextColor(ThemeManager.getTextOnBackgroundSecondary());
|
setHintTextColor(ThemeManager.getTextOnBackgroundSecondary());
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public class QKImageView extends ImageView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void init() {
|
public void init() {
|
||||||
LiveViewManager.registerView(QKPreference.THEME, key -> {
|
LiveViewManager.registerView(QKPreference.THEME, this, key -> {
|
||||||
setImageDrawable(mDrawable);
|
setImageDrawable(mDrawable);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ public class QKTextView extends TextView {
|
|||||||
|
|
||||||
// Register for theme updates if we're text that changes color dynamically.
|
// Register for theme updates if we're text that changes color dynamically.
|
||||||
if (mType == FontManager.TEXT_TYPE_CATEGORY) {
|
if (mType == FontManager.TEXT_TYPE_CATEGORY) {
|
||||||
LiveViewManager.registerView(QKPreference.THEME, key ->
|
LiveViewManager.registerView(QKPreference.THEME, this, key ->
|
||||||
setTextColor(FontManager.getTextColor(mContext, mType)));
|
setTextColor(FontManager.getTextColor(mContext, mType)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -75,15 +75,15 @@ public class QKTextView extends TextView {
|
|||||||
setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight));
|
setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight));
|
||||||
}, QKPreference.FONT_FAMILY, QKPreference.FONT_WEIGHT);
|
}, QKPreference.FONT_FAMILY, QKPreference.FONT_WEIGHT);
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.FONT_SIZE, key -> {
|
LiveViewManager.registerView(QKPreference.FONT_SIZE, this, key -> {
|
||||||
setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, mType));
|
setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, mType));
|
||||||
});
|
});
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.BACKGROUND, key -> {
|
LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> {
|
||||||
setTextColor(FontManager.getTextColor(mContext, mType));
|
setTextColor(FontManager.getTextColor(mContext, mType));
|
||||||
});
|
});
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.TEXT_FORMATTING, key -> {
|
LiveViewManager.registerView(QKPreference.TEXT_FORMATTING, this, key -> {
|
||||||
setText(getText(), BufferType.NORMAL);
|
setText(getText(), BufferType.NORMAL);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ public class StarredContactsView extends LinearLayout implements LoaderManager.L
|
|||||||
collapse();
|
collapse();
|
||||||
}
|
}
|
||||||
|
|
||||||
LiveViewManager.registerView(QKPreference.BACKGROUND, key -> {
|
LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> {
|
||||||
mIndicator.setColorFilter(ThemeManager.getTextOnBackgroundSecondary(), PorterDuff.Mode.SRC_ATOP);
|
mIndicator.setColorFilter(ThemeManager.getTextOnBackgroundSecondary(), PorterDuff.Mode.SRC_ATOP);
|
||||||
mFavoritesBackground.setBackgroundColor(ThemeManager.getBackgroundColor());
|
mFavoritesBackground.setBackgroundColor(ThemeManager.getBackgroundColor());
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user