diff --git a/android/.project b/android/.project new file mode 100644 index 0000000..3964dd3 --- /dev/null +++ b/android/.project @@ -0,0 +1,17 @@ + + + android + Project android created by Buildship. + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000..e889521 --- /dev/null +++ b/android/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir= +eclipse.preferences.version=1 diff --git a/android/build.gradle b/android/build.gradle index 75f942f..9dce636 100755 --- a/android/build.gradle +++ b/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.3.0' } } @@ -22,11 +22,11 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 16 - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { disable 'InvalidPackage' diff --git a/android/gradle.properties b/android/gradle.properties index 8bd86f6..53ae0ae 100755 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1 +1,3 @@ +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536M diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae 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..b6517bb --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 0000000..9d82f78 --- /dev/null +++ b/android/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# 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 +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# 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 + +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" ] ; 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 + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,90 @@ +@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 + +@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= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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 Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_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=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +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/com/pichillilorenzo/flutter_appavailability/AppAvailability.java b/android/src/main/java/com/pichillilorenzo/flutter_appavailability/AppAvailability.java index f6cb831..2ff0570 100755 --- a/android/src/main/java/com/pichillilorenzo/flutter_appavailability/AppAvailability.java +++ b/android/src/main/java/com/pichillilorenzo/flutter_appavailability/AppAvailability.java @@ -6,19 +6,27 @@ import io.flutter.plugin.common.MethodChannel.Result; import io.flutter.plugin.common.PluginRegistry.Registrar; +import java.io.ByteArrayOutputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import android.annotation.TargetApi; import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.PackageInfo; import android.content.pm.ApplicationInfo; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.drawable.Drawable; +import android.os.AsyncTask; import android.os.Build; -import android.annotation.TargetApi; +import android.os.Handler; +import android.os.Looper; +import android.util.Base64; /** AppAvailability */ public class AppAvailability implements MethodCallHandler { @@ -26,6 +34,8 @@ public class AppAvailability implements MethodCallHandler { private final Activity activity; private final Registrar registrar; + private final int SYSTEM_APP_MASK = ApplicationInfo.FLAG_SYSTEM | ApplicationInfo.FLAG_UPDATED_SYSTEM_APP; + public AppAvailability(Registrar registrar, Activity activity) { this.registrar = registrar; this.activity = activity; @@ -37,8 +47,55 @@ public static void registerWith(Registrar registrar) { channel.setMethodCallHandler(new AppAvailability(registrar, registrar.activity())); } + // MethodChannel.Result wrapper that responds on the platform thread. + private static class MethodResultWrapper implements Result { + private Result methodResult; + private Handler handler; + + MethodResultWrapper(Result result) { + methodResult = result; + handler = new Handler(Looper.getMainLooper()); + } + + @Override + public void success(final Object result) { + handler.post( + new Runnable() { + @Override + public void run() { + methodResult.success(result); + } + }); + } + + @Override + public void error( + final String errorCode, final String errorMessage, final Object errorDetails) { + handler.post( + new Runnable() { + @Override + public void run() { + methodResult.error(errorCode, errorMessage, errorDetails); + } + }); + } + + @Override + public void notImplemented() { + handler.post( + new Runnable() { + @Override + public void run() { + methodResult.notImplemented(); + } + }); + } + } + @Override - public void onMethodCall(MethodCall call, Result result) { + public void onMethodCall(MethodCall call, Result rawResult) { + Result result = new MethodResultWrapper(rawResult); + String uriSchema; switch (call.method) { case "checkAvailability": @@ -46,7 +103,9 @@ public void onMethodCall(MethodCall call, Result result) { this.checkAvailability( uriSchema, result ); break; case "getInstalledApps": - result.success(getInstalledApps()); + boolean systemApps = call.hasArgument("system_apps") && (Boolean) (call.argument("system_apps")); + boolean onlyAppsWithLaunchIntent = call.hasArgument("only_with_launch_intent") && (Boolean) (call.argument("only_with_launch_intent")); + getInstalledApps(systemApps, onlyAppsWithLaunchIntent, result); break; case "isAppEnabled": uriSchema = call.argument("uri").toString(); @@ -71,22 +130,38 @@ private void checkAvailability(String uri, Result result) { result.error("", "App not found " + uri, null); } - private List> getInstalledApps() { - PackageManager packageManager = registrar.context().getPackageManager(); - List apps = packageManager.getInstalledPackages(0); - List> installedApps = new ArrayList<>(apps.size()); - int systemAppMask = ApplicationInfo.FLAG_SYSTEM | ApplicationInfo.FLAG_UPDATED_SYSTEM_APP; - - for (PackageInfo pInfo : apps) { - if ((pInfo.applicationInfo.flags & systemAppMask) != 0) { - continue; + private void getInstalledApps(final boolean includeSystemApps, final boolean onlyAppsWithLaunchIntent, final Result result) { + final AppAvailability plugin = this; + new AsyncTask() + { + @Override + protected Void doInBackground(Void... params) + { + PackageManager packageManager = registrar.context().getPackageManager(); + List apps = packageManager.getInstalledPackages(0); + List> installedApps = new ArrayList<>(apps.size()); + + for (PackageInfo pInfo : apps) { + if (!includeSystemApps && isSystemApp(pInfo)) { + continue; + } + if (onlyAppsWithLaunchIntent && packageManager.getLaunchIntentForPackage(pInfo.packageName) == null) { + continue; + } + Map map = plugin.convertPackageInfoToJson(pInfo); + installedApps.add(map); + } + + result.success(installedApps); + return null; } - Map map = this.convertPackageInfoToJson(pInfo); - installedApps.add(map); - } - - return installedApps; + @Override + protected void onPostExecute(Void result) + { + super.onPostExecute(result); + } + }.execute(); } private PackageInfo getAppPackageInfo(String uri) { @@ -104,14 +179,42 @@ private PackageInfo getAppPackageInfo(String uri) { } private Map convertPackageInfoToJson(PackageInfo info) { + PackageManager packageManager = registrar.context().getPackageManager(); Map map = new HashMap<>(); - map.put("app_name", info.applicationInfo.loadLabel(registrar.context().getPackageManager()).toString()); + map.put("app_name", info.applicationInfo.loadLabel(packageManager).toString()); map.put("package_name", info.packageName); map.put("version_code", String.valueOf(info.versionCode)); map.put("version_name", info.versionName); + map.put("data_dir", info.applicationInfo.dataDir); + map.put("system_app", isSystemApp(info)); + map.put("launch_intent", packageManager.getLaunchIntentForPackage(info.packageName) != null); + try { + Drawable icon = packageManager.getApplicationIcon(info.packageName); + String encodedImage = encodeToBase64(getBitmapFromDrawable(icon), Bitmap.CompressFormat.PNG, 100); + map.put("app_icon", encodedImage); + } catch (PackageManager.NameNotFoundException ignored) { + } return map; } + private boolean isSystemApp(PackageInfo pInfo) { + return (pInfo.applicationInfo.flags & SYSTEM_APP_MASK) != 0; + } + + private String encodeToBase64(Bitmap image, Bitmap.CompressFormat compressFormat, int quality) { + ByteArrayOutputStream byteArrayOS = new ByteArrayOutputStream(); + image.compress(compressFormat, quality, byteArrayOS); + return Base64.encodeToString(byteArrayOS.toByteArray(), Base64.NO_WRAP); + } + + private Bitmap getBitmapFromDrawable(Drawable drawable) { + final Bitmap bmp = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888); + final Canvas canvas = new Canvas(bmp); + drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); + drawable.draw(canvas); + return bmp; + } + private void isAppEnabled(String packageName, Result result) { boolean appStatus = false; try { diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies new file mode 100644 index 0000000..c74e7a2 --- /dev/null +++ b/example/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_appavailability","path":"/home/patrick/DATA/Github/Flutter_packages/flutter_appavailability/","dependencies":[]}],"android":[{"name":"flutter_appavailability","path":"/home/patrick/DATA/Github/Flutter_packages/flutter_appavailability/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_appavailability","dependencies":[]}],"date_created":"2020-02-18 00:03:02.395192","version":"1.15.3"} \ No newline at end of file diff --git a/example/android/.project b/example/android/.project new file mode 100644 index 0000000..0e0a1ba --- /dev/null +++ b/example/android/.project @@ -0,0 +1,17 @@ + + + android_ + Project android_ created by Buildship. + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/example/android/.settings/org.eclipse.buildship.core.prefs b/example/android/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000..e889521 --- /dev/null +++ b/example/android/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir= +eclipse.preferences.version=1 diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh new file mode 100755 index 0000000..bf7ce8e --- /dev/null +++ b/example/ios/Flutter/flutter_export_environment.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=/home/patrick/DATA/Github/flutter" +export "FLUTTER_APPLICATION_PATH=/home/patrick/DATA/Github/Flutter_packages/flutter_appavailability/example" +export "FLUTTER_TARGET=lib/main.dart" +export "FLUTTER_BUILD_DIR=build" +export "SYMROOT=${SOURCE_ROOT}/../build/ios" +export "FLUTTER_FRAMEWORK_DIR=/home/patrick/DATA/Github/flutter/bin/cache/artifacts/engine/ios" +export "FLUTTER_BUILD_NAME=1.0.0" +export "FLUTTER_BUILD_NUMBER=1" diff --git a/lib/flutter_appavailability.dart b/lib/flutter_appavailability.dart index 6c31c15..3282b6d 100755 --- a/lib/flutter_appavailability.dart +++ b/lib/flutter_appavailability.dart @@ -21,7 +21,7 @@ class AppAvailability { /// "versionCode": "", /// "version_name": "" /// } - static Future> checkAvailability(String uri) async { + static Future> checkAvailability(String uri) async { Map args = {}; args.putIfAbsent('uri', () => uri); @@ -31,7 +31,11 @@ class AppAvailability { "app_name": app["app_name"], "package_name": app["package_name"], "versionCode": app["versionCode"], - "version_name": app["version_name"] + "version_name": app["version_name"], + "data_dir": app["data_dir"], + "system_app": app["system_app"], + "launch_intent": app["launch_intent"], + "app_icon": app["app_icon"] }; } else if (Platform.isIOS) { @@ -54,21 +58,38 @@ class AppAvailability { /// /// Get the list of all installed apps, where /// each app has a form like [checkAvailability()]. - static Future>> getInstalledApps() async { - List apps = await _channel.invokeMethod("getInstalledApps"); + static Future>> getInstalledApps( + { + bool addSystemApps: false, + bool onlyAppsWithLaunchIntent: false, + int sorted: 0 + } + ) async { + List apps = await _channel.invokeMethod("getInstalledApps", { + 'system_apps': addSystemApps, + 'only_with_launch_intent': onlyAppsWithLaunchIntent + }); if (apps != null && apps is List) { - List> list = new List(); + List> list = new List(); for (var app in apps) { if (app is Map) { list.add({ "app_name": app["app_name"], "package_name": app["package_name"], - "versionCode": app["versionCode"], - "version_name": app["version_name"] + "version_code": app["version_code"], + "version_name": app["version_name"], + "data_dir": app["data_dir"], + "system_app": app["system_app"], + "launch_intent": app["launch_intent"], + "app_icon": app["app_icon"] }); } } + if (sorted != 0) { + list.sort((a, b) => sorted > 0 ? a["app_name"].compareTo(b["app_name"]) : b["app_name"].compareTo(a["app_name"])); + } + return list; } return new List(0);