From 467905b6a343f2450511c73dda809749b95e916f Mon Sep 17 00:00:00 2001
From: jigar-f <132374182+jigar-f@users.noreply.github.com>
Date: Mon, 11 Sep 2023 19:56:46 +0530
Subject: [PATCH 1/2] Make Changes to able to run from flutter. (#907)

---
 .run/main.dart.run.xml | 8 ++++++++
 lib/ad_helper.dart     | 4 ++--
 pubspec.yaml           | 5 ++---
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 .run/main.dart.run.xml

diff --git a/.run/main.dart.run.xml b/.run/main.dart.run.xml
new file mode 100644
index 000000000..0d0028752
--- /dev/null
+++ b/.run/main.dart.run.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="main.dart" type="FlutterRunConfigurationType" factoryName="Flutter">
+    <option name="additionalArgs" value="--dart-define=INTERSTITIAL_AD_UNIT_ID=ca-app-pub-2685698271254859/9922829329 --dart-define=DD_APPLICATION_ID=f8eabf3c-5db3-4f7e-8e6a-5a72433b46d2 --dart-define=DD_CLIENT_TOKEN=puba617ab01333a95a25a9d3709f04e1654" />
+    <option name="buildFlavor" value="prod" />
+    <option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/lib/ad_helper.dart b/lib/ad_helper.dart
index 36c46d169..f3b990085 100644
--- a/lib/ad_helper.dart
+++ b/lib/ad_helper.dart
@@ -22,11 +22,11 @@ enum AdType { Google, CAS }
 const privacyPolicy = 'https://lantern.io/privacy';
 
 const googleAttributes = {
-  'provider': AdType.Google,
+  'provider': "Google",
 };
 
 const casAttributes = {
-  'provider': AdType.CAS,
+  'provider': "CAS",
 };
 
 class AdHelper {
diff --git a/pubspec.yaml b/pubspec.yaml
index 8d5589b86..bb1ed964c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -144,9 +144,8 @@ flutter:
   # included with your application, so that you can use the icons in
   # the material Icons class.
   uses-material-design: true
-
-  module:
-    androidX: true
+#  module:
+#    androidX: true
 
   # To add assets to your application, add an assets section, like this:
   assets:

From 323c56a0aad0726fee37d6ad67b17a773f7fecfe Mon Sep 17 00:00:00 2001
From: atavism <atavism@users.noreply.github.com>
Date: Tue, 12 Sep 2023 07:48:18 -0700
Subject: [PATCH 2/2] Update flashlight to v7.6.6 (#908)

* Update flashlight to v7.6.6

* run go mod tidy

---------

Co-authored-by: atavism <todd@lana.io>
---
 android/app/libs/liblantern-all.aar | 4 ++--
 go.mod                              | 2 +-
 go.sum                              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/android/app/libs/liblantern-all.aar b/android/app/libs/liblantern-all.aar
index a7afcfad8..675f1e563 100644
--- a/android/app/libs/liblantern-all.aar
+++ b/android/app/libs/liblantern-all.aar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aab74721ded0636dbf9e50711c3495c562c17fe59479f7988c92e315502ba2bc
-size 78288171
+oid sha256:589fd604df85087a334cd778b34fc7a0d10a1bd24641091ac7c1c6ffe18da0d1
+size 78809650
diff --git a/go.mod b/go.mod
index ece308896..f4b1816ad 100644
--- a/go.mod
+++ b/go.mod
@@ -33,7 +33,7 @@ require (
 	github.com/getlantern/dnsgrab v0.0.0-20211216020425-5d5e155a01a8
 	github.com/getlantern/errors v1.0.3
 	github.com/getlantern/eventual/v2 v2.0.2
-	github.com/getlantern/flashlight/v7 v7.6.0
+	github.com/getlantern/flashlight/v7 v7.6.6
 	github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65
 	github.com/getlantern/idletiming v0.0.0-20201229174729-33d04d220c4e
 	github.com/getlantern/ipproxy v0.0.0-20230511223023-ee52513fd782
diff --git a/go.sum b/go.sum
index 7c782cdcf..d201fae87 100644
--- a/go.sum
+++ b/go.sum
@@ -373,8 +373,8 @@ github.com/getlantern/fdcount v0.0.0-20210503151800-5decd65b3731/go.mod h1:XZwE+
 github.com/getlantern/filepersist v0.0.0-20160317154340-c5f0cd24e799/go.mod h1:8DGAx0LNUfXNnEH+fXI0s3OCBA/351kZCiz/8YSK3i8=
 github.com/getlantern/filepersist v0.0.0-20210901195658-ed29a1cb0b7c h1:mcz27xtAkb1OuOLBct/uFfL1p3XxAIcFct82GbT+UZM=
 github.com/getlantern/filepersist v0.0.0-20210901195658-ed29a1cb0b7c/go.mod h1:8DGAx0LNUfXNnEH+fXI0s3OCBA/351kZCiz/8YSK3i8=
-github.com/getlantern/flashlight/v7 v7.6.0 h1:s0+ljQiN4ozyeMi5bXjs7ZTuc5CjS3eL9EP7NmaqZv8=
-github.com/getlantern/flashlight/v7 v7.6.0/go.mod h1:FLZhyLFeSojL4sRjQEaLRtVl4RB1DdliWegTsIqgzlI=
+github.com/getlantern/flashlight/v7 v7.6.6 h1:ufC2VheDRB3ypnTtCsCZFJ0R9mXnz/e5ZQN2OFZqgHY=
+github.com/getlantern/flashlight/v7 v7.6.6/go.mod h1:FLZhyLFeSojL4sRjQEaLRtVl4RB1DdliWegTsIqgzlI=
 github.com/getlantern/framed v0.0.0-20190601192238-ceb6431eeede h1:yrU6Px3ZkvCsDLPryPGi6FN+2iqFPq+JeCb7EFoDBhw=
 github.com/getlantern/framed v0.0.0-20190601192238-ceb6431eeede/go.mod h1:nhnoiS6DE6zfe+BaCMU4YI01UpsuiXnDqM5S8jxHuuI=
 github.com/getlantern/fronted v0.0.0-20230601004823-7fec719639d8 h1:r/Z/SPPIfLXDI3QA7/tE6nOfPncrqeUPDjiFjnNGP50=