Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-06 09:03:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed item touch helper memory leak

Browse Source
This commit is contained in:
M66B
2023-11-12 16:05:15 +01:00
parent f6e80d917d
commit 85ee7f1d5d
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -370,7 +370,6 @@ public class FragmentMessages extends FragmentBase
private boolean navigating = false;
private AdapterMessage adapter;
private ItemTouchHelper itemTouchHelper;
private AdapterMessage.ViewType viewType;
private SelectionPredicateMessage selectionPredicate = null;
@@ -2043,13 +2042,10 @@ public class FragmentMessages extends FragmentBase
public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
}
});
} else {
itemTouchHelper = new ItemTouchHelper(touchHelper);
itemTouchHelper.attachToRecyclerView(rvMessage);
}
} else
new ItemTouchHelper(touchHelper).attachToRecyclerView(rvMessage);
} else {
itemTouchHelper = new ItemTouchHelper(touchHelper);
itemTouchHelper.attachToRecyclerView(rvMessage);
new ItemTouchHelper(touchHelper).attachToRecyclerView(rvMessage);
selectionPredicate = new SelectionPredicateMessage(rvMessage);
@@ -3252,9 +3248,10 @@ public class FragmentMessages extends FragmentBase
}
private void redraw(RecyclerView.ViewHolder vh) {
if (vh != null && itemTouchHelper != null)
if (vh != null)
try {
itemTouchHelper.onChildViewDetachedFromWindow(vh.itemView);
rvMessage.getLayoutManager().detachView(vh.itemView);
rvMessage.getLayoutManager().removeDetachedView(vh.itemView);
} catch (Throwable ex) {
Log.e(ex);
}

2
app/src/main/java/eu/faircode/email/Helper.java
View File

@@ -130,7 +130,6 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceManager;
import androidx.recyclerview.selection.SelectionTracker;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.PagerAdapter;
@@ -1876,7 +1875,6 @@ public class Helper {
SelectionTracker.SelectionPredicate.class.isAssignableFrom(type) ||
PagerAdapter.class.isAssignableFrom(type) ||
RecyclerView.Adapter.class.isAssignableFrom(type) ||
ItemTouchHelper.class.isAssignableFrom(type) ||
TwoStateOwner.class.isAssignableFrom(type))
try {
Log.i("Clearing " + fname);