From 88e1a95da7df7054c0ed67583c02b1a704377dae Mon Sep 17 00:00:00 2001 From: Peter Storch Date: Thu, 22 Oct 2020 19:08:52 +0200 Subject: [PATCH] fix NPE introduced in #466 --- .../dennisguse/opentracks/io/file/importer/ImportActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java index 0d7221697..d8ad381e4 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java @@ -45,7 +45,7 @@ public class ImportActivity extends FragmentActivity implements ImportProgressDi if (savedInstanceState == null || !savedInstanceState.getBoolean(BUNDLE_ACTIVITY_RECREATED, false)) { if (getIntent().getData() != null) { ImportProgressDialogFragment.showDialog(getSupportFragmentManager(), getIntent().getData(), false); - } else if (getIntent().getClipData().getItemCount() > 0) { + } else if (getIntent().getClipData() != null && getIntent().getClipData().getItemCount() > 0) { ImportProgressDialogFragment.showDialog(getSupportFragmentManager(), getIntent().getClipData().getItemAt(0).getUri(), false); } else { // Started from DirectoryChooserActivity