Update to webkigtk 6, revert Session authenticate stuff (#879)

Author: leolost2605

meson.build

@@ -17,13 +17,13 @@ adw_dep = dependency('libadwaita-1')
 gtk_dep = dependency('gtk4')
 camel_dep = dependency('camel-1.2', version: '>= 3.28')
 libedataserver_dep = dependency('libedataserver-1.2', version: '>=3.45.1')
-libedataserverui_dep = dependency('libedataserverui4-1.0', version: '>= 3.45.1')
-webkit2_dep = dependency('webkit2gtk-5.0')
-webkit2_web_extension_dep = dependency('webkit2gtk-web-extension-5.0')
+libedataserverui_dep = dependency('libedataserverui4-1.0', version: '>= 3.46.4')
+webkit_dep = dependency('webkitgtk-6.0')
+webkit_web_extension_dep = dependency('webkitgtk-web-process-extension-6.0')
 folks_dep = dependency('folks')
 m_dep = meson.get_compiler('c').find_library('m')
 
-webkit2_extension_path = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'webkit2')
+webkit_extension_path = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'webkit2')
 
 dependencies = [
     glib_dep,
@@ -35,7 +35,7 @@ dependencies = [
     camel_dep,
     libedataserver_dep,
     libedataserverui_dep,
-    webkit2_dep,
+    webkit_dep,
     folks_dep,
     m_dep
 ]
@@ -50,7 +50,7 @@ extension_dependencies = [
     glib_dep,
     gobject_dep,
     gee_dep,
-    webkit2_web_extension_dep
+    webkit_web_extension_dep
 ]
 
 add_global_arguments([

src/Backend/Session.vala

@@ -126,17 +126,9 @@ public class Mail.Backend.Session : Camel.Session {
             /* We need a password, preferrably one cached in
              * the keyring or else by interactive user prompt. */
 
-            try {
-                var credentials_provider = new E.SourceCredentialsProvider (registry);
-                E.NamedParameters out_credentials;
-                credentials_provider.lookup_sync (source, cancellable, out out_credentials);
-                bool out_authenticated;
-                try_credentials_sync (credentials_provider, source, out_credentials, out out_authenticated, cancellable, service, mechanism);
-                return out_authenticated;
-            } catch (Error e) {
-                critical (e.message);
-                return false;
-            }
+            var credentials_prompter = new E.CredentialsPrompter (registry);
+            credentials_prompter.set_auto_prompt (true);
+            return credentials_prompter.loop_prompt_sync (source, E.CredentialsPrompterPromptFlags.ALLOW_SOURCE_SAVE, (prompter, source, credentials, out out_authenticated, cancellable) => try_credentials_sync (prompter, source, credentials, out out_authenticated, cancellable, service, mechanism));
         } else {
             return (result == Camel.AuthenticationResult.ACCEPTED);
         }
@@ -182,7 +174,7 @@ public class Mail.Backend.Session : Camel.Session {
         return success;
     }
 
-    public bool try_credentials_sync (E.SourceCredentialsProvider provider, E.Source source, E.NamedParameters credentials, out bool out_authenticated, GLib.Cancellable? cancellable, Camel.Service service, string? mechanism) throws GLib.Error {
+    public bool try_credentials_sync (E.CredentialsPrompter prompter, E.Source source, E.NamedParameters credentials, out bool out_authenticated, GLib.Cancellable? cancellable, Camel.Service service, string? mechanism) throws GLib.Error {
         string credential_name = null;
 
         if (source.has_extension (E.SOURCE_EXTENSION_AUTHENTICATION)) {
@@ -202,7 +194,7 @@ public class Mail.Backend.Session : Camel.Session {
         out_authenticated = (result == Camel.AuthenticationResult.ACCEPTED);
 
         if (out_authenticated) {
-            var credentials_source = provider.ref_credentials_source (source);
+            var credentials_source = prompter.get_provider ().ref_credentials_source (source);
 
             if (credentials_source != null) {
                 credentials_source.invoke_authenticate_sync (credentials);

src/MessageList/MessageListItem.vala

@@ -281,7 +281,7 @@ public class Mail.MessageListItem : Gtk.ListBoxRow {
             margin_end = 12
         };
         web_view.mouse_target_changed.connect (on_mouse_target_changed);
-        web_view.context_menu.connect (on_webview_context_menu);
+        // web_view.context_menu.connect (on_webview_context_menu);
         web_view.load_finished.connect (() => {
             loaded = true;
         });

src/WebView.vala

@@ -39,8 +39,8 @@ public class Mail.WebView : WebKit.WebView {
     static construct {
         unowned WebKit.WebContext context = WebKit.WebContext.get_default ();
         unowned string? webkit_extension_path_env = Environment.get_variable ("WEBKIT_EXTENSION_PATH");
-        context.set_web_extensions_directory (webkit_extension_path_env ?? WEBKIT_EXTENSION_PATH);
-        context.set_sandbox_enabled (true);
+        context.set_web_process_extensions_directory (webkit_extension_path_env ?? WEBKIT_EXTENSION_PATH);
+        // context.set_sandbox_enabled (true);
 
         context.register_uri_scheme ("cid", (req) => {
             WebView? view = req.get_web_view () as WebView;
@@ -67,12 +67,12 @@ public class Mail.WebView : WebKit.WebView {
         setts.enable_fullscreen = false;
         setts.enable_html5_database = false;
         setts.enable_html5_local_storage = false;
-        setts.enable_java = false;
+        // setts.enable_java = false;
         setts.enable_javascript = false;
         setts.enable_media_stream = false;
         setts.enable_offline_web_application_cache = false;
         setts.enable_page_cache = false;
-        setts.enable_plugins = false;
+        // setts.enable_plugins = false;
 
         Object (settings: setts);
     }

src/meson.build

@@ -32,6 +32,6 @@ executable(
     config_file,
     asresources,
     dependencies: dependencies,
-    c_args: '-DWEBKIT_EXTENSION_PATH="' + webkit2_extension_path + '"',
+    c_args: '-DWEBKIT_EXTENSION_PATH="' + webkit_extension_path + '"',
     install: true
 )

webkit-extension/Main.vala

@@ -17,15 +17,15 @@
  * Authored by: David Hewitt <davidmhewitt@gmail.com>
  */
 
-namespace WebkitWebExtension {
+namespace WebkitWebProcessExtension {
     private static void on_page_created (WebKit.WebPage page) {
         var mail_page = new Mail.Page (page);
         // Make so that the Mail.Page is destroyed at the same time of the WebKit.WebPage
         page.set_data ("elementary-mail-page", (owned) mail_page);
     }
 
-    [CCode (cname = "G_MODULE_EXPORT webkit_web_extension_initialize", instance_pos = -1)]
-    public void initialize (WebKit.WebExtension extension) {
+    [CCode (cname = "G_MODULE_EXPORT webkit_web_process_extension_initialize", instance_pos = -1)]
+    public void initialize (WebKit.WebProcessExtension extension) {
         extension.page_created.connect (on_page_created);
     }
 }

webkit-extension/meson.build

@@ -7,6 +7,6 @@ shared_module('io.elementary.mail-webkit-extension',
     extension_files,
     dependencies: extension_dependencies,
     install: true,
-    install_dir: webkit2_extension_path
+    install_dir: webkit_extension_path
 )