Refactoring

This commit is contained in:
M66B
2018-12-03 13:18:23 +01:00
parent e64b9289e3
commit 3df4ba3a8d
4 changed files with 83 additions and 45 deletions

View File

@@ -21,7 +21,6 @@ package eu.faircode.email;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.paging.PagedList;
import androidx.recyclerview.selection.ItemKeyProvider;
import androidx.recyclerview.widget.RecyclerView;
@@ -37,23 +36,12 @@ public class ItemKeyProviderMessage extends ItemKeyProvider<Long> {
@Override
public Long getKey(int pos) {
AdapterMessage adapter = (AdapterMessage) recyclerView.getAdapter();
PagedList<TupleMessageEx> list = adapter.getCurrentList();
if (list != null && pos < list.size())
return list.get(pos).id;
else
return null;
return adapter.getKeyAtPosition(pos);
}
@Override
public int getPosition(@NonNull Long key) {
AdapterMessage adapter = (AdapterMessage) recyclerView.getAdapter();
PagedList<TupleMessageEx> messages = adapter.getCurrentList();
if (messages != null)
for (int i = 0; i < messages.size(); i++) {
TupleMessageEx message = messages.get(i);
if (message != null && message.id.equals(key))
return i;
}
return RecyclerView.NO_POSITION;
return adapter.getPositionForKey(key);
}
}