use aztec code instead of qr

2 files changed, 7 insertions, 9 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 3246a1b28..e6a252c93 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -55,8 +55,8 @@ import android.widget.Toast;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
 import com.google.zxing.WriterException;
+import com.google.zxing.aztec.AztecWriter;
 import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 
 import net.java.otr4j.session.SessionID;
@@ -1114,12 +1114,11 @@ public abstract class XmppActivity extends Activity {
     }
 
     protected Bitmap createQrCodeBitmap(String input, int size) {
-        Log.d(Config.LOGTAG, "qr code requested size: " + size);
         try {
-            final QRCodeWriter QR_CODE_WRITER = new QRCodeWriter();
+            final AztecWriter AZTEC_WRITER = new AztecWriter();
             final Hashtable<EncodeHintType, Object> hints = new Hashtable<>();
-            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M);
-            final BitMatrix result = QR_CODE_WRITER.encode(input, BarcodeFormat.QR_CODE, size, size, hints);
+            hints.put(EncodeHintType.ERROR_CORRECTION, 10);
+            final BitMatrix result = AZTEC_WRITER.encode(input, BarcodeFormat.AZTEC, size, size, hints);
             final int width = result.getWidth();
             final int height = result.getHeight();
             final int[] pixels = new int[width * height];
@@ -1130,10 +1129,9 @@ public abstract class XmppActivity extends Activity {
                 }
             }
             final Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-            Log.d(Config.LOGTAG, "output size: " + width + "x" + height);
             bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
             return bitmap;
-        } catch (final WriterException e) {
+        } catch (final Exception e) {
             return null;
         }
     }
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index d2a0fa0d2..6415acaab 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -351,8 +351,8 @@
     <string name="message_text">Message text</string>
     <string name="url_copied_to_clipboard">URL copied to clipboard</string>
     <string name="message_copied_to_clipboard">Message copied to clipboard</string>
-    <string name="scan_qr_code">Scan QR code</string>
-    <string name="show_qr_code">Show QR code</string>
+    <string name="scan_qr_code">Scan barcode</string>
+    <string name="show_qr_code">Show barcode</string>
     <string name="show_block_list">Show block list</string>
     <string name="account_details">Account details</string>
     <string name="verify_otr">Verify OTR</string>