diff options
| author | Stefan Niedermann <info@niedermann.it> | 2022-12-29 14:24:39 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2022-12-29 14:24:39 +0300 |
| commit | 323cdcd205545dc53469456632f667bd6c89553c (patch) | |
| tree | 66712a03e4c68a32d8bbd1615bc0295951d907e2 | |
| parent | 388932ffdf8eedfb0ff1f7518e7f167aaec3c1df (diff) | |
Prevent showing progress over 100% when importing first account
Signed-off-by: Stefan Niedermann <info@niedermann.it>
| -rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java | 6 | ||||
| -rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java index 962004498..ea2549a4e 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java @@ -150,10 +150,12 @@ public class ImportAccountActivity extends AppCompatActivity { }); runOnUiThread(() -> progress$.observe(ImportAccountActivity.this, (progress) -> { DeckLog.log("New progress value", progress.first, progress.second); - if(progress.first > 0) { + if (progress.first > 0) { binding.progressCircular.setIndeterminate(false); } - binding.progressText.setText(getString(R.string.progress_import, progress.first + 1, progress.second)); + if (progress.first <= progress.second) { + binding.progressText.setText(getString(R.string.progress_import, progress.first + 1, progress.second)); + } binding.progressCircular.setProgress(progress.first); binding.progressCircular.setMax(progress.second); })); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java index 8d91048cd..61b4da8ec 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java @@ -755,7 +755,7 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen ? R.string.do_you_want_to_archive_all_cards_of_the_filtered_list : R.string.do_you_want_to_archive_all_cards_of_the_list, stack.getTitle())) .setPositiveButton(R.string.simple_archive, (dialog, whichButton) -> { - final FilterInformation filterInformation = filterViewModel.getFilterInformation().getValue(); + final var filterInformation = filterViewModel.getFilterInformation().getValue(); mainViewModel.archiveCardsInStack(mainViewModel.getCurrentAccount().getId(), stackLocalId, filterInformation == null ? new FilterInformation() : filterInformation, new IResponseCallback<>() { @Override public void onResponse(Void response) { |