mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-10 04:54:04 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Guess at avoiding an NPE reported by a user

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1970 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2011-10-14 08:41:14 +00:00
parent 359551d6e7
commit 27a047ebe2
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/src/com/google/zxing/client/android/CaptureActivity.java
View file

@ -567,10 +567,12 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
} else if (source == Source.ZXING_LINK) {
// Replace each occurrence of RETURN_CODE_PLACEHOLDER in the returnUrlTemplate
// with the scanned code. This allows both queries and REST-style URLs to work.
Message message = Message.obtain(handler, R.id.launch_product_query);
message.obj = returnUrlTemplate.replace(RETURN_CODE_PLACEHOLDER,
resultHandler.getDisplayContents().toString());
handler.sendMessageDelayed(message, INTENT_RESULT_DURATION);
if (returnUrlTemplate != null) {
Message message = Message.obtain(handler, R.id.launch_product_query);
message.obj = returnUrlTemplate.replace(RETURN_CODE_PLACEHOLDER,
String.valueOf(resultHandler.getDisplayContents()));
handler.sendMessageDelayed(message, INTENT_RESULT_DURATION);
}
}
}