From e5570b2d10bf9fef440cae036ec449cfae0bb124 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 17 Jul 2020 16:55:04 +0200
Subject: [PATCH] Some fixes with quick replies

---
 .../app/fedilab/android/drawers/StatusListAdapter.java     | 2 +-
 .../app/fedilab/android/drawers/StatusListAdapter.java     | 2 +-
 .../app/fedilab/android/drawers/BaseStatusListAdapter.java | 7 +++----
 build.gradle                                               | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/common/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/common/java/app/fedilab/android/drawers/StatusListAdapter.java
index 80f48aeb1..a83a09085 100644
--- a/app/src/common/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/common/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -37,7 +37,7 @@ public class StatusListAdapter extends BaseStatusListAdapter {
         super(statusDrawerParams);
     }
 
-    public void statusAddReactionClick(Status status){
+    public void statusAddReactionClick(Status status, ViewHolder holder){
         EmojiManager.install(new EmojiOneProvider());
         final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(holder.status_add_reaction).setOnEmojiPopupDismissListener(() -> {
             InputMethodManager imm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE);
diff --git a/app/src/lite/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/lite/java/app/fedilab/android/drawers/StatusListAdapter.java
index ab87fbd34..eb07583f4 100644
--- a/app/src/lite/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/lite/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -25,7 +25,7 @@ public class StatusListAdapter extends BaseStatusListAdapter {
         super(statusDrawerParams);
     }
 
-    protected void statusAddReactionClick(Status status) {
+    protected void statusAddReactionClick(Status status, ViewHolder holder) {
         ((Activity) context).getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
     }
 
diff --git a/app/src/main/java/app/fedilab/android/drawers/BaseStatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/BaseStatusListAdapter.java
index b1555f8e0..7c6d71ac8 100644
--- a/app/src/main/java/app/fedilab/android/drawers/BaseStatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/BaseStatusListAdapter.java
@@ -202,7 +202,6 @@ public abstract class BaseStatusListAdapter extends RecyclerView.Adapter<Recycle
     public static boolean fetch_all_more = false;
     private final Object lock = new Object();
     protected Context context;
-    protected ViewHolder holder;
     protected RetrieveFeedsAsyncTask.Type type;
     protected int style;
     private List<Status> statuses;
@@ -609,7 +608,7 @@ public abstract class BaseStatusListAdapter extends RecyclerView.Adapter<Recycle
         final String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
 
         if (viewHolder.getItemViewType() != HIDDEN_STATUS) {
-            holder = (ViewHolder) viewHolder;
+            ViewHolder holder = (ViewHolder) viewHolder;
 
             holder.startUpdateTimer();
             final Status status = statuses.get(i);
@@ -1011,7 +1010,7 @@ public abstract class BaseStatusListAdapter extends RecyclerView.Adapter<Recycle
                 holder.reactions_view.setLayoutManager(layoutManager);
 
 
-                holder.status_add_reaction.setOnClickListener(v -> statusAddReactionClick(status));
+                holder.status_add_reaction.setOnClickListener(v -> statusAddReactionClick(status, holder));
             }
 
             holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
@@ -3016,7 +3015,7 @@ public abstract class BaseStatusListAdapter extends RecyclerView.Adapter<Recycle
 
     }
 
-    protected abstract void statusAddReactionClick(Status status);
+    protected abstract void statusAddReactionClick(Status status, ViewHolder viewHolder);
 
     protected abstract void notificationCharts(Status status);
 
diff --git a/build.gradle b/build.gradle
index 7d3471549..a6ad4908b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files