diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-09-10 18:36:43 +0300 |
|---|---|---|
| committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2021-09-10 19:44:25 +0300 |
| commit | 53cb66319171cc49c381cc6837e6b004a849ccfd (patch) | |
| tree | 2fad24f9c496c15c11907ac0be5fed261c58a12d /app/src/main | |
| parent | 62feba91cdaeacd980ca702fdd42fd8a3412dca1 (diff) | |
#545 Visualize import progress
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Diffstat (limited to 'app/src/main')
3 files changed, 11 insertions, 2 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/BoardDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/BoardDataProvider.java index cc299ba8d..bb7631052 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/BoardDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/BoardDataProvider.java @@ -14,6 +14,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import it.niedermann.nextcloud.deck.DeckLog; import it.niedermann.nextcloud.deck.api.ResponseCallback; import it.niedermann.nextcloud.deck.model.AccessControl; import it.niedermann.nextcloud.deck.model.Board; @@ -66,7 +67,10 @@ public class BoardDataProvider extends AbstractSyncDataProvider<FullBoard> { private void updateProgress() { if (progress != null) { + DeckLog.log("New progress post", progressCount, progressTotal); progress.postValue(Pair.create(progressCount, progressTotal)); + } else { + DeckLog.log("progress is null"); } } 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 d3a70ff6c..b8183d310 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 @@ -130,7 +130,8 @@ public class ImportAccountActivity extends AppCompatActivity { public void onResponse(Capabilities response) { if (!response.isMaintenanceEnabled()) { if (response.getDeckVersion().isSupported()) { - syncManager.synchronize(new ResponseCallback<>(account) { + binding.progressCircular.setIndeterminate(false); + var progress$ = syncManager.synchronize(new ResponseCallback<>(account) { @Override public void onResponse(Boolean response) { restoreWifiPref(); @@ -147,6 +148,11 @@ public class ImportAccountActivity extends AppCompatActivity { rollbackAccountCreation(syncManager, createdAccount.getId()); } }); + runOnUiThread(() -> progress$.observe(ImportAccountActivity.this, (progress) -> { + DeckLog.log("New progress value", progress.first, progress.second); + binding.progressCircular.setProgress(progress.first); + binding.progressCircular.setMax(progress.second); + })); } else { setStatusText(getString(R.string.deck_outdated_please_update, response.getDeckVersion().getOriginalVersion())); runOnUiThread(() -> { diff --git a/app/src/main/res/layout/activity_import_account.xml b/app/src/main/res/layout/activity_import_account.xml index 088c26426..b29aca60d 100644 --- a/app/src/main/res/layout/activity_import_account.xml +++ b/app/src/main/res/layout/activity_import_account.xml @@ -25,7 +25,6 @@ android:tint="@color/fg_secondary" app:srcCompat="@drawable/ic_app_logo" /> - <TextView android:id="@+id/welcome_text" android:layout_width="wrap_content" |