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

Avoid NPE on null action

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2262 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2012-04-26 16:34:51 +00:00
parent 9ad25e25b7
commit 6573f932a1
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
android/src/com/google/zxing/client/android/encode/EncodeActivity.java
View file

@ -63,16 +63,17 @@ public final class EncodeActivity extends Activity {
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
Intent intent = getIntent();
if (intent != null) {
if (intent == null) {
finish();
} else {
String action = intent.getAction();
if (action.equals(Intents.Encode.ACTION) || action.equals(Intent.ACTION_SEND)) {
if (Intents.Encode.ACTION.equals(action) || Intent.ACTION_SEND.equals(action)) {
setContentView(R.layout.encode);
return;
} else {
finish();
}
}
finish();
}
@Override