Subaddresses as first class citizens (#733)

several gender mistakes ("monedero" we're using now is masculine)
ledger translations
onboarding
sideshift integration

.gitignore

@@ -15,3 +15,4 @@
 /app/alphaStagenet
 /app/prodStagenet
 /app/.cxx
+/monerujo.id

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 708
+        versionCode 800
-        versionName "1.17.8 'Druk'"
+        versionName "1.18.0 'ChAdOx1'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

app/src/main/java/com/m2049r/xmrwallet/BaseActivity.java

@@ -31,10 +31,11 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.PowerManager;
+import android.widget.Toast;
+
 import androidx.annotation.CallSuper;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import android.widget.Toast;
 
 import com.m2049r.xmrwallet.data.BarcodeData;
 import com.m2049r.xmrwallet.dialog.ProgressDialog;
@@ -46,7 +47,8 @@ import java.io.IOException;
 
 import timber.log.Timber;
 
-public class BaseActivity extends SecureActivity implements GenerateReviewFragment.ProgressListener {
+public class BaseActivity extends SecureActivity
+        implements GenerateReviewFragment.ProgressListener, SubaddressFragment.ProgressListener {
 
     ProgressDialog progressDialog = null;
 

app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java

@@ -307,7 +307,6 @@ public class GenerateReviewFragment extends Fragment {
         void dismissProgressDialog();
     }
 
-
     public interface AcceptListener {
         void onAccept(String name, String password);
     }

app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java

@@ -59,13 +59,13 @@ import com.m2049r.xmrwallet.model.NetworkType;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.model.WalletManager;
 import com.m2049r.xmrwallet.service.WalletService;
-import com.m2049r.xmrwallet.util.ColorHelper;
 import com.m2049r.xmrwallet.util.DayNightMode;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.KeyStoreHelper;
 import com.m2049r.xmrwallet.util.LocaleHelper;
 import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor;
 import com.m2049r.xmrwallet.util.NightmodeHelper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.io.File;
@@ -78,7 +78,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -87,8 +86,7 @@ import timber.log.Timber;
 
 public class LoginActivity extends BaseActivity
         implements LoginFragment.Listener, GenerateFragment.Listener,
-        GenerateReviewFragment.Listener, GenerateReviewFragment.AcceptListener,
+        GenerateReviewFragment.Listener, GenerateReviewFragment.AcceptListener, NodeFragment.Listener {
-        ReceiveFragment.Listener, NodeFragment.Listener {
     private static final String GENERATE_STACK = "gen";
 
     private static final String NODES_PREFS_NAME = "nodes";
@@ -376,7 +374,7 @@ public class LoginActivity extends BaseActivity
                             }
 
                             @Override
-                            public void fail(String walletName1, String password, boolean fingerprintUsed) {
+                            public void fail(String walletName) {
                             }
                         });
                     } else { // this cannot really happen as we prefilter choices
@@ -398,28 +396,6 @@ public class LoginActivity extends BaseActivity
                 .show();
     }
 
-    @Override
-    public void onWalletReceive(String walletName) {
-        Timber.d("receive for wallet .%s.", walletName);
-        if (checkServiceRunning()) return;
-        final File walletFile = Helper.getWalletFile(this, walletName);
-        if (WalletManager.getInstance().walletExists(walletFile)) {
-            Helper.promptPassword(LoginActivity.this, walletName, false, new Helper.PasswordAction() {
-                @Override
-                public void act(String walletName, String password, boolean fingerprintUsed) {
-                    if (checkDevice(walletName, password))
-                        startReceive(walletFile, password);
-                }
-
-                @Override
-                public void fail(String walletName, String password, boolean fingerprintUsed) {
-                }
-            });
-        } else { // this cannot really happen as we prefilter choices
-            Toast.makeText(this, getString(R.string.bad_wallet), Toast.LENGTH_SHORT).show();
-        }
-    }
-
     private class AsyncRename extends AsyncTask<String, Void, Boolean> {
         @Override
         protected void onPreExecute() {
@@ -707,11 +683,11 @@ public class LoginActivity extends BaseActivity
                 break;
             case NetworkType_Testnet:
                 toolbar.setSubtitle(getString(R.string.connect_testnet));
-                toolbar.setBackgroundResource(ColorHelper.getThemedResourceId(this, R.attr.colorPrimaryDark));
+                toolbar.setBackgroundResource(ThemeHelper.getThemedResourceId(this, R.attr.colorPrimaryDark));
                 break;
             case NetworkType_Stagenet:
                 toolbar.setSubtitle(getString(R.string.connect_stagenet));
-                toolbar.setBackgroundResource(ColorHelper.getThemedResourceId(this, R.attr.colorPrimaryDark));
+                toolbar.setBackgroundResource(ThemeHelper.getThemedResourceId(this, R.attr.colorPrimaryDark));
                 break;
             default:
                 throw new IllegalStateException("NetworkType unknown: " + net);
@@ -798,14 +774,6 @@ public class LoginActivity extends BaseActivity
         startReviewFragment(b);
     }
 
-    void startReceive(File walletFile, String password) {
-        Timber.d("startReceive()");
-        Bundle b = new Bundle();
-        b.putString("path", walletFile.getAbsolutePath());
-        b.putString("password", password);
-        startReceiveFragment(b);
-    }
-
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[],
                                            @NonNull int[] grantResults) {
@@ -864,11 +832,6 @@ public class LoginActivity extends BaseActivity
         Timber.d("NodeFragment placed");
     }
 
-    void startReceiveFragment(Bundle extras) {
-        replaceFragment(new ReceiveFragment(), null, extras);
-        Timber.d("ReceiveFragment placed");
-    }
-
     void replaceFragment(Fragment newFragment, String stackName, Bundle extras) {
         if (extras != null) {
             newFragment.setArguments(extras);
@@ -1400,7 +1363,7 @@ public class LoginActivity extends BaseActivity
                         }
 
                         @Override
-                        public void fail(String walletName, String password, boolean fingerprintUsed) {
+                        public void fail(String walletName) {
                         }
 
                     });

app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java

@@ -82,8 +82,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
 
         void onWalletDetails(String wallet);
 
-        void onWalletReceive(String wallet);
-
         void onWalletRename(String name);
 
         void onWalletBackup(String name);
@@ -223,9 +221,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
             case R.id.action_info:
                 showInfo(listItem.name);
                 break;
-            case R.id.action_receive:
-                showReceive(listItem.name);
-                break;
             case R.id.action_rename:
                 activityCallback.onWalletRename(listItem.name);
                 break;
@@ -258,7 +253,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
         walletList.addAll(walletInfos);
         filterList();
         adapter.setInfos(displayedList);
-        adapter.notifyDataSetChanged();
 
         // deal with Gunther & FAB animation
         if (displayedList.isEmpty()) {
@@ -291,10 +285,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
         activityCallback.onWalletDetails(name);
     }
 
-    private void showReceive(@NonNull String name) {
-        activityCallback.onWalletReceive(name);
-    }
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java

@@ -228,24 +228,23 @@ public class NodeFragment extends Fragment
 
     // open up edit dialog
     @Override
-    public void onLongInteraction(final View view, final NodeInfo nodeItem) {
+    public boolean onLongInteraction(final View view, final NodeInfo nodeItem) {
         Timber.d("onLongInteraction");
         EditDialog diag = createEditDialog(nodeItem);
         if (diag != null) {
             diag.show();
         }
+        return true;
     }
 
     @Override
     public void onClick(View v) {
         int id = v.getId();
-        switch (id) {
+        if (id == R.id.fab) {
-            case R.id.fab:
+            EditDialog diag = createEditDialog(null);
-                EditDialog diag = createEditDialog(null);
+            if (diag != null) {
-                if (diag != null) {
+                diag.show();
-                    diag.show();
+            }
-                }
-                break;
         }
     }
 
@@ -524,7 +523,7 @@ public class NodeFragment extends Fragment
                     .setNegativeButton(getString(R.string.label_cancel),
                             (dialog, id) -> {
                                 closeDialog();
-                                nodesAdapter.dataSetChanged(); // to refresh test results
+                                nodesAdapter.setNodes(); // to refresh test results
                             });
 
             editDialog = alertDialogBuilder.create();
@@ -588,7 +587,7 @@ public class NodeFragment extends Fragment
                     if (nodeBackup == null) {
                         nodesAdapter.addNode(nodeInfo);
                     } else {
-                        nodesAdapter.dataSetChanged();
+                        nodesAdapter.setNodes();
                     }
                 }
             }

app/src/main/java/com/m2049r/xmrwallet/SubaddressFragment.java

@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.transition.MaterialElevationScale;
+import com.m2049r.xmrwallet.data.Subaddress;
+import com.m2049r.xmrwallet.layout.SubaddressInfoAdapter;
+import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;
+import com.m2049r.xmrwallet.model.TransactionInfo;
+import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.model.WalletManager;
+import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor;
+import com.m2049r.xmrwallet.widget.Toolbar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import timber.log.Timber;
+
+public class SubaddressFragment extends Fragment implements SubaddressInfoAdapter.OnInteractionListener,
+        View.OnClickListener {
+    static public final String KEY_MODE = "mode";
+    static public final String MODE_MANAGER = "manager";
+
+    private SubaddressInfoAdapter adapter;
+
+    private Listener activityCallback;
+
+    private Wallet wallet;
+
+    // Container Activity must implement this interface
+    public interface Listener {
+        void onSubaddressSelected(Subaddress subaddress);
+
+        void setSubtitle(String title);
+
+        void setToolbarButton(int type);
+
+        void showSubaddress(View view, final int subaddressIndex);
+    }
+
+    public interface ProgressListener {
+        void showProgressDialog(int msgId);
+
+        void showLedgerProgressDialog(int mode);
+
+        void dismissProgressDialog();
+    }
+
+    private ProgressListener progressCallback = null;
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        if (context instanceof ProgressListener) {
+            progressCallback = (ProgressListener) context;
+        }
+        if (context instanceof Listener) {
+            activityCallback = (Listener) context;
+        } else {
+            throw new ClassCastException(context.toString()
+                    + " must implement Listener");
+        }
+    }
+
+    @Override
+    public void onPause() {
+        Timber.d("onPause()");
+        super.onPause();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        activityCallback.setSubtitle(getString(R.string.subbaddress_title));
+        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        Timber.d("onCreateView");
+
+        final Bundle b = getArguments();
+        managerMode = ((b != null) && (MODE_MANAGER.equals(b.getString(KEY_MODE))));
+
+        View view = inflater.inflate(R.layout.fragment_subaddress, container, false);
+
+        final MaterialElevationScale exitTransition = new MaterialElevationScale(false);
+        exitTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        setExitTransition(exitTransition);
+        final MaterialElevationScale reenterTransition = new MaterialElevationScale(true);
+        reenterTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        setReenterTransition(reenterTransition);
+
+        view.findViewById(R.id.fab).setOnClickListener(this);
+
+        if (managerMode) {
+            view.findViewById(R.id.tvInstruction).setVisibility(View.GONE);
+            view.findViewById(R.id.tvHint).setVisibility(View.GONE);
+        }
+
+        final RecyclerView list = view.findViewById(R.id.list);
+        adapter = new SubaddressInfoAdapter(getActivity(), this);
+        list.setAdapter(adapter);
+        adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
+            @Override
+            public void onItemRangeInserted(int positionStart, int itemCount) {
+                list.scrollToPosition(positionStart);
+            }
+        });
+
+        Helper.hideKeyboard(getActivity());
+
+        wallet = WalletManager.getInstance().getWallet();
+
+        loadList();
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        postponeEnterTransition();
+        view.getViewTreeObserver().addOnPreDrawListener(() -> {
+            startPostponedEnterTransition();
+            return true;
+        });
+    }
+
+    public void loadList() {
+        Timber.d("loadList()");
+        final int numSubaddresses = wallet.getNumSubaddresses();
+        final List<Subaddress> list = new ArrayList<>();
+        for (int i = 0; i < numSubaddresses; i++) {
+            list.add(wallet.getSubaddressObject(i));
+        }
+        adapter.setInfos(list);
+    }
+
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+        if (id == R.id.fab) {
+            getNewSubaddress();
+        }
+    }
+
+    private int lastUsedSubaddress() {
+        int lastUsedSubaddress = 0;
+        for (TransactionInfo info : wallet.getHistory().getAll()) {
+            if (info.addressIndex > lastUsedSubaddress)
+                lastUsedSubaddress = info.addressIndex;
+        }
+        return lastUsedSubaddress;
+    }
+
+    private void getNewSubaddress() {
+        final int maxSubaddresses = lastUsedSubaddress() + wallet.getDeviceType().getSubaddressLookahead();
+        if (wallet.getNumSubaddresses() < maxSubaddresses)
+            new AsyncSubaddress().executeOnExecutor(MoneroThreadPoolExecutor.MONERO_THREAD_POOL_EXECUTOR);
+        else
+            Toast.makeText(getActivity(), getString(R.string.max_subaddress_warning), Toast.LENGTH_LONG).show();
+    }
+
+    @SuppressLint("StaticFieldLeak")
+    @RequiredArgsConstructor
+    private class AsyncSubaddress extends AsyncTask<Void, Void, Boolean> {
+        boolean dialogOpened = false;
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            if ((wallet.getDeviceType() == Wallet.Device.Device_Ledger) && (progressCallback != null)) {
+                progressCallback.showLedgerProgressDialog(LedgerProgressDialog.TYPE_SUBADDRESS);
+                dialogOpened = true;
+            }
+        }
+
+        @Override
+        protected Boolean doInBackground(Void... params) {
+            if (params.length != 0) return false;
+            wallet.getNewSubaddress();
+            wallet.store();
+            return true;
+        }
+
+        @Override
+        protected void onPostExecute(Boolean result) {
+            super.onPostExecute(result);
+            if (dialogOpened)
+                progressCallback.dismissProgressDialog();
+            if (!isAdded()) // never mind then
+                return;
+            loadList();
+        }
+    }
+
+    boolean managerMode = false;
+
+    // Callbacks from SubaddressInfoAdapter
+    @Override
+    public void onInteraction(final View view, final Subaddress subaddress) {
+        if (managerMode)
+            activityCallback.showSubaddress(view, subaddress.getAddressIndex());
+        else
+            activityCallback.onSubaddressSelected(subaddress); // also closes the fragment with onBackpressed()
+    }
+
+    @Override
+    public boolean onLongInteraction(View view, Subaddress subaddress) {
+        activityCallback.showSubaddress(view, subaddress.getAddressIndex());
+        return false;
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/SubaddressInfoFragment.java

@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.textfield.TextInputLayout;
+import com.google.android.material.transition.MaterialContainerTransform;
+import com.m2049r.xmrwallet.data.Subaddress;
+import com.m2049r.xmrwallet.layout.TransactionInfoAdapter;
+import com.m2049r.xmrwallet.model.TransactionInfo;
+import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
+import com.m2049r.xmrwallet.widget.Toolbar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import timber.log.Timber;
+
+// TODO: live update - i.e. use onRefreshed() somehow
+public class SubaddressInfoFragment extends Fragment implements TransactionInfoAdapter.OnInteractionListener {
+    private TransactionInfoAdapter adapter;
+
+    private Subaddress subaddress;
+
+    private TextInputLayout etName;
+    private TextView tvAddress;
+    private TextView tvTxLabel;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_subaddressinfo, container, false);
+
+        etName = view.findViewById(R.id.etName);
+        tvAddress = view.findViewById(R.id.tvAddress);
+        tvTxLabel = view.findViewById(R.id.tvTxLabel);
+
+        final RecyclerView list = view.findViewById(R.id.list);
+        adapter = new TransactionInfoAdapter(getActivity(), this);
+        list.setAdapter(adapter);
+
+        final Wallet wallet = activityCallback.getWallet();
+
+        Bundle b = getArguments();
+        final int subaddressIndex = b.getInt("subaddressIndex");
+        subaddress = wallet.getSubaddressObject(subaddressIndex);
+
+        etName.getEditText().setText(subaddress.getDisplayLabel());
+        tvAddress.setText(getContext().getString(R.string.subbaddress_info_subtitle,
+                subaddress.getAddressIndex(), subaddress.getSquashedAddress()));
+
+        etName.getEditText().setOnFocusChangeListener((v, hasFocus) -> {
+            if (!hasFocus) {
+                wallet.setSubaddressLabel(subaddressIndex, etName.getEditText().getText().toString());
+            }
+        });
+        etName.getEditText().setOnEditorActionListener((v, actionId, event) -> {
+            if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
+                    || (actionId == EditorInfo.IME_ACTION_DONE)) {
+                Helper.hideKeyboard(getActivity());
+                wallet.setSubaddressLabel(subaddressIndex, etName.getEditText().getText().toString());
+                onRefreshed(wallet);
+                return true;
+            }
+            return false;
+        });
+
+        onRefreshed(wallet);
+
+        return view;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final MaterialContainerTransform transform = new MaterialContainerTransform();
+        transform.setDrawingViewId(R.id.fragment_container);
+        transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), android.R.attr.colorBackground));
+        setSharedElementEnterTransition(transform);
+    }
+
+    public void onRefreshed(final Wallet wallet) {
+        Timber.d("onRefreshed");
+        List<TransactionInfo> list = new ArrayList<>();
+        for (TransactionInfo info : wallet.getHistory().getAll()) {
+            if (info.addressIndex == subaddress.getAddressIndex())
+                list.add(info);
+        }
+        adapter.setInfos(list);
+        if (list.isEmpty())
+            tvTxLabel.setText(R.string.subaddress_notx_label);
+        else
+            tvTxLabel.setText(R.string.subaddress_tx_label);
+    }
+
+    // Callbacks from TransactionInfoAdapter
+    @Override
+    public void onInteraction(final View view, final TransactionInfo infoItem) {
+        activityCallback.onTxDetailsRequest(view, infoItem);
+    }
+
+    Listener activityCallback;
+
+    // Container Activity must implement this interface
+    public interface Listener {
+        void onTxDetailsRequest(View view, TransactionInfo info);
+
+        Wallet getWallet();
+
+        void setToolbarButton(int type);
+
+        void setTitle(String title, String subtitle);
+
+        void setSubtitle(String subtitle);
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        if (context instanceof Listener) {
+            this.activityCallback = (Listener) context;
+        } else {
+            throw new ClassCastException(context.toString()
+                    + " must implement Listener");
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Timber.d("onResume()");
+        activityCallback.setSubtitle(getString(R.string.subbaddress_title));
+        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/TxFragment.java

@@ -22,7 +22,9 @@ import android.content.Intent;
 import android.graphics.Paint;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.InputType;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -36,11 +38,15 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
+import com.google.android.material.transition.MaterialContainerTransform;
+import com.google.android.material.transition.MaterialElevationScale;
+import com.m2049r.xmrwallet.data.Subaddress;
 import com.m2049r.xmrwallet.data.UserNotes;
 import com.m2049r.xmrwallet.model.TransactionInfo;
 import com.m2049r.xmrwallet.model.Transfer;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.text.SimpleDateFormat;
@@ -50,6 +56,8 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.TimeZone;
 
+import timber.log.Timber;
+
 public class TxFragment extends Fragment {
 
     static public final String ARG_INFO = "info";
@@ -86,11 +94,16 @@ public class TxFragment extends Fragment {
     private ImageView tvXmrToLogo;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-                             Bundle savedInstanceState) {
-
         View view = inflater.inflate(R.layout.fragment_tx_info, container, false);
 
+        final MaterialElevationScale exitTransition = new MaterialElevationScale(false);
+        exitTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        setExitTransition(exitTransition);
+        final MaterialElevationScale reenterTransition = new MaterialElevationScale(true);
+        reenterTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        setReenterTransition(reenterTransition);
+
         cvXmrTo = view.findViewById(R.id.cvXmrTo);
         tvTxXmrToKey = view.findViewById(R.id.tvTxXmrToKey);
         tvDestinationBtc = view.findViewById(R.id.tvDestinationBtc);
@@ -119,9 +132,8 @@ public class TxFragment extends Fragment {
             Toast.makeText(getActivity(), getString(R.string.message_copy_xmrtokey), Toast.LENGTH_SHORT).show();
         });
 
-        Bundle args = getArguments();
+        info = getArguments().getParcelable(ARG_INFO);
-        TransactionInfo info = args.getParcelable(ARG_INFO);
+        show();
-        show(info);
         return view;
     }
 
@@ -190,7 +202,7 @@ public class TxFragment extends Fragment {
     TransactionInfo info = null;
     UserNotes userNotes = null;
 
-    void loadNotes(TransactionInfo info) {
+    void loadNotes() {
         if ((userNotes == null) || (info.notes == null)) {
             info.notes = activityCallback.getTxNotes(info.hash);
         }
@@ -203,19 +215,28 @@ public class TxFragment extends Fragment {
         tvTxFee.setTextColor(clr);
     }
 
-    private void show(TransactionInfo info) {
+    private void showSubaddressLabel() {
+        final Subaddress subaddress = activityCallback.getWalletSubaddress(info.accountIndex, info.addressIndex);
+        final Context ctx = getContext();
+        Spanned label = Html.fromHtml(ctx.getString(R.string.tx_account_formatted,
+                info.accountIndex, info.addressIndex,
+                Integer.toHexString(ContextCompat.getColor(ctx, R.color.monerujoGreen) & 0xFFFFFF),
+                Integer.toHexString(ContextCompat.getColor(ctx, R.color.monerujoBackground) & 0xFFFFFF),
+                subaddress.getDisplayLabel()));
+        tvAccount.setText(label);
+        tvAccount.setOnClickListener(v -> activityCallback.showSubaddress(v, info.addressIndex));
+    }
+
+    private void show() {
         if (info.txKey == null) {
             info.txKey = activityCallback.getTxKey(info.hash);
         }
         if (info.address == null) {
-            info.address = activityCallback.getTxAddress(info.account, info.subaddress);
+            info.address = activityCallback.getTxAddress(info.accountIndex, info.addressIndex);
         }
-        loadNotes(info);
+        loadNotes();
 
-        activityCallback.setSubtitle(getString(R.string.tx_title));
+        showSubaddressLabel();
-        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
-
-        tvAccount.setText(getString(R.string.tx_account_formatted, info.account, info.subaddress));
         tvAddress.setText(info.address);
 
         tvTxTimestamp.setText(TS_FORMATTER.format(new Date(info.timestamp * 1000)));
@@ -254,8 +275,8 @@ public class TxFragment extends Fragment {
             setTxColour(ContextCompat.getColor(getContext(), R.color.tx_minus));
         }
         Set<String> destinations = new HashSet<>();
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
-        StringBuffer dstSb = new StringBuffer();
+        StringBuilder dstSb = new StringBuilder();
         if (info.transfers != null) {
             boolean newline = false;
             for (Transfer transfer : info.transfers) {
@@ -279,14 +300,12 @@ public class TxFragment extends Fragment {
             }
         } else {
             sb.append("-");
-            dstSb.append(info.direction ==
+            dstSb.append(info.direction == TransactionInfo.Direction.Direction_In ?
-                    TransactionInfo.Direction.Direction_In ?
+                    activityCallback.getWalletSubaddress(info.accountIndex, info.addressIndex).getAddress() :
-                    activityCallback.getWalletSubaddress(info.account, info.subaddress) :
                     "-");
         }
         tvTxTransfers.setText(sb.toString());
         tvDestination.setText(dstSb.toString());
-        this.info = info;
         showBtcInfo();
     }
 
@@ -300,7 +319,7 @@ public class TxFragment extends Fragment {
             }
             tvTxXmrToKey.setText(key);
             tvDestinationBtc.setText(userNotes.xmrtoDestination);
-            tvTxAmountBtc.setText(userNotes.xmrtoAmount + " "+ userNotes.xmrtoCurrency);
+            tvTxAmountBtc.setText(userNotes.xmrtoAmount + " " + userNotes.xmrtoCurrency);
             switch (userNotes.xmrtoTag) {
                 case "xmrto":
                     tvXmrToSupport.setVisibility(View.GONE);
@@ -329,6 +348,11 @@ public class TxFragment extends Fragment {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        final MaterialContainerTransform transform = new MaterialContainerTransform();
+        transform.setDrawingViewId(R.id.fragment_container);
+        transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), android.R.attr.colorBackground));
+        setSharedElementEnterTransition(transform);
     }
 
     @Override
@@ -340,7 +364,7 @@ public class TxFragment extends Fragment {
     Listener activityCallback;
 
     public interface Listener {
-        String getWalletSubaddress(int accountIndex, int subaddressIndex);
+        Subaddress getWalletSubaddress(int accountIndex, int subaddressIndex);
 
         String getTxKey(String hash);
 
@@ -354,6 +378,8 @@ public class TxFragment extends Fragment {
 
         void setSubtitle(String subtitle);
 
+        void showSubaddress(View view, final int subaddressIndex);
+
     }
 
     @Override
@@ -378,4 +404,13 @@ public class TxFragment extends Fragment {
         Helper.hideKeyboard(getActivity());
         super.onPause();
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Timber.d("onResume()");
+        activityCallback.setSubtitle(getString(R.string.tx_title));
+        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
+        showSubaddressLabel();
+    }
 }

app/src/main/java/com/m2049r/xmrwallet/data/Node.java

@@ -64,12 +64,14 @@ public class Node {
         return hostAddress.hashCode();
     }
 
-    // Nodes are equal if they are the same host address & are on the same network
+    // Nodes are equal if they are the same host address:port & are on the same network
     @Override
     public boolean equals(Object other) {
         if (!(other instanceof Node)) return false;
         final Node anotherNode = (Node) other;
-        return (hostAddress.equals(anotherNode.hostAddress) && (networkType == anotherNode.networkType));
+        return (hostAddress.equals(anotherNode.hostAddress)
+                && (rpcPort == anotherNode.rpcPort)
+                && (networkType == anotherNode.networkType));
     }
 
     static public Node fromString(String nodeString) {

app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java

@@ -227,8 +227,7 @@ public class NodeInfo extends Node {
                 if (response.isSuccessful()) {
                     ResponseBody respBody = response.body(); // closed through Response object
                     if ((respBody != null) && (respBody.contentLength() < 2000)) { // sanity check
-                        final JSONObject json = new JSONObject(
+                        final JSONObject json = new JSONObject(respBody.string());
-                                respBody.string());
                         String rpcVersion = json.getString("jsonrpc");
                         if (!RPC_VERSION.equals(rpcVersion))
                             return false;

app/src/main/java/com/m2049r/xmrwallet/data/Subaddress.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.data;
+
+import java.util.regex.Pattern;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+@AllArgsConstructor
+@ToString
+@EqualsAndHashCode
+public class Subaddress implements Comparable<Subaddress> {
+    @Getter
+    final private int accountIndex;
+    @Getter
+    final private int addressIndex;
+    @Getter
+    final private String address;
+    @Getter
+    private final String label;
+
+    @Override
+    public int compareTo(Subaddress another) { // newer is <
+        final int compareAccountIndex = another.accountIndex - accountIndex;
+        if (compareAccountIndex == 0)
+            return another.addressIndex - addressIndex;
+        return compareAccountIndex;
+    }
+
+    public String getSquashedAddress() {
+        return address.substring(0, 8) + "…" + address.substring(address.length() - 8);
+    }
+
+    public static final Pattern DEFAULT_LABEL_FORMATTER = Pattern.compile("^[0-9]{4}-[0-9]{2}-[0-9]{2}-[0-9]{2}:[0-9]{2}:[0-9]{2}$");
+
+    public String getDisplayLabel() {
+        if (label.isEmpty() || (DEFAULT_LABEL_FORMATTER.matcher(label).matches()))
+            return ("#" + addressIndex);
+        else
+            return label;
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java

@@ -332,7 +332,7 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements
                 send();
             }
 
-            public void fail(String walletName, String password, boolean fingerprintUsed) {
+            public void fail(String walletName) {
                 getActivity().runOnUiThread(() -> {
                     bSend.setEnabled(sendCountdown > 0); // allow to try again
                 });

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java

@@ -227,7 +227,7 @@ public class SendConfirmWizardFragment extends SendWizardFragment implements Sen
                 send();
             }
 
-            public void fail(String walletName, String password, boolean fingerprintUsed) {
+            public void fail(String walletName) {
                 getActivity().runOnUiThread(() -> {
                     bSend.setEnabled(true); // allow to try again
                 });

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java

@@ -36,6 +36,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
+import com.google.android.material.transition.MaterialContainerTransform;
 import com.m2049r.xmrwallet.OnBackPressedListener;
 import com.m2049r.xmrwallet.OnUriScannedListener;
 import com.m2049r.xmrwallet.R;
@@ -49,10 +50,12 @@ import com.m2049r.xmrwallet.layout.SpendViewPager;
 import com.m2049r.xmrwallet.model.PendingTransaction;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.Notice;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.widget.DotBar;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.lang.ref.WeakReference;
+import java.util.Objects;
 
 import timber.log.Timber;
 
@@ -309,7 +312,7 @@ public class SendFragment extends Fragment
         SparseArray<WeakReference<SendWizardFragment>> myFragments = new SparseArray<>();
 
         public SpendPagerAdapter(FragmentManager fm) {
-            super(fm);
+            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
         }
 
         public void addSuccess() {
@@ -538,14 +541,18 @@ public class SendFragment extends Fragment
         enableNavigation();
     }
 
-    @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        final MaterialContainerTransform transform = new MaterialContainerTransform();
+        transform.setDrawingViewId(R.id.fragment_container);
+        transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), android.R.attr.colorBackground));
+        setSharedElementEnterTransition(transform);
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.send_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);
     }

app/src/main/java/com/m2049r/xmrwallet/layout/DiffCallback.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2021 yorha-0x
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.layout;
+
+import androidx.recyclerview.widget.DiffUtil;
+
+import java.util.List;
+
+public abstract class DiffCallback<T> extends DiffUtil.Callback {
+
+    protected final List<T> mOldList;
+    protected final List<T> mNewList;
+
+    public DiffCallback(List<T> oldList, List<T> newList) {
+        this.mOldList = oldList;
+        this.mNewList = newList;
+    }
+
+    @Override
+    public int getOldListSize() {
+        return mOldList.size();
+    }
+
+    @Override
+    public int getNewListSize() {
+        return mNewList.size();
+    }
+
+    public abstract boolean areItemsTheSame(int oldItemPosition, int newItemPosition);
+
+    public abstract boolean areContentsTheSame(int oldItemPosition, int newItemPosition);
+}

app/src/main/java/com/m2049r/xmrwallet/layout/NodeInfoAdapter.java

@@ -25,11 +25,12 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.data.NodeInfo;
-import com.m2049r.xmrwallet.util.ColorHelper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.util.Helper;
 
 import java.net.HttpURLConnection;
@@ -47,13 +48,13 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
     public interface OnInteractionListener {
         void onInteraction(View view, NodeInfo item);
 
-        void onLongInteraction(View view, NodeInfo item);
+        boolean onLongInteraction(View view, NodeInfo item);
     }
 
     private final List<NodeInfo> nodeItems = new ArrayList<>();
     private final OnInteractionListener listener;
 
-    private Context context;
+    private final Context context;
 
     public NodeInfoAdapter(Context context, OnInteractionListener listener) {
         this.context = context;
@@ -63,11 +64,34 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
         TS_FORMATTER.setTimeZone(tz);
     }
 
+    private static class NodeDiff extends DiffCallback<NodeInfo> {
+
+        public NodeDiff(List<NodeInfo> oldList, List<NodeInfo> newList) {
+            super(oldList, newList);
+        }
+
+        @Override
+        public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldList.get(oldItemPosition).equals(mNewList.get(newItemPosition));
+        }
+
+        @Override
+        public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
+            final NodeInfo oldItem = mOldList.get(oldItemPosition);
+            final NodeInfo newItem = mNewList.get(newItemPosition);
+            return (oldItem.getTimestamp() == newItem.getTimestamp())
+                    && (oldItem.isTested() == newItem.isTested())
+                    && (oldItem.isValid() == newItem.isValid())
+                    && (oldItem.getResponseTime() == newItem.getResponseTime())
+                    && (oldItem.isSelected() == newItem.isSelected())
+                    && (oldItem.getName().equals(newItem.getName()));
+        }
+    }
+
     @Override
     public @NonNull
     ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_node, parent, false);
-                .inflate(R.layout.item_node, parent, false);
         return new ViewHolder(view);
     }
 
@@ -82,25 +106,29 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
     }
 
     public void addNode(NodeInfo node) {
+        List<NodeInfo> newItems = new ArrayList<>(nodeItems);
         if (!nodeItems.contains(node))
-            nodeItems.add(node);
+            newItems.add(node);
-        dataSetChanged(); // in case the nodeinfo has changed
+        setNodes(newItems); // in case the nodeinfo has changed
     }
 
-    public void dataSetChanged() {
+    public void setNodes(Collection<NodeInfo> newItemsCollection) {
-        Collections.sort(nodeItems, NodeInfo.BestNodeComparator);
+        List<NodeInfo> newItems;
-        notifyDataSetChanged();
+        if (newItemsCollection != null) {
-    }
+            newItems = new ArrayList<>(newItemsCollection);
-
+            Collections.sort(newItems, NodeInfo.BestNodeComparator);
-    public void setNodes(Collection<NodeInfo> data) {
+        } else {
-        nodeItems.clear();
+            newItems = new ArrayList<>();
-        if (data != null) {
-            for (NodeInfo node : data) {
-                if (!nodeItems.contains(node))
-                    nodeItems.add(node);
-            }
         }
-        dataSetChanged();
+        final NodeInfoAdapter.NodeDiff diffCallback = new NodeInfoAdapter.NodeDiff(nodeItems, newItems);
+        final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(diffCallback);
+        nodeItems.clear();
+        nodeItems.addAll(newItems);
+        diffResult.dispatchUpdatesTo(this);
+    }
+
+    public void setNodes() {
+        setNodes(nodeItems);
     }
 
     private boolean itemsClickable = true;
@@ -130,7 +158,7 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
                 showStar();
                 if (!nodeItem.isFavourite()) {
                     nodeItem.setSelected(false);
-                    notifyDataSetChanged();
+                    setNodes(nodeItems);
                 }
             });
             itemView.setOnClickListener(this);
@@ -154,7 +182,7 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
                     Helper.showTimeDifference(tvIp, nodeItem.getTimestamp());
                 } else {
                     tvIp.setText(getResponseErrorText(context, nodeItem.getResponseCode()));
-                    tvIp.setTextColor(ColorHelper.getThemedColor(tvIp.getContext(), R.attr.colorError));
+                    tvIp.setTextColor(ThemeHelper.getThemedColor(context, R.attr.colorError));
                 }
             } else {
                 tvIp.setText(context.getResources().getString(R.string.node_testing, nodeItem.getHostAddress()));
@@ -185,10 +213,10 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
             if (listener != null) {
                 int position = getAdapterPosition(); // gets item position
                 if (position != RecyclerView.NO_POSITION) { // Check if an item was deleted, but the user clicked it before the UI removed it
-                    listener.onLongInteraction(view, nodeItems.get(position));
+                    return listener.onLongInteraction(view, nodeItems.get(position));
                 }
             }
-            return true;
+            return false;
         }
     }
 

app/src/main/java/com/m2049r/xmrwallet/layout/SubaddressInfoAdapter.java

@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.layout;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.m2049r.xmrwallet.R;
+import com.m2049r.xmrwallet.data.Subaddress;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import timber.log.Timber;
+
+public class SubaddressInfoAdapter extends RecyclerView.Adapter<SubaddressInfoAdapter.ViewHolder> {
+    public interface OnInteractionListener {
+        void onInteraction(View view, Subaddress item);
+
+        boolean onLongInteraction(View view, Subaddress item);
+    }
+
+    private final List<Subaddress> items;
+    private final OnInteractionListener listener;
+
+    Context context;
+
+    public SubaddressInfoAdapter(Context context, OnInteractionListener listener) {
+        this.context = context;
+        this.items = new ArrayList<>();
+        this.listener = listener;
+    }
+
+    private static class SubaddressInfoDiff extends DiffCallback<Subaddress> {
+
+        public SubaddressInfoDiff(List<Subaddress> oldList, List<Subaddress> newList) {
+            super(oldList, newList);
+        }
+
+        @Override
+        public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldList.get(oldItemPosition).getAddress().equals(mNewList.get(newItemPosition).getAddress());
+        }
+
+        @Override
+        public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldList.get(oldItemPosition).equals(mNewList.get(newItemPosition));
+        }
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.item_subaddress, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(final ViewHolder holder, int position) {
+        holder.bind(position);
+    }
+
+    @Override
+    public int getItemCount() {
+        return items.size();
+    }
+
+    public Subaddress getItem(int position) {
+        return items.get(position);
+    }
+
+    public void setInfos(List<Subaddress> newItems) {
+        if (newItems == null) {
+            newItems = new ArrayList<>();
+            Timber.d("setInfos null");
+        } else {
+            Timber.d("setInfos %s", newItems.size());
+        }
+        Collections.sort(newItems);
+        final DiffCallback<Subaddress> diffCallback = new SubaddressInfoDiff(items, newItems);
+        final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(diffCallback);
+        items.clear();
+        items.addAll(newItems);
+        diffResult.dispatchUpdatesTo(this);
+    }
+
+    class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
+        final TextView tvName;
+        final TextView tvAddress;
+        Subaddress item;
+
+        ViewHolder(View itemView) {
+            super(itemView);
+            tvName = itemView.findViewById(R.id.tvName);
+            tvAddress = itemView.findViewById(R.id.tvAddress);
+            itemView.setOnClickListener(this);
+            itemView.setOnLongClickListener(this);
+        }
+
+        void bind(int position) {
+            item = getItem(position);
+            itemView.setTransitionName(context.getString(R.string.subaddress_item_transition_name, item.getAddressIndex()));
+
+            final String label = item.getDisplayLabel();
+            final String address = context.getString(R.string.subbaddress_info_subtitle,
+                    item.getAddressIndex(), item.getSquashedAddress());
+            tvName.setText(label.isEmpty() ? address : label);
+            tvAddress.setText(address);
+        }
+
+        @Override
+        public void onClick(View view) {
+            if (listener != null) {
+                int position = getAdapterPosition(); // gets item position
+                if (position != RecyclerView.NO_POSITION) { // Check if an item was deleted, but the user clicked it before the UI removed it
+                    listener.onInteraction(view, getItem(position));
+                }
+            }
+        }
+
+        @Override
+        public boolean onLongClick(View view) {
+            if (listener != null) {
+                int position = getAdapterPosition(); // gets item position
+                if (position != RecyclerView.NO_POSITION) { // Check if an item was deleted, but the user clicked it before the UI removed it
+                    return listener.onLongInteraction(view, getItem(position));
+                }
+            }
+            return true;
+        }
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java

@@ -17,13 +17,17 @@
 package com.m2049r.xmrwallet.layout;
 
 import android.content.Context;
+import android.text.Html;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.m2049r.xmrwallet.R;
@@ -38,18 +42,18 @@ import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.TimeZone;
 
 import timber.log.Timber;
 
 public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfoAdapter.ViewHolder> {
-
     private final SimpleDateFormat DATETIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
-    private int outboundColour;
+    private final int outboundColour;
-    private int inboundColour;
+    private final int inboundColour;
-    private int pendingColour;
+    private final int pendingColour;
-    private int failedColour;
+    private final int failedColour;
 
     public interface OnInteractionListener {
         void onInteraction(View view, TransactionInfo item);
@@ -58,7 +62,7 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
     private final List<TransactionInfo> infoItems;
     private final OnInteractionListener listener;
 
-    private Context context;
+    private final Context context;
 
     public TransactionInfoAdapter(Context context, OnInteractionListener listener) {
         this.context = context;
@@ -73,10 +77,33 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
         DATETIME_FORMATTER.setTimeZone(tz);
     }
 
+    private static class TransactionInfoDiff extends DiffCallback<TransactionInfo> {
+
+        public TransactionInfoDiff(List<TransactionInfo> oldList, List<TransactionInfo> newList) {
+            super(oldList, newList);
+        }
+
+        @Override
+        public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldList.get(oldItemPosition).hash.equals(mNewList.get(newItemPosition).hash);
+        }
+
+        @Override
+        public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
+            final TransactionInfo oldItem = mOldList.get(oldItemPosition);
+            final TransactionInfo newItem = mNewList.get(newItemPosition);
+            return (oldItem.direction == newItem.direction)
+                    && (oldItem.isPending == newItem.isPending)
+                    && (oldItem.isFailed == newItem.isFailed)
+                    && (oldItem.subaddressLabel.equals(newItem.subaddressLabel))
+                    && (Objects.equals(oldItem.notes, newItem.notes));
+        }
+    }
+
+    @NonNull
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_transaction, parent, false);
-                .inflate(R.layout.item_transaction, parent, false);
         return new ViewHolder(view);
     }
 
@@ -90,23 +117,26 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
         return infoItems.size();
     }
 
-    public void setInfos(List<TransactionInfo> data) {
+    public void setInfos(List<TransactionInfo> newItems) {
-        // TODO do stuff with data so we can really recycle elements (i.e. add only new tx)
+        if (newItems == null) {
-        // as the TransactionInfo items are always recreated, we cannot recycle
+            newItems = new ArrayList<>();
-        infoItems.clear();
-        if (data != null) {
-            Timber.d("setInfos %s", data.size());
-            infoItems.addAll(data);
-            Collections.sort(infoItems);
-        } else {
             Timber.d("setInfos null");
+        } else {
+            Timber.d("setInfos %s", newItems.size());
         }
-        notifyDataSetChanged();
+        Collections.sort(newItems);
+        final DiffCallback<TransactionInfo> diffCallback = new TransactionInfoAdapter.TransactionInfoDiff(infoItems, newItems);
+        final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(diffCallback);
+        infoItems.clear();
+        infoItems.addAll(newItems);
+        diffResult.dispatchUpdatesTo(this);
     }
 
     public void removeItem(int position) {
-        infoItems.remove(position);
+        List<TransactionInfo> newItems = new ArrayList<>(infoItems);
-        notifyItemRemoved(position);
+        if (newItems.size() > position)
+            newItems.remove(position);
+        setInfos(newItems); // in case the nodeinfo has changed
     }
 
     public TransactionInfo getItem(int position) {
@@ -139,7 +169,8 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
         }
 
         void bind(int position) {
-            this.infoItem = infoItems.get(position);
+            infoItem = infoItems.get(position);
+            itemView.setTransitionName(context.getString(R.string.tx_item_transition_name, infoItem.hash));
 
             UserNotes userNotes = new UserNotes(infoItem.notes);
             if (userNotes.xmrtoKey != null) {
@@ -182,14 +213,25 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
                 setTxColour(outboundColour);
             }
 
+            String tag = null;
+            String info = "";
+            if ((infoItem.addressIndex != 0) && (infoItem.direction == TransactionInfo.Direction.Direction_In))
+                tag = infoItem.getDisplayLabel();
             if ((userNotes.note.isEmpty())) {
-                this.tvPaymentId.setText(infoItem.paymentId.equals("0000000000000000") ?
+                if (!infoItem.paymentId.equals("0000000000000000")) {
-                        (infoItem.subaddress != 0 ?
+                    info = infoItem.paymentId;
-                                (context.getString(R.string.tx_subaddress, infoItem.subaddress)) :
+                }
-                                "") :
-                        infoItem.paymentId);
             } else {
-                this.tvPaymentId.setText(userNotes.note);
+                info = userNotes.note;
+            }
+            if (tag == null) {
+                tvPaymentId.setText(info);
+            } else {
+                Spanned label = Html.fromHtml(context.getString(R.string.tx_details_notes,
+                        Integer.toHexString(ContextCompat.getColor(context, R.color.monerujoGreen) & 0xFFFFFF),
+                        Integer.toHexString(ContextCompat.getColor(context, R.color.monerujoBackground) & 0xFFFFFF),
+                        tag, info.isEmpty() ? "" : ("&nbsp; " + info)));
+                tvPaymentId.setText(label);
             }
 
             this.tvDateTime.setText(getDateTime(infoItem.timestamp));

app/src/main/java/com/m2049r/xmrwallet/layout/WalletInfoAdapter.java

@@ -17,8 +17,6 @@
 package com.m2049r.xmrwallet.layout;
 
 import android.content.Context;
-import androidx.appcompat.widget.PopupMenu;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -26,6 +24,11 @@ import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.model.WalletManager;
 
@@ -63,6 +66,24 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi
         DATETIME_FORMATTER.setTimeZone(tz);
     }
 
+    private static class WalletInfoDiff extends DiffCallback<WalletManager.WalletInfo> {
+
+        public WalletInfoDiff(List<WalletManager.WalletInfo> oldList, List<WalletManager.WalletInfo> newList) {
+            super(oldList, newList);
+        }
+
+        @Override
+        public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldList.get(oldItemPosition).name.equals(mNewList.get(newItemPosition).name);
+        }
+
+        @Override
+        public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldList.get(oldItemPosition).compareTo(mNewList.get(newItemPosition)) == 0;
+        }
+    }
+
+    @NonNull
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext())
@@ -84,18 +105,19 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi
         return infoItems.get(position);
     }
 
-    public void setInfos(List<WalletManager.WalletInfo> data) {
+    public void setInfos(List<WalletManager.WalletInfo> newItems) {
-        // TODO do stuff with data so we can really recycle elements (i.e. add only new tx)
+        if (newItems == null) {
-        // as the WalletInfo items are always recreated, we cannot recycle
+            newItems = new ArrayList<>();
-        infoItems.clear();
-        if (data != null) {
-            Timber.d("setInfos %s", data.size());
-            infoItems.addAll(data);
-            Collections.sort(infoItems);
-        } else {
             Timber.d("setInfos null");
+        } else {
+            Timber.d("setInfos %s", newItems.size());
         }
-        notifyDataSetChanged();
+        Collections.sort(newItems);
+        final DiffCallback<WalletManager.WalletInfo> diffCallback = new WalletInfoAdapter.WalletInfoDiff(infoItems, newItems);
+        final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(diffCallback);
+        infoItems.clear();
+        infoItems.addAll(newItems);
+        diffResult.dispatchUpdatesTo(this);
     }
 
     class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
@@ -110,35 +132,24 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi
             tvName = itemView.findViewById(R.id.tvName);
             tvAddress = itemView.findViewById(R.id.tvAddress);
             ibOptions = itemView.findViewById(R.id.ibOptions);
-            ibOptions.setOnClickListener(new View.OnClickListener() {
+            ibOptions.setOnClickListener(view -> {
-                @Override
+                if (popupOpen) return;
-                public void onClick(View view) {
+                //creating a popup menu
-                    if (popupOpen) return;
+                PopupMenu popup = new PopupMenu(context, ibOptions);
-                    //creating a popup menu
+                //inflating menu from xml resource
-                    PopupMenu popup = new PopupMenu(context, ibOptions);
+                popup.inflate(R.menu.list_context_menu);
-                    //inflating menu from xml resource
+                popupOpen = true;
-                    popup.inflate(R.menu.list_context_menu);
+                //adding click listener
-                    popupOpen = true;
+                popup.setOnMenuItemClickListener(item -> {
-                    //adding click listener
+                    if (listener != null) {
-                    popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                        return listener.onContextInteraction(item, infoItem);
-                        @Override
+                    }
-                        public boolean onMenuItemClick(MenuItem item) {
+                    return false;
-                            if (listener != null) {
+                });
-                                return listener.onContextInteraction(item, infoItem);
+                //displaying the popup
-                            }
+                popup.show();
-                            return false;
+                popup.setOnDismissListener(menu -> popupOpen = false);
-                        }
-                    });
-                    //displaying the popup
-                    popup.show();
-                    popup.setOnDismissListener(new PopupMenu.OnDismissListener() {
-                        @Override
-                        public void onDismiss(PopupMenu menu) {
-                            popupOpen = false;
-                        }
-                    });
 
-                }
             });
             itemView.setOnClickListener(this);
         }

app/src/main/java/com/m2049r/xmrwallet/model/TransactionHistory.java

@@ -71,18 +71,18 @@ public class TransactionHistory {
 //    }
 
     public void refresh() {
-        List<TransactionInfo> t = refreshJ();
+        List<TransactionInfo> transactionInfos = refreshJ();
-        Timber.d("refreshed %d", t.size());
+        Timber.d("refreshed %d", transactionInfos.size());
-        for (Iterator<TransactionInfo> iterator = t.iterator(); iterator.hasNext(); ) {
+        for (Iterator<TransactionInfo> iterator = transactionInfos.iterator(); iterator.hasNext(); ) {
             TransactionInfo info = iterator.next();
-            if (info.account != accountIndex) {
+            if (info.accountIndex != accountIndex) {
                 iterator.remove();
                 Timber.d("removed %s", info.hash);
             } else {
                 Timber.d("kept %s", info.hash);
             }
         }
-        transactions = t;
+        transactions = transactionInfos;
     }
 
     private native List<TransactionInfo> refreshJ();

app/src/main/java/com/m2049r/xmrwallet/model/TransactionInfo.java

@@ -19,13 +19,17 @@ package com.m2049r.xmrwallet.model;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.m2049r.xmrwallet.data.Subaddress;
+
 import java.util.List;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
 // this is not the TransactionInfo from the API as that is owned by the TransactionHistory
 // this is a POJO for the TransactionInfoAdapter
 public class TransactionInfo implements Parcelable, Comparable<TransactionInfo> {
-    static final String TAG = "TransactionInfo";
+    @RequiredArgsConstructor
-
     public enum Direction {
         Direction_In(0),
         Direction_Out(1);
@@ -40,15 +44,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
             return null;
         }
 
-        public int getValue() {
+        @Getter
-            return value;
+        private final int value;
-        }
-
-        private int value;
-
-        Direction(int value) {
-            this.value = value;
-        }
     }
 
     public Direction direction;
@@ -60,8 +57,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
     public String hash;
     public long timestamp;
     public String paymentId;
-    public int account;
+    public int accountIndex;
-    public int subaddress;
+    public int addressIndex;
     public long confirmations;
     public String subaddressLabel;
     public List<Transfer> transfers;
@@ -80,8 +77,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
             String hash,
             long timestamp,
             String paymentId,
-            int account,
+            int accountIndex,
-            int subaddress,
+            int addressIndex,
             long confirmations,
             String subaddressLabel,
             List<Transfer> transfers) {
@@ -94,13 +91,20 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
         this.hash = hash;
         this.timestamp = timestamp;
         this.paymentId = paymentId;
-        this.account = account;
+        this.accountIndex = accountIndex;
-        this.subaddress = subaddress;
+        this.addressIndex = addressIndex;
         this.confirmations = confirmations;
         this.subaddressLabel = subaddressLabel;
         this.transfers = transfers;
     }
 
+    public String getDisplayLabel() {
+        if (subaddressLabel.isEmpty() || (Subaddress.DEFAULT_LABEL_FORMATTER.matcher(subaddressLabel).matches()))
+            return ("#" + addressIndex);
+        else
+            return subaddressLabel;
+    }
+
     public String toString() {
         return direction + "@" + blockheight + " " + amount;
     }
@@ -116,8 +120,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
         out.writeString(hash);
         out.writeLong(timestamp);
         out.writeString(paymentId);
-        out.writeInt(account);
+        out.writeInt(accountIndex);
-        out.writeInt(subaddress);
+        out.writeInt(addressIndex);
         out.writeLong(confirmations);
         out.writeString(subaddressLabel);
         out.writeList(transfers);
@@ -146,8 +150,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
         hash = in.readString();
         timestamp = in.readLong();
         paymentId = in.readString();
-        account = in.readInt();
+        accountIndex = in.readInt();
-        subaddress = in.readInt();
+        addressIndex = in.readInt();
         confirmations = in.readLong();
         subaddressLabel = in.readString();
         transfers = in.readArrayList(Transfer.class.getClassLoader());

app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java

@@ -19,6 +19,7 @@ package com.m2049r.xmrwallet.model;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.m2049r.xmrwallet.data.Subaddress;
 import com.m2049r.xmrwallet.data.TxData;
 
 import java.io.File;
@@ -26,6 +27,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import timber.log.Timber;
 
 public class Wallet {
@@ -104,10 +107,14 @@ public class Wallet {
         this.accountIndex = accountIndex;
     }
 
+    @RequiredArgsConstructor
+    @Getter
     public enum Device {
-        Device_Undefined,
+        Device_Undefined(0, 0),
-        Device_Software,
+        Device_Software(50, 200),
-        Device_Ledger
+        Device_Ledger(5, 20);
+        private final int accountLookahead;
+        private final int subaddressLookahead;
     }
 
     public enum StatusEnum {
@@ -160,6 +167,15 @@ public class Wallet {
 
     private native String getAddressJ(int accountIndex, int addressIndex);
 
+    public Subaddress getSubaddressObject(int accountIndex, int subAddressIndex) {
+        return new Subaddress(accountIndex, subAddressIndex,
+                getSubaddress(subAddressIndex), getSubaddressLabel(subAddressIndex));
+    }
+
+    public Subaddress getSubaddressObject(int subAddressIndex) {
+        return getSubaddressObject(accountIndex, subAddressIndex);
+    }
+
     public native String getPath();
 
     public NetworkType getNetworkType() {
@@ -428,6 +444,11 @@ public class Wallet {
         setSubaddressLabel(accountIndex, 0, label);
     }
 
+    public void setSubaddressLabel(int addressIndex, String label) {
+        setSubaddressLabel(accountIndex, addressIndex, label);
+        getHistory().refreshWithNotes(this);
+    }
+
     public native void setSubaddressLabel(int accountIndex, int addressIndex, String label);
 
     public native int getNumAccounts();

app/src/main/java/com/m2049r/xmrwallet/util/Helper.java

@@ -23,7 +23,6 @@ import android.content.ClipData;
 import android.content.ClipDescription;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -484,7 +483,6 @@ public class Helper {
         }
 
         etPassword.getEditText().addTextChangedListener(new TextWatcher() {
-
             @Override
             public void afterTextChanged(Editable s) {
                 if (etPassword.getError() != null) {
@@ -508,17 +506,16 @@ public class Helper {
                 .setCancelable(false)
                 .setPositiveButton(context.getString(R.string.label_ok), null)
                 .setNegativeButton(context.getString(R.string.label_cancel),
-                        new DialogInterface.OnClickListener() {
+                        (dialog, id) -> {
-                            public void onClick(DialogInterface dialog, int id) {
+                            action.fail(wallet);
-                                Helper.hideKeyboardAlways((Activity) context);
+                            Helper.hideKeyboardAlways((Activity) context);
-                                cancelSignal.cancel();
+                            cancelSignal.cancel();
-                                if (passwordTask != null) {
+                            if (passwordTask != null) {
-                                    passwordTask.cancel(true);
+                                passwordTask.cancel(true);
-                                    passwordTask = null;
+                                passwordTask = null;
-                                }
-                                dialog.cancel();
-                                openDialog = null;
                             }
+                            dialog.cancel();
+                            openDialog = null;
                         });
         openDialog = alertDialogBuilder.create();
 
@@ -561,45 +558,37 @@ public class Helper {
             };
         }
 
-        openDialog.setOnShowListener(new DialogInterface.OnShowListener() {
+        openDialog.setOnShowListener(dialog -> {
-            @Override
+            if (fingerprintAuthAllowed && fingerprintAuthCallback != null) {
-            public void onShow(DialogInterface dialog) {
+                tvOpenPrompt.setCompoundDrawablesRelativeWithIntrinsicBounds(icFingerprint, null, null, null);
-                if (fingerprintAuthAllowed && fingerprintAuthCallback != null) {
+                tvOpenPrompt.setText(context.getText(R.string.prompt_fingerprint_auth));
-                    tvOpenPrompt.setCompoundDrawablesRelativeWithIntrinsicBounds(icFingerprint, null, null, null);
+                tvOpenPrompt.setVisibility(View.VISIBLE);
-                    tvOpenPrompt.setText(context.getText(R.string.prompt_fingerprint_auth));
+                FingerprintHelper.authenticate(context, cancelSignal, fingerprintAuthCallback);
-                    tvOpenPrompt.setVisibility(View.VISIBLE);
+            } else {
-                    FingerprintHelper.authenticate(context, cancelSignal, fingerprintAuthCallback);
+                etPassword.requestFocus();
-                } else {
-                    etPassword.requestFocus();
-                }
-                Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE);
-                button.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        String pass = etPassword.getEditText().getText().toString();
-                        if (passwordTask == null) {
-                            passwordTask = new PasswordTask(pass, false);
-                            passwordTask.execute();
-                        }
-                    }
-                });
             }
+            Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE);
+            button.setOnClickListener(view -> {
+                String pass = etPassword.getEditText().getText().toString();
+                if (passwordTask == null) {
+                    passwordTask = new PasswordTask(pass, false);
+                    passwordTask.execute();
+                }
+            });
         });
 
         // accept keyboard "ok"
-        etPassword.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
+        etPassword.getEditText().setOnEditorActionListener((v, actionId, event) -> {
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+            if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
-                if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
+                    || (actionId == EditorInfo.IME_ACTION_DONE)) {
-                        || (actionId == EditorInfo.IME_ACTION_DONE)) {
+                String pass = etPassword.getEditText().getText().toString();
-                    String pass = etPassword.getEditText().getText().toString();
+                if (passwordTask == null) {
-                    if (passwordTask == null) {
+                    passwordTask = new PasswordTask(pass, false);
-                        passwordTask = new PasswordTask(pass, false);
+                    passwordTask.execute();
-                        passwordTask.execute();
-                    }
-                    return true;
                 }
-                return false;
+                return true;
             }
+            return false;
         });
 
         if (Helper.preventScreenshot()) {
@@ -613,7 +602,7 @@ public class Helper {
     public interface PasswordAction {
         void act(String walletName, String password, boolean fingerprintUsed);
 
-        void fail(String walletName, String password, boolean fingerprintUsed);
+        void fail(String walletName);
     }
 
     static private boolean processPasswordEntry(Context context, String walletName, String pass, boolean fingerprintUsed, PasswordAction action) {
@@ -622,7 +611,7 @@ public class Helper {
             action.act(walletName, walletPassword, fingerprintUsed);
             return true;
         } else {
-            action.fail(walletName, walletPassword, fingerprintUsed);
+            action.fail(walletName);
             return false;
         }
     }
@@ -667,8 +656,8 @@ public class Helper {
         }
         view.setText(msg);
         if (hours >= STALE_NODE_HOURS)
-            view.setTextColor(ColorHelper.getThemedColor(view.getContext(), R.attr.colorError));
+            view.setTextColor(ThemeHelper.getThemedColor(view.getContext(), R.attr.colorError));
         else
-            view.setTextColor(ColorHelper.getThemedColor(view.getContext(), android.R.attr.textColorPrimary));
+            view.setTextColor(ThemeHelper.getThemedColor(view.getContext(), android.R.attr.textColorPrimary));
     }
 }

app/src/main/java/com/m2049r/xmrwallet/util/ThemeHelper.java

@@ -17,19 +17,26 @@
 package com.m2049r.xmrwallet.util;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.util.TypedValue;
 
-import com.m2049r.xmrwallet.R;
+import androidx.annotation.ColorInt;
 
-public class ColorHelper {
+public class ThemeHelper {
     static public int getThemedResourceId(Context ctx, int attrId) {
-        TypedArray styledAttributes = ctx.getTheme().obtainStyledAttributes(R.style.MyMaterialTheme, new int[]{attrId});
+        final TypedValue typedValue = new TypedValue();
-        return styledAttributes.getResourceId(0, 0);
+        if (ctx.getTheme().resolveAttribute(attrId, typedValue, true))
+            return typedValue.resourceId;
+        else
+            return 0;
     }
 
+    @ColorInt
     static public int getThemedColor(Context ctx, int attrId) {
-        TypedArray styledAttributes = ctx.getTheme().obtainStyledAttributes(R.style.MyMaterialTheme, new int[]{attrId});
+        final TypedValue typedValue = new TypedValue();
-        return styledAttributes.getColor(0, Color.BLACK);
+        if (ctx.getTheme().resolveAttribute(attrId, typedValue, true))
+            return typedValue.data;
+        else
+            return Color.BLACK;
     }
 }

app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java

@@ -42,7 +42,7 @@ import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
-import com.m2049r.xmrwallet.util.ColorHelper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.ServiceHelper;
 
@@ -180,7 +180,7 @@ public class ExchangeView extends LinearLayout {
 
         // make progress circle gray
         pbExchange.getIndeterminateDrawable().
-                setColorFilter(ColorHelper.getThemedColor(getContext(), R.attr.colorPrimaryVariant),
+                setColorFilter(ThemeHelper.getThemedColor(getContext(), R.attr.colorPrimaryVariant),
                         android.graphics.PorterDuff.Mode.MULTIPLY);
 
         sCurrencyA.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {

app/src/main/res/layout/fragment_receive.xml

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:transitionName="@string/receive_transition_name">
 
     <EditText
         android:id="@+id/etDummy"
@@ -25,18 +26,27 @@
             android:indeterminate="true"
             android:visibility="gone" />
 
+        <TextView
+            style="@style/MoneroText.Label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:text="@string/tx_subaddress"
+            android:textAlignment="textStart" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center">
+            android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/tvAddressLabel"
+                android:id="@+id/tvAddress"
-                style="@style/MoneroLabel.Heading"
+                style="@style/MoneroText.Medium"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
-                android:layout_gravity="center"
+                android:layout_gravity="start"
-                android:text="@string/generate_address_label" />
+                android:layout_weight="1"
+                tools:text="TAG 9wZnnNctRc7RaLya1rxykH21dUwfQpNGmVLjAvkvqe7nKT2Mw848AJNGMunW5xjoSZ5vCCU3uDnUoVqSSHxzRtQBE3f6crx" />
 
             <ImageButton
                 android:id="@+id/bCopyAddress"
@@ -44,33 +54,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
                 android:background="?android:selectableItemBackground"
+                android:padding="8dp"
                 android:src="@drawable/ic_content_copy_24dp" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:orientation="horizontal"
-            android:weightSum="10">
-
-            <TextView
-                android:id="@+id/tvAddress"
-                style="@style/MoneroText.Medium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="10"
-                android:textAlignment="center"
-                tools:text="9wZnnNctRc7RaLya1rxykH21dUwfQpNGmVLjAvkvqe7nKT2Mw848AJNGMunW5xjoSZ5vCCU3uDnUoVqSSHxzRtQBE3f6crx" />
-
-            <ImageButton
-                android:id="@+id/bSubaddress"
-                android:layout_width="56dp"
-                android:layout_height="56dp"
-                android:layout_marginStart="8dp"
-                android:background="?android:selectableItemBackground"
-                android:src="@drawable/ic_refresh_24dp" />
 
         </LinearLayout>
 

app/src/main/res/layout/fragment_send.xml

@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:transitionName="@string/send_transition_name">
 
     <LinearLayout
         android:id="@+id/llNotice"