Merge 'upstream/master'

1 files changed, 29 insertions, 0 deletions

diff --git a/main/src/plugins/openpgp/util.vala b/main/src/plugins/openpgp/util.vala
new file mode 100644
index 00000000..3c7a7594
--- /dev/null
+++ b/main/src/plugins/openpgp/util.vala
@@ -0,0 +1,29 @@
+using Gtk;
+
+using Dino.Entities;
+using Xmpp.Util;
+
+namespace Dino.Plugins.OpenPgp {
+
+public static string markup_id(string s, bool is_fingerprint) {
+    string markup = is_fingerprint ? "" : "0x";
+    for (int i = 0; i < s.length; i += 4) {
+        string four_chars = s.substring(i, 4).down();
+
+        if (i == 4 * 5) markup += "\n";
+        markup += four_chars;
+        if (is_fingerprint) markup += " ";
+    }
+    return "<span font_family='monospace' font='9'>" + markup + "</span>";
+}
+
+private static string? get_sign_key(string sig, string signed_text) {
+    string armor = "-----BEGIN PGP MESSAGE-----\n\n" + sig + "\n-----END PGP MESSAGE-----";
+    string? sign_key = null;
+    try {
+        sign_key = GPGHelper.get_sign_key(armor, signed_text);
+    } catch (Error e) { }
+    return sign_key;
+}
+
+}