karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Bugfix: NPE in import. Fixes #506.

Browse Source
This commit is contained in:
Román Martínez
2020-11-08 13:38:09 +01:00
committed by Dennis Guse
parent dd490f528e
commit 82f5c127ee
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
+2 -2
View File
@@ -110,7 +110,7 @@ public class ImportActivity extends FragmentActivity {
@Override @Override
public void onBackPressed() { public void onBackPressed() {
if (doubleBackToCancel || getTotalDone() == summary.getTotalCount()) { if (doubleBackToCancel || (summary != null && getTotalDone() == summary.getTotalCount())) {
super.onBackPressed(); super.onBackPressed();
viewModel.cancel(); viewModel.cancel();
getViewModelStore().clear(); getViewModelStore().clear();
@@ -130,7 +130,7 @@ public class ImportActivity extends FragmentActivity {
} }
private int getTotalDone() { private int getTotalDone() {
return summary.getSuccessCount() + summary.getExistsCount() + summary.getErrorCount(); return summary != null ? summary.getSuccessCount() + summary.getExistsCount() + summary.getErrorCount() : 0;
} }
private void setProgress() { private void setProgress() {