Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[url_launcher] Set broadcast reciever visability as required by target api 34 #3973

Merged
merged 6 commits into from
May 12, 2023
Merged

[url_launcher] Set broadcast reciever visability as required by target api 34 #3973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e45c050
Update the version of androidx used.
reidbaker May 12, 2023
120ac9a
Explictly set Exported on previously exported broadcast reciever
reidbaker May 12, 2023
253957d
Fix import order
reidbaker May 12, 2023
bea8585
independent version for core test
reidbaker May 12, 2023
851fc86
replace not add second registation
reidbaker May 12, 2023
cd26d39
Update packages/url_launcher/url_launcher_android/CHANGELOG.md
reidbaker May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/url_launcher/url_launcher_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 6.0.33

* Explicitly sets if reciever for close should be exported.

## 6.0.32

* Updates gradle, AGP and fixes some lint errors.
Expand Down
9 changes: 9 additions & 0 deletions packages/url_launcher/url_launcher_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,18 @@ android {
}

dependencies {
def core_version = "1.10.1"

// Java language implementation
implementation "androidx.core:core:$core_version"

compileOnly 'androidx.annotation:annotation:1.2.0'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:5.1.1'
testImplementation 'androidx.test:core:1.0.0'
testImplementation 'org.robolectric:robolectric:4.4.1'

// org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions.
// See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.10"))
}
7 changes: 6 additions & 1 deletion ...auncher_android/android/src/main/java/io/flutter/plugins/urllauncher/WebViewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.annotation.VisibleForTesting;
import androidx.core.content.ContextCompat;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -143,7 +144,11 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
webview.setWebChromeClient(new FlutterWebChromeClient());

// Register receiver that may finish this Activity.
registerReceiver(broadcastReceiver, closeIntentFilter);
ContextCompat.registerReceiver(
this.getApplication(),
broadcastReceiver,
closeIntentFilter,
ContextCompat.RECEIVER_EXPORTED);
}

@VisibleForTesting
Expand Down
2 changes: 1 addition & 1 deletion packages/url_launcher/url_launcher_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: url_launcher_android
description: Android implementation of the url_launcher plugin.
repository: https://github.com/flutter/packages/tree/main/packages/url_launcher/url_launcher_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22
version: 6.0.32
version: 6.0.33

environment:
sdk: ">=2.18.0 <4.0.0"
Expand Down