mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added null checks for intent and action

Browse source
This commit is contained in:
Ivan Poliakov 2014-05-20 20:11:21 +01:00
parent 55bbe9f7fb
commit cf35e85024
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
glass/src/com/google/zxing/client/glass/CaptureActivity.java
View file

@ -57,7 +57,18 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
returnResult = getIntent().getAction().equals(SCAN_ACTION);
// returnResult should be true if activity was started using
// startActivityForResult() with SCAN_ACTION intent
returnResult = false;
Intent intent = getIntent();
if (intent != null) {
String action = intent.getAction();
if (action != null)
returnResult = action.equals(SCAN_ACTION);
}
Window window = getWindow(); Window window = getWindow();
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
setContentView(R.layout.capture); setContentView(R.layout.capture);