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

Fix possible NPE from null action

Browse source
This commit is contained in:
Sean Owen 2016-01-23 21:34:43 +00:00
parent 308d91de1c
commit 05b9f0af9b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java
View file

@ -97,7 +97,7 @@ public final class SearchBookContentsActivity extends Activity {
CookieManager.getInstance().removeExpiredCookie(); CookieManager.getInstance().removeExpiredCookie();
Intent intent = getIntent(); Intent intent = getIntent();
if (intent == null || !intent.getAction().equals(Intents.SearchBookContents.ACTION)) { if (intent == null || !Intents.SearchBookContents.ACTION.equals(intent.getAction())) {
finish(); finish();
return; return;
} }

4
android/src/com/google/zxing/client/android/encode/QRCodeEncoder.java
View file

@ -74,9 +74,9 @@ final class QRCodeEncoder {
this.dimension = dimension; this.dimension = dimension;
this.useVCard = useVCard; this.useVCard = useVCard;
String action = intent.getAction(); String action = intent.getAction();
if (action.equals(Intents.Encode.ACTION)) { if (Intents.Encode.ACTION.equals(action)) {
encodeContentsFromZXingIntent(intent); encodeContentsFromZXingIntent(intent);
} else if (action.equals(Intent.ACTION_SEND)) { } else if (Intent.ACTION_SEND.equals(action)) {
encodeContentsFromShareIntent(intent); encodeContentsFromShareIntent(intent);
} }
} }