Make Midori.URI.get_fingerprint more legible

diff --git a/katze/midori-uri.vala b/katze/midori-uri.vala
index 4dad32c196e850378fa88a4df298c749c39d8238..c823a48f150585ecb3a2f4a671443ccd3cd1ab9a 100644 (file)
--- a/katze/midori-uri.vala
+++ b/katze/midori-uri.vala
@@ -146,21 +146,25 @@ namespace Midori {
             out string checksum, out string label) {
 
             /* http://foo.bar/baz/spam.eggs#!algo!123456 */
+            unowned string display = null;
+            GLib.ChecksumType type = (GLib.ChecksumType)int.MAX;
+
             unowned string delimiter = "#!md5!";
-            unowned string display = _("MD5-Checksum:");
-            GLib.ChecksumType type = GLib.ChecksumType.MD5;
             unowned string? fragment = uri.str (delimiter);
-            if (fragment == null) {
-                delimiter = "#!sha1!";
+            if (fragment != null) {
+                display = _("MD5-Checksum:");
+                type = GLib.ChecksumType.MD5;
+            }
+
+            delimiter = "#!sha1!";
+            fragment = uri.str (delimiter);
+            if (fragment != null) {
                 display = _("SHA1-Checksum:");
                 type = GLib.ChecksumType.SHA1;
-                fragment = uri.str (delimiter);
-            }
-            if (fragment == null) {
-                type = (GLib.ChecksumType)int.MAX;
-                display = null;
             }
 
+            /* No SHA256: no known usage and no need for strong encryption */
+
             if (&checksum != null)
                 checksum = fragment != null
                     ? fragment.offset (delimiter.length) : null;

diff --git a/tests/magic-uri.c b/tests/magic-uri.c
index b80bf153374dd4e954a3c9c9d0583461359eee57..53bee470e403925b3b8773108189d92c389dbe92 100644 (file)
--- a/tests/magic-uri.c
+++ b/tests/magic-uri.c
@@ -249,6 +249,8 @@ magic_uri_fingerprint (void)
     g_assert_cmpint (midori_uri_get_fingerprint (uri, NULL, NULL), ==, G_MAXINT);
     uri = "http://midori-0.4.1.tar.bz2#abcdefg";
     g_assert_cmpint (midori_uri_get_fingerprint (uri, NULL, NULL), ==, G_MAXINT);
+    uri = "http://midori-0.4.1.tar.bz2";
+    g_assert_cmpint (midori_uri_get_fingerprint (uri, NULL, NULL), ==, G_MAXINT);
 }
 
 static void