update flashlight

getlantern · Jan 5, 2024 · 19fa5a6 · 19fa5a6
1 parent 367a52f
commit 19fa5a6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -571,8 +571,8 @@ $(INSTALLER_NAME).dmg: require-version require-appdmg require-retry require-magi
 		mkdir $(DARWIN_APP_NAME)/Contents/MacOS && \
 		cp -a build/macos/Build/Products/Debug/Lantern.app/Contents/* $(DARWIN_APP_NAME)/Contents/ && \
 		ls build/macos/Build/Products/Debug/Lantern.app/Contents && \
-		cp $(DARWIN_BINARY_NAME) build/macos/Build/Products/Debug/Lantern.app/Contents/Frameworks && \
-		cp -r $(DARWIN_BINARY_NAME) $(DARWIN_APP_NAME)/Contents/Resources && \
+		cp $(DARWIN_BINARY_NAME) build/macos/Build/Products/Debug/Lantern.app/Contents/Frameworks/liblantern.dylib && \
+		cp -r $(DARWIN_BINARY_NAME) $(DARWIN_APP_NAME)/Contents/Resources/liblantern.dylib && \
 		$(call osxcodesign,$(DARWIN_APP_NAME)/Contents/Resources/liblantern.dylib) && \
 		mkdir $(DARWIN_APP_NAME)/Contents/Resources/en.lproj && \
 		cp $(INSTALLER_RESOURCES)/$(PACKAGED_YAML) $(DARWIN_APP_NAME)/Contents/Resources/en.lproj/$(PACKAGED_YAML) && \

diff --git a/go.mod b/go.mod
@@ -32,7 +32,7 @@ require (
 	github.com/getlantern/eventual v1.0.0
 	github.com/getlantern/eventual/v2 v2.0.2
 	github.com/getlantern/filepersist v0.0.0-20210901195658-ed29a1cb0b7c
-	github.com/getlantern/flashlight/v7 v7.6.34-0.20240101094715-9538dba48ce1
+	github.com/getlantern/flashlight/v7 v7.6.34-0.20240105043417-f8432e94b48d
 	github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65
 	github.com/getlantern/i18n v0.0.0-20181205222232-2afc4f49bb1c
 	github.com/getlantern/idletiming v0.0.0-20231030193830-6767b09f86db

diff --git a/go.sum b/go.sum
@@ -271,6 +271,8 @@ github.com/getlantern/flashlight/v7 v7.6.34-0.20240101090023-369fcd3c7744 h1:SVS
 github.com/getlantern/flashlight/v7 v7.6.34-0.20240101090023-369fcd3c7744/go.mod h1:fX68JW5XYV6tgYipzZQXGVkZQzm9SIFNXiW6X7fE94U=
 github.com/getlantern/flashlight/v7 v7.6.34-0.20240101094715-9538dba48ce1 h1:OBQuDm6ehAu5SRjzyXJv2sVfF/nrIN8oatG+nP0ymsY=
 github.com/getlantern/flashlight/v7 v7.6.34-0.20240101094715-9538dba48ce1/go.mod h1:fX68JW5XYV6tgYipzZQXGVkZQzm9SIFNXiW6X7fE94U=
+github.com/getlantern/flashlight/v7 v7.6.34-0.20240105043417-f8432e94b48d h1:CnCkhGZ4Ta/BnWWY3c5jjLT0+YHcgjqmpXoHukEyW20=
+github.com/getlantern/flashlight/v7 v7.6.34-0.20240105043417-f8432e94b48d/go.mod h1:fX68JW5XYV6tgYipzZQXGVkZQzm9SIFNXiW6X7fE94U=
 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=

diff --git a/lib/plans/checkout.dart b/lib/plans/checkout.dart
@@ -213,7 +213,11 @@ class _CheckoutState extends State<Checkout>
               "stripe",
               os,
             );
-          await context.pushRoute(AppWebview(url: redirectUrl));
+          if (!Platform.isMacOS) {
+            await context.pushRoute(AppWebview(url: redirectUrl));
+          } else {
+            await InAppBrowser.openWithSystemBrowser(url: WebUri(redirectUrl));
+          }
           return;
         }
 
@@ -403,9 +407,6 @@ class _CheckoutState extends State<Checkout>
                           message: AppKeys.continueCheckout,
                           child: Button(
                             text: 'continue'.i18n,
-                            disabled: emailController.value.text.isEmpty ||
-                                emailFieldKey.currentState?.validate() ==
-                                    false,
                             onPressed: onContinueTapped,
                           ),
                         ),