aboutsummaryrefslogtreecommitdiff
path: root/libdino
diff options
context:
space:
mode:
Diffstat (limited to 'libdino')
-rw-r--r--libdino/CMakeLists.txt33
-rw-r--r--libdino/data/pgp_stack.ui31
-rw-r--r--libdino/src/application.vala1
-rw-r--r--libdino/src/service/module_manager.vala1
-rw-r--r--libdino/src/service/pgp_manager.vala176
5 files changed, 7 insertions, 235 deletions
diff --git a/libdino/CMakeLists.txt b/libdino/CMakeLists.txt
index 15a434e9..10972b9a 100644
--- a/libdino/CMakeLists.txt
+++ b/libdino/CMakeLists.txt
@@ -1,7 +1,6 @@
find_package(Vala REQUIRED)
find_package(PkgConfig REQUIRED)
include(${VALA_USE_FILE})
-include(GlibCompileResourcesSupport)
set(LIBDINO_PACKAGES
gee-0.8
@@ -14,28 +13,10 @@ set(LIBDINO_PACKAGES
pkg_check_modules(LIBDINO REQUIRED ${LIBDINO_PACKAGES})
-set(RESOURCE_LIST
- pgp_stack.ui
-)
-
-compile_gresources(
- LIBDINO_GRESOURCES_TARGET
- LIBDINO_GRESOURCES_XML
- TARGET ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c
- TYPE EMBED_C
- RESOURCES ${RESOURCE_LIST}
- PREFIX /org/dino-im
- SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data
-)
-
vala_precompile(LIBDINO_VALA_C
SOURCES
src/application.vala
- src/plugin/interfaces.vala
- src/plugin/loader.vala
- src/plugin/registry.vala
-
src/dbus/login1.vala
src/dbus/networkmanager.vala
src/dbus/upower.vala
@@ -46,6 +27,10 @@ SOURCES
src/entity/message.vala
src/entity/encryption.vala
+ src/plugin/interfaces.vala
+ src/plugin/loader.vala
+ src/plugin/registry.vala
+
src/service/avatar_manager.vala
src/service/avatar_storage.vala
src/service/chat_interaction.vala
@@ -57,7 +42,6 @@ SOURCES
src/service/message_manager.vala
src/service/module_manager.vala
src/service/muc_manager.vala
- src/service/pgp_manager.vala
src/service/presence_manager.vala
src/service/roster_manager.vala
src/service/stream_interactor.vala
@@ -66,15 +50,12 @@ SOURCES
CUSTOM_VAPIS
"${CMAKE_BINARY_DIR}/exports/xmpp-vala.vapi"
"${CMAKE_BINARY_DIR}/exports/qlite.vapi"
- "${CMAKE_BINARY_DIR}/exports/gpgme.vapi"
PACKAGES
${LIBDINO_PACKAGES}
GENERATE_VAPI
dino
GENERATE_HEADER
dino
-GRESOURCES
- ${LIBDINO_GRESOURCES_XML}
OPTIONS
--target-glib=2.38
${GLOBAL_DEBUG_FLAGS}
@@ -83,9 +64,9 @@ OPTIONS
set(CFLAGS ${VALA_CFLAGS} ${LIBDINO_CFLAGS})
add_definitions(${CFLAGS})
-add_library(libdino SHARED ${LIBDINO_VALA_C} ${LIBDINO_GRESOURCES_TARGET})
-add_dependencies(libdino xmpp-vala-vapi qlite-vapi gpgme-vapi)
-target_link_libraries(libdino xmpp-vala qlite gpgme-vala ${LIBDINO_LIBRARIES} -lm)
+add_library(libdino SHARED ${LIBDINO_VALA_C})
+add_dependencies(libdino xmpp-vala-vapi qlite-vapi)
+target_link_libraries(libdino xmpp-vala qlite ${LIBDINO_LIBRARIES} -lm)
set_target_properties(libdino PROPERTIES PREFIX "")
add_custom_target(dino-vapi
diff --git a/libdino/data/pgp_stack.ui b/libdino/data/pgp_stack.ui
deleted file mode 100644
index 4df9f0b8..00000000
--- a/libdino/data/pgp_stack.ui
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <template class="DinoPgpManagerAccountSettingsWidget">
- <property name="visible">True</property>
- <child>
- <object class="GtkButton" id="pgp_button">
- <property name="relief">none</property>
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="pgp_label">
- <property name="xalign">0</property>
- <property name="visible">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="name">label</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="pgp_combobox">
- <property name="hexpand">True</property>
- <property name="width_request">200</property>
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="name">entry</property>
- </packing>
- </child>
- </template>
-</interface> \ No newline at end of file
diff --git a/libdino/src/application.vala b/libdino/src/application.vala
index eb8160a9..ad19a976 100644
--- a/libdino/src/application.vala
+++ b/libdino/src/application.vala
@@ -17,7 +17,6 @@ public class Dino.Application : Gtk.Application {
CounterpartInteractionManager.start(stream_interaction);
PresenceManager.start(stream_interaction);
MucManager.start(stream_interaction);
- PgpManager.start(stream_interaction, db);
RosterManager.start(stream_interaction);
ConversationManager.start(stream_interaction, db);
ChatInteraction.start(stream_interaction);
diff --git a/libdino/src/service/module_manager.vala b/libdino/src/service/module_manager.vala
index c21e189e..896fb1e4 100644
--- a/libdino/src/service/module_manager.vala
+++ b/libdino/src/service/module_manager.vala
@@ -63,7 +63,6 @@ public class ModuleManager {
module_map[account].add(new Xmpp.Message.Module());
module_map[account].add(new Xep.MessageCarbons.Module());
module_map[account].add(new Xep.Muc.Module());
- module_map[account].add(new Xep.Pgp.Module());
module_map[account].add(new Xep.Pubsub.Module());
module_map[account].add(new Xep.EntityCapabilities.Module(entity_capabilities_storage));
module_map[account].add(new Xep.UserAvatars.Module(avatar_storage));
diff --git a/libdino/src/service/pgp_manager.vala b/libdino/src/service/pgp_manager.vala
deleted file mode 100644
index 447c1f7f..00000000
--- a/libdino/src/service/pgp_manager.vala
+++ /dev/null
@@ -1,176 +0,0 @@
-using Gee;
-using Xmpp;
-
-using Xmpp;
-using Dino.Entities;
-
-namespace Dino {
- public class PgpManager : StreamInteractionModule, Object {
- public const string id = "pgp_manager";
-
- public const string MESSAGE_ENCRYPTED = "pgp";
-
- private StreamInteractor stream_interactor;
- private Database db;
- private HashMap<Jid, string> pgp_key_ids = new HashMap<Jid, string>(Jid.hash_bare_func, Jid.equals_bare_func);
-
- public static void start(StreamInteractor stream_interactor, Database db) {
- PgpManager m = new PgpManager(stream_interactor, db);
- stream_interactor.add_module(m);
-
- Plugins.Registry plugin_registry = (GLib.Application.get_default() as Application).plugin_registry;
- plugin_registry.register_encryption_list_entry(new EncryptionListEntry(m));
- plugin_registry.register_account_settings_entry(new AccountSettingsEntry(m));
- }
-
- private class AccountSettingsEntry : Plugins.AccountSettingsEntry {
- private PgpManager pgp_manager;
-
- public AccountSettingsEntry(PgpManager pgp_manager) {
- this.pgp_manager = pgp_manager;
- }
-
- public override string id { get {
- return "pgp_key_picker";
- }}
-
- public override string name { get {
- return "OpenPGP";
- }}
-
- public override Plugins.AccountSettingsWidget get_widget() {
- return new AccountSettingsWidget();
- }
- }
-
- [GtkTemplate (ui = "/org/dino-im/pgp_stack.ui")]
- private class AccountSettingsWidget : Gtk.Stack, Plugins.AccountSettingsWidget {
- [GtkChild] private Gtk.Label pgp_label;
- [GtkChild] private Gtk.Button pgp_button;
- [GtkChild] private Gtk.ComboBox pgp_combobox;
-
- private Gtk.ListStore list_store = new Gtk.ListStore(2, typeof(string), typeof(string?));
-
- public AccountSettingsWidget() {
- Gtk.CellRendererText renderer = new Gtk.CellRendererText();
- renderer.set_padding(0, 0);
- pgp_combobox.pack_start(renderer, true);
- pgp_combobox.add_attribute(renderer, "markup", 0);
- pgp_button.clicked.connect(() => { activated(); this.set_visible_child_name("entry"); pgp_combobox.popup(); });
- }
-
- public void deactivate() {
- this.set_visible_child_name("label");
- }
-
- private void key_changed() {
- Gtk.TreeIter selected;
- pgp_combobox.get_active_iter(out selected);
- Value text;
- list_store.get_value(selected, 0, out text);
- pgp_label.set_markup((string) text);
- deactivate();
- }
-
- public void set_account(Account account) {
- populate_pgp_combobox(account);
- }
-
- private void populate_pgp_combobox(Account account) {
- pgp_combobox.changed.disconnect(key_changed);
-
- Gtk.TreeIter iter;
- pgp_combobox.set_model(list_store);
-
- list_store.clear();
- list_store.append(out iter);
- pgp_label.set_markup("Disabled\n<span font='9'>Select key</span>");
- list_store.set(iter, 0, "Disabled\n<span font='9'>Select key</span>", 1, null);
- Gee.List<GPG.Key> list = GPGHelper.get_keylist(null, true);
- foreach (GPG.Key key in list) {
- list_store.append(out iter);
- list_store.set(iter, 0, @"<span font='11'>$(Markup.escape_text(key.uids[0].uid))</span>\n<span font='9'>0x$(Markup.escape_text(key.fpr[0:16]))</span>");
- list_store.set(iter, 1, key.fpr);
- }
-
- pgp_combobox.set_active(0);
- pgp_combobox.changed.connect(key_changed);
- }
- }
-
- private class EncryptionListEntry : Plugins.EncryptionListEntry, Object {
- private PgpManager pgp_manager;
-
- public EncryptionListEntry(PgpManager pgp_manager) {
- this.pgp_manager = pgp_manager;
- }
-
- public Entities.Encryption encryption { get {
- return Encryption.PGP;
- }}
-
- public string name { get {
- return "OpenPGP";
- }}
-
- public bool can_encrypt(Entities.Conversation conversation) {
- return pgp_manager.pgp_key_ids.has_key(conversation.counterpart);
- }
- }
-
- private PgpManager(StreamInteractor stream_interactor, Database db) {
- this.stream_interactor = stream_interactor;
- this.db = db;
-
- stream_interactor.account_added.connect(on_account_added);
- MessageManager.get_instance(stream_interactor).pre_message_received.connect(on_pre_message_received);
- MessageManager.get_instance(stream_interactor).pre_message_send.connect(on_pre_message_send);
- }
-
- private void on_pre_message_received(Entities.Message message, Xmpp.Message.Stanza message_stanza, Conversation conversation) {
- if (Xep.Pgp.MessageFlag.get_flag(message_stanza) != null && Xep.Pgp.MessageFlag.get_flag(message_stanza).decrypted) {
- message.encryption = Encryption.PGP;
- }
- }
-
- private void on_pre_message_send(Entities.Message message, Xmpp.Message.Stanza message_stanza, Conversation conversation) {
- if (message.encryption == Encryption.PGP) {
- string? key_id = get_key_id(conversation.account, message.counterpart);
- bool encrypted = false;
- if (key_id != null) {
- encrypted = stream_interactor.get_stream(conversation.account).get_module(Xep.Pgp.Module.IDENTITY).encrypt(message_stanza, key_id);
- }
- if (!encrypted) {
- message.marked = Entities.Message.Marked.WONTSEND;
- }
- }
- }
-
- public string? get_key_id(Account account, Jid jid) {
- return db.get_pgp_key(jid);
- }
-
- public static PgpManager? get_instance(StreamInteractor stream_interactor) {
- return (PgpManager) stream_interactor.get_module(id);
- }
-
- internal string get_id() {
- return id;
- }
-
- private void on_account_added(Account account) {
- stream_interactor.module_manager.get_module(account, Xep.Pgp.Module.IDENTITY).received_jid_key_id.connect((stream, jid, key_id) => {
- on_jid_key_received(account, new Jid(jid), key_id);
- });
- }
-
- private void on_jid_key_received(Account account, Jid jid, string key_id) {
- if (!pgp_key_ids.has_key(jid) || pgp_key_ids[jid] != key_id) {
- if (!MucManager.get_instance(stream_interactor).is_groupchat_occupant(jid, account)) {
- db.set_pgp_key(jid.bare_jid, key_id);
- }
- }
- pgp_key_ids[jid] = key_id;
- }
- }
-} \ No newline at end of file
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-10 07:01:40 +0000