Merge pull request zxing#397 from kmark/title-decode-fix

Decode HTML entities in titles
tacsipacsi · May 23, 2015 · 5561322 · 5561322
2 parents faee672 + 955a9e8
commit 5561322
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/android/src/com/google/zxing/client/android/result/supplement/TitleRetriever.java b/android/src/com/google/zxing/client/android/result/supplement/TitleRetriever.java
@@ -16,6 +16,7 @@
 
 package com.google.zxing.client.android.result.supplement;
 
+import android.text.Html;
 import android.widget.TextView;
 import com.google.zxing.client.android.HttpHelper;
 import com.google.zxing.client.android.history.HistoryManager;
@@ -56,6 +57,7 @@ void retrieveSupplementalInfo() {
       if (m.find()) {
         String title = m.group(1);
         if (title != null && !title.isEmpty()) {
+          title = Html.fromHtml(title).toString();
           if (title.length() > MAX_TITLE_LEN) {
             title = title.substring(0, MAX_TITLE_LEN) + "...";
           }