diff --git a/packages/android_intent_plus/CHANGELOG.md b/packages/android_intent_plus/CHANGELOG.md index e7cee146a7..8370ee4fff 100644 --- a/packages/android_intent_plus/CHANGELOG.md +++ b/packages/android_intent_plus/CHANGELOG.md @@ -1,3 +1,8 @@ +## 3.1.2 + +- Fix explicit intent fallback to implicit +- Update Android Gradle plugin and Gradle verion + ## 3.1.1+1 - Add issue_tracker link. diff --git a/packages/android_intent_plus/android/build.gradle b/packages/android_intent_plus/android/build.gradle index c455cd43a7..2b2b66dd7a 100644 --- a/packages/android_intent_plus/android/build.gradle +++ b/packages/android_intent_plus/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.3.0' } } diff --git a/packages/android_intent_plus/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_intent_plus/android/gradle/wrapper/gradle-wrapper.properties index 4e974715fd..ae04661ee7 100644 --- a/packages/android_intent_plus/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/android_intent_plus/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/IntentSender.java b/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/IntentSender.java index 830dfa7cbb..3fe3588935 100644 --- a/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/IntentSender.java +++ b/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/IntentSender.java @@ -172,9 +172,6 @@ Intent buildIntent( intent.setComponent(componentName); } } - if (intent.resolveActivity(applicationContext.getPackageManager()) == null) { - Log.i(TAG, "Cannot resolve explicit intent"); - } return intent; } diff --git a/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/MethodCallHandlerImpl.java b/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/MethodCallHandlerImpl.java index c6d4a9c381..261b992034 100644 --- a/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/MethodCallHandlerImpl.java +++ b/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/MethodCallHandlerImpl.java @@ -92,11 +92,17 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) { action, flags, category, data, arguments, packageName, componentName, type); if ("launch".equalsIgnoreCase(call.method)) { - sender.send(intent); + if (intent != null && !sender.canResolveActivity(intent)) { + Log.i(TAG, "Cannot resolve explicit intent, falling back to implicit"); + intent.setPackage(null); + } + + sender.send(intent); result.success(null); } else if ("launchChooser".equalsIgnoreCase(call.method)) { String title = call.argument("chooserTitle"); + sender.launchChooser(intent, title); result.success(null); } else if ("sendBroadcast".equalsIgnoreCase(call.method)) { diff --git a/packages/android_intent_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/android_intent_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties index 9a4163a4f5..ae04661ee7 100644 --- a/packages/android_intent_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ b/packages/android_intent_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/android_intent_plus/example/android/build.gradle b/packages/android_intent_plus/example/android/build.gradle index 9971094448..3ecc2576de 100644 --- a/packages/android_intent_plus/example/android/build.gradle +++ b/packages/android_intent_plus/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.3.0' } } diff --git a/packages/android_intent_plus/example/android/gradle.properties b/packages/android_intent_plus/example/android/gradle.properties index 08f2b5f91b..d9cf55df7c 100644 --- a/packages/android_intent_plus/example/android/gradle.properties +++ b/packages/android_intent_plus/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx1536M -android.enableJetifier=true android.useAndroidX=true diff --git a/packages/android_intent_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_intent_plus/example/android/gradle/wrapper/gradle-wrapper.properties index a0acea0e80..d54175a4e7 100644 --- a/packages/android_intent_plus/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/android_intent_plus/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Oct 05 13:40:15 CEST 2021 +#Sun Oct 02 17:46:54 EEST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/packages/android_intent_plus/pubspec.yaml b/packages/android_intent_plus/pubspec.yaml index bf7de7c8b8..263ba0b9d1 100644 --- a/packages/android_intent_plus/pubspec.yaml +++ b/packages/android_intent_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: android_intent_plus description: Flutter plugin for launching Android Intents. Not supported on iOS. -version: 3.1.1+1 +version: 3.1.2 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ issue_tracker: https://github.com/fluttercommunity/plus_plugins/labels/android_intent_plus