2017-01-20 19:09:10 +11:00
|
|
|
/* Copyright 2017 Andrew Dawson
|
|
|
|
*
|
2017-04-10 10:12:31 +10:00
|
|
|
* This file is a part of Tusky.
|
2017-01-20 19:09:10 +11:00
|
|
|
*
|
2017-04-10 10:12:31 +10:00
|
|
|
* This program is free software; you can redistribute it and/or modify it under the terms of the
|
|
|
|
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
|
|
|
* License, or (at your option) any later version.
|
2017-01-20 19:09:10 +11:00
|
|
|
*
|
|
|
|
* Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
2017-04-10 10:12:31 +10:00
|
|
|
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
|
|
|
* Public License for more details.
|
2017-01-20 19:09:10 +11:00
|
|
|
*
|
2017-04-10 10:12:31 +10:00
|
|
|
* You should have received a copy of the GNU General Public License along with Tusky; if not,
|
|
|
|
* see <http://www.gnu.org/licenses>. */
|
2017-01-20 19:09:10 +11:00
|
|
|
|
2017-05-05 08:55:34 +10:00
|
|
|
package com.keylesspalace.tusky.fragment;
|
2017-01-08 09:24:02 +11:00
|
|
|
|
2017-11-14 05:05:23 +11:00
|
|
|
import android.app.Activity;
|
2017-01-08 09:24:02 +11:00
|
|
|
import android.content.Context;
|
2017-03-12 05:20:10 +11:00
|
|
|
import android.content.SharedPreferences;
|
2017-01-08 09:24:02 +11:00
|
|
|
import android.os.Bundle;
|
2017-04-22 18:41:49 +10:00
|
|
|
import android.preference.PreferenceManager;
|
2017-05-24 05:34:31 +10:00
|
|
|
import android.util.Log;
|
2017-01-08 09:24:02 +11:00
|
|
|
import android.view.LayoutInflater;
|
|
|
|
import android.view.View;
|
|
|
|
import android.view.ViewGroup;
|
2018-05-27 18:22:12 +10:00
|
|
|
import android.widget.ProgressBar;
|
2017-01-08 09:24:02 +11:00
|
|
|
|
2019-01-29 05:02:31 +11:00
|
|
|
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
|
|
|
import com.google.android.material.tabs.TabLayout;
|
2017-05-05 08:55:34 +10:00
|
|
|
import com.keylesspalace.tusky.MainActivity;
|
2018-03-10 06:39:08 +11:00
|
|
|
import com.keylesspalace.tusky.R;
|
2017-05-05 08:55:34 +10:00
|
|
|
import com.keylesspalace.tusky.adapter.NotificationsAdapter;
|
2018-05-27 18:22:12 +10:00
|
|
|
import com.keylesspalace.tusky.appstore.BlockEvent;
|
2018-08-23 05:18:56 +10:00
|
|
|
import com.keylesspalace.tusky.appstore.EventHub;
|
2018-05-27 18:22:12 +10:00
|
|
|
import com.keylesspalace.tusky.appstore.FavoriteEvent;
|
2018-11-13 07:09:39 +11:00
|
|
|
import com.keylesspalace.tusky.appstore.PreferenceChangedEvent;
|
2018-05-27 18:22:12 +10:00
|
|
|
import com.keylesspalace.tusky.appstore.ReblogEvent;
|
2018-02-04 08:45:14 +11:00
|
|
|
import com.keylesspalace.tusky.db.AccountEntity;
|
|
|
|
import com.keylesspalace.tusky.db.AccountManager;
|
2018-03-28 04:47:00 +11:00
|
|
|
import com.keylesspalace.tusky.di.Injectable;
|
2017-03-09 10:27:37 +11:00
|
|
|
import com.keylesspalace.tusky.entity.Notification;
|
|
|
|
import com.keylesspalace.tusky.entity.Status;
|
2017-08-05 19:34:50 +10:00
|
|
|
import com.keylesspalace.tusky.interfaces.ActionButtonActivity;
|
2017-05-05 08:55:34 +10:00
|
|
|
import com.keylesspalace.tusky.interfaces.StatusActionListener;
|
2018-03-28 04:47:00 +11:00
|
|
|
import com.keylesspalace.tusky.network.TimelineCases;
|
2017-11-06 03:11:00 +11:00
|
|
|
import com.keylesspalace.tusky.util.CollectionUtil;
|
|
|
|
import com.keylesspalace.tusky.util.Either;
|
2017-06-30 16:31:58 +10:00
|
|
|
import com.keylesspalace.tusky.util.HttpHeaderLink;
|
2017-07-15 13:23:14 +10:00
|
|
|
import com.keylesspalace.tusky.util.ListUtils;
|
2017-07-13 05:54:52 +10:00
|
|
|
import com.keylesspalace.tusky.util.PairedList;
|
2017-05-05 08:55:34 +10:00
|
|
|
import com.keylesspalace.tusky.util.ThemeUtils;
|
2017-07-13 05:54:52 +10:00
|
|
|
import com.keylesspalace.tusky.util.ViewDataUtils;
|
2019-01-29 05:02:31 +11:00
|
|
|
import com.keylesspalace.tusky.view.BackgroundMessageView;
|
2017-05-29 20:14:09 +10:00
|
|
|
import com.keylesspalace.tusky.view.EndlessOnScrollListener;
|
2017-07-13 05:54:52 +10:00
|
|
|
import com.keylesspalace.tusky.viewdata.NotificationViewData;
|
|
|
|
import com.keylesspalace.tusky.viewdata.StatusViewData;
|
2017-01-08 09:24:02 +11:00
|
|
|
|
2019-01-29 05:02:31 +11:00
|
|
|
import java.io.IOException;
|
2018-08-23 05:18:56 +10:00
|
|
|
import java.util.Collections;
|
2017-07-13 05:54:52 +10:00
|
|
|
import java.util.Iterator;
|
2017-01-08 09:24:02 +11:00
|
|
|
import java.util.List;
|
2018-05-27 18:22:12 +10:00
|
|
|
import java.util.Objects;
|
2017-01-08 09:24:02 +11:00
|
|
|
|
2018-03-28 04:47:00 +11:00
|
|
|
import javax.inject.Inject;
|
|
|
|
|
2019-01-29 05:02:31 +11:00
|
|
|
import androidx.annotation.NonNull;
|
|
|
|
import androidx.annotation.Nullable;
|
|
|
|
import androidx.arch.core.util.Function;
|
|
|
|
import androidx.core.util.Pair;
|
|
|
|
import androidx.lifecycle.Lifecycle;
|
|
|
|
import androidx.recyclerview.widget.DividerItemDecoration;
|
|
|
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
|
|
import androidx.recyclerview.widget.RecyclerView;
|
|
|
|
import androidx.recyclerview.widget.SimpleItemAnimator;
|
|
|
|
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
|
2018-05-27 18:22:12 +10:00
|
|
|
import io.reactivex.android.schedulers.AndroidSchedulers;
|
2019-01-29 05:02:31 +11:00
|
|
|
import kotlin.Unit;
|
2019-01-12 08:07:40 +11:00
|
|
|
import kotlin.collections.CollectionsKt;
|
2017-03-09 10:27:37 +11:00
|
|
|
import retrofit2.Call;
|
|
|
|
import retrofit2.Callback;
|
2017-03-20 18:03:03 +11:00
|
|
|
import retrofit2.Response;
|
2017-03-09 10:27:37 +11:00
|
|
|
|
2019-02-01 05:03:34 +11:00
|
|
|
import static com.keylesspalace.tusky.util.StringUtils.isLessThan;
|
2018-05-27 18:22:12 +10:00
|
|
|
import static com.uber.autodispose.AutoDispose.autoDisposable;
|
|
|
|
import static com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider.from;
|
|
|
|
|
2017-01-23 10:42:05 +11:00
|
|
|
public class NotificationsFragment extends SFragment implements
|
2018-03-28 04:47:00 +11:00
|
|
|
SwipeRefreshLayout.OnRefreshListener,
|
|
|
|
StatusActionListener,
|
2017-06-07 07:15:29 +10:00
|
|
|
NotificationsAdapter.NotificationActionListener,
|
2018-03-28 04:47:00 +11:00
|
|
|
Injectable {
|
2017-11-04 08:17:31 +11:00
|
|
|
private static final String TAG = "NotificationF"; // logging tag
|
|
|
|
|
|
|
|
private static final int LOAD_AT_ONCE = 30;
|
2017-02-07 18:05:50 +11:00
|
|
|
|
2017-06-30 16:31:58 +10:00
|
|
|
private enum FetchEnd {
|
|
|
|
TOP,
|
2017-11-04 08:17:31 +11:00
|
|
|
BOTTOM,
|
|
|
|
MIDDLE
|
2017-06-30 16:31:58 +10:00
|
|
|
}
|
|
|
|
|
2017-11-06 03:11:00 +11:00
|
|
|
/**
|
2018-02-04 08:45:14 +11:00
|
|
|
* Placeholder for the notificationsEnabled. Consider moving to the separate class to hide constructor
|
2017-11-06 03:11:00 +11:00
|
|
|
* and reuse in different places as needed.
|
|
|
|
*/
|
|
|
|
private static final class Placeholder {
|
|
|
|
private static final Placeholder INSTANCE = new Placeholder();
|
|
|
|
|
|
|
|
public static Placeholder getInstance() {
|
|
|
|
return INSTANCE;
|
|
|
|
}
|
|
|
|
|
|
|
|
private Placeholder() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-28 04:47:00 +11:00
|
|
|
@Inject
|
|
|
|
public TimelineCases timelineCases;
|
|
|
|
@Inject
|
2018-04-23 01:20:01 +10:00
|
|
|
AccountManager accountManager;
|
2018-05-27 18:22:12 +10:00
|
|
|
@Inject
|
|
|
|
EventHub eventHub;
|
2018-03-28 04:47:00 +11:00
|
|
|
|
2017-01-08 09:24:02 +11:00
|
|
|
private SwipeRefreshLayout swipeRefreshLayout;
|
2017-04-22 18:41:49 +10:00
|
|
|
private RecyclerView recyclerView;
|
2018-05-27 18:22:12 +10:00
|
|
|
private ProgressBar progressBar;
|
2019-01-29 05:02:31 +11:00
|
|
|
private BackgroundMessageView statusView;
|
2018-05-27 18:22:12 +10:00
|
|
|
|
|
|
|
private LinearLayoutManager layoutManager;
|
2017-02-13 16:18:17 +11:00
|
|
|
private EndlessOnScrollListener scrollListener;
|
2017-01-08 09:24:02 +11:00
|
|
|
private NotificationsAdapter adapter;
|
2017-02-13 16:18:17 +11:00
|
|
|
private TabLayout.OnTabSelectedListener onTabSelectedListener;
|
2017-04-22 18:41:49 +10:00
|
|
|
private boolean hideFab;
|
2017-06-30 16:31:58 +10:00
|
|
|
private boolean topLoading;
|
|
|
|
private boolean bottomLoading;
|
2017-07-13 05:54:52 +10:00
|
|
|
private String bottomId;
|
2017-12-01 06:12:09 +11:00
|
|
|
private boolean alwaysShowSensitiveMedia;
|
2017-07-13 05:54:52 +10:00
|
|
|
|
2018-03-28 04:47:00 +11:00
|
|
|
@Override
|
|
|
|
protected TimelineCases timelineCases() {
|
|
|
|
return timelineCases;
|
|
|
|
}
|
|
|
|
|
2017-11-06 03:11:00 +11:00
|
|
|
// Each element is either a Notification for loading data or a Placeholder
|
|
|
|
private final PairedList<Either<Placeholder, Notification>, NotificationViewData> notifications
|
|
|
|
= new PairedList<>(new Function<Either<Placeholder, Notification>, NotificationViewData>() {
|
2017-07-13 05:54:52 +10:00
|
|
|
@Override
|
2017-11-06 03:11:00 +11:00
|
|
|
public NotificationViewData apply(Either<Placeholder, Notification> input) {
|
|
|
|
if (input.isRight()) {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
Notification notification = input.asRight();
|
Add support for collapsible statuses when they exceed 500 characters (#825)
* Update Gradle plugin to work with Android Studio 3.3 Canary
Android Studio 3.1.4 Stable doesn't render layout previews in this project
for whatever reason. Switching to the latest 3.3 Canary release fixes the
issue without affecting Gradle scripts but requires the new Android Gradle
plugin to match the new Android Studio release.
This commit will be reverted once development on the feature is done.
* Update gradle build script to allow installing debug builds alongside store version
This will allow developers, testers, etc to work on Tusky will not having to worry
about overwriting, uninstalling, fiddling with a preinstalled application which would
mean having to login again every time the development cycle starts/finishes and
manually reinstalling the app.
* Add UI changes to support collapsing statuses
The button uses subtle styling to not be distracting like the CW button on the timeline
The button is toggleable, full width to match the status textbox hitbox width and also
is shorter to not be too intrusive between the status text and images, or the post below
* Update status data model to store whether the message has been collapsed
* Update status action listener to notify of collapsed state changing
Provide stubs in all implementing classes and mark as TODO the stubs that
require a proper implementation for the feature to work.
* Add implementation code to handle status collapse/expand in timeline
Code has not been added elsewhere to simplify testing.
Once the code will be considered stable it will be also included in other
status action listener implementers.
* Add preferences so that users can toggle the collapsing of long posts
This is currently limited to a simple toggle, it would be nice to implement
a more advanced UI to offer the user more control over the feature.
* Update Gradle plugin to work with latest Android Studio 3.3 Canary 8
Just like the other commit, this will be reverted once the feature is working.
I simply don't want to deal with what changes in my installation of Android
Studio 3.1.4 Stable which breaks the layout preview rendering.
* Update data models and utils for statuses to better handle collapsing
I forgot that data isn't available from the API and can't really be built
from scratch using existing data due to preferences.
A new, extra boolean should fix the issue.
* Fix search breaking due to newly introduced variables in utils classes
* Fix timeline breaking due to newly introduced variables in utils classes
* Fix item status text for collapsed toggle being shown in the wrong state
* Update timeline fragment to refresh the list when collapsed settings change
* Add support for status content collapse in timeline viewholder
* Fix view holder truncating posts using temporary debug settings at 50 chars
* Add toggle support to notification layout as well
* Add support for collapsed statuses to search results
* Add support for expandable content to notifications too
* Update codebase with some suggested changes by @charlang
* Update more code with more suggestions and move null-safety into view data
* Update even more code with even more suggested code changes
* Revert a0a41ca and 0ee004d (Android Studio 3.1 to Android Studio 3.3 updates)
* Add an input filter utility class to reuse code for trimming statuses
* Update UI of statuses to show a taller collapsible button
* Update notification fragment logging to simplify null checks
* Add smartness to SmartLengthInputFilter such as word trimming and runway
* Fix posts with show more button even if bad ratio didn't collapse
* Fix thread view showing button but not collapsing by implementing the feature
* Fix spannable losing spans when collapsed and restore length to 500 characters
* Remove debug build suffix as per request
* Fix all the merging happened in f66d689, 623cad2 and 7056ba5
* Fix notification button spanning full width rather than content width
* Add a way to access a singleton to smart filter and use clearer code
* Update view holders using smart input filters to use more singletons
* Fix code style lacking spaces before boolean checks in ifs and others
* Remove all code related to collapsibility preferences, strings included
* Update style to match content warning toggle button
* Update strings to give cleaner differentiation between CW and collapse
* Update smart filter code to use fully qualified names to avoid confusion
2018-09-20 03:51:20 +10:00
|
|
|
return ViewDataUtils.notificationToViewData(
|
|
|
|
notification,
|
|
|
|
alwaysShowSensitiveMedia
|
|
|
|
);
|
2017-11-06 03:11:00 +11:00
|
|
|
} else {
|
|
|
|
return new NotificationViewData.Placeholder(false);
|
|
|
|
}
|
2017-07-13 05:54:52 +10:00
|
|
|
}
|
|
|
|
});
|
2017-01-08 09:24:02 +11:00
|
|
|
|
|
|
|
public static NotificationsFragment newInstance() {
|
|
|
|
NotificationsFragment fragment = new NotificationsFragment();
|
|
|
|
Bundle arguments = new Bundle();
|
|
|
|
fragment.setArguments(arguments);
|
|
|
|
return fragment;
|
|
|
|
}
|
|
|
|
|
|
|
|
@Nullable
|
|
|
|
@Override
|
2017-11-14 05:05:23 +11:00
|
|
|
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
|
2017-04-22 18:41:49 +10:00
|
|
|
@Nullable Bundle savedInstanceState) {
|
2017-01-08 09:24:02 +11:00
|
|
|
View rootView = inflater.inflate(R.layout.fragment_timeline, container, false);
|
|
|
|
|
2017-11-14 05:05:23 +11:00
|
|
|
@NonNull Context context = inflater.getContext(); // from inflater to silence warning
|
2017-01-08 09:24:02 +11:00
|
|
|
// Setup the SwipeRefreshLayout.
|
2019-02-13 05:22:37 +11:00
|
|
|
swipeRefreshLayout = rootView.findViewById(R.id.swipeRefreshLayout);
|
|
|
|
recyclerView = rootView.findViewById(R.id.recyclerView);
|
|
|
|
progressBar = rootView.findViewById(R.id.progressBar);
|
2019-01-29 05:02:31 +11:00
|
|
|
statusView = rootView.findViewById(R.id.statusView);
|
2018-05-27 18:22:12 +10:00
|
|
|
|
2017-01-08 09:24:02 +11:00
|
|
|
swipeRefreshLayout.setOnRefreshListener(this);
|
2018-12-18 01:25:35 +11:00
|
|
|
swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue);
|
2018-03-10 06:39:08 +11:00
|
|
|
swipeRefreshLayout.setProgressBackgroundColorSchemeColor(ThemeUtils.getColor(context, android.R.attr.colorBackground));
|
2017-01-08 09:24:02 +11:00
|
|
|
// Setup the RecyclerView.
|
|
|
|
recyclerView.setHasFixedSize(true);
|
2017-02-13 16:18:17 +11:00
|
|
|
layoutManager = new LinearLayoutManager(context);
|
2017-01-08 09:24:02 +11:00
|
|
|
recyclerView.setLayoutManager(layoutManager);
|
2019-02-27 04:28:20 +11:00
|
|
|
|
|
|
|
recyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL));
|
2017-04-22 18:41:49 +10:00
|
|
|
|
2017-03-11 07:12:40 +11:00
|
|
|
adapter = new NotificationsAdapter(this, this);
|
2018-11-13 07:09:39 +11:00
|
|
|
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
|
|
|
|
alwaysShowSensitiveMedia = accountManager.getActiveAccount().getAlwaysShowSensitiveMedia();
|
|
|
|
boolean mediaPreviewEnabled = accountManager.getActiveAccount().getMediaPreviewEnabled();
|
2017-06-26 19:15:47 +10:00
|
|
|
adapter.setMediaPreviewEnabled(mediaPreviewEnabled);
|
2018-08-17 12:53:38 +10:00
|
|
|
boolean useAbsoluteTime = preferences.getBoolean("absoluteTimeView", false);
|
|
|
|
adapter.setUseAbsoluteTime(useAbsoluteTime);
|
2017-01-08 09:24:02 +11:00
|
|
|
recyclerView.setAdapter(adapter);
|
|
|
|
|
2017-07-21 11:17:36 +10:00
|
|
|
notifications.clear();
|
2017-07-15 07:09:44 +10:00
|
|
|
topLoading = false;
|
|
|
|
bottomLoading = false;
|
|
|
|
bottomId = null;
|
|
|
|
|
2018-05-27 18:22:12 +10:00
|
|
|
((SimpleItemAnimator) recyclerView.getItemAnimator()).setSupportsChangeAnimations(false);
|
|
|
|
|
2019-01-12 08:07:40 +11:00
|
|
|
sendFetchNotificationsRequest(null, null, FetchEnd.BOTTOM, -1);
|
2018-08-23 05:18:56 +10:00
|
|
|
|
2017-06-26 19:15:47 +10:00
|
|
|
return rootView;
|
|
|
|
}
|
|
|
|
|
2018-05-27 18:22:12 +10:00
|
|
|
private void handleFavEvent(FavoriteEvent event) {
|
|
|
|
Pair<Integer, Notification> posAndNotification =
|
|
|
|
findReplyPosition(event.getStatusId());
|
|
|
|
if (posAndNotification == null) return;
|
|
|
|
//noinspection ConstantConditions
|
|
|
|
setFavovouriteForStatus(posAndNotification.first,
|
|
|
|
posAndNotification.second.getStatus(),
|
|
|
|
event.getFavourite());
|
|
|
|
}
|
|
|
|
|
|
|
|
private void handleReblogEvent(ReblogEvent event) {
|
|
|
|
Pair<Integer, Notification> posAndNotification = findReplyPosition(event.getStatusId());
|
|
|
|
if (posAndNotification == null) return;
|
|
|
|
//noinspection ConstantConditions
|
|
|
|
setReblogForStatus(posAndNotification.first,
|
|
|
|
posAndNotification.second.getStatus(),
|
|
|
|
event.getReblog());
|
|
|
|
}
|
|
|
|
|
2017-06-26 19:15:47 +10:00
|
|
|
@Override
|
|
|
|
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
|
|
|
|
super.onActivityCreated(savedInstanceState);
|
|
|
|
|
|
|
|
MainActivity activity = (MainActivity) getActivity();
|
2017-11-14 05:05:23 +11:00
|
|
|
if (activity == null) throw new AssertionError("Activity is null");
|
2017-06-26 19:15:47 +10:00
|
|
|
|
|
|
|
// MainActivity's layout is guaranteed to be inflated until onCreate returns.
|
2017-10-18 09:20:26 +11:00
|
|
|
TabLayout layout = activity.findViewById(R.id.tab_layout);
|
2017-02-13 16:18:17 +11:00
|
|
|
onTabSelectedListener = new TabLayout.OnTabSelectedListener() {
|
|
|
|
@Override
|
2018-03-10 08:02:32 +11:00
|
|
|
public void onTabSelected(TabLayout.Tab tab) {
|
|
|
|
}
|
2017-02-13 16:18:17 +11:00
|
|
|
|
|
|
|
@Override
|
2018-03-10 08:02:32 +11:00
|
|
|
public void onTabUnselected(TabLayout.Tab tab) {
|
|
|
|
}
|
2017-02-13 16:18:17 +11:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onTabReselected(TabLayout.Tab tab) {
|
|
|
|
jumpToTop();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
layout.addOnTabSelectedListener(onTabSelectedListener);
|
|
|
|
|
2017-04-22 18:41:49 +10:00
|
|
|
/* This is delayed until onActivityCreated solely because MainActivity.composeButton isn't
|
|
|
|
* guaranteed to be set until then.
|
2018-02-04 08:45:14 +11:00
|
|
|
* Use a modified scroll listener that both loads more notificationsEnabled as it goes, and hides
|
2017-04-22 18:41:49 +10:00
|
|
|
* the compose button on down-scroll. */
|
2017-08-05 19:34:50 +10:00
|
|
|
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
|
2017-04-22 18:41:49 +10:00
|
|
|
hideFab = preferences.getBoolean("fabHide", false);
|
|
|
|
scrollListener = new EndlessOnScrollListener(layoutManager) {
|
|
|
|
@Override
|
|
|
|
public void onScrolled(RecyclerView view, int dx, int dy) {
|
|
|
|
super.onScrolled(view, dx, dy);
|
|
|
|
|
2017-08-05 19:34:50 +10:00
|
|
|
ActionButtonActivity activity = (ActionButtonActivity) getActivity();
|
|
|
|
FloatingActionButton composeButton = activity.getActionButton();
|
|
|
|
|
2017-11-06 03:11:00 +11:00
|
|
|
if (composeButton != null) {
|
2017-08-04 19:44:10 +10:00
|
|
|
if (hideFab) {
|
|
|
|
if (dy > 0 && composeButton.isShown()) {
|
|
|
|
composeButton.hide(); // hides the button if we're scrolling down
|
|
|
|
} else if (dy < 0 && !composeButton.isShown()) {
|
|
|
|
composeButton.show(); // shows it if we are scrolling up
|
|
|
|
}
|
|
|
|
} else if (!composeButton.isShown()) {
|
|
|
|
composeButton.show();
|
2017-04-22 18:41:49 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
2018-05-27 18:22:12 +10:00
|
|
|
public void onLoadMore(int totalItemsCount, RecyclerView view) {
|
2017-07-13 05:54:52 +10:00
|
|
|
NotificationsFragment.this.onLoadMore();
|
2017-04-22 18:41:49 +10:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
recyclerView.addOnScrollListener(scrollListener);
|
2018-07-13 05:21:53 +10:00
|
|
|
|
|
|
|
eventHub.getEvents()
|
|
|
|
.observeOn(AndroidSchedulers.mainThread())
|
|
|
|
.as(autoDisposable(from(this, Lifecycle.Event.ON_DESTROY)))
|
|
|
|
.subscribe(event -> {
|
|
|
|
if (event instanceof FavoriteEvent) {
|
|
|
|
handleFavEvent((FavoriteEvent) event);
|
|
|
|
} else if (event instanceof ReblogEvent) {
|
|
|
|
handleReblogEvent((ReblogEvent) event);
|
|
|
|
} else if (event instanceof BlockEvent) {
|
|
|
|
removeAllByAccountId(((BlockEvent) event).getAccountId());
|
2018-11-13 07:09:39 +11:00
|
|
|
} else if (event instanceof PreferenceChangedEvent) {
|
|
|
|
onPreferenceChanged(((PreferenceChangedEvent) event).getPreferenceKey());
|
2018-07-13 05:21:53 +10:00
|
|
|
}
|
|
|
|
});
|
2017-04-22 18:41:49 +10:00
|
|
|
}
|
|
|
|
|
2017-02-13 16:18:17 +11:00
|
|
|
@Override
|
|
|
|
public void onDestroyView() {
|
2017-11-14 05:05:23 +11:00
|
|
|
Activity activity = getActivity();
|
|
|
|
if (activity == null) {
|
|
|
|
Log.e(TAG, "Activity is null");
|
|
|
|
} else {
|
|
|
|
TabLayout tabLayout = activity.findViewById(R.id.tab_layout);
|
|
|
|
tabLayout.removeOnTabSelectedListener(onTabSelectedListener);
|
|
|
|
}
|
2017-06-07 07:15:29 +10:00
|
|
|
|
2017-02-13 16:18:17 +11:00
|
|
|
super.onDestroyView();
|
|
|
|
}
|
|
|
|
|
2017-06-25 15:07:41 +10:00
|
|
|
@Override
|
2017-01-08 09:24:02 +11:00
|
|
|
public void onRefresh() {
|
2019-01-29 05:02:31 +11:00
|
|
|
swipeRefreshLayout.setEnabled(true);
|
|
|
|
this.statusView.setVisibility(View.GONE);
|
2019-01-12 08:07:40 +11:00
|
|
|
Either<Placeholder, Notification> first = CollectionsKt.firstOrNull(this.notifications);
|
|
|
|
String topId;
|
|
|
|
if (first != null && first.isRight()) {
|
2019-01-15 08:29:12 +11:00
|
|
|
topId = first.asRight().getId();
|
2019-01-12 08:07:40 +11:00
|
|
|
} else {
|
|
|
|
topId = null;
|
|
|
|
}
|
2017-11-04 08:17:31 +11:00
|
|
|
sendFetchNotificationsRequest(null, topId, FetchEnd.TOP, -1);
|
2017-01-23 10:42:05 +11:00
|
|
|
}
|
|
|
|
|
2017-06-25 15:07:41 +10:00
|
|
|
@Override
|
2017-01-23 10:42:05 +11:00
|
|
|
public void onReply(int position) {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
super.reply(notifications.get(position).asRight().getStatus());
|
2017-01-23 10:42:05 +11:00
|
|
|
}
|
|
|
|
|
2017-06-25 15:07:41 +10:00
|
|
|
@Override
|
2017-10-28 08:39:36 +11:00
|
|
|
public void onReblog(final boolean reblog, final int position) {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
final Notification notification = notifications.get(position).asRight();
|
2018-03-03 23:24:03 +11:00
|
|
|
final Status status = notification.getStatus();
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
Objects.requireNonNull(status, "Reblog on notification without status");
|
|
|
|
timelineCases.reblog(status, reblog)
|
|
|
|
.observeOn(AndroidSchedulers.mainThread())
|
|
|
|
.as(autoDisposable(from(this)))
|
|
|
|
.subscribe(
|
|
|
|
(newStatus) -> setReblogForStatus(position, status, reblog),
|
|
|
|
(t) -> Log.d(getClass().getSimpleName(),
|
|
|
|
"Failed to reblog status: " + status.getId(), t)
|
|
|
|
);
|
2017-01-23 10:42:05 +11:00
|
|
|
}
|
|
|
|
|
2018-05-27 18:22:12 +10:00
|
|
|
private void setReblogForStatus(int position, Status status, boolean reblog) {
|
|
|
|
status.setReblogged(reblog);
|
|
|
|
|
|
|
|
if (status.getReblog() != null) {
|
|
|
|
status.getReblog().setReblogged(reblog);
|
|
|
|
}
|
|
|
|
|
|
|
|
NotificationViewData.Concrete viewdata = (NotificationViewData.Concrete) notifications.getPairedItem(position);
|
|
|
|
|
|
|
|
StatusViewData.Builder viewDataBuilder = new StatusViewData.Builder(viewdata.getStatusViewData());
|
|
|
|
viewDataBuilder.setReblogged(reblog);
|
|
|
|
|
|
|
|
NotificationViewData.Concrete newViewData = new NotificationViewData.Concrete(
|
|
|
|
viewdata.getType(), viewdata.getId(), viewdata.getAccount(),
|
|
|
|
viewDataBuilder.createStatusViewData(), viewdata.isExpanded());
|
|
|
|
|
|
|
|
notifications.setPairedItem(position, newViewData);
|
|
|
|
|
|
|
|
adapter.updateItemWithNotify(position, newViewData, true);
|
|
|
|
}
|
|
|
|
|
2017-10-28 08:39:36 +11:00
|
|
|
|
2017-06-25 15:07:41 +10:00
|
|
|
@Override
|
2017-10-28 08:39:36 +11:00
|
|
|
public void onFavourite(final boolean favourite, final int position) {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
final Notification notification = notifications.get(position).asRight();
|
2018-03-03 23:24:03 +11:00
|
|
|
final Status status = notification.getStatus();
|
2017-10-28 08:39:36 +11:00
|
|
|
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
timelineCases.favourite(status, favourite)
|
|
|
|
.observeOn(AndroidSchedulers.mainThread())
|
|
|
|
.as(autoDisposable(from(this)))
|
|
|
|
.subscribe(
|
|
|
|
(newStatus) -> setFavovouriteForStatus(position, status, favourite),
|
|
|
|
(t) -> Log.d(getClass().getSimpleName(),
|
|
|
|
"Failed to favourite status: " + status.getId(), t)
|
|
|
|
);
|
2017-01-23 10:42:05 +11:00
|
|
|
}
|
|
|
|
|
2018-05-27 18:22:12 +10:00
|
|
|
private void setFavovouriteForStatus(int position, Status status, boolean favourite) {
|
|
|
|
status.setFavourited(favourite);
|
|
|
|
|
|
|
|
if (status.getReblog() != null) {
|
|
|
|
status.getReblog().setFavourited(favourite);
|
|
|
|
}
|
|
|
|
|
|
|
|
NotificationViewData.Concrete viewdata = (NotificationViewData.Concrete) notifications.getPairedItem(position);
|
|
|
|
|
|
|
|
StatusViewData.Builder viewDataBuilder = new StatusViewData.Builder(viewdata.getStatusViewData());
|
|
|
|
viewDataBuilder.setFavourited(favourite);
|
|
|
|
|
|
|
|
NotificationViewData.Concrete newViewData = new NotificationViewData.Concrete(
|
|
|
|
viewdata.getType(), viewdata.getId(), viewdata.getAccount(),
|
|
|
|
viewDataBuilder.createStatusViewData(), viewdata.isExpanded());
|
|
|
|
|
|
|
|
notifications.setPairedItem(position, newViewData);
|
|
|
|
|
|
|
|
adapter.updateItemWithNotify(position, newViewData, true);
|
|
|
|
}
|
|
|
|
|
2017-06-25 15:07:41 +10:00
|
|
|
@Override
|
2019-02-13 05:22:37 +11:00
|
|
|
public void onMore(@NonNull View view, int position) {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
Notification notification = notifications.get(position).asRight();
|
2018-03-03 23:24:03 +11:00
|
|
|
super.more(notification.getStatus(), view, position);
|
2017-01-23 10:42:05 +11:00
|
|
|
}
|
|
|
|
|
2017-06-25 15:07:41 +10:00
|
|
|
@Override
|
2019-02-13 05:22:37 +11:00
|
|
|
public void onViewMedia(int position, int attachmentIndex, @NonNull View view) {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
Notification notification = notifications.get(position).asRightOrNull();
|
2018-05-11 04:13:25 +10:00
|
|
|
if (notification == null || notification.getStatus() == null) return;
|
|
|
|
super.viewMedia(attachmentIndex, notification.getStatus(), view);
|
2017-01-23 10:42:05 +11:00
|
|
|
}
|
2017-01-23 16:19:30 +11:00
|
|
|
|
2017-06-25 15:07:41 +10:00
|
|
|
@Override
|
2017-01-23 16:19:30 +11:00
|
|
|
public void onViewThread(int position) {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
Notification notification = notifications.get(position).asRight();
|
2018-03-03 23:24:03 +11:00
|
|
|
super.viewThread(notification.getStatus());
|
2017-01-23 16:19:30 +11:00
|
|
|
}
|
2017-01-27 11:34:32 +11:00
|
|
|
|
2017-06-28 18:10:56 +10:00
|
|
|
@Override
|
|
|
|
public void onOpenReblog(int position) {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
Notification notification = notifications.get(position).asRight();
|
2018-03-03 23:24:03 +11:00
|
|
|
onViewAccount(notification.getAccount().getId());
|
2017-06-28 18:10:56 +10:00
|
|
|
}
|
|
|
|
|
2017-07-13 05:54:52 +10:00
|
|
|
@Override
|
|
|
|
public void onExpandedChange(boolean expanded, int position) {
|
2017-11-06 03:11:00 +11:00
|
|
|
NotificationViewData.Concrete old =
|
|
|
|
(NotificationViewData.Concrete) notifications.getPairedItem(position);
|
2017-11-07 02:19:15 +11:00
|
|
|
StatusViewData.Concrete statusViewData =
|
2017-07-13 05:54:52 +10:00
|
|
|
new StatusViewData.Builder(old.getStatusViewData())
|
|
|
|
.setIsExpanded(expanded)
|
|
|
|
.createStatusViewData();
|
2017-11-06 03:11:00 +11:00
|
|
|
NotificationViewData notificationViewData = new NotificationViewData.Concrete(old.getType(),
|
2017-12-01 06:12:09 +11:00
|
|
|
old.getId(), old.getAccount(), statusViewData, expanded);
|
2017-07-13 05:54:52 +10:00
|
|
|
notifications.setPairedItem(position, notificationViewData);
|
|
|
|
adapter.updateItemWithNotify(position, notificationViewData, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onContentHiddenChange(boolean isShowing, int position) {
|
2017-11-06 03:11:00 +11:00
|
|
|
NotificationViewData.Concrete old =
|
|
|
|
(NotificationViewData.Concrete) notifications.getPairedItem(position);
|
2017-11-07 02:19:15 +11:00
|
|
|
StatusViewData.Concrete statusViewData =
|
2017-07-13 05:54:52 +10:00
|
|
|
new StatusViewData.Builder(old.getStatusViewData())
|
|
|
|
.setIsShowingSensitiveContent(isShowing)
|
|
|
|
.createStatusViewData();
|
2017-11-06 03:11:00 +11:00
|
|
|
NotificationViewData notificationViewData = new NotificationViewData.Concrete(old.getType(),
|
2017-12-01 06:12:09 +11:00
|
|
|
old.getId(), old.getAccount(), statusViewData, old.isExpanded());
|
2017-07-13 05:54:52 +10:00
|
|
|
notifications.setPairedItem(position, notificationViewData);
|
|
|
|
adapter.updateItemWithNotify(position, notificationViewData, false);
|
|
|
|
}
|
|
|
|
|
2017-11-04 08:17:31 +11:00
|
|
|
@Override
|
|
|
|
public void onLoadMore(int position) {
|
|
|
|
//check bounds before accessing list,
|
|
|
|
if (notifications.size() >= position && position > 0) {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
Notification previous = notifications.get(position - 1).asRightOrNull();
|
|
|
|
Notification next = notifications.get(position + 1).asRightOrNull();
|
2017-11-07 02:19:15 +11:00
|
|
|
if (previous == null || next == null) {
|
|
|
|
Log.e(TAG, "Failed to load more, invalid placeholder position: " + position);
|
|
|
|
return;
|
|
|
|
}
|
2018-03-03 23:24:03 +11:00
|
|
|
sendFetchNotificationsRequest(previous.getId(), next.getId(), FetchEnd.MIDDLE, position);
|
2017-11-06 03:11:00 +11:00
|
|
|
NotificationViewData notificationViewData =
|
|
|
|
new NotificationViewData.Placeholder(true);
|
2017-11-04 08:17:31 +11:00
|
|
|
notifications.setPairedItem(position, notificationViewData);
|
|
|
|
adapter.updateItemWithNotify(position, notificationViewData, false);
|
|
|
|
} else {
|
|
|
|
Log.d(TAG, "error loading more");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Add support for collapsible statuses when they exceed 500 characters (#825)
* Update Gradle plugin to work with Android Studio 3.3 Canary
Android Studio 3.1.4 Stable doesn't render layout previews in this project
for whatever reason. Switching to the latest 3.3 Canary release fixes the
issue without affecting Gradle scripts but requires the new Android Gradle
plugin to match the new Android Studio release.
This commit will be reverted once development on the feature is done.
* Update gradle build script to allow installing debug builds alongside store version
This will allow developers, testers, etc to work on Tusky will not having to worry
about overwriting, uninstalling, fiddling with a preinstalled application which would
mean having to login again every time the development cycle starts/finishes and
manually reinstalling the app.
* Add UI changes to support collapsing statuses
The button uses subtle styling to not be distracting like the CW button on the timeline
The button is toggleable, full width to match the status textbox hitbox width and also
is shorter to not be too intrusive between the status text and images, or the post below
* Update status data model to store whether the message has been collapsed
* Update status action listener to notify of collapsed state changing
Provide stubs in all implementing classes and mark as TODO the stubs that
require a proper implementation for the feature to work.
* Add implementation code to handle status collapse/expand in timeline
Code has not been added elsewhere to simplify testing.
Once the code will be considered stable it will be also included in other
status action listener implementers.
* Add preferences so that users can toggle the collapsing of long posts
This is currently limited to a simple toggle, it would be nice to implement
a more advanced UI to offer the user more control over the feature.
* Update Gradle plugin to work with latest Android Studio 3.3 Canary 8
Just like the other commit, this will be reverted once the feature is working.
I simply don't want to deal with what changes in my installation of Android
Studio 3.1.4 Stable which breaks the layout preview rendering.
* Update data models and utils for statuses to better handle collapsing
I forgot that data isn't available from the API and can't really be built
from scratch using existing data due to preferences.
A new, extra boolean should fix the issue.
* Fix search breaking due to newly introduced variables in utils classes
* Fix timeline breaking due to newly introduced variables in utils classes
* Fix item status text for collapsed toggle being shown in the wrong state
* Update timeline fragment to refresh the list when collapsed settings change
* Add support for status content collapse in timeline viewholder
* Fix view holder truncating posts using temporary debug settings at 50 chars
* Add toggle support to notification layout as well
* Add support for collapsed statuses to search results
* Add support for expandable content to notifications too
* Update codebase with some suggested changes by @charlang
* Update more code with more suggestions and move null-safety into view data
* Update even more code with even more suggested code changes
* Revert a0a41ca and 0ee004d (Android Studio 3.1 to Android Studio 3.3 updates)
* Add an input filter utility class to reuse code for trimming statuses
* Update UI of statuses to show a taller collapsible button
* Update notification fragment logging to simplify null checks
* Add smartness to SmartLengthInputFilter such as word trimming and runway
* Fix posts with show more button even if bad ratio didn't collapse
* Fix thread view showing button but not collapsing by implementing the feature
* Fix spannable losing spans when collapsed and restore length to 500 characters
* Remove debug build suffix as per request
* Fix all the merging happened in f66d689, 623cad2 and 7056ba5
* Fix notification button spanning full width rather than content width
* Add a way to access a singleton to smart filter and use clearer code
* Update view holders using smart input filters to use more singletons
* Fix code style lacking spaces before boolean checks in ifs and others
* Remove all code related to collapsibility preferences, strings included
* Update style to match content warning toggle button
* Update strings to give cleaner differentiation between CW and collapse
* Update smart filter code to use fully qualified names to avoid confusion
2018-09-20 03:51:20 +10:00
|
|
|
@Override
|
|
|
|
public void onContentCollapsedChange(boolean isCollapsed, int position) {
|
|
|
|
if (position < 0 || position >= notifications.size()) {
|
|
|
|
Log.e(TAG, String.format("Tried to access out of bounds status position: %d of %d", position, notifications.size() - 1));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
NotificationViewData notification = notifications.getPairedItem(position);
|
|
|
|
if (!(notification instanceof NotificationViewData.Concrete)) {
|
|
|
|
Log.e(TAG, String.format(
|
|
|
|
"Expected NotificationViewData.Concrete, got %s instead at position: %d of %d",
|
|
|
|
notification == null ? "null" : notification.getClass().getSimpleName(),
|
|
|
|
position,
|
|
|
|
notifications.size() - 1
|
|
|
|
));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
StatusViewData.Concrete status = ((NotificationViewData.Concrete) notification).getStatusViewData();
|
|
|
|
StatusViewData.Concrete updatedStatus = new StatusViewData.Builder(status)
|
|
|
|
.setCollapsed(isCollapsed)
|
|
|
|
.createStatusViewData();
|
|
|
|
|
|
|
|
NotificationViewData.Concrete concreteNotification = (NotificationViewData.Concrete) notification;
|
|
|
|
NotificationViewData updatedNotification = new NotificationViewData.Concrete(
|
|
|
|
concreteNotification.getType(),
|
|
|
|
concreteNotification.getId(),
|
|
|
|
concreteNotification.getAccount(),
|
|
|
|
updatedStatus,
|
|
|
|
concreteNotification.isExpanded()
|
|
|
|
);
|
|
|
|
notifications.setPairedItem(position, updatedNotification);
|
|
|
|
adapter.updateItemWithNotify(position, updatedNotification, false);
|
|
|
|
|
|
|
|
// Since we cannot notify to the RecyclerView right away because it may be scrolling
|
|
|
|
// we run this when the RecyclerView is done doing measurements and other calculations.
|
|
|
|
// To test this is not bs: try getting a notification while scrolling, without wrapping
|
|
|
|
// notifyItemChanged in a .post() call. App will crash.
|
|
|
|
recyclerView.post(() -> adapter.notifyItemChanged(position, notification));
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onNotificationContentCollapsedChange(boolean isCollapsed, int position) {
|
|
|
|
onContentCollapsedChange(isCollapsed, position);
|
|
|
|
}
|
|
|
|
|
2017-06-25 15:07:41 +10:00
|
|
|
@Override
|
2017-01-27 11:34:32 +11:00
|
|
|
public void onViewTag(String tag) {
|
|
|
|
super.viewTag(tag);
|
|
|
|
}
|
2017-01-28 14:33:43 +11:00
|
|
|
|
2017-06-25 15:07:41 +10:00
|
|
|
@Override
|
2017-03-03 11:25:35 +11:00
|
|
|
public void onViewAccount(String id) {
|
|
|
|
super.viewAccount(id);
|
2017-01-28 14:33:43 +11:00
|
|
|
}
|
2017-04-22 18:41:49 +10:00
|
|
|
|
2017-11-08 06:36:19 +11:00
|
|
|
@Override
|
|
|
|
public void onViewStatusForNotificationId(String notificationId) {
|
|
|
|
for (Either<Placeholder, Notification> either : notifications) {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
Notification notification = either.asRightOrNull();
|
2018-03-03 23:24:03 +11:00
|
|
|
if (notification != null && notification.getId().equals(notificationId)) {
|
|
|
|
super.viewThread(notification.getStatus());
|
2017-11-08 06:36:19 +11:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Log.w(TAG, "Didn't find a notification for ID: " + notificationId);
|
|
|
|
}
|
|
|
|
|
2018-11-13 07:09:39 +11:00
|
|
|
public void onPreferenceChanged(String key) {
|
2017-06-26 19:15:47 +10:00
|
|
|
switch (key) {
|
|
|
|
case "fabHide": {
|
2018-11-13 07:09:39 +11:00
|
|
|
hideFab = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("fabHide", false);
|
2017-06-26 19:15:47 +10:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case "mediaPreviewEnabled": {
|
2018-11-13 07:09:39 +11:00
|
|
|
boolean enabled = accountManager.getActiveAccount().getMediaPreviewEnabled();
|
2018-08-25 03:47:27 +10:00
|
|
|
if (enabled != adapter.isMediaPreviewEnabled()) {
|
|
|
|
adapter.setMediaPreviewEnabled(enabled);
|
|
|
|
fullyRefresh();
|
|
|
|
}
|
2017-06-26 19:15:47 +10:00
|
|
|
break;
|
|
|
|
}
|
2017-04-22 18:41:49 +10:00
|
|
|
}
|
|
|
|
}
|
2017-06-26 19:15:47 +10:00
|
|
|
|
2017-07-13 05:54:52 +10:00
|
|
|
@Override
|
|
|
|
public void removeItem(int position) {
|
|
|
|
notifications.remove(position);
|
|
|
|
adapter.update(notifications.getPairedCopy());
|
|
|
|
}
|
|
|
|
|
2018-05-27 18:22:12 +10:00
|
|
|
private void removeAllByAccountId(String accountId) {
|
2017-07-13 05:54:52 +10:00
|
|
|
// using iterator to safely remove items while iterating
|
2017-11-06 03:11:00 +11:00
|
|
|
Iterator<Either<Placeholder, Notification>> iterator = notifications.iterator();
|
2017-07-13 05:54:52 +10:00
|
|
|
while (iterator.hasNext()) {
|
2017-11-06 03:11:00 +11:00
|
|
|
Either<Placeholder, Notification> notification = iterator.next();
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
Notification maybeNotification = notification.asRightOrNull();
|
2018-03-03 23:24:03 +11:00
|
|
|
if (maybeNotification != null && maybeNotification.getAccount().getId().equals(accountId)) {
|
2017-07-13 05:54:52 +10:00
|
|
|
iterator.remove();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
adapter.update(notifications.getPairedCopy());
|
|
|
|
}
|
|
|
|
|
|
|
|
private void onLoadMore() {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
if (bottomId == null) {
|
2018-08-27 05:10:38 +10:00
|
|
|
// already loaded everything
|
|
|
|
return;
|
|
|
|
}
|
Add support for collapsible statuses when they exceed 500 characters (#825)
* Update Gradle plugin to work with Android Studio 3.3 Canary
Android Studio 3.1.4 Stable doesn't render layout previews in this project
for whatever reason. Switching to the latest 3.3 Canary release fixes the
issue without affecting Gradle scripts but requires the new Android Gradle
plugin to match the new Android Studio release.
This commit will be reverted once development on the feature is done.
* Update gradle build script to allow installing debug builds alongside store version
This will allow developers, testers, etc to work on Tusky will not having to worry
about overwriting, uninstalling, fiddling with a preinstalled application which would
mean having to login again every time the development cycle starts/finishes and
manually reinstalling the app.
* Add UI changes to support collapsing statuses
The button uses subtle styling to not be distracting like the CW button on the timeline
The button is toggleable, full width to match the status textbox hitbox width and also
is shorter to not be too intrusive between the status text and images, or the post below
* Update status data model to store whether the message has been collapsed
* Update status action listener to notify of collapsed state changing
Provide stubs in all implementing classes and mark as TODO the stubs that
require a proper implementation for the feature to work.
* Add implementation code to handle status collapse/expand in timeline
Code has not been added elsewhere to simplify testing.
Once the code will be considered stable it will be also included in other
status action listener implementers.
* Add preferences so that users can toggle the collapsing of long posts
This is currently limited to a simple toggle, it would be nice to implement
a more advanced UI to offer the user more control over the feature.
* Update Gradle plugin to work with latest Android Studio 3.3 Canary 8
Just like the other commit, this will be reverted once the feature is working.
I simply don't want to deal with what changes in my installation of Android
Studio 3.1.4 Stable which breaks the layout preview rendering.
* Update data models and utils for statuses to better handle collapsing
I forgot that data isn't available from the API and can't really be built
from scratch using existing data due to preferences.
A new, extra boolean should fix the issue.
* Fix search breaking due to newly introduced variables in utils classes
* Fix timeline breaking due to newly introduced variables in utils classes
* Fix item status text for collapsed toggle being shown in the wrong state
* Update timeline fragment to refresh the list when collapsed settings change
* Add support for status content collapse in timeline viewholder
* Fix view holder truncating posts using temporary debug settings at 50 chars
* Add toggle support to notification layout as well
* Add support for collapsed statuses to search results
* Add support for expandable content to notifications too
* Update codebase with some suggested changes by @charlang
* Update more code with more suggestions and move null-safety into view data
* Update even more code with even more suggested code changes
* Revert a0a41ca and 0ee004d (Android Studio 3.1 to Android Studio 3.3 updates)
* Add an input filter utility class to reuse code for trimming statuses
* Update UI of statuses to show a taller collapsible button
* Update notification fragment logging to simplify null checks
* Add smartness to SmartLengthInputFilter such as word trimming and runway
* Fix posts with show more button even if bad ratio didn't collapse
* Fix thread view showing button but not collapsing by implementing the feature
* Fix spannable losing spans when collapsed and restore length to 500 characters
* Remove debug build suffix as per request
* Fix all the merging happened in f66d689, 623cad2 and 7056ba5
* Fix notification button spanning full width rather than content width
* Add a way to access a singleton to smart filter and use clearer code
* Update view holders using smart input filters to use more singletons
* Fix code style lacking spaces before boolean checks in ifs and others
* Remove all code related to collapsibility preferences, strings included
* Update style to match content warning toggle button
* Update strings to give cleaner differentiation between CW and collapse
* Update smart filter code to use fully qualified names to avoid confusion
2018-09-20 03:51:20 +10:00
|
|
|
|
|
|
|
// Check for out-of-bounds when loading
|
|
|
|
// This is required to allow full-timeline reloads of collapsible statuses when the settings
|
|
|
|
// change.
|
|
|
|
if (notifications.size() > 0) {
|
|
|
|
Either<Placeholder, Notification> last = notifications.get(notifications.size() - 1);
|
|
|
|
if (last.isRight()) {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
notifications.add(new Either.Left(Placeholder.getInstance()));
|
Add support for collapsible statuses when they exceed 500 characters (#825)
* Update Gradle plugin to work with Android Studio 3.3 Canary
Android Studio 3.1.4 Stable doesn't render layout previews in this project
for whatever reason. Switching to the latest 3.3 Canary release fixes the
issue without affecting Gradle scripts but requires the new Android Gradle
plugin to match the new Android Studio release.
This commit will be reverted once development on the feature is done.
* Update gradle build script to allow installing debug builds alongside store version
This will allow developers, testers, etc to work on Tusky will not having to worry
about overwriting, uninstalling, fiddling with a preinstalled application which would
mean having to login again every time the development cycle starts/finishes and
manually reinstalling the app.
* Add UI changes to support collapsing statuses
The button uses subtle styling to not be distracting like the CW button on the timeline
The button is toggleable, full width to match the status textbox hitbox width and also
is shorter to not be too intrusive between the status text and images, or the post below
* Update status data model to store whether the message has been collapsed
* Update status action listener to notify of collapsed state changing
Provide stubs in all implementing classes and mark as TODO the stubs that
require a proper implementation for the feature to work.
* Add implementation code to handle status collapse/expand in timeline
Code has not been added elsewhere to simplify testing.
Once the code will be considered stable it will be also included in other
status action listener implementers.
* Add preferences so that users can toggle the collapsing of long posts
This is currently limited to a simple toggle, it would be nice to implement
a more advanced UI to offer the user more control over the feature.
* Update Gradle plugin to work with latest Android Studio 3.3 Canary 8
Just like the other commit, this will be reverted once the feature is working.
I simply don't want to deal with what changes in my installation of Android
Studio 3.1.4 Stable which breaks the layout preview rendering.
* Update data models and utils for statuses to better handle collapsing
I forgot that data isn't available from the API and can't really be built
from scratch using existing data due to preferences.
A new, extra boolean should fix the issue.
* Fix search breaking due to newly introduced variables in utils classes
* Fix timeline breaking due to newly introduced variables in utils classes
* Fix item status text for collapsed toggle being shown in the wrong state
* Update timeline fragment to refresh the list when collapsed settings change
* Add support for status content collapse in timeline viewholder
* Fix view holder truncating posts using temporary debug settings at 50 chars
* Add toggle support to notification layout as well
* Add support for collapsed statuses to search results
* Add support for expandable content to notifications too
* Update codebase with some suggested changes by @charlang
* Update more code with more suggestions and move null-safety into view data
* Update even more code with even more suggested code changes
* Revert a0a41ca and 0ee004d (Android Studio 3.1 to Android Studio 3.3 updates)
* Add an input filter utility class to reuse code for trimming statuses
* Update UI of statuses to show a taller collapsible button
* Update notification fragment logging to simplify null checks
* Add smartness to SmartLengthInputFilter such as word trimming and runway
* Fix posts with show more button even if bad ratio didn't collapse
* Fix thread view showing button but not collapsing by implementing the feature
* Fix spannable losing spans when collapsed and restore length to 500 characters
* Remove debug build suffix as per request
* Fix all the merging happened in f66d689, 623cad2 and 7056ba5
* Fix notification button spanning full width rather than content width
* Add a way to access a singleton to smart filter and use clearer code
* Update view holders using smart input filters to use more singletons
* Fix code style lacking spaces before boolean checks in ifs and others
* Remove all code related to collapsibility preferences, strings included
* Update style to match content warning toggle button
* Update strings to give cleaner differentiation between CW and collapse
* Update smart filter code to use fully qualified names to avoid confusion
2018-09-20 03:51:20 +10:00
|
|
|
NotificationViewData viewData = new NotificationViewData.Placeholder(true);
|
|
|
|
notifications.setPairedItem(notifications.size() - 1, viewData);
|
|
|
|
recyclerView.post(() -> adapter.addItems(Collections.singletonList(viewData)));
|
|
|
|
}
|
2018-08-23 05:18:56 +10:00
|
|
|
}
|
|
|
|
|
2017-11-04 08:17:31 +11:00
|
|
|
sendFetchNotificationsRequest(bottomId, null, FetchEnd.BOTTOM, -1);
|
2017-06-30 16:31:58 +10:00
|
|
|
}
|
|
|
|
|
|
|
|
private void jumpToTop() {
|
|
|
|
layoutManager.scrollToPosition(0);
|
|
|
|
scrollListener.reset();
|
|
|
|
}
|
|
|
|
|
|
|
|
private void sendFetchNotificationsRequest(String fromId, String uptoId,
|
2017-11-04 08:17:31 +11:00
|
|
|
final FetchEnd fetchEnd, final int pos) {
|
2017-06-30 16:31:58 +10:00
|
|
|
/* 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) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (fetchEnd == FetchEnd.BOTTOM && bottomLoading) {
|
|
|
|
return;
|
|
|
|
}
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
if (fetchEnd == FetchEnd.TOP) {
|
2018-08-23 05:18:56 +10:00
|
|
|
topLoading = true;
|
|
|
|
}
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
if (fetchEnd == FetchEnd.BOTTOM) {
|
2018-08-23 05:18:56 +10:00
|
|
|
bottomLoading = true;
|
2017-06-30 16:31:58 +10:00
|
|
|
}
|
|
|
|
|
2017-11-04 08:17:31 +11:00
|
|
|
Call<List<Notification>> call = mastodonApi.notifications(fromId, uptoId, LOAD_AT_ONCE);
|
2017-06-30 16:31:58 +10:00
|
|
|
|
|
|
|
call.enqueue(new Callback<List<Notification>>() {
|
|
|
|
@Override
|
2017-10-28 08:39:36 +11:00
|
|
|
public void onResponse(@NonNull Call<List<Notification>> call,
|
|
|
|
@NonNull Response<List<Notification>> response) {
|
2017-06-30 16:31:58 +10:00
|
|
|
if (response.isSuccessful()) {
|
|
|
|
String linkHeader = response.headers().get("Link");
|
2017-11-04 08:17:31 +11:00
|
|
|
onFetchNotificationsSuccess(response.body(), linkHeader, fetchEnd, pos);
|
2017-06-30 16:31:58 +10:00
|
|
|
} else {
|
2017-11-04 08:17:31 +11:00
|
|
|
onFetchNotificationsFailure(new Exception(response.message()), fetchEnd, pos);
|
2017-06-30 16:31:58 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
2017-10-28 08:39:36 +11:00
|
|
|
public void onFailure(@NonNull Call<List<Notification>> call, @NonNull Throwable t) {
|
2017-11-04 08:17:31 +11:00
|
|
|
onFetchNotificationsFailure((Exception) t, fetchEnd, pos);
|
2017-06-30 16:31:58 +10:00
|
|
|
}
|
|
|
|
});
|
|
|
|
callList.add(call);
|
|
|
|
}
|
|
|
|
|
|
|
|
private void onFetchNotificationsSuccess(List<Notification> notifications, String linkHeader,
|
2017-11-04 08:17:31 +11:00
|
|
|
FetchEnd fetchEnd, int pos) {
|
2017-06-30 16:31:58 +10:00
|
|
|
List<HttpHeaderLink> links = HttpHeaderLink.parse(linkHeader);
|
|
|
|
switch (fetchEnd) {
|
|
|
|
case TOP: {
|
|
|
|
HttpHeaderLink previous = HttpHeaderLink.findByRelationType(links, "prev");
|
|
|
|
String uptoId = null;
|
|
|
|
if (previous != null) {
|
|
|
|
uptoId = previous.uri.getQueryParameter("since_id");
|
|
|
|
}
|
2019-01-12 08:07:40 +11:00
|
|
|
update(notifications, null);
|
2017-06-30 16:31:58 +10:00
|
|
|
break;
|
|
|
|
}
|
2017-11-04 08:17:31 +11:00
|
|
|
case MIDDLE: {
|
2017-11-06 03:11:00 +11:00
|
|
|
replacePlaceholderWithNotifications(notifications, pos);
|
2017-11-04 08:17:31 +11:00
|
|
|
break;
|
|
|
|
}
|
2017-06-30 16:31:58 +10:00
|
|
|
case BOTTOM: {
|
|
|
|
HttpHeaderLink next = HttpHeaderLink.findByRelationType(links, "next");
|
|
|
|
String fromId = null;
|
|
|
|
if (next != null) {
|
|
|
|
fromId = next.uri.getQueryParameter("max_id");
|
|
|
|
}
|
2018-08-23 05:18:56 +10:00
|
|
|
|
|
|
|
if (!this.notifications.isEmpty()
|
|
|
|
&& !this.notifications.get(this.notifications.size() - 1).isRight()) {
|
|
|
|
this.notifications.remove(this.notifications.size() - 1);
|
|
|
|
adapter.removeItemAndNotify(this.notifications.size());
|
|
|
|
}
|
|
|
|
|
2018-09-29 01:14:37 +10:00
|
|
|
if (adapter.getItemCount() > 0) {
|
2017-07-13 05:54:52 +10:00
|
|
|
addItems(notifications, fromId);
|
2017-06-30 16:31:58 +10:00
|
|
|
} else {
|
|
|
|
/* If this is the first fetch, also save the id from the "previous" link and
|
|
|
|
* treat this operation as a refresh so the scroll position doesn't get pushed
|
|
|
|
* down to the end. */
|
|
|
|
HttpHeaderLink previous = HttpHeaderLink.findByRelationType(links, "prev");
|
|
|
|
String uptoId = null;
|
|
|
|
if (previous != null) {
|
|
|
|
uptoId = previous.uri.getQueryParameter("since_id");
|
|
|
|
}
|
2019-01-12 08:07:40 +11:00
|
|
|
update(notifications, fromId);
|
2017-06-30 16:31:58 +10:00
|
|
|
}
|
2018-02-04 08:45:14 +11:00
|
|
|
|
2017-06-30 16:31:58 +10:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2018-02-04 08:45:14 +11:00
|
|
|
|
|
|
|
saveNewestNotificationId(notifications);
|
|
|
|
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
if (fetchEnd == FetchEnd.TOP) {
|
2018-08-23 05:18:56 +10:00
|
|
|
topLoading = false;
|
|
|
|
}
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
if (fetchEnd == FetchEnd.BOTTOM) {
|
2018-08-23 05:18:56 +10:00
|
|
|
bottomLoading = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (notifications.size() == 0 && adapter.getItemCount() == 0) {
|
2019-01-29 05:02:31 +11:00
|
|
|
this.statusView.setVisibility(View.VISIBLE);
|
|
|
|
this.statusView.setup(R.drawable.elephant_friend_empty, R.string.message_empty, null);
|
|
|
|
|
2017-06-30 16:31:58 +10:00
|
|
|
}
|
|
|
|
swipeRefreshLayout.setRefreshing(false);
|
2018-05-27 18:22:12 +10:00
|
|
|
progressBar.setVisibility(View.GONE);
|
2017-06-30 16:31:58 +10:00
|
|
|
}
|
|
|
|
|
2017-11-07 22:59:46 +11:00
|
|
|
private void onFetchNotificationsFailure(Exception exception, FetchEnd fetchEnd, int position) {
|
|
|
|
swipeRefreshLayout.setRefreshing(false);
|
|
|
|
if (fetchEnd == FetchEnd.MIDDLE && !notifications.get(position).isRight()) {
|
|
|
|
NotificationViewData placeholderVD =
|
|
|
|
new NotificationViewData.Placeholder(false);
|
|
|
|
notifications.setPairedItem(position, placeholderVD);
|
|
|
|
adapter.updateItemWithNotify(position, placeholderVD, true);
|
2019-01-29 05:02:31 +11:00
|
|
|
} else if (this.notifications.isEmpty()) {
|
|
|
|
this.statusView.setVisibility(View.VISIBLE);
|
|
|
|
swipeRefreshLayout.setEnabled(false);
|
|
|
|
if (exception instanceof IOException) {
|
|
|
|
this.statusView.setup(R.drawable.elephant_offline, R.string.error_network, __ -> {
|
|
|
|
this.progressBar.setVisibility(View.VISIBLE);
|
|
|
|
this.onRefresh();
|
|
|
|
return Unit.INSTANCE;
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
this.statusView.setup(R.drawable.elephant_error, R.string.error_generic, __ -> {
|
|
|
|
this.progressBar.setVisibility(View.VISIBLE);
|
|
|
|
this.onRefresh();
|
|
|
|
return Unit.INSTANCE;
|
|
|
|
});
|
|
|
|
}
|
2017-11-07 22:59:46 +11:00
|
|
|
}
|
|
|
|
Log.e(TAG, "Fetch failure: " + exception.getMessage());
|
2018-05-27 18:22:12 +10:00
|
|
|
progressBar.setVisibility(View.GONE);
|
2017-11-07 22:59:46 +11:00
|
|
|
}
|
|
|
|
|
2018-02-04 08:45:14 +11:00
|
|
|
private void saveNewestNotificationId(List<Notification> notifications) {
|
2018-04-23 01:20:01 +10:00
|
|
|
|
2018-02-04 08:45:14 +11:00
|
|
|
AccountEntity account = accountManager.getActiveAccount();
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
if (account != null) {
|
2019-02-01 05:03:34 +11:00
|
|
|
String lastNotificationId = account.getLastNotificationId();
|
2018-02-04 08:45:14 +11:00
|
|
|
|
2018-09-04 05:23:12 +10:00
|
|
|
for (Notification noti : notifications) {
|
2019-02-01 05:03:34 +11:00
|
|
|
if (isLessThan(lastNotificationId, noti.getId())) {
|
|
|
|
lastNotificationId = noti.getId();
|
2018-09-04 05:23:12 +10:00
|
|
|
}
|
2018-02-04 08:45:14 +11:00
|
|
|
}
|
|
|
|
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
if (!account.getLastNotificationId().equals(lastNotificationId)) {
|
2018-09-04 05:23:12 +10:00
|
|
|
Log.d(TAG, "saving newest noti id: " + lastNotificationId);
|
|
|
|
account.setLastNotificationId(lastNotificationId);
|
|
|
|
accountManager.saveAccount(account);
|
|
|
|
}
|
|
|
|
}
|
2018-02-04 08:45:14 +11:00
|
|
|
}
|
|
|
|
|
2019-01-12 08:07:40 +11:00
|
|
|
private void update(@Nullable List<Notification> newNotifications, @Nullable String fromId) {
|
2017-07-15 13:23:14 +10:00
|
|
|
if (ListUtils.isEmpty(newNotifications)) {
|
2017-07-13 05:54:52 +10:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (fromId != null) {
|
|
|
|
bottomId = fromId;
|
|
|
|
}
|
2017-11-06 03:11:00 +11:00
|
|
|
List<Either<Placeholder, Notification>> liftedNew =
|
|
|
|
liftNotificationList(newNotifications);
|
2017-07-13 05:54:52 +10:00
|
|
|
if (notifications.isEmpty()) {
|
2017-11-06 03:11:00 +11:00
|
|
|
notifications.addAll(liftedNew);
|
2017-07-13 05:54:52 +10:00
|
|
|
} else {
|
2017-11-06 03:11:00 +11:00
|
|
|
int index = notifications.indexOf(liftedNew.get(newNotifications.size() - 1));
|
2017-07-13 05:54:52 +10:00
|
|
|
for (int i = 0; i < index; i++) {
|
|
|
|
notifications.remove(0);
|
|
|
|
}
|
2017-11-06 03:11:00 +11:00
|
|
|
|
|
|
|
int newIndex = liftedNew.indexOf(notifications.get(0));
|
2017-07-13 05:54:52 +10:00
|
|
|
if (newIndex == -1) {
|
2017-11-06 03:11:00 +11:00
|
|
|
if (index == -1 && liftedNew.size() >= LOAD_AT_ONCE) {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
liftedNew.add(new Either.Left(Placeholder.getInstance()));
|
2017-11-04 08:17:31 +11:00
|
|
|
}
|
2017-11-06 03:11:00 +11:00
|
|
|
notifications.addAll(0, liftedNew);
|
2017-07-13 05:54:52 +10:00
|
|
|
} else {
|
2017-11-06 03:11:00 +11:00
|
|
|
notifications.addAll(0, liftedNew.subList(0, newIndex));
|
2017-07-13 05:54:52 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
adapter.update(notifications.getPairedCopy());
|
|
|
|
}
|
|
|
|
|
2017-11-04 08:17:31 +11:00
|
|
|
private void addItems(List<Notification> newNotifications, @Nullable String fromId) {
|
2018-08-27 05:10:38 +10:00
|
|
|
bottomId = fromId;
|
2017-07-15 13:23:14 +10:00
|
|
|
if (ListUtils.isEmpty(newNotifications)) {
|
|
|
|
return;
|
|
|
|
}
|
2017-07-13 05:54:52 +10:00
|
|
|
int end = notifications.size();
|
2017-11-06 03:11:00 +11:00
|
|
|
List<Either<Placeholder, Notification>> liftedNew = liftNotificationList(newNotifications);
|
|
|
|
Either<Placeholder, Notification> last = notifications.get(end - 1);
|
|
|
|
if (last != null && liftedNew.indexOf(last) == -1) {
|
|
|
|
notifications.addAll(liftedNew);
|
2017-07-13 05:54:52 +10:00
|
|
|
List<NotificationViewData> newViewDatas = notifications.getPairedCopy()
|
|
|
|
.subList(notifications.size() - newNotifications.size(),
|
2017-11-04 08:17:31 +11:00
|
|
|
notifications.size());
|
2017-07-14 11:31:31 +10:00
|
|
|
adapter.addItems(newViewDatas);
|
2017-07-13 05:54:52 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-06 03:11:00 +11:00
|
|
|
private void replacePlaceholderWithNotifications(List<Notification> newNotifications, int pos) {
|
|
|
|
// Remove placeholder
|
2017-11-04 08:17:31 +11:00
|
|
|
notifications.remove(pos);
|
|
|
|
|
|
|
|
if (ListUtils.isEmpty(newNotifications)) {
|
|
|
|
adapter.update(notifications.getPairedCopy());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2017-11-06 03:11:00 +11:00
|
|
|
List<Either<Placeholder, Notification>> liftedNew = liftNotificationList(newNotifications);
|
|
|
|
|
|
|
|
// If we fetched less posts than in the limit, it means that the hole is not filled
|
|
|
|
// If we fetched at least as much it means that there are more posts to load and we should
|
|
|
|
// insert new placeholder
|
|
|
|
if (newNotifications.size() >= LOAD_AT_ONCE) {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
liftedNew.add(new Either.Left(Placeholder.getInstance()));
|
2017-11-04 08:17:31 +11:00
|
|
|
}
|
|
|
|
|
2017-11-06 03:11:00 +11:00
|
|
|
notifications.addAll(pos, liftedNew);
|
2017-11-04 08:17:31 +11:00
|
|
|
adapter.update(notifications.getPairedCopy());
|
2017-11-06 03:11:00 +11:00
|
|
|
}
|
|
|
|
|
|
|
|
private final Function<Notification, Either<Placeholder, Notification>> notificationLifter =
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
Either.Right::new;
|
2017-11-04 08:17:31 +11:00
|
|
|
|
2017-11-06 03:11:00 +11:00
|
|
|
private List<Either<Placeholder, Notification>> liftNotificationList(List<Notification> list) {
|
|
|
|
return CollectionUtil.map(list, notificationLifter);
|
2017-11-04 08:17:31 +11:00
|
|
|
}
|
|
|
|
|
2017-06-26 19:15:47 +10:00
|
|
|
private void fullyRefresh() {
|
|
|
|
adapter.clear();
|
2017-07-13 05:54:52 +10:00
|
|
|
notifications.clear();
|
2017-11-04 08:17:31 +11:00
|
|
|
sendFetchNotificationsRequest(null, null, FetchEnd.TOP, -1);
|
2017-06-26 19:15:47 +10:00
|
|
|
}
|
2018-05-27 18:22:12 +10:00
|
|
|
|
|
|
|
@Nullable
|
|
|
|
private Pair<Integer, Notification> findReplyPosition(@NonNull String statusId) {
|
|
|
|
for (int i = 0; i < notifications.size(); i++) {
|
Caching toots (#809)
* Initial timeline cache implementation
* Fix build/DI errors for caching
* Rename timeline entities tables. Add migration. Add DB scheme file.
* Fix uniqueness problem, change offline strategy, improve mapping
* Try to merge in new statuses, fix bottom loading, fix saving spans.
* Fix reblogs IDs, fix inserting elements from top
* Send one more request to get latest timeline statuses
* Give Timeline placeholders string id. Rewrite Either in Kotlin
* Initial placeholder implementation for caching
* Fix crash on removing overlap statuses
* Migrate counters to long
* Remove unused counters. Add minimal TimelineDAOTest
* Fix bug with placeholder ID
* Update cache in response to events. Refactor TimelineCases
* Fix crash, reduce number of placeholders
* Fix crash, fix filtering, improve placeholder handling
* Fix migration, add 8-9 migration test
* Fix initial timeline update, remove more placeholders
* Add cleanup for old statuses
* Fix cleanup
* Delete ExampleInstrumentedTest
* Improve timeline UX regarding caching
* Fix typos
* Fix initial timeline update
* Cleanup/fix initial timeline update
* Workaround for weird behavior of first post on initial tl update.
* Change counter types back to int
* Clear timeline cache on logout
* Fix loading when timeline is completely empty
* Fix androidx migration issues
* Fix tests
* Apply caching feedback
* Save account emojis to cache
* Fix warnings and bugs
2019-01-15 08:05:08 +11:00
|
|
|
Notification notification = notifications.get(i).asRightOrNull();
|
2018-05-27 18:22:12 +10:00
|
|
|
if (notification != null
|
|
|
|
&& notification.getStatus() != null
|
|
|
|
&& notification.getType() == Notification.Type.MENTION
|
|
|
|
&& (statusId.equals(notification.getStatus().getId())
|
|
|
|
|| (notification.getStatus().getReblog() != null
|
|
|
|
&& statusId.equals(notification.getStatus().getReblog().getId())))) {
|
|
|
|
return new Pair<>(i, notification);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return null;
|
|
|
|
}
|
2017-01-08 09:24:02 +11:00
|
|
|
}
|