mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-01-12 19:57:27 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refinements to last change, for history text and newlines

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1892 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2011-08-22 12:55:08 +00:00
parent 9af326638d
commit 143b028063
2 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
android/src/com/google/zxing/client/android/history/HistoryManager.java
View file

@ -68,6 +68,7 @@ public final class HistoryManager {
};
private static final String[] ID_COL_PROJECTION = { DBHelper.ID_COL };
private static final String[] ID_DETAIL_COL_PROJECTION = { DBHelper.ID_COL, DBHelper.DETAILS_COL };
private static final DateFormat EXPORT_DATE_TIME_FORMAT = DateFormat.getDateTimeInstance();
private final CaptureActivity activity;
@ -174,9 +175,6 @@ public final class HistoryManager {
// As we're going to do an update only we don't need need to worry
// about the preferences; if the item wasn't saved it won't be udpated
ContentValues values = new ContentValues();
values.put(DBHelper.DETAILS_COL, itemDetails);
SQLiteOpenHelper helper = new DBHelper(activity);
SQLiteDatabase db;
try {
@ -187,8 +185,34 @@ public final class HistoryManager {
}
try {
// Update the details for the ID entry into the DB.
db.update(DBHelper.TABLE_NAME, values, DBHelper.TEXT_COL + "=?", new String[] {itemID});
Cursor cursor = null;
String oldID = null;
String oldDetails = null;
try {
cursor = db.query(DBHelper.TABLE_NAME,
ID_DETAIL_COL_PROJECTION,
DBHelper.TEXT_COL + "=?",
new String[] { itemID },
null,
null,
DBHelper.TIMESTAMP_COL + " DESC");
if (cursor.moveToNext()) {
oldID = cursor.getString(0);
oldDetails = cursor.getString(1);
}
} finally {
if (cursor != null) {
cursor.close();
}
}
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 });
} finally {
db.close();
}

12
android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java
View file

@ -120,10 +120,10 @@ public abstract class SupplementalInfoRetriever implements Callable<Void> {
StringBuilder newTextCombined = new StringBuilder();
if (source != null) {
newTextCombined.append(source).append('\n');
newTextCombined.append(source).append(" : ");
}
int spanStart = newTextCombined.length();
int linkStart = newTextCombined.length();
boolean first = true;
for (String newText : newTexts) {
@ -137,14 +137,12 @@ public abstract class SupplementalInfoRetriever implements Callable<Void> {
}
}
int spanEnd = newTextCombined.length();
newTextCombined.append("\n\n");
int linkEnd = newTextCombined.length();
String newText = newTextCombined.toString();
final Spannable content = new SpannableString(newText);
final Spannable content = new SpannableString(newText + "\n\n");
if (linkURL != null) {
content.setSpan(new URLSpan(linkURL), spanStart, spanEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
content.setSpan(new URLSpan(linkURL), linkStart, linkEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}
handler.post(new Runnable() {