jab2870/sxmo-utils
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Look for ATTRIB events for notifications updates; remove "Pickup" menu

Browse source 
Picking up call can be done from both dunst notification & notifications menu;
so for more consistency / less bugs the Pickup menu entry has been removed.
This commit is contained in:
Miles Alan 2020-08-20 21:55:46 -05:00
parent 7559984430
commit c5b665ca4f
5 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/core/sxmo_appmenu.sh
View file

@ -343,16 +343,6 @@ getprogchoices() {
# E.g. sets CHOICES var # E.g. sets CHOICES var
programchoicesinit "$@" programchoicesinit "$@"
# Decorate menu at top *always* w/ incoming call entry if present
if [ -e "$NOTIFDIR"/incomingcall ]; then
INCOMINGCALLMSG="$(tail -n+3 "$NOTIFDIR"/incomingcall)"
INCOMINGCALLPICKUPACTION="$(head -n1 "$NOTIFDIR"/incomingcall)"
CHOICES="
$INCOMINGCALLMSG ^ sh -c "rm "$NOTIFDIR"/incomingcall; "$INCOMINGCALLPICKUPACTION""
$CHOICES
"
fi
# For the Sys menu decorate at top with notifications if >1 notification # For the Sys menu decorate at top with notifications if >1 notification
if [ "$WINNAME" = "Sys" ]; then if [ "$WINNAME" = "Sys" ]; then
NNOTIFICATIONS="$(find "$NOTIFDIR" -type f | wc -l)" NNOTIFICATIONS="$(find "$NOTIFDIR" -type f | wc -l)"

2
scripts/modem/sxmo_modemmonitor.sh
View file

@ -67,7 +67,7 @@ checkforincomingcalls() {
sxmo_notificationwrite.sh \ sxmo_notificationwrite.sh \
"$NOTIFDIR/incomingcall" \ "$NOTIFDIR/incomingcall" \
"sxmo_modemcall.sh pickup $VOICECALLID" \ "sxmo_modemcall.sh pickup $VOICECALLID" \
"$NOTIFDIR/incomingcall" \ "none" \
"Pickup $(sxmo_contacts.sh | grep -E "^$INCOMINGNUMBER")" & "Pickup $(sxmo_contacts.sh | grep -E "^$INCOMINGNUMBER")" &
echo "Number: $INCOMINGNUMBER (VOICECALLID: $VOICECALLID)" echo "Number: $INCOMINGNUMBER (VOICECALLID: $VOICECALLID)"

6
scripts/core/sxmo_notificationmonitor.sh → scripts/notifications/sxmo_notificationmonitor.sh
View file

@ -33,7 +33,7 @@ handlenewnotiffile(){
if dunstify --action="2,open" "$NOTIFMSG" | grep 2; then if dunstify --action="2,open" "$NOTIFMSG" | grep 2; then
eval "$NOTIFACTION" eval "$NOTIFACTION"
else elif [ -e "$NOTIFWATCHFILE" ]; then
inotifywait "$NOTIFWATCHFILE" && rm -f "$NOTIFFILE" & inotifywait "$NOTIFWATCHFILE" && rm -f "$NOTIFFILE" &
fi fi
fi fi
@ -48,11 +48,11 @@ recreateexistingnotifs() {
monitorforaddordelnotifs() { monitorforaddordelnotifs() {
while true; do while true; do
inotifywait -e create,moved_to,delete,delete_self,moved_from "$NOTIFDIR"/ | ( inotifywait -e create,attrib,moved_to,delete,delete_self,moved_from "$NOTIFDIR"/ | (
INOTIFYOUTPUT="$(cat)" INOTIFYOUTPUT="$(cat)"
INOTIFYEVENTTYPE="$(echo "$INOTIFYOUTPUT" | cut -d" " -f2)" INOTIFYEVENTTYPE="$(echo "$INOTIFYOUTPUT" | cut -d" " -f2)"
case "$INOTIFYEVENTTYPE" in case "$INOTIFYEVENTTYPE" in
"CREATE"|"MOVED_TO") "CREATE"|"MOVED_TO","ATTRIB")
NOTIFFILE="$NOTIFDIR/$(echo "$INOTIFYOUTPUT" | cut -d" " -f3)" NOTIFFILE="$NOTIFDIR/$(echo "$INOTIFYOUTPUT" | cut -d" " -f3)"
handlenewnotiffile "$NOTIFFILE" handlenewnotiffile "$NOTIFFILE"
;; ;;

0
scripts/core/sxmo_notificationsmenu.sh → scripts/notifications/sxmo_notificationsmenu.sh
View file

2
scripts/core/sxmo_notificationwrite.sh → scripts/notifications/sxmo_notificationwrite.sh
View file

@ -18,7 +18,7 @@ writenotification() {
NOTIFFILEPATHTOWRITE="$NOTIFDIR/$(tr -dc 'a-zA-Z0-9' < /dev/urandom | head -c 10)" NOTIFFILEPATHTOWRITE="$NOTIFDIR/$(tr -dc 'a-zA-Z0-9' < /dev/urandom | head -c 10)"
fi fi
touch "$NOTIFFILEPATHTOWRITE" touch "$NOTIFFILEPATHTOWRITE"
printf %b "$ACTION\n$WATCHFILE\n$NOTIFMSG\n" > "$NOTIFFILEPATHTOWRITE" printf %b "rm -f $NOTIFFILEPATHTOWRITE; $ACTION\n$WATCHFILE\n$NOTIFMSG\n" > "$NOTIFFILEPATHTOWRITE"
} }
[ "$#" -lt 4 ] && echo "Need >=4 args to create a notification" && exit 1 [ "$#" -lt 4 ] && echo "Need >=4 args to create a notification" && exit 1