Fix QMI USSD async response handling and prevent st terminal popup

overlay/rootfs/usr/bin/sxmo_modemmonitor.sh

@@ -115,8 +115,8 @@ mainloop() {
       esac
 
       if [ "$CHANGED" = "1" ]; then
-        # Fetch message (third argument) in sxmo_ussd.sh to save time in this loop
-        sxmo_terminal.sh sxmo_ussd.sh "$MODEM" "$TYPE" "" &
+        # Handle unsolicited USSD in background without spawning a terminal window
+        sxmo_ussd.sh "$MODEM" "$TYPE" "" &
       fi
 
     done &

overlay/rootfs/usr/bin/sxmo_ussd.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright 2022 Sxmo Contributors
+
+# include common definitions
+# shellcheck source=scripts/core/sxmo_common.sh
+. sxmo_common.sh
+
+MODEM="$1"
+TYPE="$2"
+MESSAGE="${3:-}"
+
+# If xdialer, xmodem, or msm-modem-uim-selection ussd is actively handling USSD,
+# do not interfere with the active USSD session.
+RDIR="${XDG_RUNTIME_DIR:-/tmp}"
+if [ -f "$RDIR/xdialer.pid" ] || [ -f "$RDIR/xmodem.pid" ] || \
+   pgrep -f "msm-modem-uim-selection ussd" >/dev/null 2>&1; then
+  exit 0
+fi
+
+MM_IFACE="org.freedesktop.ModemManager1"
+DBUS_PROP_IFACE="org.freedesktop.DBus.Properties"
+USSD_IFACE="org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd"
+
+if [ "$TYPE" = "NetworkNotification" ] || [ "$TYPE" = "NetworkRequest" ]; then
+  MESSAGE="$(busctl --json=short call "$MM_IFACE" "$MODEM" "$DBUS_PROP_IFACE" Get ss "$USSD_IFACE" "$TYPE" 2>/dev/null | jq -r '.data[].data // empty' 2>/dev/null || true)"
+fi
+
+if [ -z "$MESSAGE" ]; then
+  exit 0
+fi
+
+sxmo_notify_user.sh "USSD: $MESSAGE"

overlay/rootfs/usr/libexec/msm-modem-uim-selection

@@ -1014,23 +1014,80 @@ case "$cmd" in
       echo "ERROR: Empty USSD code"
       exit 1
     fi
-    mm_state="$(mmcli -m any -K 2>/dev/null | awk -F': ' '$1 == "modem.generic.state" {print $2; exit}')"
+    mm_state="$(mmcli -m any -K 2>/dev/null | awk -F': ' '$1 == "modem.generic.state" {print $2; exit}' || true)"
     if [ "$mm_state" = "disabled" ] || [ -z "$mm_state" ]; then
       mmcli -m any -e >/dev/null 2>&1 || true
       sleep 1
     fi
+    modem_dbus_path="$(mmcli -m any -K 2>/dev/null | awk -F': ' '$1 == "modem.dbus-path" {print $2; exit}' || true)"
+    get_ussd_prop() {
+      prop_name="$1"
+      if [ -n "$modem_dbus_path" ] && command -v busctl >/dev/null 2>&1 && command -v jq >/dev/null 2>&1; then
+        busctl --json=short call org.freedesktop.ModemManager1 "$modem_dbus_path" \
+          org.freedesktop.DBus.Properties Get ss \
+          org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd "$prop_name" 2>/dev/null | \
+          jq -r '.data[].data // empty' 2>/dev/null || true
+      fi
+    }
+    prev_notif="$(get_ussd_prop NetworkNotification)"
+    prev_req="$(get_ussd_prop NetworkRequest)"
+    ussd_st="$(mmcli -m any -K 2>/dev/null | awk -F': ' '$1 == "modem.3gpp.ussd.status" || $1 == "modem.3gpp.ussd.state" {print $2; exit}' || true)"
+    if [ "$ussd_mode" = "respond" ] && [ "$ussd_st" != "user-response" ]; then
+      case "$ussd_code" in
+        \**\#|\#*\#)
+          ussd_mode="initiate"
+          ;;
+      esac
+    fi
+    mm_rc=0
+    mm_out=""
     if [ "$ussd_mode" = "respond" ]; then
-      mm_out="$(mmcli -m any --3gpp-ussd-respond="$ussd_code" 2>&1)"
-      mm_rc=$?
+      mm_out="$(mmcli --timeout=30 -m any --3gpp-ussd-respond="$ussd_code" 2>&1)" || mm_rc=$?
     else
-      mmcli -m any --3gpp-ussd-cancel >/dev/null 2>&1 || true
-      mm_out="$(mmcli -m any --3gpp-ussd-initiate="$ussd_code" 2>&1)"
-      mm_rc=$?
+      if [ "$ussd_st" = "active" ] || [ "$ussd_st" = "user-response" ]; then
+        mmcli -m any --3gpp-ussd-cancel >/dev/null 2>&1 || true
+      fi
+      mm_out="$(mmcli --timeout=30 -m any --3gpp-ussd-initiate="$ussd_code" 2>&1)" || mm_rc=$?
     fi
     if [ "$mm_rc" -eq 0 ] && [ -n "$mm_out" ]; then
-      printf "%s\n" "$mm_out" | sed -e "s/^USSD session initiated; new reply from network: '\(.*\)'$/\1/" -e "s/^USSD response sent; new reply from network: '\(.*\)'$/\1/"
-      exit 0
+      reply="$(printf "%s\n" "$mm_out" | sed \
+        -e "1s/^USSD session initiated; new reply from network: '//" \
+        -e "1s/^response successfully sent in USSD session; new reply from network: '//" \
+        -e "1s/^USSD response sent; new reply from network: '//" \
+        -e "\$s/'$//")"
+      if [ -n "$reply" ]; then
+        printf "%s\n" "$reply"
+        exit 0
+      fi
     fi
+    # Check if the USSD response arrived asynchronously via D-Bus properties
+    w=0
+    while [ "$w" -lt 25 ]; do
+      cur_req="$(get_ussd_prop NetworkRequest)"
+      cur_notif="$(get_ussd_prop NetworkNotification)"
+      if [ -n "$cur_req" ] && [ "$cur_req" != "$prev_req" ]; then
+        printf "%s\n" "$cur_req"
+        exit 0
+      fi
+      if [ -n "$cur_notif" ] && [ "$cur_notif" != "$prev_notif" ]; then
+        printf "%s\n" "$cur_notif"
+        exit 0
+      fi
+      cur_st="$(mmcli -m any -K 2>/dev/null | awk -F': ' '$1 == "modem.3gpp.ussd.status" || $1 == "modem.3gpp.ussd.state" {print $2; exit}' || true)"
+      if [ "$cur_st" != "active" ] && [ "$w" -ge 8 ]; then
+        if [ -n "$cur_req" ]; then
+          printf "%s\n" "$cur_req"
+          exit 0
+        fi
+        if [ -n "$cur_notif" ]; then
+          printf "%s\n" "$cur_notif"
+          exit 0
+        fi
+        break
+      fi
+      sleep 0.2
+      w=$((w + 1))
+    done
     # Fallback to direct AT+CUSD on the active SIM AT port
     if [ "$PREFERRED_SIM_SLOT" = "2" ]; then
       at_candidates="/dev/wwan0at1 /dev/wwan0at0"