Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-deck.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java1
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardDataProvider.java3
-rw-r--r--fastlane/metadata/android/en-US/changelogs/1013002.txt3
3 files changed, 4 insertions, 3 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
index d93835423..eb1e8afb3 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
@@ -423,6 +423,7 @@ public class SyncManager {
Account acc = dataBaseAdapter.getAccountByIdDirectly(account.getId());
acc.applyCapabilities(response.getResponse(), response.getHeaders().get("ETag"));
dataBaseAdapter.updateAccount(acc);
+ callback.getAccount().setServerDeckVersion(acc.getServerDeckVersion());
callback.onResponse(response.getResponse());
}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardDataProvider.java
index 0ceac2cd8..6f6c75c61 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardDataProvider.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardDataProvider.java
@@ -22,7 +22,6 @@ import it.niedermann.nextcloud.deck.model.User;
import it.niedermann.nextcloud.deck.model.enums.DBStatus;
import it.niedermann.nextcloud.deck.model.full.FullCard;
import it.niedermann.nextcloud.deck.model.full.FullStack;
-import it.niedermann.nextcloud.deck.model.ocs.Version;
import it.niedermann.nextcloud.deck.model.propagation.CardUpdate;
import it.niedermann.nextcloud.deck.persistence.sync.adapters.ServerAdapter;
import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DataBaseAdapter;
@@ -142,7 +141,7 @@ public class CardDataProvider extends AbstractSyncDataProvider<FullCard> {
}
syncHelper.doSyncFor(new AttachmentDataProvider(this, board, stack.getStack(), existingEntity, attachments));
- if (callback.getAccount().getServerDeckVersionAsObject().isGreaterOrEqualTo(new Version("1.0.0", 1, 0, 0))) {
+ if (callback.getAccount().getServerDeckVersionAsObject().supportsComments()) {
DeckLog.verbose("Comments - Version is OK, SYNC");
syncHelper.doSyncFor(new DeckCommentsDataProvider(this, existingEntity.getCard()));
} else {
diff --git a/fastlane/metadata/android/en-US/changelogs/1013002.txt b/fastlane/metadata/android/en-US/changelogs/1013002.txt
index b421db210..c9d44970a 100644
--- a/fastlane/metadata/android/en-US/changelogs/1013002.txt
+++ b/fastlane/metadata/android/en-US/changelogs/1013002.txt
@@ -1 +1,2 @@
-- 🌗 Dark mode following system default (#392) (by @fm-sys) \ No newline at end of file
+- 🌗 Dark mode following system default (#392) (by @fm-sys)
+- 🐞 Fix missing comments under some circumstances \ No newline at end of file