From 99f92620324b8602ece9b8867d65a18e5961e9e6 Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@google.com>
Date: Mon, 24 Aug 2020 14:15:32 -0700
Subject: [PATCH] Pass platform configuration to Dart VM for insecure socket
 policy

---
 .../io/flutter/embedding/engine/loader/FlutterLoader.java  | 7 +++----
 .../darwin/ios/framework/Source/FlutterDartProject.mm      | 6 ------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java b/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
index c69d6a3fb9b36..5ae0b30b18e81 100644
--- a/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
+++ b/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
@@ -216,10 +216,9 @@ public void ensureInitializationComplete(
       }
 
       shellArgs.add("--cache-dir-path=" + result.engineCachesPath);
-      // TODO(mehmetf): Announce this since it is a breaking change then enable it.
-      // if (!flutterApplicationInfo.clearTextPermitted) {
-      //   shellArgs.add("--disallow-insecure-connections");
-      // }
+      if (!flutterApplicationInfo.clearTextPermitted) {
+        shellArgs.add("--disallow-insecure-connections");
+      }
       if (flutterApplicationInfo.domainNetworkPolicy != null) {
         shellArgs.add("--domain-network-policy=" + flutterApplicationInfo.domainNetworkPolicy);
       }
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
index 4f6a2acdf7b76..f080460f99b8a 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
@@ -140,12 +140,6 @@
   settings.domain_network_policy =
       [FlutterDartProject domainNetworkPolicy:appTransportSecurity].UTF8String;
 
-  // TODO(mehmetf): We need to announce this change since it is breaking.
-  // Remove these two lines after we announce and we know which release this is
-  // going to be part of.
-  settings.may_insecurely_connect_to_all_domains = true;
-  settings.domain_network_policy = "";
-
 #if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
   // There are no ownership concerns here as all mappings are owned by the
   // embedder and not the engine.