diff options
author | tom79 <tschneider.ac@gmail.com> | 2020-04-11 19:18:08 +0200 |
---|---|---|
committer | tom79 <tschneider.ac@gmail.com> | 2020-04-11 19:18:08 +0200 |
commit | 27448a0c4a7f5d243f3b968a4fa102f329b2f7c4 (patch) | |
tree | db0b84966d4eae4a7dd1a2583aea592a730cc65b /app/src/main/java | |
parent | 7f656e1ec16e54f41756b87278cc7f5e1fc8aa34 (diff) |
Prepare release 2.34.1
Diffstat (limited to 'app/src/main/java')
5 files changed, 20 insertions, 2 deletions
diff --git a/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java index fab8f13c5..f21dde88e 100644 --- a/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java @@ -293,6 +293,7 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve super.onDestroy(); if (receive_action != null) LocalBroadcastManager.getInstance(ShowConversationActivity.this).unregisterReceiver(receive_action); + detailsStatus = null; } @Override diff --git a/app/src/main/java/app/fedilab/android/client/API.java b/app/src/main/java/app/fedilab/android/client/API.java index ec2f9520b..525b0c0dc 100644 --- a/app/src/main/java/app/fedilab/android/client/API.java +++ b/app/src/main/java/app/fedilab/android/client/API.java @@ -19,6 +19,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.database.sqlite.SQLiteDatabase; import android.os.Bundle; + import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.google.gson.JsonArray; diff --git a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java index bf2d4ff67..f87383615 100644 --- a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java @@ -138,7 +138,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On int firstPosition = ((LinearLayoutManager) mRecyclerView.getLayoutManager()).findFirstCompletelyVisibleItemPosition(); int lastPosition = ((LinearLayoutManager) mRecyclerView.getLayoutManager()).findLastCompletelyVisibleItemPosition(); for (int i = firstPosition; i <= lastPosition; i++) { - if (mRecyclerView.findViewHolderForAdapterPosition(i) != null) { + if (mRecyclerView.findViewHolderForAdapterPosition(i) != null && mRecyclerView.findViewHolderForAdapterPosition(i) instanceof ViewHolder) { ((ViewHolder) Objects.requireNonNull(mRecyclerView.findViewHolderForAdapterPosition(i))).updateAnimatedEmoji(); } } diff --git a/app/src/main/java/app/fedilab/android/drawers/ReactionAdapter.java b/app/src/main/java/app/fedilab/android/drawers/ReactionAdapter.java index b2eb4fd2f..e011d23b4 100644 --- a/app/src/main/java/app/fedilab/android/drawers/ReactionAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/ReactionAdapter.java @@ -25,6 +25,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import com.bumptech.glide.Glide; + import java.util.List; import app.fedilab.android.R; @@ -67,6 +69,20 @@ public class ReactionAdapter extends RecyclerView.Adapter { holder.reaction_emoji.setVisibility(View.VISIBLE); holder.reaction_emoji.setContentDescription(reaction.getName()); Helper.loadGiF(holder.itemView.getContext(), reaction.getUrl(), holder.reaction_emoji); + + if( !reaction.getUrl().contains("gif")) { + Glide.with(holder.itemView.getContext()) + .asDrawable() + .load(reaction.getUrl()) + .thumbnail(0.1f) + .into(holder.reaction_emoji); + }else{ + Glide.with(holder.itemView.getContext()) + .asGif() + .load(reaction.getUrl()) + .thumbnail(0.1f) + .into(holder.reaction_emoji); + } } else { holder.reaction_name.setText(reaction.getName()); holder.reaction_name.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index d1027c085..cd5d921e1 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -238,7 +238,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct int firstPosition = ((LinearLayoutManager) mRecyclerView.getLayoutManager()).findFirstCompletelyVisibleItemPosition(); int lastPosition = ((LinearLayoutManager) mRecyclerView.getLayoutManager()).findLastCompletelyVisibleItemPosition(); for (int i = firstPosition; i <= lastPosition; i++) { - if (mRecyclerView.findViewHolderForAdapterPosition(i) != null) { + if (mRecyclerView.findViewHolderForAdapterPosition(i) != null && mRecyclerView.findViewHolderForAdapterPosition(i) instanceof ViewHolder) { ((ViewHolder) Objects.requireNonNull(mRecyclerView.findViewHolderForAdapterPosition(i))).updateAnimatedEmoji(); } } |