fix bug

berial · Aug 24, 2020 · 2c7598e · 2c7598e
1 parent f1f76c1
commit 2c7598e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/emoji/src/main/java/com/vanniktech/emoji/EmojiPopup.java b/emoji/src/main/java/com/vanniktech/emoji/EmojiPopup.java
@@ -93,8 +93,6 @@ public final class EmojiPopup implements EmojiResultReceiver.Receiver {
     @Nullable
     OnEmojiPopupDismissListener onEmojiPopupDismissListener;
 
-    EmojiView.OnCustomViewListener onCustomViewListener;
-
     int popupWindowHeight;
     int originalImeOptions = -1;
 
@@ -176,7 +174,6 @@ public void onDismiss() {
                 internalOnEmojiClickListener, internalOnEmojiLongClickListener, builder);
 
         emojiView.setOnEmojiBackspaceClickListener(internalOnEmojiBackspaceClickListener);
-        emojiView.setOnCustomViewListener(builder.onCustomViewListener);
 
         popupWindow.setContentView(emojiView);
         popupWindow.setInputMethodMode(PopupWindow.INPUT_METHOD_NOT_NEEDED);

diff --git a/emoji/src/main/java/com/vanniktech/emoji/EmojiView.java b/emoji/src/main/java/com/vanniktech/emoji/EmojiView.java
@@ -59,8 +59,6 @@ public final class EmojiView extends LinearLayout implements ViewPager.OnPageCha
     @Nullable
     OnEmojiBackspaceClickListener onEmojiBackspaceClickListener;
 
-    OnCustomViewListener onCustomViewListener;
-
     private int emojiTabLastSelectedIndex = -1;
 
     @SuppressWarnings("PMD.CyclomaticComplexity")
@@ -71,8 +69,8 @@ public EmojiView(final Context context,
 
         View.inflate(context, R.layout.emoji_view, this);
 
-        if (onCustomViewListener != null) {
-            onCustomViewListener.onCustomView(this);
+        if (builder.onCustomViewListener != null) {
+            builder.onCustomViewListener.onCustomView(this);
         }
 
         setOrientation(VERTICAL);
@@ -128,10 +126,6 @@ public void onClick(final View view) {
         }));
     }
 
-    public void setOnCustomViewListener(OnCustomViewListener listener) {
-        onCustomViewListener = listener;
-    }
-
     public void setOnEmojiBackspaceClickListener(@Nullable final OnEmojiBackspaceClickListener onEmojiBackspaceClickListener) {
         this.onEmojiBackspaceClickListener = onEmojiBackspaceClickListener;
     }