Fix merge issue

2 years ago · f26a468536
parent a54db34df9
commit f26a468536
2 changed files with 9 additions and 4 deletions
--- a/app/src/main/java/com/alphawallet/app/entity/walletconnect/WalletConnectSessionItem.java
+++ b/app/src/main/java/com/alphawallet/app/entity/walletconnect/WalletConnectSessionItem.java
@ -10,9 +10,9 @@ public class WalletConnectSessionItem
    public String name = "";
    public String url = "";
    public String icon = "";
-    public final String sessionId;
-    public final String localSessionId;
-    public final long chainId;
+    public String sessionId;
+    public String localSessionId;
+    public long chainId;

    public WalletConnectSessionItem(RealmWCSession s)
    {
@ -26,4 +26,9 @@ public class WalletConnectSessionItem
        localSessionId = s.getSessionId();
        chainId = s.getChainId() == 0 ? 1 : s.getChainId(); //older sessions without chainId set must be mainnet
    }
+
+    public WalletConnectSessionItem()
+    {
+
+    }
 }
--- a/app/src/main/res/raw/token_anim.data
+++ b/app/src/main/res/raw/token_anim.data
@ -20,7 +20,7 @@
    </head>
    <body>
        <div class="imgbox">
-        <video class="center-fit" controls autoplay name="media" loop>
+        <video class="center-fit" autoplay name="media" loop>
            <source src="[URL]" type="[MIME]">
        </video>
        </div>