1 files changed, 18 insertions, 35 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/ChatFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/ChatFragment.java
index efdf0c7f..cec28722 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/ChatFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/ChatFragment.java
@@ -9,6 +9,8 @@ import java.util.Collections;
 import java.util.List;
 import android.os.Bundle;
 import android.os.Handler;
+
+import androidx.annotation.NonNull;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -24,7 +26,6 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ListView;
-import android.widget.TextView;
 import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.domain.ChatMessage;
 import github.daneren2005.dsub.service.MusicService;
@@ -42,7 +43,6 @@ import java.util.concurrent.TimeUnit;
  * @author Joshua Bahnsen
  */
 public class ChatFragment extends SubsonicFragment {
-	private static final String TAG = ChatFragment.class.getSimpleName();
 	private ListView chatListView;
 	private EditText messageEditText;
 	private ImageButton sendButton;
@@ -56,7 +56,7 @@ public class ChatFragment extends SubsonicFragment {
 
 		if(bundle != null) {
 			List<ChatMessage> abstractList = (List<ChatMessage>) bundle.getSerializable(Constants.FRAGMENT_LIST);
-			messageList = new ArrayList<ChatMessage>(abstractList);
+			messageList = new ArrayList<>(abstractList);
 		}
 	}
 
@@ -73,12 +73,7 @@ public class ChatFragment extends SubsonicFragment {
 		messageEditText = (EditText) rootView.findViewById(R.id.chat_edittext);
 		sendButton = (ImageButton) rootView.findViewById(R.id.chat_send);
 
-		sendButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				sendMessage();
-			}
-		});
+		sendButton.setOnClickListener(view -> sendMessage());
 
 		chatListView = (ListView) rootView.findViewById(R.id.chat_entries);
 		chatListView.setStackFromBottom(true);
@@ -99,21 +94,17 @@ public class ChatFragment extends SubsonicFragment {
 			}
 		});
 
-		messageEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-
-			@Override
-			public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-				if (actionId == EditorInfo.IME_ACTION_DONE || (actionId == EditorInfo.IME_NULL && event.getAction() == KeyEvent.ACTION_DOWN)) {
-					sendMessage();
-					return true;
-				}
-
-				return false;
+		messageEditText.setOnEditorActionListener((v, actionId, event) -> {
+			if (actionId == EditorInfo.IME_ACTION_DONE || (actionId == EditorInfo.IME_NULL && event.getAction() == KeyEvent.ACTION_DOWN)) {
+				sendMessage();
+				return true;
 			}
+
+			return false;
 		});
 
 		if(messageList == null) {
-			messageList = new ArrayList<ChatMessage>();
+			messageList = new ArrayList<>();
 			refresh(true);
 		} else {
 			for (ChatMessage message : messageList) {
@@ -139,21 +130,13 @@ public class ChatFragment extends SubsonicFragment {
 		super.onStart();
 		
 		final Handler handler = new Handler();
-		Runnable runnable = new Runnable() {
-			@Override
-			public void run() {
-				handler.post(new Runnable() {
-					@Override
-					public void run() {
-						if(primaryFragment) {
-							load(false);
-						} else {
-							invalidated = true;
-						}
-					}
-				});
+		Runnable runnable = () -> handler.post(() -> {
+			if(primaryFragment) {
+				load(false);
+			} else {
+				invalidated = true;
 			}
-		};
+		});
 
 		SharedPreferences prefs = Util.getPreferences(context);
 		long refreshRate = Integer.parseInt(prefs.getString(Constants.PREFERENCES_KEY_CHAT_REFRESH, "30"));
@@ -173,7 +156,7 @@ public class ChatFragment extends SubsonicFragment {
 	}
 	
 	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
+	public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater menuInflater) {
 		menuInflater.inflate(R.menu.abstract_top_menu, menu);
 	}