|
|
|
|
@ -15,6 +15,7 @@ |
|
|
|
|
|
|
|
|
|
package com.keylesspalace.tusky.fragment; |
|
|
|
|
|
|
|
|
|
import android.arch.core.util.Function; |
|
|
|
|
import android.content.Context; |
|
|
|
|
import android.content.SharedPreferences; |
|
|
|
|
import android.graphics.drawable.Drawable; |
|
|
|
|
@ -25,6 +26,7 @@ import android.support.annotation.Nullable; |
|
|
|
|
import android.support.design.widget.FloatingActionButton; |
|
|
|
|
import android.support.design.widget.TabLayout; |
|
|
|
|
import android.support.v4.content.LocalBroadcastManager; |
|
|
|
|
import android.support.v4.util.Pair; |
|
|
|
|
import android.support.v4.widget.SwipeRefreshLayout; |
|
|
|
|
import android.support.v7.widget.DividerItemDecoration; |
|
|
|
|
import android.support.v7.widget.LinearLayoutManager; |
|
|
|
|
@ -43,6 +45,8 @@ import com.keylesspalace.tusky.interfaces.ActionButtonActivity; |
|
|
|
|
import com.keylesspalace.tusky.interfaces.StatusActionListener; |
|
|
|
|
import com.keylesspalace.tusky.network.MastodonApi; |
|
|
|
|
import com.keylesspalace.tusky.receiver.TimelineReceiver; |
|
|
|
|
import com.keylesspalace.tusky.util.CollectionUtil; |
|
|
|
|
import com.keylesspalace.tusky.util.Either; |
|
|
|
|
import com.keylesspalace.tusky.util.HttpHeaderLink; |
|
|
|
|
import com.keylesspalace.tusky.util.ListUtils; |
|
|
|
|
import com.keylesspalace.tusky.util.PairedList; |
|
|
|
|
@ -52,7 +56,6 @@ import com.keylesspalace.tusky.view.EndlessOnScrollListener; |
|
|
|
|
import com.keylesspalace.tusky.viewdata.StatusViewData; |
|
|
|
|
|
|
|
|
|
import java.util.Iterator; |
|
|
|
|
import java.util.LinkedHashSet; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Locale; |
|
|
|
|
|
|
|
|
|
@ -64,10 +67,12 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
SwipeRefreshLayout.OnRefreshListener, |
|
|
|
|
StatusActionListener, |
|
|
|
|
SharedPreferences.OnSharedPreferenceChangeListener { |
|
|
|
|
private static final String TAG = "Timeline"; // logging tag
|
|
|
|
|
private static final String TAG = "TimelineF"; // logging tag
|
|
|
|
|
private static final String KIND_ARG = "kind"; |
|
|
|
|
private static final String HASHTAG_OR_ID_ARG = "hashtag_or_id"; |
|
|
|
|
|
|
|
|
|
private static final int LOAD_AT_ONCE = 30; |
|
|
|
|
|
|
|
|
|
public enum Kind { |
|
|
|
|
HOME, |
|
|
|
|
PUBLIC_LOCAL, |
|
|
|
|
@ -80,6 +85,7 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
private enum FetchEnd { |
|
|
|
|
TOP, |
|
|
|
|
BOTTOM, |
|
|
|
|
MIDDLE |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private SwipeRefreshLayout swipeRefreshLayout; |
|
|
|
|
@ -102,8 +108,18 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
private String bottomId; |
|
|
|
|
@Nullable |
|
|
|
|
private String topId; |
|
|
|
|
private PairedList<Status, StatusViewData> statuses = |
|
|
|
|
new PairedList<>(ViewDataUtils.statusMapper()); |
|
|
|
|
private PairedList<Either<Placeholder, Status>, StatusViewData> statuses = |
|
|
|
|
new PairedList<>(new Function<Either<Placeholder, Status>, StatusViewData>() { |
|
|
|
|
@Override |
|
|
|
|
public StatusViewData apply(Either<Placeholder, Status> input) { |
|
|
|
|
Status status = input.getAsRightOrNull(); |
|
|
|
|
if (status != null) { |
|
|
|
|
return ViewDataUtils.statusToViewData(status); |
|
|
|
|
} else { |
|
|
|
|
return new StatusViewData.Placeholder(false); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
public static TimelineFragment newInstance(Kind kind) { |
|
|
|
|
TimelineFragment fragment = new TimelineFragment(); |
|
|
|
|
@ -122,6 +138,17 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
return fragment; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private static final class Placeholder { |
|
|
|
|
private final static Placeholder INSTANCE = new Placeholder(); |
|
|
|
|
|
|
|
|
|
public static Placeholder getInstance() { |
|
|
|
|
return INSTANCE; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private Placeholder() { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, |
|
|
|
|
Bundle savedInstanceState) { |
|
|
|
|
@ -179,12 +206,10 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
TabLayout layout = getActivity().findViewById(R.id.tab_layout); |
|
|
|
|
onTabSelectedListener = new TabLayout.OnTabSelectedListener() { |
|
|
|
|
@Override |
|
|
|
|
public void onTabSelected(TabLayout.Tab tab) { |
|
|
|
|
} |
|
|
|
|
public void onTabSelected(TabLayout.Tab tab) {} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onTabUnselected(TabLayout.Tab tab) { |
|
|
|
|
} |
|
|
|
|
public void onTabUnselected(TabLayout.Tab tab) {} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onTabReselected(TabLayout.Tab tab) { |
|
|
|
|
@ -219,7 +244,7 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
} else if (!composeButton.isShown()) { |
|
|
|
|
composeButton.show(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
@ -251,86 +276,97 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onRefresh() { |
|
|
|
|
sendFetchTimelineRequest(null, topId, FetchEnd.TOP); |
|
|
|
|
sendFetchTimelineRequest(null, topId, FetchEnd.TOP, -1); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onReply(int position) { |
|
|
|
|
super.reply(statuses.get(position)); |
|
|
|
|
super.reply(statuses.get(position).getAsRight()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onReblog(final boolean reblog, final int position) { |
|
|
|
|
final Status status = statuses.get(position); |
|
|
|
|
final Status status = statuses.get(position).getAsRight(); |
|
|
|
|
super.reblogWithCallback(status, reblog, new Callback<Status>() { |
|
|
|
|
@Override |
|
|
|
|
public void onResponse(@NonNull Call<Status> call, @NonNull retrofit2.Response<Status> response) { |
|
|
|
|
public void onResponse(@NonNull Call<Status> call, @NonNull Response<Status> response) { |
|
|
|
|
|
|
|
|
|
if (response.isSuccessful()) { |
|
|
|
|
status.reblogged = reblog; |
|
|
|
|
|
|
|
|
|
if (status.reblog != null) { |
|
|
|
|
status.reblog.reblogged = reblog; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
Pair<StatusViewData.Concrete, Integer> actual = |
|
|
|
|
findStatusAndPosition(position, status); |
|
|
|
|
if (actual == null) return; |
|
|
|
|
|
|
|
|
|
StatusViewData newViewData = |
|
|
|
|
new StatusViewData.Builder(statuses.getPairedItem(position)) |
|
|
|
|
new StatusViewData.Builder(actual.first) |
|
|
|
|
.setReblogged(reblog) |
|
|
|
|
.createStatusViewData(); |
|
|
|
|
statuses.setPairedItem(position, newViewData); |
|
|
|
|
adapter.changeItem(position, newViewData, true); |
|
|
|
|
statuses.setPairedItem(actual.second, newViewData); |
|
|
|
|
adapter.changeItem(actual.second, newViewData, true); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onFailure(@NonNull Call<Status> call, @NonNull Throwable t) { |
|
|
|
|
Log.d(TAG, "Failed to reblog status " + status.id); |
|
|
|
|
t.printStackTrace(); |
|
|
|
|
Log.d(TAG, "Failed to reblog status " + status.id, t); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onFavourite(final boolean favourite, final int position) { |
|
|
|
|
final Status status = statuses.get(position); |
|
|
|
|
final Status status = statuses.get(position).getAsRight(); |
|
|
|
|
|
|
|
|
|
super.favouriteWithCallback(status, favourite, new Callback<Status>() { |
|
|
|
|
@Override |
|
|
|
|
public void onResponse(@NonNull Call<Status> call, @NonNull retrofit2.Response<Status> response) { |
|
|
|
|
public void onResponse(@NonNull Call<Status> call, @NonNull Response<Status> response) { |
|
|
|
|
|
|
|
|
|
if (response.isSuccessful()) { |
|
|
|
|
status.favourited = favourite; |
|
|
|
|
|
|
|
|
|
if (status.reblog != null) { |
|
|
|
|
status.reblog.favourited = favourite; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
Pair<StatusViewData.Concrete, Integer> actual = |
|
|
|
|
findStatusAndPosition(position, status); |
|
|
|
|
if (actual == null) return; |
|
|
|
|
|
|
|
|
|
StatusViewData newViewData = new StatusViewData |
|
|
|
|
.Builder(statuses.getPairedItem(position)) |
|
|
|
|
.Builder(actual.first) |
|
|
|
|
.setFavourited(favourite) |
|
|
|
|
.createStatusViewData(); |
|
|
|
|
statuses.setPairedItem(position, newViewData); |
|
|
|
|
adapter.changeItem(position, newViewData, true); |
|
|
|
|
statuses.setPairedItem(actual.second, newViewData); |
|
|
|
|
adapter.changeItem(actual.second, newViewData, true); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onFailure(@NonNull Call<Status> call, @NonNull Throwable t) { |
|
|
|
|
Log.d(TAG, "Failed to favourite status " + status.id); |
|
|
|
|
t.printStackTrace(); |
|
|
|
|
Log.d(TAG, "Failed to favourite status " + status.id, t); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onMore(View view, final int position) { |
|
|
|
|
super.more(statuses.get(position), view, position); |
|
|
|
|
super.more(statuses.get(position).getAsRight(), view, position); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onOpenReblog(int position) { |
|
|
|
|
super.openReblog(statuses.get(position)); |
|
|
|
|
super.openReblog(statuses.get(position).getAsRight()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onExpandedChange(boolean expanded, int position) { |
|
|
|
|
StatusViewData newViewData = new StatusViewData.Builder(statuses.getPairedItem(position)) |
|
|
|
|
StatusViewData newViewData = new StatusViewData.Builder( |
|
|
|
|
((StatusViewData.Concrete) statuses.getPairedItem(position))) |
|
|
|
|
.setIsExpanded(expanded).createStatusViewData(); |
|
|
|
|
statuses.setPairedItem(position, newViewData); |
|
|
|
|
adapter.changeItem(position, newViewData, false); |
|
|
|
|
@ -338,12 +374,33 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onContentHiddenChange(boolean isShowing, int position) { |
|
|
|
|
StatusViewData newViewData = new StatusViewData.Builder(statuses.getPairedItem(position)) |
|
|
|
|
StatusViewData newViewData = new StatusViewData.Builder( |
|
|
|
|
((StatusViewData.Concrete) statuses.getPairedItem(position))) |
|
|
|
|
.setIsShowingSensitiveContent(isShowing).createStatusViewData(); |
|
|
|
|
statuses.setPairedItem(position, newViewData); |
|
|
|
|
adapter.changeItem(position, newViewData, false); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onLoadMore(int position) { |
|
|
|
|
//check bounds before accessing list,
|
|
|
|
|
if (statuses.size() >= position && position > 0) { |
|
|
|
|
Status fromStatus = statuses.get(position - 1).getAsRightOrNull(); |
|
|
|
|
Status toStatus = statuses.get(position + 1).getAsRightOrNull(); |
|
|
|
|
if (fromStatus == null || toStatus == null) { |
|
|
|
|
Log.e(TAG, "Failed to load more at " + position + ", wrong placeholder position"); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
sendFetchTimelineRequest(fromStatus.id, toStatus.id, FetchEnd.MIDDLE, position); |
|
|
|
|
|
|
|
|
|
StatusViewData newViewData = new StatusViewData.Placeholder(true); |
|
|
|
|
statuses.setPairedItem(position, newViewData); |
|
|
|
|
adapter.changeItem(position, newViewData, false); |
|
|
|
|
} else { |
|
|
|
|
Log.e(TAG, "error loading more"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onViewMedia(String[] urls, int urlIndex, Status.MediaAttachment.Type type, |
|
|
|
|
View view) { |
|
|
|
|
@ -352,7 +409,7 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onViewThread(int position) { |
|
|
|
|
super.viewThread(statuses.get(position)); |
|
|
|
|
super.viewThread(statuses.get(position).getAsRight()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
@ -417,10 +474,10 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
@Override |
|
|
|
|
public void removeAllByAccountId(String accountId) { |
|
|
|
|
// using iterator to safely remove items while iterating
|
|
|
|
|
Iterator<Status> iterator = statuses.iterator(); |
|
|
|
|
Iterator<Either<Placeholder, Status>> iterator = statuses.iterator(); |
|
|
|
|
while (iterator.hasNext()) { |
|
|
|
|
Status status = iterator.next(); |
|
|
|
|
if (status.account.id.equals(accountId)) { |
|
|
|
|
Status status = iterator.next().getAsRightOrNull(); |
|
|
|
|
if (status != null && status.account.id.equals(accountId)) { |
|
|
|
|
iterator.remove(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -428,12 +485,12 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void onLoadMore() { |
|
|
|
|
sendFetchTimelineRequest(bottomId, null, FetchEnd.BOTTOM); |
|
|
|
|
sendFetchTimelineRequest(bottomId, null, FetchEnd.BOTTOM, -1); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void fullyRefresh() { |
|
|
|
|
adapter.clear(); |
|
|
|
|
sendFetchTimelineRequest(null, null, FetchEnd.TOP); |
|
|
|
|
sendFetchTimelineRequest(null, null, FetchEnd.TOP, -1); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private boolean jumpToTopAllowed() { |
|
|
|
|
@ -457,20 +514,20 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
case HOME: |
|
|
|
|
return api.homeTimeline(fromId, uptoId, null); |
|
|
|
|
case PUBLIC_FEDERATED: |
|
|
|
|
return api.publicTimeline(null, fromId, uptoId, null); |
|
|
|
|
return api.publicTimeline(null, fromId, uptoId, LOAD_AT_ONCE); |
|
|
|
|
case PUBLIC_LOCAL: |
|
|
|
|
return api.publicTimeline(true, fromId, uptoId, null); |
|
|
|
|
return api.publicTimeline(true, fromId, uptoId, LOAD_AT_ONCE); |
|
|
|
|
case TAG: |
|
|
|
|
return api.hashtagTimeline(tagOrId, null, fromId, uptoId, null); |
|
|
|
|
return api.hashtagTimeline(tagOrId, null, fromId, uptoId, LOAD_AT_ONCE); |
|
|
|
|
case USER: |
|
|
|
|
return api.accountStatuses(tagOrId, fromId, uptoId, null, null); |
|
|
|
|
return api.accountStatuses(tagOrId, fromId, uptoId, LOAD_AT_ONCE); |
|
|
|
|
case FAVOURITES: |
|
|
|
|
return api.favourites(fromId, uptoId, null); |
|
|
|
|
return api.favourites(fromId, uptoId, LOAD_AT_ONCE); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void sendFetchTimelineRequest(@Nullable String fromId, @Nullable String uptoId, |
|
|
|
|
final FetchEnd fetchEnd) { |
|
|
|
|
final FetchEnd fetchEnd, final int pos) { |
|
|
|
|
/* If there is a fetch already ongoing, record however many fetches are requested and |
|
|
|
|
* fulfill them after it's complete. */ |
|
|
|
|
if (fetchEnd == FetchEnd.TOP && topLoading) { |
|
|
|
|
@ -499,15 +556,15 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
public void onResponse(@NonNull Call<List<Status>> call, @NonNull Response<List<Status>> response) { |
|
|
|
|
if (response.isSuccessful()) { |
|
|
|
|
String linkHeader = response.headers().get("Link"); |
|
|
|
|
onFetchTimelineSuccess(response.body(), linkHeader, fetchEnd); |
|
|
|
|
onFetchTimelineSuccess(response.body(), linkHeader, fetchEnd, pos); |
|
|
|
|
} else { |
|
|
|
|
onFetchTimelineFailure(new Exception(response.message()), fetchEnd); |
|
|
|
|
onFetchTimelineFailure(new Exception(response.message()), fetchEnd, pos); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onFailure(@NonNull Call<List<Status>> call, @NonNull Throwable t) { |
|
|
|
|
onFetchTimelineFailure((Exception) t, fetchEnd); |
|
|
|
|
onFetchTimelineFailure((Exception) t, fetchEnd, pos); |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
@ -516,8 +573,11 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
listCall.enqueue(callback); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public void onFetchTimelineSuccess(List<Status> statuses, String linkHeader, |
|
|
|
|
FetchEnd fetchEnd) { |
|
|
|
|
private void onFetchTimelineSuccess(List<Status> statuses, String linkHeader, |
|
|
|
|
FetchEnd fetchEnd, int pos) { |
|
|
|
|
// We filled the hole (or reached the end) if the server returned less statuses than we
|
|
|
|
|
// we asked for.
|
|
|
|
|
boolean fullFetch = statuses.size() >= LOAD_AT_ONCE; |
|
|
|
|
filterStatuses(statuses); |
|
|
|
|
List<HttpHeaderLink> links = HttpHeaderLink.parse(linkHeader); |
|
|
|
|
switch (fetchEnd) { |
|
|
|
|
@ -527,7 +587,11 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
if (previous != null) { |
|
|
|
|
uptoId = previous.uri.getQueryParameter("since_id"); |
|
|
|
|
} |
|
|
|
|
updateStatuses(statuses, null, uptoId); |
|
|
|
|
updateStatuses(statuses, null, uptoId, fullFetch); |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
case MIDDLE: { |
|
|
|
|
replacePlaceholderWithStatuses(statuses, fullFetch, pos); |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
case BOTTOM: { |
|
|
|
|
@ -547,7 +611,7 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
if (previous != null) { |
|
|
|
|
uptoId = previous.uri.getQueryParameter("since_id"); |
|
|
|
|
} |
|
|
|
|
updateStatuses(statuses, fromId, uptoId); |
|
|
|
|
updateStatuses(statuses, fromId, uptoId, fullFetch); |
|
|
|
|
} |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
@ -561,8 +625,15 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
swipeRefreshLayout.setRefreshing(false); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public void onFetchTimelineFailure(Exception exception, FetchEnd fetchEnd) { |
|
|
|
|
private void onFetchTimelineFailure(Exception exception, FetchEnd fetchEnd, int position) { |
|
|
|
|
swipeRefreshLayout.setRefreshing(false); |
|
|
|
|
|
|
|
|
|
if (fetchEnd == FetchEnd.MIDDLE && !statuses.get(position).isRight()) { |
|
|
|
|
StatusViewData newViewData = new StatusViewData.Placeholder(false); |
|
|
|
|
statuses.setPairedItem(position, newViewData); |
|
|
|
|
adapter.changeItem(position, newViewData, true); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
Log.e(TAG, "Fetch Failure: " + exception.getMessage()); |
|
|
|
|
fulfillAnyQueuedFetches(fetchEnd); |
|
|
|
|
} |
|
|
|
|
@ -588,7 +659,7 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
protected void filterStatuses(List<Status> statuses) { |
|
|
|
|
private void filterStatuses(List<Status> statuses) { |
|
|
|
|
Iterator<Status> it = statuses.iterator(); |
|
|
|
|
while (it.hasNext()) { |
|
|
|
|
Status status = it.next(); |
|
|
|
|
@ -600,7 +671,7 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void updateStatuses(List<Status> newStatuses, @Nullable String fromId, |
|
|
|
|
@Nullable String toId) { |
|
|
|
|
@Nullable String toId, boolean fullFetch) { |
|
|
|
|
if (ListUtils.isEmpty(newStatuses)) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
@ -610,20 +681,26 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
if (toId != null) { |
|
|
|
|
topId = toId; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<Either<Placeholder, Status>> liftedNew = listStatusList(newStatuses); |
|
|
|
|
|
|
|
|
|
if (statuses.isEmpty()) { |
|
|
|
|
// This construction removes duplicates while preserving order.
|
|
|
|
|
statuses.addAll(new LinkedHashSet<>(newStatuses)); |
|
|
|
|
statuses.addAll(liftedNew); |
|
|
|
|
} else { |
|
|
|
|
Status lastOfNew = newStatuses.get(newStatuses.size() - 1); |
|
|
|
|
Either<Placeholder, Status> lastOfNew = liftedNew.get(newStatuses.size() - 1); |
|
|
|
|
int index = statuses.indexOf(lastOfNew); |
|
|
|
|
|
|
|
|
|
for (int i = 0; i < index; i++) { |
|
|
|
|
statuses.remove(0); |
|
|
|
|
} |
|
|
|
|
int newIndex = newStatuses.indexOf(statuses.get(0)); |
|
|
|
|
int newIndex = liftedNew.indexOf(statuses.get(0)); |
|
|
|
|
if (newIndex == -1) { |
|
|
|
|
statuses.addAll(0, newStatuses); |
|
|
|
|
if (index == -1 && fullFetch) { |
|
|
|
|
liftedNew.add(Either.<Placeholder, Status>left(Placeholder.getInstance())); |
|
|
|
|
} |
|
|
|
|
statuses.addAll(0, liftedNew); |
|
|
|
|
} else { |
|
|
|
|
statuses.addAll(0, newStatuses.subList(0, newIndex)); |
|
|
|
|
statuses.addAll(0, liftedNew.subList(0, newIndex)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
adapter.update(statuses.getPairedCopy()); |
|
|
|
|
@ -634,15 +711,17 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
int end = statuses.size(); |
|
|
|
|
Status last = statuses.get(end - 1); |
|
|
|
|
Status last = statuses.get(end - 1).getAsRightOrNull(); |
|
|
|
|
// I was about to replace findStatus with indexOf but it is incorrect to compare value
|
|
|
|
|
// types by ID anyway and we should change equals() for Status, I think, so this makes sense
|
|
|
|
|
if (last != null && !findStatus(newStatuses, last.id)) { |
|
|
|
|
statuses.addAll(newStatuses); |
|
|
|
|
statuses.addAll(listStatusList(newStatuses)); |
|
|
|
|
List<StatusViewData> newViewDatas = statuses.getPairedCopy() |
|
|
|
|
.subList(statuses.size() - newStatuses.size(), statuses.size()); |
|
|
|
|
if (BuildConfig.DEBUG && newStatuses.size() != newViewDatas.size()) { |
|
|
|
|
String error = String.format(Locale.getDefault(), |
|
|
|
|
"Incorrectly got statusViewData sublist." + |
|
|
|
|
" newStatuses.size == %d newViewDatas.size == %d, statuses.size == %d", |
|
|
|
|
" newStatuses.size == %d newViewDatas.size == %d, statuses.size == %d", |
|
|
|
|
newStatuses.size(), newViewDatas.size(), statuses.size()); |
|
|
|
|
throw new AssertionError(error); |
|
|
|
|
} |
|
|
|
|
@ -653,6 +732,28 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void replacePlaceholderWithStatuses(List<Status> newStatuses, boolean fullFetch, int pos) { |
|
|
|
|
Status status = statuses.get(pos).getAsRightOrNull(); |
|
|
|
|
if (status == null) { |
|
|
|
|
statuses.remove(pos); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (ListUtils.isEmpty(newStatuses)) { |
|
|
|
|
adapter.update(statuses.getPairedCopy()); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<Either<Placeholder, Status>> liftedNew = listStatusList(newStatuses); |
|
|
|
|
|
|
|
|
|
if (fullFetch) { |
|
|
|
|
liftedNew.add(Either.<Placeholder, Status>left(Placeholder.getInstance())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
statuses.addAll(pos, liftedNew); |
|
|
|
|
adapter.update(statuses.getPairedCopy()); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private static boolean findStatus(List<Status> statuses, String id) { |
|
|
|
|
for (Status status : statuses) { |
|
|
|
|
if (status.id.equals(id)) { |
|
|
|
|
@ -661,4 +762,39 @@ public class TimelineFragment extends SFragment implements |
|
|
|
|
} |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private final Function<Status, Either<Placeholder, Status>> statusLifter = |
|
|
|
|
new Function<Status, Either<Placeholder, Status>>() { |
|
|
|
|
@Override |
|
|
|
|
public Either<Placeholder, Status> apply(Status input) { |
|
|
|
|
return Either.right(input); |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
private @Nullable |
|
|
|
|
Pair<StatusViewData.Concrete, Integer> |
|
|
|
|
findStatusAndPosition(int position, Status status) { |
|
|
|
|
StatusViewData.Concrete statusToUpdate; |
|
|
|
|
int positionToUpdate; |
|
|
|
|
StatusViewData someOldViewData = statuses.getPairedItem(position); |
|
|
|
|
|
|
|
|
|
// Unlikely, but data could change between the request and response
|
|
|
|
|
if ((someOldViewData instanceof StatusViewData.Placeholder) || |
|
|
|
|
!((StatusViewData.Concrete) someOldViewData).getId().equals(status.id)) { |
|
|
|
|
// try to find the status we need to update
|
|
|
|
|
int foundPos = statuses.indexOf(Either.<Placeholder, Status>right(status)); |
|
|
|
|
if (foundPos < 0) return null; // okay, it's hopeless, give up
|
|
|
|
|
statusToUpdate = ((StatusViewData.Concrete) |
|
|
|
|
statuses.getPairedItem(foundPos)); |
|
|
|
|
positionToUpdate = position; |
|
|
|
|
} else { |
|
|
|
|
statusToUpdate = (StatusViewData.Concrete) someOldViewData; |
|
|
|
|
positionToUpdate = position; |
|
|
|
|
} |
|
|
|
|
return new Pair<>(statusToUpdate, positionToUpdate); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private List<Either<Placeholder, Status>> listStatusList(List<Status> list) { |
|
|
|
|
return CollectionUtil.map(list, statusLifter); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
Konrad Pozniak
7 years ago
committed by