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

# Conflicts:
#	app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
#	app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java
#	app/src/main/res/layout/fragment_card_edit_tab_comments.xml
#	app/src/main/res/layout/item_comment.xml
#	app/src/main/res/values/strings.xml

2 files changed, 18 insertions, 1 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Account.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Account.java
index 30cc0a2e3..ba8fb72b7 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Account.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Account.java
@@ -1,17 +1,23 @@
 package it.niedermann.nextcloud.deck.model;
 
+import android.net.Uri;
+
 import androidx.annotation.NonNull;
+import androidx.annotation.Px;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import com.nextcloud.android.sso.model.SingleSignOnAccount;
+
 import java.io.Serializable;
 
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.model.ocs.Capabilities;
 import it.niedermann.nextcloud.deck.model.ocs.Version;
+import it.niedermann.nextcloud.deck.ui.accountswitcher.AccountSwitcherDialog;
 import it.niedermann.nextcloud.deck.util.ColorUtil;
 
 @Entity(indices = {@Index(value = "name", unique = true)})
@@ -182,6 +188,15 @@ public class Account implements Serializable {
         return serverDeckVersion.equals(account.serverDeckVersion);
     }
 
+    /**
+     * A cache buster parameter is added for duplicate account names on different hosts which shall be fetched from the same {@link SingleSignOnAccount} (e. g. {@link AccountSwitcherDialog})
+     *
+     * @return an {@link String} to fetch the avatar for this account.
+     */
+    public String getAvatarUrl(@Px int size) {
+        return getUrl() + "/index.php/avatar/" + Uri.encode(getUserName()) + "/" + size;
+    }
+
     @Override
     public int hashCode() {
         int result = id != null ? id.hashCode() : 0;
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
index fcaab380b..11f0c3000 100644
--- 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
@@ -12,7 +12,9 @@ import it.niedermann.nextcloud.deck.model.Card;
 
 @Entity(
         indices = {
-                @Index("cardId")
+                @Index(value = "cardId", name = "index_SingleCardWidgetModel_cardId"),
+                @Index(value = "accountId", name = "idx_cardWidgetModel_accountId"),
+                @Index(value = "boardId", name = "idx_cardWidgetModel_boardId")
         },
         foreignKeys = {
                 @ForeignKey(