From 2c7eb04b698c1f75b7233346eea097b3dd85ffb9 Mon Sep 17 00:00:00 2001 From: sh123 Date: Thu, 7 Dec 2023 14:26:07 +0200 Subject: [PATCH] Fix hang issue with messages longer than 67 characters --- codec2talkie/build.gradle | 4 ++-- .../radio/codec2talkie/protocol/aprs/AprsDataTextMessage.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/codec2talkie/build.gradle b/codec2talkie/build.gradle index d4bec50..41916c9 100644 --- a/codec2talkie/build.gradle +++ b/codec2talkie/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.radio.codec2talkie" minSdkVersion 23 targetSdkVersion 30 - versionCode 165 - versionName "1.65" + versionCode 166 + versionName "1.66" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/aprs/AprsDataTextMessage.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/aprs/AprsDataTextMessage.java index 790434f..ec79d5f 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/aprs/AprsDataTextMessage.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/aprs/AprsDataTextMessage.java @@ -94,14 +94,14 @@ public class AprsDataTextMessage implements AprsData { } } else { // message requires acknowledge {xxxxx (for auto ack) - p = Pattern.compile("^(.+){0,67}[{](\\d+){1,5}$", Pattern.DOTALL); + p = Pattern.compile("^.+[{](\\d+){1,5}$", Pattern.DOTALL); m = p.matcher(stringMessage); if (m.find()) { this.textMessage = m.group(1); String ackNumStr = m.group(2); if (ackNumStr != null) this.ackId = Integer.parseInt(ackNumStr); - } else if (stringMessage.length() <= 67) { + } else { this.textMessage = stringMessage; } }