FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

bugfix: 70_Jabber: log OTR empty message if debug-mode == 1 only

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11779 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
bios01 2016-07-10 18:38:04 +00:00
parent 65dede21d3
commit dd1d78c69c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it.
- bugfix: 70_Jabber: log OTR empty message if debug-mode == 1 only
- changed: 70_BRAVIA: re-worked state handling
- feature: PRESENCE: new attribute presenceThreshold to define a number of
checks that have to result in "present" before the state of

6
fhem/FHEM/70_Jabber.pm
View File

@ -1,4 +1,5 @@
##############################################################################
# $Id$
#
# 70_Jabber.pm
# An FHEM Perl module for connecting to an Jabber XMPP Server and
@ -22,9 +23,10 @@
# You should have received a copy of the GNU General Public License
# along with fhem. If not, see <http://www.gnu.org/licenses/>.
#
# Version: 1.5 - 2015-09-17
# Version: 1.6 - 2015-09-17
#
# Changelog:
# v1.6 2016-07-10 Fix log message if otr message is empty (thx spikeh1)
# v1.5 2015-09-17 Added OTR (Off the Record) end to end encryption
# Added MUC (Multi-User-Channel) joining and handling
# v1.4 2015-08-27 Fixed broken callback registration in Net::XMPP >= 1.04
@ -671,7 +673,7 @@ sub Jabber_INC_Message {
#When we have got no message after the OTR decrypt, we can leave this function.
if (!defined($message) || $message eq "") {
Log 0, "$hash->{NAME} Message is empty after OTR decrypt.";
Log 0, "$hash->{NAME} Message is empty after OTR decrypt." if $debug;
return undef;
}