From 82f5c127ee943ebfc441c70a9cdd244f4b011c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rom=C3=A1n=20Mart=C3=ADnez?= Date: Sun, 8 Nov 2020 13:38:09 +0100 Subject: [PATCH] Bugfix: NPE in import. Fixes #506. --- .../opentracks/io/file/importer/ImportActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 4e926bf2e..c2408e82e 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 @@ -110,7 +110,7 @@ public class ImportActivity extends FragmentActivity { @Override public void onBackPressed() { - if (doubleBackToCancel || getTotalDone() == summary.getTotalCount()) { + if (doubleBackToCancel || (summary != null && getTotalDone() == summary.getTotalCount())) { super.onBackPressed(); viewModel.cancel(); getViewModelStore().clear(); @@ -130,7 +130,7 @@ public class ImportActivity extends FragmentActivity { } private int getTotalDone() { - return summary.getSuccessCount() + summary.getExistsCount() + summary.getErrorCount(); + return summary != null ? summary.getSuccessCount() + summary.getExistsCount() + summary.getErrorCount() : 0; } private void setProgress() {