From 82e05d1c51168b117f96817f414486fea72218fe Mon Sep 17 00:00:00 2001
From: "srowen@gmail.com"
 <srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Thu, 25 Apr 2013 14:13:15 +0000
Subject: [PATCH] Avoid redundant info in history

git-svn-id: https://zxing.googlecode.com/svn/trunk@2688 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 .../client/android/history/HistoryManager.java  | 17 +++++++++++++----
 .../supplement/SupplementalInfoRetriever.java   |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/android/src/com/google/zxing/client/android/history/HistoryManager.java b/android/src/com/google/zxing/client/android/history/HistoryManager.java
index 550439afd..dca9ea451 100644
--- a/android/src/com/google/zxing/client/android/history/HistoryManager.java
+++ b/android/src/com/google/zxing/client/android/history/HistoryManager.java
@@ -204,10 +204,19 @@ public final class HistoryManager {
       }
 
       if (oldID != null) {
-        String newDetails = oldDetails == null ? itemDetails : oldDetails + " : " + itemDetails;
-        ContentValues values = new ContentValues();
-        values.put(DBHelper.DETAILS_COL, newDetails);
-        db.update(DBHelper.TABLE_NAME, values, DBHelper.ID_COL + "=?", new String[] { oldID });
+        String newDetails;
+        if (oldDetails == null) {
+          newDetails = itemDetails;
+        } else if (oldDetails.contains(itemDetails)) {
+          newDetails = null;
+        } else {
+          newDetails = oldDetails + " : " + itemDetails;
+        } 
+        if (newDetails != null) {
+          ContentValues values = new ContentValues();
+          values.put(DBHelper.DETAILS_COL, newDetails);
+          db.update(DBHelper.TABLE_NAME, values, DBHelper.ID_COL + "=?", new String[] { oldID });
+        }
       }
 
     } finally {
diff --git a/android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java b/android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java
index 332178658..b3caaf85d 100644
--- a/android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java
+++ b/android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java
@@ -108,7 +108,7 @@ public abstract class SupplementalInfoRetriever extends AsyncTask<Object,Object,
     StringBuilder newTextCombined = new StringBuilder();
 
     if (source != null) {
-      newTextCombined.append(source).append(" : ");
+      newTextCombined.append(source).append(' ');
     }
 
     int linkStart = newTextCombined.length();