From a5e6b295b90b00c12d8a88e9efe95c0b3a01b5be Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Sun, 12 Feb 2017 15:50:48 +0100 Subject: [PATCH] add support for incomming Telegram Messanger Message --- 74_AMAD.pm | 12 +- ...8.xml => 74_AMADautomagicFlowset_2.6.9.xml | 845 ++++++++++-------- 2 files changed, 458 insertions(+), 399 deletions(-) rename 74_AMADautomagicFlowset_2.6.8.xml => 74_AMADautomagicFlowset_2.6.9.xml (84%) diff --git a/74_AMAD.pm b/74_AMAD.pm index e183150..007d690 100644 --- a/74_AMAD.pm +++ b/74_AMAD.pm @@ -37,8 +37,8 @@ use TcpServerUtils; use Encode qw(encode); -my $modulversion = "2.6.8"; -my $flowsetversion = "2.6.8"; +my $modulversion = "2.6.9"; +my $flowsetversion = "2.6.9"; @@ -1475,6 +1475,10 @@ sub AMAD_decrypt($) {
  • flow_SetCommands - active/inactive, state of SetCommands flow
  • flow_informations - active/inactive, state of Informations flow
  • flowsetVersionAtDevice - currently installed version of the flowsets on the Android device
  • +
  • incomingCallerName - Callername from last Call
  • +
  • incomingCallerNumber - Callernumber from last Call
  • +
  • incommingWhatsAppMessageFrom - last WhatsApp message
  • +
  • incommingWhatsTelegramMessageFrom - last telegram message
  • intentRadioName - name of the most-recent streamed intent radio
  • intentRadioState - state of intent radio player
  • keyguardSet - 0/1 keyguard set, 0=no 1=yes, does not indicate whether it is currently active
  • @@ -1640,6 +1644,10 @@ sub AMAD_decrypt($) {
  • flow_SetCommands - active/inactive, Status des SetCommands Flow
  • flow_informations - active/inactive, Status des Informations Flow
  • flowsetVersionAtDevice - aktuell installierte Flowsetversion auf dem Device
  • +
  • incomingCallerName - Anrufername des eingehenden Anrufes
  • +
  • incomingCallerNumber - Anrufernummer des eingehenden Anrufes
  • +
  • incommingWhatsAppMessageFrom - letzte WhatsApp Nachricht
  • +
  • incommingWhatsTelegramMessageFrom - letzte Telegram Nachricht
  • intentRadioName - zuletzt gesrreamter Intent Radio Name
  • intentRadioState - Status des IntentRadio Players
  • keyguardSet - 0/1 Displaysperre gesetzt 0=nein 1=ja, bedeutet nicht das sie gerade aktiv ist
  • diff --git a/74_AMADautomagicFlowset_2.6.8.xml b/74_AMADautomagicFlowset_2.6.9.xml similarity index 84% rename from 74_AMADautomagicFlowset_2.6.8.xml rename to 74_AMADautomagicFlowset_2.6.9.xml index a275e0a..39fa582 100644 --- a/74_AMADautomagicFlowset_2.6.8.xml +++ b/74_AMADautomagicFlowset_2.6.9.xml @@ -37,6 +37,17 @@ false true + + true + Benachrichtigung in Statusbar angezeigt: org.telegram.messenger + true + org.telegram.messenger + TEXT + CONTAINS_TEXT + + false + true + true Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic @@ -387,6 +398,18 @@ irname=getString("name") false false + + false + Benachrichtigung in Statusbar angezeigt: Telegram Messenger + org.telegram.messenger + true + 1 + TEXT + CONTAINS_TEXT + + false + false + false Benachrichtigung in Statusbar angezeigt: WhatsApp @@ -809,6 +832,11 @@ irname=getString("name") Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" + + true + Expression: trigger == "Benachrichtigung in Statusbar angezeigt: org.telegram.messenger" + trigger == "Benachrichtigung in Statusbar angezeigt: org.telegram.messenger" + true Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" @@ -2103,6 +2131,12 @@ nextalarmstate = "snooze" Script: incomingCaller = "incomingCallerName@@" + {contact_name} + "@@@@incomingCallerNumber@@" + {incoming_number}; fhemcmd = "setreading"; + + + true + Script: incommingTelegramMessage = "incommingTelegramMessageFrom@@" + {notification_text}; fhemcmd = "setreading"; + @@ -2308,7 +2342,7 @@ fhemcmd = "setreading"; false Script: Set FHEMDATA -