upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 17:43:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: ImportActivity.

Browse Source
This commit is contained in:
Dennis Guse
2025-10-15 09:02:36 +02:00
parent fed884a6ce
commit c7ca6800f7
3 changed files with 45 additions and 52 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 -17
View File
@@ -99,8 +99,6 @@ public class ImportActivity extends FragmentActivity {
documentFiles = documentUris.stream().map(it -> DocumentFile.fromSingleUri(this, it)).collect(Collectors.toList());
}
initViews();
viewModel = new ViewModelProvider(this).get(ImportViewModel.class);
viewModel.getImportData(documentFiles).observe(this, data -> {
summary = data;
@@ -118,21 +116,8 @@ public class ImportActivity extends FragmentActivity {
outState.putBoolean(BUNDLE_IS_DIRECTORY, isDirectory);
}
private void initViews() {
viewBinding.importProgressDone.setText("0");
viewBinding.importProgressTotal.setText("0");
viewBinding.importProgressSummaryOk.setText("0");
viewBinding.importProgressSummaryExists.setText("0");
viewBinding.importProgressSummaryErrors.setText("0");
}
private int getTotalDone() {
return summary != null ? summary.getSuccessCount() + summary.getExistsCount() + summary.getErrorCount() : 0;
}
private void setProgress() {
int done = getTotalDone();
int done = summary.getCount();
viewBinding.importProgressDone.setText("" + done);
viewBinding.importProgressTotal.setText("" + summary.getTotalCount());
@@ -144,7 +129,7 @@ public class ImportActivity extends FragmentActivity {
viewBinding.importProgressSummaryExistsGroup.setVisibility(summary.getExistsCount() > 0 ? View.VISIBLE : View.GONE);
viewBinding.importProgressSummaryErrorsGroup.setVisibility(summary.getErrorCount() > 0 ? View.VISIBLE : View.GONE);
if (done == summary.getTotalCount()) {
if (summary.isDone()) {
onImportEnded();
}
}
src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java
+8
View File
@@ -126,5 +126,13 @@ public class ImportViewModel extends AndroidViewModel implements ImportServiceRe
public ArrayList<String> getFileErrors() {
return fileErrors;
}
public int getCount() {
return getSuccessCount() + getExistsCount() + getErrorCount();
}
public boolean isDone() {
return getTotalCount() == getCount();
}
}
}