1 files changed, 7 insertions, 9 deletions
diff --git a/app/src/main/java/app/fedilab/android/imageeditor/EmojiBSFragment.java b/app/src/main/java/app/fedilab/android/imageeditor/EmojiBSFragment.java
index 894875914..af3f0c49d 100644
--- a/app/src/main/java/app/fedilab/android/imageeditor/EmojiBSFragment.java
+++ b/app/src/main/java/app/fedilab/android/imageeditor/EmojiBSFragment.java
@@ -18,6 +18,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.Objects;
 
 import app.fedilab.android.R;
 import ja.burhanrashid52.photoeditor.PhotoEditor;
@@ -46,7 +47,7 @@ public class EmojiBSFragment extends BottomSheetDialogFragment {
 
     @SuppressLint("RestrictedApi")
     @Override
-    public void setupDialog(Dialog dialog, int style) {
+    public void setupDialog(@NotNull Dialog dialog, int style) {
         super.setupDialog(dialog, style);
         View contentView = View.inflate(getContext(), R.layout.fragment_bottom_sticker_emoji_dialog, null);
         dialog.setContentView(contentView);
@@ -75,7 +76,7 @@ public class EmojiBSFragment extends BottomSheetDialogFragment {
 
     public class EmojiAdapter extends RecyclerView.Adapter<EmojiAdapter.ViewHolder> {
 
-        ArrayList<String> emojisList = PhotoEditor.getEmojis(getActivity());
+        ArrayList<String> emojisList = PhotoEditor.getEmojis(Objects.requireNonNull(getActivity()));
 
         @NotNull
         @Override
@@ -101,14 +102,11 @@ public class EmojiBSFragment extends BottomSheetDialogFragment {
                 super(itemView);
                 txtEmoji = itemView.findViewById(R.id.txtEmoji);
 
-                itemView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        if (mEmojiListener != null) {
-                            mEmojiListener.onEmojiClick(emojisList.get(getLayoutPosition()));
-                        }
-                        dismiss();
+                itemView.setOnClickListener(v -> {
+                    if (mEmojiListener != null) {
+                        mEmojiListener.onEmojiClick(emojisList.get(getLayoutPosition()));
                     }
+                    dismiss();
                 });
             }
         }