-use more compact QR encoding, if possible

1 files changed, 29 insertions, 11 deletions

diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index e54d0972..88af45b0 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -453,33 +453,50 @@ create_qrcode (unsigned int scale)
   const char *dir;
   char *fn;
   unsigned int size;
+  char *upper;
 
-  qri = QRinput_new2 (0, QR_ECLEVEL_Q);
+  qri = QRinput_new2 (0, QR_ECLEVEL_M);
   if (NULL == qri)
   {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "QRinput_new2");
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                         "QRinput_new2");
     return NULL;
   }
   entry = GTK_ENTRY (get_object ("gnunet_namestore_gtk_pseu_entry"));
   pseu = gtk_entry_get_text (GTK_ENTRY(entry));
   GNUNET_asprintf (&str,
-                   "gnunet://gns/%s/%s\n",
+                   "gnunet://gns/%s/%s",
                    GNUNET_GNSRECORD_z2s (&pubkey),
                    pseu);
-  if (0 != QRinput_append (qri,
-                           QR_MODE_8,
-                           strlen (str),
-                           (unsigned char*) str))
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "QRinput_append");
+  upper = GNUNET_strdup (str);
+  GNUNET_STRINGS_utf8_toupper (str,
+                               upper);
+  /* first try encoding as uppercase-only alpha-numerical
+     QR code (much smaller encoding); if that fails, also
+     try using binary encoding (in case nick contains
+     special characters). */
+  if ( (0 != QRinput_append (qri,
+                           QR_MODE_AN,
+                           strlen (upper),
+                           (unsigned char*) upper)) &&
+       (0 != QRinput_append (qri,
+                             QR_MODE_8,
+                             strlen (str),
+                             (unsigned char*) str)) )
+    {
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                         "QRinput_append");
+    GNUNET_free (upper);
     GNUNET_free (str);
     return NULL;
   }
+  GNUNET_free (upper);
   GNUNET_free (str);
   qrc = QRcode_encodeInput (qri);
   if (NULL == qrc)
   {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "QRcode_encodeInput");
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                         "QRcode_encodeInput");
     QRinput_free (qri);
     return NULL;
   }
@@ -530,7 +547,8 @@ setup_qrcode ()
   pb = create_qrcode (2);
   if (NULL == pb)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("Failed to initialize QR-code pixbuf"));
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("Failed to initialize QR-code pixbuf\n"));
     return;
   }
   image = GTK_IMAGE (get_object ("gnunet_namestore_gtk_qr_image"));