Prepare release 2.34.1

7 files changed, 26 insertions, 6 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 80069389a..8327fc23e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 358
-        versionName "2.34.0"
+        versionCode 359
+        versionName "2.34.1"
         multiDexEnabled true
         renderscriptTargetApi 28 as int
         renderscriptSupportModeEnabled true
diff --git a/app/src/main/assets/changelogs/359.txt b/app/src/main/assets/changelogs/359.txt
index ae4001f19..d2c164b6b 100644
--- a/app/src/main/assets/changelogs/359.txt
+++ b/app/src/main/assets/changelogs/359.txt
@@ -1,6 +1,8 @@
 Added:
 - Gif support for some keyboards.
+- Support animated emoji for reactions
 
 Fixed:
-- Crash when Youtube videos in timelines
-- Announcements not displayed
\ No newline at end of file
+- Crash when playing Youtube videos in timelines
+- Announcements not displayed
+- A crash due to recent changes
\ No newline at end of file
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();
                         }
                     }