Add closeWebView

getlantern · May 11, 2023 · e81b468 · e81b468
1 parent 8cb4f69
commit e81b468
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/activity/WebViewActivity.kt b/android/app/src/main/kotlin/org/getlantern/lantern/activity/WebViewActivity.kt
@@ -2,6 +2,7 @@ package org.getlantern.lantern.activity
 
 import android.app.ProgressDialog
 import android.view.KeyEvent
+import android.view.View
 import android.webkit.WebSettings.PluginState
 import android.webkit.WebView
 import android.webkit.WebViewClient
@@ -77,6 +78,10 @@ open class WebViewActivity : BaseFragmentActivity() {
         webView.loadUrl(url)
     }
 
+    public fun closeWebView(view: View) {
+        finish()
+    }
+
     companion object {
         private val TAG = WebViewActivity::class.java.simpleName
     }

diff --git a/lib/account/settings.dart b/lib/account/settings.dart
@@ -25,7 +25,7 @@ class Settings extends StatelessWidget {
 
   void checkForUpdates() async => await sessionModel.checkForUpdates();
 
-  void openWebview(String url) => sessionModel.openWebview(url);
+  void openWebview(String url) async => await sessionModel.openWebview(url);
 
   @override
   Widget build(BuildContext context) {
@@ -142,9 +142,7 @@ class Settings extends StatelessWidget {
           ListItemFactory.settingsItem(
             header: 'about'.i18n,
             content: 'privacy_policy'.i18n,
-            onTap: () {
-              openWebview("https://lantern.io/privacy");
-            },
+            onTap: () => openWebview("https://lantern.io/privacy"),
             trailingArray: [
               mirrorLTR(
                   context: context,
@@ -169,9 +167,7 @@ class Settings extends StatelessWidget {
                 ),
               )
             ],
-            onTap: () {
-              openWebview("https://lantern.io/terms");
-            },
+            onTap: () => openWebview("https://lantern.io/terms"),
           ),
           //* Build version
           FutureBuilder<PackageInfo>(