Skip to content

Commit 4bdcd11

Browse files
author
Chris Bellew
committed
Fixed a few nullpointerexceptions.
1 parent 8f7f807 commit 4bdcd11

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Voice Control For Plex/src/main/java/com/atomjack/vcfp/activities/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ public static void setListViewHeightBasedOnChildren(ListView listView) {
764764
protected void onNewIntent(Intent intent) {
765765
Logger.d("MainActivity onNewIntent: %s", intent.getAction());
766766

767-
if(intent.getAction().equals(VoiceControlForPlexApplication.Intent.GDMRECEIVE)) {
767+
if(intent.getAction().equals(VoiceControlForPlexApplication.Intent.GDMRECEIVE) && intent.getStringExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE) != null) {
768768
if(intent.getStringExtra(VoiceControlForPlexApplication.Intent.SCAN_TYPE).equals(VoiceControlForPlexApplication.Intent.SCAN_TYPE_SERVER)) {
769769
Logger.d("Got " + VoiceControlForPlexApplication.servers.size() + " servers");
770770
if(searchDialog != null)

Voice Control For Plex/src/main/java/com/atomjack/vcfp/activities/VCFPActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,9 @@ private void setThumb(InputStream is) {
600600
} catch (IOException e) {
601601
}
602602

603+
if(layout == null)
604+
return;
605+
603606
Drawable d = Drawable.createFromStream(is, "thumb");
604607
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
605608
layout.setBackground(d);

0 commit comments

Comments
 (0)