From ecf08736829bd2ab4ba9aedf93afdda4f4eb9626 Mon Sep 17 00:00:00 2001
From: zap <>
Date: Wed, 12 May 2021 18:06:45 +0000
Subject: [PATCH] AndroidDB: Bugfix

git-svn-id: https://svn.fhem.de/fhem/trunk@24428 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/89_AndroidDB.pm     |  6 ++----
 fhem/FHEM/89_AndroidDBHost.pm | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/fhem/FHEM/89_AndroidDB.pm b/fhem/FHEM/89_AndroidDB.pm
index bdcb2ffd8..21bc44f2a 100644
--- a/fhem/FHEM/89_AndroidDB.pm
+++ b/fhem/FHEM/89_AndroidDB.pm
@@ -4,7 +4,7 @@
 #
 # 89_AndroidDB
 #
-# Version 0.1
+# Version 0.2
 #
 # FHEM Integration for Android Devices
 #
@@ -44,8 +44,6 @@ package AndroidDB;
 use strict;
 use warnings;
 
-use Data::Dumper;
-
 use SetExtensions;
 
 use GPUtils qw(:all); 
@@ -178,7 +176,7 @@ sub Get ($@)
 	$opt = lc($opt);
 	
 	if ($opt eq 'presets') {
-		return Dumper (\%PRESET);
+		return "Command not implemented";
 	}
 	else {
 		return "Unknown argument $opt, choose one of $options";
diff --git a/fhem/FHEM/89_AndroidDBHost.pm b/fhem/FHEM/89_AndroidDBHost.pm
index 92fbbc0b8..4d146a8a7 100644
--- a/fhem/FHEM/89_AndroidDBHost.pm
+++ b/fhem/FHEM/89_AndroidDBHost.pm
@@ -4,7 +4,7 @@
 #
 # 89_AndroidDBHost
 #
-# Version 0.1
+# Version 0.2
 #
 # FHEM Integration for Android Debug Bridge
 #
@@ -199,7 +199,7 @@ sub Set ($@)
 	my $opt = shift @$a // return 'No set command specified';
 
 	# Preprare list of available commands
-	my $options = 'start:noArg stop:noArg';
+	my $options = 'command start:noArg stop:noArg';
 
 	$opt = lc($opt);
 
@@ -220,6 +220,11 @@ sub Set ($@)
 			return "ADB server still running. Please try again.";
 		}
 	}
+	elsif ($opt eq 'command') {
+		my $command = shift @$a // return "Usage: set $name $opt Command [Args]";
+		my ($rc, $result, $error) = Execute ($hash, $command, '.*', @$a);
+		return $result.$error;
+	}
 	else {
 		return "Unknown argument $opt, choose one of $options";
 	}
@@ -324,8 +329,8 @@ sub IsConnected ($)
 	my ($rc, $result, $error) = Execute ($ioHash, 'devices', 'list');
 	return -1 if ($rc == 0);
 
-	my @devices = $result =~ /device$/g;
-	if (scalar(@devices) == 1 && $result =~ /$clHash->{ADBDevice}/) {
+	my @devices = $result =~ /([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:[0-9]+)/g;
+	if (scalar(@devices) == 1 && $devices[0] eq $clHash->{ADBDevice}) {
 		return 1;
 	}
 	elsif (scalar(@devices) > 1) {
@@ -466,6 +471,9 @@ sub TCPConnect ($$$)
 <a name="AndroidDBHostset"></a>
 <b>Set</b><br/><br/>
 <ul>
+	<li><b>set &lt;name&gt; command &lt;Command&gt; [&lt;Args&gt;]</b><br/>
+		Execute ADB command.
+	</li><br/>
 	<li><b>set &lt;name&gt; start</b><br/>
 		Start ADB server.
 	</li><br/>