fixes from Firebase

Release point 3.24.5
AlphaWallet · Mar 22, 2021 · 49af8bc · 49af8bc
1 parent 18f2716
commit 49af8bc
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -35,8 +35,8 @@ android {
         }
     }
     defaultConfig {
-        versionCode 140
-        versionName "3.24.1"
+        versionCode 146
+        versionName "3.24.5"
 
         applicationId "io.stormbird.wallet"
         minSdkVersion 23

diff --git a/app/src/main/java/com/alphawallet/app/ui/AddEditDappActivity.java b/app/src/main/java/com/alphawallet/app/ui/AddEditDappActivity.java
@@ -64,6 +64,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             favicon = DappBrowserUtils.getIconUrl(visibleUrl);
             Glide.with(this)
                     .load(favicon)
+                    .override(42)
                     .apply(new RequestOptions().circleCrop())
                     .apply(new RequestOptions().placeholder(R.drawable.ic_logo))
                     .into(icon);

diff --git a/app/src/main/java/com/alphawallet/app/ui/DappBrowserFragment.java b/app/src/main/java/com/alphawallet/app/ui/DappBrowserFragment.java
@@ -1159,7 +1159,7 @@ else if (transaction.payload == null && transaction.value == null)
 
     public void backPressed()
     {
-        if (back.getAlpha() == 0.3f) return;
+        if (web3 == null || back == null || back.getAlpha() == 0.3f) return;
         if (web3.canGoBack())
         {
             checkBackClickArrowVisibility(); //to make arrows function correctly - don't want to wait for web page to load to check back/forwards - this looks clunky

diff --git a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/MyDappsGridAdapter.java b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/MyDappsGridAdapter.java
@@ -68,6 +68,7 @@ public void onBindViewHolder(@NonNull MyDappsGridAdapter.ViewHolder viewHolder,
             favicon = DappBrowserUtils.getIconUrl(visibleUrl);
             Glide.with(viewHolder.icon.getContext())
                     .load(favicon)
+                    .override(80)
                     .apply(new RequestOptions().circleCrop())
                     .apply(new RequestOptions().placeholder(R.drawable.ic_logo))
                     .into(viewHolder.icon);

diff --git a/app/src/main/java/com/alphawallet/app/ui/widget/holder/TokenGridHolder.java b/app/src/main/java/com/alphawallet/app/ui/widget/holder/TokenGridHolder.java
@@ -62,6 +62,7 @@ public void bind(@Nullable TokenCardMeta tcm, @NonNull Bundle addition) {
                     if (firstAsset != null) {
                         Glide.with(getContext())
                                 .load(firstAsset.getImagePreviewUrl())
+                                .override(72)
                                 .into(imageIcon);
                         name.setText(token.tokenInfo.name);
                         textIcon.setVisibility(View.GONE);

diff --git a/app/src/main/java/com/alphawallet/app/viewmodel/HomeViewModel.java b/app/src/main/java/com/alphawallet/app/viewmodel/HomeViewModel.java
@@ -272,6 +272,7 @@ else if (!TextUtils.isEmpty(wallet.name))
         }
         else
         {
+            walletName.postValue("");
             //check for ENS name
             new AWEnsResolver(TokenRepository.getWeb3jService(EthereumNetworkRepository.MAINNET_ID), context)
                     .resolveEnsName(wallet.address)

diff --git a/app/src/main/java/com/alphawallet/app/widget/TokenIcon.java b/app/src/main/java/com/alphawallet/app/widget/TokenIcon.java
@@ -1,11 +1,9 @@
 package com.alphawallet.app.widget;
 
-import android.animation.Animator;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
@@ -15,7 +13,6 @@
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.alphawallet.app.R;
-import com.alphawallet.app.entity.Transaction;
 import com.alphawallet.app.entity.tokens.Token;
 import com.alphawallet.app.repository.CurrencyRepository;
 import com.alphawallet.app.repository.EthereumNetworkRepository;