From 907d4b10d93262d2fee68fa0a96682f242b30209 Mon Sep 17 00:00:00 2001
From: sh123 <sh123@users.noreply.github.com>
Date: Thu, 3 Dec 2020 16:01:01 +0200
Subject: [PATCH] Small refactoring

---
 .../com/radio/codec2talkie/Codec2Player.java   | 18 ++++++++----------
 .../com/radio/codec2talkie/MainActivity.java   |  5 +----
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/radio/codec2talkie/Codec2Player.java b/app/src/main/java/com/radio/codec2talkie/Codec2Player.java
index b1d0958..283dba4 100644
--- a/app/src/main/java/com/radio/codec2talkie/Codec2Player.java
+++ b/app/src/main/java/com/radio/codec2talkie/Codec2Player.java
@@ -37,7 +37,7 @@ public class Codec2Player extends Thread {
     private byte _kissCmd = KISS_CMD_NOCMD;
 
     // common audio
-    public static int PLAYER_EXIT = 1;
+    public static int PLAYER_DISCONNECT = 1;
 
     private final long _codec2Con;
 
@@ -164,14 +164,12 @@ public class Codec2Player extends Thread {
                     }
                     break;
                 case GET_CMD:
-                    if (b != KISS_FEND) {
-                        if (b == KISS_CMD_DATA) {
-                            _playbackAudioAudioEncodedBufferIndex = 0;
-                            _kissCmd = b;
-                            _kissState = KissState.GET_DATA;
-                        } else {
-                            kissResetState();
-                        }
+                    if (b == KISS_CMD_DATA) {
+                        _playbackAudioAudioEncodedBufferIndex = 0;
+                        _kissCmd = b;
+                        _kissState = KissState.GET_DATA;
+                    } else if (b != KISS_FEND) {
+                        kissResetState();
                     }
                     break;
                 case GET_DATA:
@@ -253,7 +251,7 @@ public class Codec2Player extends Thread {
         Codec2.destroy(_codec2Con);
 
         Message msg = Message.obtain();
-        msg.what = PLAYER_EXIT;
+        msg.what = PLAYER_DISCONNECT;
         _onPlayerStateChanged.sendMessage(msg);
     }
 }
diff --git a/app/src/main/java/com/radio/codec2talkie/MainActivity.java b/app/src/main/java/com/radio/codec2talkie/MainActivity.java
index 36f3385..337f6cb 100644
--- a/app/src/main/java/com/radio/codec2talkie/MainActivity.java
+++ b/app/src/main/java/com/radio/codec2talkie/MainActivity.java
@@ -6,7 +6,6 @@ import androidx.core.content.ContextCompat;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
@@ -15,13 +14,11 @@ import android.os.Looper;
 import android.os.Message;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -117,7 +114,7 @@ public class MainActivity extends AppCompatActivity {
     private final Handler onPlayerStateChanged = new Handler(Looper.getMainLooper()) {
         @Override
         public void handleMessage(Message msg) {
-            if (msg.what == Codec2Player.PLAYER_EXIT) {
+            if (msg.what == Codec2Player.PLAYER_DISCONNECT) {
                 Toast.makeText(getBaseContext(), "Bluetooth disconnected", Toast.LENGTH_SHORT).show();
                 startBluetoothConnectActivity();
             }