#1863 archive card not working: read account from DB to be sure of actual version (was: fallback to default)

Author: desperateCoder

app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/DataPropagationHelper.java

@@ -9,7 +9,6 @@
 import java.util.function.BiConsumer;
 
 import it.niedermann.nextcloud.deck.database.DataBaseAdapter;
-import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.enums.DBStatus;
 import it.niedermann.nextcloud.deck.model.interfaces.IRemoteEntity;
 import it.niedermann.nextcloud.deck.remote.adapters.ServerAdapter;
@@ -89,7 +88,7 @@ public <T extends IRemoteEntity> void updateEntity(@NonNull final AbstractSyncDa
         }
         if (entity.getId() != null && serverAdapter.hasInternetConnection()) {
             try {
-                provider.updateOnServer(serverAdapter, dataBaseAdapter, accountId, new ResponseCallback<>(new Account(accountId)) {
+                provider.updateOnServer(serverAdapter, dataBaseAdapter, accountId, new ResponseCallback<>(dataBaseAdapter.getAccountByIdDirectly(accountId)) {
                     @Override
                     public void onResponse(T response, Headers headers) {
                         executor.submit(() -> {
@@ -124,7 +123,7 @@ public <T extends IRemoteEntity> void deleteEntity(@NonNull final AbstractSyncDa
         }
         if (entity.getId() != null && serverAdapter.hasInternetConnection()) {
             try {
-                provider.deleteOnServer(serverAdapter, accountId, new ResponseCallback<>(new Account(accountId)) {
+                provider.deleteOnServer(serverAdapter, accountId, new ResponseCallback<>(dataBaseAdapter.getAccountByIdDirectly(accountId)) {
                     @Override
                     public void onResponse(EmptyResponse response, Headers headers) {
                         executor.submit(() -> {

app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/CardDataProvider.java

@@ -407,7 +407,7 @@ public void handleDeletes(ServerAdapter serverAdapter, DataBaseAdapter dataBaseA
             }
             if (cardToDelete.getStatus() == DBStatus.LOCAL_MOVED.getId()) {
                 //only delete, if the card isn't availible on server anymore.
-                serverAdapter.getCard(board.getId(), stack.getId(), cardToDelete.getId(), new ResponseCallback<>(new Account(accountId)) {
+                serverAdapter.getCard(board.getId(), stack.getId(), cardToDelete.getId(), new ResponseCallback<>(dataBaseAdapter.getAccountByIdDirectly(accountId)) {
                     @Override
                     public void onResponse(FullCard response, Headers headers) {
                         // do not delete, it's still there and was just moved!