Merge branch 'master' into 454-replay-to-comments

# Conflicts:
#	app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
#	app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java

3 files changed, 131 insertions, 1 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullSingleCardWidgetModel.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullSingleCardWidgetModel.java
new file mode 100644
index 000000000..c9786f4d2
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullSingleCardWidgetModel.java
@@ -0,0 +1,44 @@
+package it.niedermann.nextcloud.deck.model.full;
+
+import androidx.room.Embedded;
+import androidx.room.Ignore;
+import androidx.room.Relation;
+
+import it.niedermann.nextcloud.deck.model.Account;
+import it.niedermann.nextcloud.deck.model.widget.singlecard.SingleCardWidgetModel;
+
+public class FullSingleCardWidgetModel {
+
+    @Embedded
+    private SingleCardWidgetModel model;
+
+    @Relation(parentColumn = "accountId", entityColumn = "id")
+    private Account account;
+
+    @Ignore
+    private FullCard fullCard;
+
+    public SingleCardWidgetModel getModel() {
+        return model;
+    }
+
+    public void setModel(SingleCardWidgetModel model) {
+        this.model = model;
+    }
+
+    public Account getAccount() {
+        return account;
+    }
+
+    public void setAccount(Account account) {
+        this.account = account;
+    }
+
+    public FullCard getFullCard() {
+        return fullCard;
+    }
+
+    public void setFullCard(FullCard fullCard) {
+        this.fullCard = fullCard;
+    }
+}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java
index 5e7169472..701cdd335 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java
@@ -80,7 +80,7 @@ public class Version implements Comparable<Version> {
         if (matcher.find()) {
             return Integer.parseInt(matcher.group());
         }
-        return 0;
+        throw new IllegalArgumentException("could not extract a number from following string: \""+containsNumbers+"\"");
     }
 
     @NonNull
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/singlecard/SingleCardWidgetModel.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/singlecard/SingleCardWidgetModel.java
new file mode 100644
index 000000000..fcaab380b
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/singlecard/SingleCardWidgetModel.java
@@ -0,0 +1,86 @@
+package it.niedermann.nextcloud.deck.model.widget.singlecard;
+
+import androidx.room.Entity;
+import androidx.room.ForeignKey;
+import androidx.room.Ignore;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
+
+import it.niedermann.nextcloud.deck.model.Account;
+import it.niedermann.nextcloud.deck.model.Board;
+import it.niedermann.nextcloud.deck.model.Card;
+
+@Entity(
+        indices = {
+                @Index("cardId")
+        },
+        foreignKeys = {
+                @ForeignKey(
+                        entity = Account.class,
+                        parentColumns = "id",
+                        childColumns = "accountId", onDelete = ForeignKey.CASCADE
+                ),
+                @ForeignKey(
+                        entity = Board.class,
+                        parentColumns = "localId",
+                        childColumns = "boardId", onDelete = ForeignKey.CASCADE
+                ),
+                @ForeignKey(
+                        entity = Card.class,
+                        parentColumns = "localId",
+                        childColumns = "cardId", onDelete = ForeignKey.CASCADE
+                )
+        }
+)
+public class SingleCardWidgetModel {
+    @Ignore
+    private static final long serialVersionUID = 0;
+
+    @PrimaryKey()
+    private Integer widgetId;
+    private Long accountId;
+    private Long boardId;
+    private Long cardId;
+
+    public Integer getWidgetId() {
+        return widgetId;
+    }
+
+    public void setWidgetId(Integer widgetId) {
+        this.widgetId = widgetId;
+    }
+
+    public Long getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(Long accountId) {
+        this.accountId = accountId;
+    }
+
+    public Long getBoardId() {
+        return boardId;
+    }
+
+    public void setBoardId(Long boardId) {
+        this.boardId = boardId;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    @Override
+    public String toString() {
+        return "SingleCardWidget{" +
+                "widgetId=" + widgetId +
+                ", accountId=" + accountId +
+                ", boardId=" + boardId +
+                ", cardId=" + cardId +
+                '}';
+    }
+}