colin/sxmo-utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix truncated sms on first line return

Browse Source 
This problem has been introduced with 05fd5112

This time, we will use the json format with -J instead of parsing
manually this key-value format.
This commit is contained in:
Willow Barraco
2023-11-07 15:38:36 +01:00
parent 824ad04d59
commit 1654cde76d
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/modem/sxmo_modem.sh
View File

@@ -191,7 +191,7 @@ checkfornewtexts() {
# Loop each textid received and read out the data into appropriate logfile
for TEXTID in $TEXTIDS; do
TEXTDATA="$(mmcli -m any -s "$TEXTID" -K)"
TEXTDATA="$(mmcli -m any -s "$TEXTID" -J)"
# SMS with no TEXTID is an SMS WAP (I think). So skip.
if [ -z "$TEXTDATA" ]; then
stderr "Received an empty SMS (TEXTID: $TEXTID). I will assume this is an MMS."
@@ -202,15 +202,11 @@ checkfornewtexts() {
stderr "WARNING: mmsdtng not found or unconfigured, treating as normal sms."
fi
fi
TEXT="$(printf %b "$TEXTDATA" | grep sms.content.text | sed -E 's/^sms\.content\.text\s+:\s+//')"
NUM="$(
echo "$TEXTDATA" |
grep sms.content.number |
sed -E 's/^sms\.content\.number\s+:\s+//'
)"
TEXT="$(printf %s "$TEXTDATA" | jq -r .sms.content.text)"
NUM="$(printf %s "$TEXTDATA" | jq -r .sms.content.number)"
NUM="$(cleanupnumber "$NUM")"
TIME="$(echo "$TEXTDATA" | grep sms.properties.timestamp | sed -E 's/^sms\.properties\.timestamp\s+:\s+//')"
TIME="$(printf %s "$TEXTDATA" | jq -r .sms.properties.timestamp)"
TIME="$(date +%FT%H:%M:%S%z -d "$TIME")"
# Note: this will *not* block MMS, since we have to unpack the phone numbers for an MMS