From 6fcf2f38ff4ae8722ff9a1ed988c35bd8481b17b Mon Sep 17 00:00:00 2001
From: sh123 <sh123@users.noreply.github.com>
Date: Sat, 9 Dec 2023 16:17:25 +0200
Subject: [PATCH] Refactoring

---
 codec2talkie/build.gradle                                   | 4 ++--
 ...FrameAggregator.java => AudioCodec2FrameAggregator.java} | 6 +++---
 .../com/radio/codec2talkie/protocol/ProtocolFactory.java    | 2 +-
 .../src/main/java/com/radio/codec2talkie/protocol/Raw.java  | 1 +
 .../codec2talkie/settings/AprsSymbolSelectionActivity.java  | 1 -
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename codec2talkie/src/main/java/com/radio/codec2talkie/protocol/{AudioFrameAggregator.java => AudioCodec2FrameAggregator.java} (96%)

diff --git a/codec2talkie/build.gradle b/codec2talkie/build.gradle
index f3ae5c4..3289356 100644
--- a/codec2talkie/build.gradle
+++ b/codec2talkie/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.radio.codec2talkie"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 166
-        versionName "1.66"
+        versionCode 167
+        versionName "1.67"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioFrameAggregator.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioCodec2FrameAggregator.java
similarity index 96%
rename from codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioFrameAggregator.java
rename to codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioCodec2FrameAggregator.java
index 7f3a1d1..f456dc4 100644
--- a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioFrameAggregator.java
+++ b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioCodec2FrameAggregator.java
@@ -17,9 +17,9 @@ import com.ustadmobile.codec2.Codec2;
 import java.io.IOException;
 import java.util.Arrays;
 
-public class AudioFrameAggregator implements Protocol {
+public class AudioCodec2FrameAggregator implements Protocol {
 
-    private static final String TAG = AudioFrameAggregator.class.getSimpleName();
+    private static final String TAG = AudioCodec2FrameAggregator.class.getSimpleName();
 
     private final Protocol _childProtocol;
 
@@ -35,7 +35,7 @@ public class AudioFrameAggregator implements Protocol {
     private final SharedPreferences _sharedPreferences;
     private ProtocolCallback _parentProtocolCallback;
 
-    public AudioFrameAggregator(Protocol childProtocol, SharedPreferences sharedPreferences) {
+    public AudioCodec2FrameAggregator(Protocol childProtocol, SharedPreferences sharedPreferences) {
         _childProtocol = childProtocol;
         _sharedPreferences = sharedPreferences;
     }
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/ProtocolFactory.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/ProtocolFactory.java
index cd9c955..a018fa8 100644
--- a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/ProtocolFactory.java
+++ b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/ProtocolFactory.java
@@ -107,7 +107,7 @@ public class ProtocolFactory {
                 proto = new Recorder(proto, sharedPreferences);
             }
 
-            proto = new AudioFrameAggregator(proto, sharedPreferences);
+            proto = new AudioCodec2FrameAggregator(proto, sharedPreferences);
             proto = new AudioCodec2(proto, sharedPreferences);
         }
 
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Raw.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Raw.java
index ee3136e..1df66ee 100644
--- a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Raw.java
+++ b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Raw.java
@@ -60,6 +60,7 @@ public class Raw implements Protocol {
     public boolean receive() throws IOException {
         int bytesRead = _transport.read(_rxDataBuffer);
         if (bytesRead > 0) {
+            // NOTE, default data is compressed audio, upper layer should distinguish
             _parentProtocolCallback.onReceiveCompressedAudio(null, null, Arrays.copyOf(_rxDataBuffer, bytesRead));
             return true;
         }
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/settings/AprsSymbolSelectionActivity.java b/codec2talkie/src/main/java/com/radio/codec2talkie/settings/AprsSymbolSelectionActivity.java
index cdebb07..a276359 100644
--- a/codec2talkie/src/main/java/com/radio/codec2talkie/settings/AprsSymbolSelectionActivity.java
+++ b/codec2talkie/src/main/java/com/radio/codec2talkie/settings/AprsSymbolSelectionActivity.java
@@ -18,7 +18,6 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.PreferenceManager;
 
 import com.radio.codec2talkie.R;
-import com.radio.codec2talkie.protocol.AudioFrameAggregator;
 import com.radio.codec2talkie.protocol.aprs.tools.AprsSymbolTable;
 
 public class AprsSymbolSelectionActivity extends AppCompatActivity {