Merge branch 'main' into url-launcher-full-federation

stuartmorgan-g · stuartmorgan-g · commit 91bdd12c75d4 · 2021-11-16T11:32:10.000-05:00
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -13,7 +13,7 @@
 - [ ] The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. `[shared_preferences]`
 - [ ] I listed at least one issue that this PR fixes in the description above.
 - [ ] I updated `pubspec.yaml` with an appropriate new version according to the [pub versioning philosophy], or this PR is [exempt from version changes].
-- [ ] I updated `CHANGELOG.md` to add a description of the change.
+- [ ] I updated `CHANGELOG.md` to add a description of the change, [following repository CHANGELOG style].
 - [ ] I updated/added relevant documentation (doc comments with `///`).
 - [ ] I added new tests to check the change I am making, or this PR is [test-exempt].
 - [ ] All existing and new tests are passing.
@@ -30,5 +30,6 @@ If you need help, consider asking for advice on the #hackers-new channel on [Dis
 [Discord]: https://github.com/flutter/flutter/wiki/Chat
 [pub versioning philosophy]: https://dart.dev/tools/pub/versioning
 [exempt from version changes]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#version-and-changelog-updates
+[following repository CHANGELOG style]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changelog-style
 [the auto-formatter]: https://github.com/flutter/plugins/blob/master/script/tool/README.md#format-code
 [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests
diff --git a/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md
@@ -1,8 +1,11 @@
-## 0.9.4+3
+## 0.9.4+4
 
 * Change Android compileSdkVersion to 31.
 * Remove usages of deprecated Android API `CamcorderProfile`.
 * Update gradle version to 7.0.2 on Android.
+
+## 0.9.4+3
+
 * Fix registerTexture and result being called on background thread on iOS.
 
 ## 0.9.4+2
diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml
@@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
   Dart.
 repository: https://github.com/flutter/plugins/tree/master/packages/camera/camera
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.9.4+3
+version: 0.9.4+4
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
diff --git a/packages/path_provider/path_provider_android/CHANGELOG.md b/packages/path_provider/path_provider_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.7
+
+* Fixes link in README.
+
 ## 2.0.6
 
 * Split from `path_provider` as a federated implementation.
diff --git a/packages/path_provider/path_provider_android/README.md b/packages/path_provider/path_provider_android/README.md
@@ -1,6 +1,6 @@
 # path\_provider\_android
 
-The Android implementation of [`path_provider`].
+The Android implementation of [`path_provider`][1].
 
 ## Usage
 
diff --git a/packages/path_provider/path_provider_android/pubspec.yaml b/packages/path_provider/path_provider_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: path_provider_android
 description: Android implementation of the path_provider plugin.
 repository: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22
-version: 2.0.6
+version: 2.0.7
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
diff --git a/packages/path_provider/path_provider_ios/CHANGELOG.md b/packages/path_provider/path_provider_ios/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.7
+
+* Fixes link in README.
+
 ## 2.0.6
 
 * Split from `path_provider` as a federated implementation.
diff --git a/packages/path_provider/path_provider_ios/README.md b/packages/path_provider/path_provider_ios/README.md
@@ -1,6 +1,6 @@
 # path\_provider\_ios
 
-The iOS implementation of [`path_provider`].
+The iOS implementation of [`path_provider`][1].
 
 ## Usage
 
diff --git a/packages/path_provider/path_provider_ios/pubspec.yaml b/packages/path_provider/path_provider_ios/pubspec.yaml
@@ -2,7 +2,7 @@ name: path_provider_ios
 description: iOS implementation of the path_provider plugin.
 repository: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_ios
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22
-version: 2.0.6
+version: 2.0.7
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
diff --git a/packages/path_provider/path_provider_linux/CHANGELOG.md b/packages/path_provider/path_provider_linux/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.2
+
+* Fixes link in README.
+
 ## 2.1.1
 
 * Removed obsolete `pluginClass: none` from pubpsec.
@@ -46,5 +50,5 @@
 * This updates the readme and pubspec and example to reflect the endorsement of this implementation of `path_provider`
 
 ## 0.0.1
-* The initial implementation of path_provider for Linux
+* The initial implementation of path\_provider for Linux
   * Implements getApplicationSupportPath, getApplicationDocumentsPath, getDownloadsPath, and getTemporaryPath
diff --git a/packages/path_provider/path_provider_linux/README.md b/packages/path_provider/path_provider_linux/README.md
@@ -1,6 +1,6 @@
 # path\_provider\_linux
 
-The linux implementation of [`path_provider`].
+The linux implementation of [`path_provider`][1].
 
 ## Usage
 
diff --git a/packages/path_provider/path_provider_linux/pubspec.yaml b/packages/path_provider/path_provider_linux/pubspec.yaml
@@ -2,7 +2,7 @@ name: path_provider_linux
 description: Linux implementation of the path_provider plugin
 repository: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_linux
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22
-version: 2.1.1
+version: 2.1.2
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
diff --git a/packages/path_provider/path_provider_macos/CHANGELOG.md b/packages/path_provider/path_provider_macos/CHANGELOG.md
@@ -1,4 +1,8 @@
-# 2.0.2
+## 2.0.3
+
+* Fixes link in README.
+
+## 2.0.2
 
 * Add Swift language version to podspec.
 * Add native unit tests.
@@ -55,7 +59,7 @@
 
 ## 0.0.3+1
 
-* Make the pedantic dev_dependency explicit.
+* Make the pedantic `dev_dependency` explicit.
 
 ## 0.0.3
 
diff --git a/packages/path_provider/path_provider_macos/README.md b/packages/path_provider/path_provider_macos/README.md
@@ -1,6 +1,6 @@
 # path\_provider\_macos
 
-The macos implementation of [`path_provider`].
+The macos implementation of [`path_provider`][1].
 
 ## Usage
 
diff --git a/packages/path_provider/path_provider_macos/pubspec.yaml b/packages/path_provider/path_provider_macos/pubspec.yaml
@@ -2,7 +2,7 @@ name: path_provider_macos
 description: macOS implementation of the path_provider plugin
 repository: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_macos
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22
-version: 2.0.2
+version: 2.0.3
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
diff --git a/packages/url_launcher/url_launcher/CHANGELOG.md b/packages/url_launcher/url_launcher/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 * Moves Android and iOS implementations to federated packages.
 
+## 6.0.13
+
+* Fixed extracting browser headers when they are null error.
+
 ## 6.0.12
 
 * Fixed an error where 'launch' method of url_launcher would cause an error if the provided URL was not valid by RFC 3986.
diff --git a/packages/url_launcher/url_launcher/pubspec.yaml b/packages/url_launcher/url_launcher/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for launching a URL. Supports
   web, phone, SMS, and email schemes.
 repository: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22
-version: 6.0.12
+version: 6.0.13
 # Temporarily disable publishing to allow moving Android and iOS
 # implementations.
 publish_to: none
diff --git a/packages/url_launcher/url_launcher_android/CHANGELOG.md b/packages/url_launcher/url_launcher_android/CHANGELOG.md
@@ -1,3 +1,3 @@
-## 6.0.12
+## 6.0.13
 
 * Splits from `shared_preferences` as a federated implementation.
diff --git a/packages/url_launcher/url_launcher_android/android/src/main/java/io/flutter/plugins/urllauncher/WebViewActivity.java b/packages/url_launcher/url_launcher_android/android/src/main/java/io/flutter/plugins/urllauncher/WebViewActivity.java
@@ -20,7 +20,10 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.annotation.VisibleForTesting;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -142,7 +145,11 @@ public void onCreate(Bundle savedInstanceState) {
     registerReceiver(broadcastReceiver, closeIntentFilter);
   }
 
-  private Map<String, String> extractHeaders(Bundle headersBundle) {
+  @VisibleForTesting
+  public static Map<String, String> extractHeaders(@Nullable Bundle headersBundle) {
+    if (headersBundle == null) {
+      return Collections.emptyMap();
+    }
     final Map<String, String> headersMap = new HashMap<>();
     for (String key : headersBundle.keySet()) {
       final String value = headersBundle.getString(key);
diff --git a/packages/url_launcher/url_launcher_android/android/src/test/java/io/flutter/plugins/urllauncher/WebViewActivityTest.java b/packages/url_launcher/url_launcher_android/android/src/test/java/io/flutter/plugins/urllauncher/WebViewActivityTest.java
@@ -0,0 +1,17 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.urllauncher;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+import org.junit.Test;
+
+public class WebViewActivityTest {
+  @Test
+  public void extractHeaders_returnsEmptyMapWhenHeadersBundleNull() {
+    assertEquals(WebViewActivity.extractHeaders(null), Collections.emptyMap());
+  }
+}
diff --git a/packages/url_launcher/url_launcher_android/pubspec.yaml b/packages/url_launcher/url_launcher_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: url_launcher_android
 description: Android implementation of the url_launcher plugin.
 repository: https://github.com/flutter/plugins/tree/master/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.12
+version: 6.0.13
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
diff --git a/packages/url_launcher/url_launcher_ios/CHANGELOG.md b/packages/url_launcher/url_launcher_ios/CHANGELOG.md
@@ -1,3 +1,3 @@
-## 6.0.12
+## 6.0.13
 
 * Splits from `url_launcher` as a federated implementation.
diff --git a/packages/url_launcher/url_launcher_ios/pubspec.yaml b/packages/url_launcher/url_launcher_ios/pubspec.yaml
@@ -2,7 +2,7 @@ name: url_launcher_ios
 description: iOS implementation of the url_launcher plugin.
 repository: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher_ios
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22
-version: 6.0.12
+version: 6.0.13
 
 environment:
   sdk: ">=2.14.0 <3.0.0"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-## 6.0.12`
	`1`	`+## 6.0.13`
`2`	`2`
`3`	`3`	* Splits from `shared_preferences` as a federated implementation.