- improve starting speed & responsiveness

app/src/main/java/com/alphawallet/app/service/PriceAlertsService.java

@@ -93,7 +93,6 @@ public class PriceAlertsService extends Service
     {
         tokensService.setCurrentAddress(wallet.address);
         assetDefinitionService.startEventListener();
-        tokensService.startUpdateCycle();
         defaultWallet = wallet;
     }
 

app/src/main/java/com/alphawallet/app/service/TokensService.java

@@ -232,9 +232,17 @@ public class TokensService
         startUpdateCycle();
     }
 
+    public void startUpdateCycleIfRequired()
+    {
+        if (eventTimer == null || eventTimer.isDisposed())
+        {
+            startUpdateCycle();
+        }
+    }
+
     public void startUpdateCycle()
     {
-        if ((lastStartCycleTime + 1000) > System.currentTimeMillis())
+        if ((lastStartCycleTime + 2000) > System.currentTimeMillis())
         {
             return; // Block this refresh - we need to ensure the cycle restarts but within 1 second no need to restart
         }

app/src/main/java/com/alphawallet/app/ui/NFTAssetsFragment.java

@@ -50,6 +50,7 @@ import java.math.BigInteger;
 import java.util.List;
 
 import dagger.hilt.android.AndroidEntryPoint;
+import timber.log.Timber;
 
 @AndroidEntryPoint
 public class NFTAssetsFragment extends BaseFragment implements OnAssetClickListener, TokensAdapterCallback {
@@ -188,10 +189,17 @@ public class NFTAssetsFragment extends BaseFragment implements OnAssetClickListe
 
     public void showListView()
     {
-        recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
+        try
-        recyclerView.removeItemDecoration(gridItemDecoration);
+        {
-        recyclerView.setPadding(0, 0, 0, 0);
+            recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
-        initAndAttachAdapter(false);
+            recyclerView.removeItemDecoration(gridItemDecoration);
+            recyclerView.setPadding(0, 0, 0, 0);
+            initAndAttachAdapter(false);
+        }
+        catch (Exception e)
+        {
+            Timber.e(e);
+        }
     }
 
     private void initAndAttachAdapter(boolean isGridView)

app/src/main/java/com/alphawallet/app/ui/WalletFragment.java

@@ -30,6 +30,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
@@ -66,7 +67,6 @@ import com.alphawallet.app.ui.widget.holder.WarningHolder;
 import com.alphawallet.app.util.LocaleUtils;
 import com.alphawallet.app.viewmodel.WalletViewModel;
 import com.alphawallet.app.walletconnect.AWWalletConnectClient;
-import com.alphawallet.app.widget.AWalletAlertDialog;
 import com.alphawallet.app.widget.BuyEthOptionsView;
 import com.alphawallet.app.widget.LargeTitleView;
 import com.alphawallet.app.widget.NotificationView;
@@ -117,6 +117,7 @@ public class WalletFragment extends BaseFragment implements
     private LargeTitleView largeTitleView;
     private ActivityResultLauncher<Intent> handleBackupClick;
     private ActivityResultLauncher<Intent> tokenManagementLauncher;
+    private boolean completed = false;
 
     @Inject
     AWWalletConnectClient awWalletConnectClient;
@@ -210,6 +211,34 @@ public class WalletFragment extends BaseFragment implements
                 });
     }
 
+    class CompletionLayoutListener extends LinearLayoutManager
+    {
+        public CompletionLayoutListener(Context context)
+        {
+            super(context);
+        }
+
+        public CompletionLayoutListener(FragmentActivity activity, int orientation, boolean reverseLayout)
+        {
+            super(activity, orientation, reverseLayout);
+        }
+
+        @Override
+        public void onLayoutCompleted(RecyclerView.State state)
+        {
+            super.onLayoutCompleted(state);
+            final int firstVisibleItemPosition = findFirstVisibleItemPosition();
+            final int lastVisibleItemPosition = findLastVisibleItemPosition();
+            int itemsShown = lastVisibleItemPosition - firstVisibleItemPosition + 1;
+            if (!completed && itemsShown > 1)
+            {
+                completed = true;
+                viewModel.startUpdateListener();
+                viewModel.getTokensService().startUpdateCycleIfRequired();
+            }
+        }
+    }
+
     private void initList()
     {
         adapter = new TokensAdapter(this, viewModel.getAssetDefinitionService(), viewModel.getTokensService(),
@@ -225,7 +254,7 @@ public class WalletFragment extends BaseFragment implements
 
         refreshLayout.setOnRefreshListener(this::refreshList);
         recyclerView.addRecyclerListener(holder -> adapter.onRViewRecycled(holder));
-        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        recyclerView.setLayoutManager(new CompletionLayoutListener(getActivity(), LinearLayoutManager.VERTICAL, false));
     }
 
     private void initViewModel()
@@ -373,13 +402,17 @@ public class WalletFragment extends BaseFragment implements
     public void comeIntoFocus()
     {
         isVisible = true;
-        viewModel.startUpdateListener();
+        if (completed)
-        viewModel.getTokensService().startUpdateCycle();
+        {
+            viewModel.startUpdateListener();
+            viewModel.getTokensService().startUpdateCycleIfRequired();
+        }
     }
 
     @Override
     public void leaveFocus()
     {
+        isVisible = false;
         viewModel.stopUpdateListener();
         softKeyboardGone();
     }
@@ -388,6 +421,10 @@ public class WalletFragment extends BaseFragment implements
     public void onPause()
     {
         super.onPause();
+        if (isVisible)
+        {
+            viewModel.stopUpdateListener();
+        }
     }
 
     private void initTabLayout(View view)
@@ -418,7 +455,7 @@ public class WalletFragment extends BaseFragment implements
                     case ASSETS:
                     case DEFI:
                     case GOVERNANCE:
-                        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+                        recyclerView.setLayoutManager(new CompletionLayoutListener(getActivity()));
                         viewModel.prepare();
                         break;
                     case COLLECTIBLES:
@@ -538,6 +575,12 @@ public class WalletFragment extends BaseFragment implements
                 largeTitleView.setVisibility(View.VISIBLE); //show or hide Fiat summary
             }
         }
+
+        if (isVisible)
+        {
+            viewModel.startUpdateListener();
+            viewModel.getTokensService().startUpdateCycleIfRequired();
+        }
     }
 
     private void onTokens(TokenCardMeta[] tokens)
@@ -550,11 +593,6 @@ public class WalletFragment extends BaseFragment implements
         }
         systemView.showProgress(false);
 
-        if (isVisible)
-        {
-            viewModel.startUpdateListener();
-        }
-
         if (currentTabPos.equals(TokenFilter.ALL))
         {
             awWalletConnectClient.updateNotification();

app/src/main/java/com/alphawallet/app/viewmodel/HomeViewModel.java

@@ -779,13 +779,6 @@ public class HomeViewModel extends BaseViewModel
         currencyRepository.setDefaultCurrency(preferenceRepository.getDefaultCurrency());
     }
 
-    public void sendMsgPumpToWC(Context context)
-    {
-        //NB: WalletConnect v1 has been deprecated
-        //Timber.d("Start WC service");
-        //WCUtils.startServiceLocal(context, null, WalletConnectActions.MSG_PUMP);
-    }
-
     // Restart walletconnect sessions if required
     private void initWalletConnectSessions(Activity activity, Wallet wallet)
     {

app/src/main/java/com/alphawallet/app/viewmodel/WalletViewModel.java

@@ -219,7 +219,6 @@ public class WalletViewModel extends BaseViewModel
         tokensService.setCurrentAddress(wallet.address);
         assetDefinitionService.startEventListener();
         defaultWallet.postValue(wallet);
-        tokensService.startUpdateCycle();
         fetchTokens(wallet);
     }