mirror of
https://github.com/zxing/zxing.git
synced 2025-03-05 20:48:51 -08:00
Commit additional check for null as suggested on discussion group
git-svn-id: https://zxing.googlecode.com/svn/trunk@810 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
parent
9433c5955b
commit
29f9ff964c
|
@ -66,7 +66,7 @@ import java.io.IOException;
|
|||
* The barcode reader activity itself. This is loosely based on the CameraPreview
|
||||
* example included in the Android SDK.
|
||||
*/
|
||||
public final class CaptureActivity extends Activity implements SurfaceHolder.Callback {
|
||||
public final class DECaptureActivity extends Activity implements SurfaceHolder.Callback {
|
||||
|
||||
private static final int SHARE_ID = Menu.FIRST;
|
||||
private static final int SETTINGS_ID = Menu.FIRST + 1;
|
||||
|
@ -132,8 +132,9 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
|
|||
}
|
||||
|
||||
Intent intent = getIntent();
|
||||
if (intent != null && (intent.getAction().equals(Intents.Scan.ACTION) ||
|
||||
intent.getAction().equals(Intents.Scan.DEPRECATED_ACTION))) {
|
||||
String action = intent.getAction();
|
||||
if (intent != null && action != null && (action.equals(Intents.Scan.ACTION) ||
|
||||
action.equals(Intents.Scan.DEPRECATED_ACTION))) {
|
||||
mScanIntent = true;
|
||||
mDecodeMode = intent.getStringExtra(Intents.Scan.MODE);
|
||||
resetStatusView();
|
||||
|
|
Loading…
Reference in a new issue