Commit 7e30ba8f authored by Thomas's avatar Thomas
Browse files

Speed-up Nitter

parent 8645f6d5

app/src/main/java/app/fedilab/android/client/entities/nitter/Nitter.java

+1 −2
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ public class Nitter implements Serializable { 
            account.avatar = nitterAccount.image.url;

            account.avatar_static = nitterAccount.image.url;

            account.url = nitterAccount.image.link;

            status.account = account;

        } else {

            account.id = feedItem.guid;

            account.acct = feedItem.creator.replace("@", "");
@@ -124,8 +123,8 @@ public class Nitter implements Serializable { 
            account.avatar = "";

            account.avatar_static = "";

            account.url = feedItem.link;

            status.account = account;

        }

        status.account = account;



        if (feedItem.description != null) {

            Pattern imgPattern = Pattern.compile("<img [^>]*src=\"([^\"]+)\"[^>]*>");

app/src/main/java/app/fedilab/android/helper/Helper.java

+3 −0
Original line number Diff line number Diff line
@@ -588,6 +588,9 @@ public class Helper { 
     * @return String

     */

    public static String longDateToString(Date date) {

        if (date == null) {

            date = new Date();

        }

        DateFormat df = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT, Locale.getDefault());

        return df.format(date);

    }

app/src/main/java/app/fedilab/android/ui/drawer/ContextAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class ContextAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder 
        StatusesVM statusesVM = new ViewModelProvider((ViewModelStoreOwner) context).get(StatusesVM.class);

        SearchVM searchVM = new ViewModelProvider((ViewModelStoreOwner) context).get(SearchVM.class);

        StatusAdapter.StatusViewHolder holder = (StatusAdapter.StatusViewHolder) viewHolder;

        statusManagement(context, statusesVM, searchVM, holder, this, statusList, null, status, Timeline.TimeLineEnum.UNKNOWN, false, true);

        statusManagement(context, statusesVM, searchVM, holder, this, statusList, status, Timeline.TimeLineEnum.UNKNOWN, false, true);

        //Hide/Show specific view



    }

app/src/main/java/app/fedilab/android/ui/drawer/NotificationAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public class NotificationAdapter extends RecyclerView.Adapter<RecyclerView.ViewH 
            }

            StatusesVM statusesVM = new ViewModelProvider((ViewModelStoreOwner) context).get(StatusesVM.class);

            SearchVM searchVM = new ViewModelProvider((ViewModelStoreOwner) context).get(SearchVM.class);

            statusManagement(context, statusesVM, searchVM, holderStatus, this, null, notificationList, notification.status, Timeline.TimeLineEnum.NOTIFICATION, false, true);

            statusManagement(context, statusesVM, searchVM, holderStatus, this, null, notification.status, Timeline.TimeLineEnum.NOTIFICATION, false, true);

            holderStatus.bindingNotification.status.dateShort.setText(Helper.dateDiff(context, notification.created_at));

            holderStatus.bindingNotification.containerTransparent.setAlpha(.3f);

            if (getItemViewType(position) == TYPE_MENTION || getItemViewType(position) == TYPE_STATUS || getItemViewType(position) == TYPE_REACTION) {

app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java

+2 −5
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ import app.fedilab.android.activities.ProfileActivity; 
import app.fedilab.android.activities.ReportActivity;

import app.fedilab.android.activities.StatusInfoActivity;

import app.fedilab.android.client.entities.api.Attachment;

import app.fedilab.android.client.entities.api.Notification;

import app.fedilab.android.client.entities.api.Poll;

import app.fedilab.android.client.entities.api.Reaction;

import app.fedilab.android.client.entities.api.Status;
@@ -289,7 +288,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
     * @param holder           StatusViewHolder

     * @param adapter          RecyclerView.Adapter<RecyclerView.ViewHolder> - General adapter that can be for {@link StatusAdapter} or {@link NotificationAdapter}

     * @param statusList       List<Status>

     * @param notificationList List<Notification>

     * @param timelineType     Timeline.TimeLineEnum timelineTypeTimeline.TimeLineEnum

     * @param status           {@link Status}

     */
@@ -300,7 +298,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                                        StatusViewHolder holder,

                                        RecyclerView.Adapter<RecyclerView.ViewHolder> adapter,

                                        List<Status> statusList,

                                        List<Notification> notificationList,

                                        Status status,

                                        Timeline.TimeLineEnum timelineType,

                                        boolean minified, boolean canBeFederated) {
@@ -935,7 +932,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
            holder.binding.visibilitySmall.setVisibility(View.GONE);

        } else {

            holder.binding.visibilitySmall.setImageResource(ressource);

            if (displayCounters) {

            if (displayCounters && canBeFederated) {

                holder.binding.statusInfo.setVisibility(View.VISIBLE);

                holder.binding.dateShort.setVisibility(View.GONE);

                holder.binding.visibilitySmall.setVisibility(View.GONE);
@@ -1940,7 +1937,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
            StatusViewHolder holder = (StatusViewHolder) viewHolder;

            StatusesVM statusesVM = new ViewModelProvider((ViewModelStoreOwner) context).get(StatusesVM.class);

            SearchVM searchVM = new ViewModelProvider((ViewModelStoreOwner) context).get(SearchVM.class);

            statusManagement(context, statusesVM, searchVM, holder, this, statusList, null, status, timelineType, minified, canBeFederated);

            statusManagement(context, statusesVM, searchVM, holder, this, statusList, status, timelineType, minified, canBeFederated);

        } else if (viewHolder.getItemViewType() == STATUS_ART) {

            StatusViewHolder holder = (StatusViewHolder) viewHolder;

            MastodonHelper.loadPPMastodon(holder.bindingArt.artPp, status.account);