diff --git a/android/.gitignore b/android/.gitignore index c6cbe56..8c43417 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -1,8 +1,9 @@ *.iml .gradle /local.properties +/.idea /.idea/workspace.xml /.idea/libraries .DS_Store /build -/captures +/captures \ No newline at end of file diff --git a/android/.idea/encodings.xml b/android/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/android/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/android/.idea/vcs.xml b/android/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/android/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 33d7f51..59f243d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.4.1' } } @@ -22,7 +22,7 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 16 @@ -31,4 +31,9 @@ android { lintOptions { disable 'InvalidPackage' } + compileOptions { + sourceCompatibility = '1.8' + targetCompatibility = '1.8' + } + buildToolsVersion = '29.0.0' } diff --git a/android/flutter/build.gradle b/android/flutter/build.gradle new file mode 100644 index 0000000..1e23855 --- /dev/null +++ b/android/flutter/build.gradle @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file('flutter.jar')) \ No newline at end of file diff --git a/android/flutter/flutter.jar b/android/flutter/flutter.jar new file mode 100644 index 0000000..4ab12c7 Binary files /dev/null and b/android/flutter/flutter.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..c4486d4 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/android/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/src/main/java/eu/sndr/fluttermdnsplugin/FlutterMdnsPlugin.java b/android/src/main/java/eu/sndr/fluttermdnsplugin/FlutterMdnsPlugin.java index 8995727..4c4d2ad 100644 --- a/android/src/main/java/eu/sndr/fluttermdnsplugin/FlutterMdnsPlugin.java +++ b/android/src/main/java/eu/sndr/fluttermdnsplugin/FlutterMdnsPlugin.java @@ -1,9 +1,11 @@ package eu.sndr.fluttermdnsplugin; import android.annotation.SuppressLint; +import android.annotation.TargetApi; import android.content.Context; import android.net.nsd.NsdManager; import android.net.nsd.NsdServiceInfo; +import android.os.Build; import android.util.Log; import java.util.ArrayList; @@ -77,7 +79,7 @@ public void onMethodCall(MethodCall call, Result result) { switch (call.method) { case "startDiscovery": - startDiscovery((String) call.argument("serviceType")); + startDiscovery(call.argument("serviceType")); result.success(null); break; case "stopDiscovery" : @@ -187,6 +189,7 @@ private void stopDiscovery() { * @param info The ServiceInfo to convert * @return The map that can be interpreted by Flutter and sent back on an EventChannel */ + @TargetApi(Build.VERSION_CODES.LOLLIPOP) private static Map ServiceToMap(NsdServiceInfo info) { Map map = new HashMap<>(); diff --git a/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/DiscoveryRunningHandler.java b/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/DiscoveryRunningHandler.java index 503e133..67ceaf7 100644 --- a/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/DiscoveryRunningHandler.java +++ b/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/DiscoveryRunningHandler.java @@ -1,9 +1,19 @@ package eu.sndr.fluttermdnsplugin.handlers; +import android.os.Handler; +import android.os.Looper; + import io.flutter.plugin.common.EventChannel; public class DiscoveryRunningHandler implements EventChannel.StreamHandler { + + private Handler handler; EventChannel.EventSink sink; + + public DiscoveryRunningHandler(){ + this.handler = new Handler(Looper.getMainLooper()); + } + @Override public void onListen(Object o, EventChannel.EventSink eventSink) { sink = eventSink; @@ -15,10 +25,10 @@ public void onCancel(Object o) { } public void onDiscoveryStopped(){ - sink.success(false); + handler.post(() -> sink.success(false)); } public void onDiscoveryStarted(){ - sink.success(true); + handler.post(() -> sink.success(true)); } } diff --git a/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceDiscoveredHandler.java b/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceDiscoveredHandler.java index 86a9fb6..1adf39a 100644 --- a/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceDiscoveredHandler.java +++ b/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceDiscoveredHandler.java @@ -1,12 +1,21 @@ package eu.sndr.fluttermdnsplugin.handlers; +import android.os.Handler; +import android.os.Looper; + import java.util.Map; import io.flutter.plugin.common.EventChannel; public class ServiceDiscoveredHandler implements EventChannel.StreamHandler { + private Handler handler; EventChannel.EventSink sink; + + public ServiceDiscoveredHandler(){ + this.handler = new Handler(Looper.getMainLooper()); + } + @Override public void onListen(Object o, EventChannel.EventSink eventSink) { sink = eventSink; @@ -18,6 +27,6 @@ public void onCancel(Object o) { } public void onServiceDiscovered(Map serviceInfoMap){ - sink.success(serviceInfoMap); + handler.post(() -> sink.success(serviceInfoMap)); } } \ No newline at end of file diff --git a/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceLostHandler.java b/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceLostHandler.java index 3aa8141..dfcfb87 100644 --- a/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceLostHandler.java +++ b/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceLostHandler.java @@ -1,12 +1,21 @@ package eu.sndr.fluttermdnsplugin.handlers; +import android.os.Handler; +import android.os.Looper; + import java.util.Map; import io.flutter.plugin.common.EventChannel; public class ServiceLostHandler implements EventChannel.StreamHandler { + private Handler handler; EventChannel.EventSink sink; + + public ServiceLostHandler(){ + this.handler = new Handler(Looper.getMainLooper()); + } + @Override public void onListen(Object o, EventChannel.EventSink eventSink) { sink = eventSink; @@ -18,6 +27,6 @@ public void onCancel(Object o) { } public void onServiceLost(Map serviceInfoMap){ - sink.success(serviceInfoMap); + handler.post(() -> sink.success(serviceInfoMap)); } } \ No newline at end of file diff --git a/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceResolvedHandler.java b/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceResolvedHandler.java index 214b120..fe0b0f6 100644 --- a/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceResolvedHandler.java +++ b/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceResolvedHandler.java @@ -1,12 +1,21 @@ package eu.sndr.fluttermdnsplugin.handlers; +import android.os.Handler; +import android.os.Looper; + import java.util.Map; import io.flutter.plugin.common.EventChannel; public class ServiceResolvedHandler implements EventChannel.StreamHandler { + private Handler handler; EventChannel.EventSink sink; + + public ServiceResolvedHandler(){ + this.handler = new Handler(Looper.getMainLooper()); + } + @Override public void onListen(Object o, EventChannel.EventSink eventSink) { sink = eventSink; @@ -18,7 +27,7 @@ public void onCancel(Object o) { } public void onServiceResolved(Map serviceInfoMap) { - sink.success(serviceInfoMap); + handler.post(() -> sink.success(serviceInfoMap)); } }