bump version

Fix transactions not updating when switching accounts

app/build.gradle

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

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

@@ -376,7 +376,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
@@ -412,7 +412,7 @@ public class LoginActivity extends BaseActivity
                 }
 
                 @Override
-                public void fail(String walletName, String password, boolean fingerprintUsed) {
+                public void fail(String walletName) {
                 }
             });
         } else { // this cannot really happen as we prefilter choices
@@ -1400,7 +1400,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

@@ -258,7 +258,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()) {

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

@@ -524,7 +524,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 +588,7 @@ public class NodeFragment extends Fragment
                     if (nodeBackup == null) {
                         nodesAdapter.addNode(nodeInfo);
                     } else {
-                        nodesAdapter.dataSetChanged();
+                        nodesAdapter.setNodes();
                     }
                 }
             }

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

@@ -337,7 +337,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
             }
 
             @Override
-            public void fail(String walletName, String password, boolean fingerprintUsed) {
+            public void fail(String walletName) {
             }
         });
     }
@@ -854,7 +854,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
                             }
 
                             @Override
-                            public void fail(String walletName, String password, boolean fingerprintUsed) {
+                            public void fail(String walletName) {
                             }
                         });
 

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

@@ -154,7 +154,6 @@ public class WalletFragment extends Fragment
                                     dismissedTransactions.add(adapter.getItem(position).hash);
                                     adapter.removeItem(position);
                                 }
-                                adapter.notifyDataSetChanged();
                             }
 
                             @Override
@@ -163,7 +162,6 @@ public class WalletFragment extends Fragment
                                     dismissedTransactions.add(adapter.getItem(position).hash);
                                     adapter.removeItem(position);
                                 }
-                                adapter.notifyDataSetChanged();
                             }
                         });
 
@@ -352,7 +350,6 @@ public class WalletFragment extends Fragment
                     list.add(info);
             }
             adapter.setInfos(list);
-            adapter.notifyDataSetChanged();
         }
         updateStatus(wallet);
     }

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(
-                                respBody.string());
+                        final JSONObject json = new JSONObject(respBody.string());
                         String rpcVersion = json.getString("jsonrpc");
                         if (!RPC_VERSION.equals(rpcVersion))
                             return false;

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/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,6 +25,7 @@ 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;
@@ -53,7 +54,7 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
     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())
-                .inflate(R.layout.item_node, parent, false);
+        View view = LayoutInflater.from(parent.getContext()).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);
-        dataSetChanged(); // in case the nodeinfo has changed
+            newItems.add(node);
+        setNodes(newItems); // in case the nodeinfo has changed
     }
 
-    public void dataSetChanged() {
-        Collections.sort(nodeItems, NodeInfo.BestNodeComparator);
-        notifyDataSetChanged();
-    }
-
-    public void setNodes(Collection<NodeInfo> data) {
-        nodeItems.clear();
-        if (data != null) {
-            for (NodeInfo node : data) {
-                if (!nodeItems.contains(node))
-                    nodeItems.add(node);
-            }
+    public void setNodes(Collection<NodeInfo> newItemsCollection) {
+        List<NodeInfo> newItems;
+        if (newItemsCollection != null) {
+            newItems = new ArrayList<>(newItemsCollection);
+            Collections.sort(newItems, NodeInfo.BestNodeComparator);
+        } else {
+            newItems = new ArrayList<>();
         }
-        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);

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

@@ -23,7 +23,9 @@ 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;
@@ -46,10 +48,10 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
 
     private final SimpleDateFormat DATETIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
-    private int outboundColour;
-    private int inboundColour;
-    private int pendingColour;
-    private int failedColour;
+    private final int outboundColour;
+    private final int inboundColour;
+    private final int pendingColour;
+    private final int failedColour;
 
     public interface OnInteractionListener {
         void onInteraction(View view, TransactionInfo item);
@@ -58,7 +60,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 +75,31 @@ 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);
+        }
+    }
+
+    @NonNull
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.item_transaction, parent, false);
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_transaction, parent, false);
         return new ViewHolder(view);
     }
 
@@ -90,23 +113,26 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
         return infoItems.size();
     }
 
-    public void setInfos(List<TransactionInfo> data) {
-        // TODO do stuff with data so we can really recycle elements (i.e. add only new tx)
-        // as the TransactionInfo items are always recreated, we cannot recycle
-        infoItems.clear();
-        if (data != null) {
-            Timber.d("setInfos %s", data.size());
-            infoItems.addAll(data);
-            Collections.sort(infoItems);
-        } else {
+    public void setInfos(List<TransactionInfo> newItems) {
+        if (newItems == null) {
+            newItems = new ArrayList<>();
             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);
-        notifyItemRemoved(position);
+        List<TransactionInfo> newItems = new ArrayList<>(infoItems);
+        if (newItems.size() > position)
+            newItems.remove(position);
+        setInfos(newItems); // in case the nodeinfo has changed
     }
 
     public TransactionInfo getItem(int position) {

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) {
-        // TODO do stuff with data so we can really recycle elements (i.e. add only new tx)
-        // as the WalletInfo items are always recreated, we cannot recycle
-        infoItems.clear();
-        if (data != null) {
-            Timber.d("setInfos %s", data.size());
-            infoItems.addAll(data);
-            Collections.sort(infoItems);
-        } else {
+    public void setInfos(List<WalletManager.WalletInfo> newItems) {
+        if (newItems == null) {
+            newItems = new ArrayList<>();
             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() {
-                @Override
-                public void onClick(View view) {
-                    if (popupOpen) return;
-                    //creating a popup menu
-                    PopupMenu popup = new PopupMenu(context, ibOptions);
-                    //inflating menu from xml resource
-                    popup.inflate(R.menu.list_context_menu);
-                    popupOpen = true;
-                    //adding click listener
-                    popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-                        @Override
-                        public boolean onMenuItemClick(MenuItem item) {
-                            if (listener != null) {
-                                return listener.onContextInteraction(item, infoItem);
-                            }
-                            return false;
-                        }
-                    });
-                    //displaying the popup
-                    popup.show();
-                    popup.setOnDismissListener(new PopupMenu.OnDismissListener() {
-                        @Override
-                        public void onDismiss(PopupMenu menu) {
-                            popupOpen = false;
-                        }
-                    });
+            ibOptions.setOnClickListener(view -> {
+                if (popupOpen) return;
+                //creating a popup menu
+                PopupMenu popup = new PopupMenu(context, ibOptions);
+                //inflating menu from xml resource
+                popup.inflate(R.menu.list_context_menu);
+                popupOpen = true;
+                //adding click listener
+                popup.setOnMenuItemClickListener(item -> {
+                    if (listener != null) {
+                        return listener.onContextInteraction(item, infoItem);
+                    }
+                    return false;
+                });
+                //displaying the popup
+                popup.show();
+                popup.setOnDismissListener(menu -> popupOpen = false);
 
-                }
             });
             itemView.setOnClickListener(this);
         }

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() {
-                            public void onClick(DialogInterface dialog, int id) {
-                                Helper.hideKeyboardAlways((Activity) context);
-                                cancelSignal.cancel();
-                                if (passwordTask != null) {
-                                    passwordTask.cancel(true);
-                                    passwordTask = null;
-                                }
-                                dialog.cancel();
-                                openDialog = null;
+                        (dialog, id) -> {
+                            action.fail(wallet);
+                            Helper.hideKeyboardAlways((Activity) context);
+                            cancelSignal.cancel();
+                            if (passwordTask != null) {
+                                passwordTask.cancel(true);
+                                passwordTask = null;
                             }
+                            dialog.cancel();
+                            openDialog = null;
                         });
         openDialog = alertDialogBuilder.create();
 
@@ -561,45 +558,37 @@ public class Helper {
             };
         }
 
-        openDialog.setOnShowListener(new DialogInterface.OnShowListener() {
-            @Override
-            public void onShow(DialogInterface dialog) {
-                if (fingerprintAuthAllowed && fingerprintAuthCallback != null) {
-                    tvOpenPrompt.setCompoundDrawablesRelativeWithIntrinsicBounds(icFingerprint, null, null, null);
-                    tvOpenPrompt.setText(context.getText(R.string.prompt_fingerprint_auth));
-                    tvOpenPrompt.setVisibility(View.VISIBLE);
-                    FingerprintHelper.authenticate(context, cancelSignal, fingerprintAuthCallback);
-                } 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();
-                        }
-                    }
-                });
+        openDialog.setOnShowListener(dialog -> {
+            if (fingerprintAuthAllowed && fingerprintAuthCallback != null) {
+                tvOpenPrompt.setCompoundDrawablesRelativeWithIntrinsicBounds(icFingerprint, null, null, null);
+                tvOpenPrompt.setText(context.getText(R.string.prompt_fingerprint_auth));
+                tvOpenPrompt.setVisibility(View.VISIBLE);
+                FingerprintHelper.authenticate(context, cancelSignal, fingerprintAuthCallback);
+            } else {
+                etPassword.requestFocus();
             }
+            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() {
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
-                        || (actionId == EditorInfo.IME_ACTION_DONE)) {
-                    String pass = etPassword.getEditText().getText().toString();
-                    if (passwordTask == null) {
-                        passwordTask = new PasswordTask(pass, false);
-                        passwordTask.execute();
-                    }
-                    return true;
+        etPassword.getEditText().setOnEditorActionListener((v, actionId, event) -> {
+            if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
+                    || (actionId == EditorInfo.IME_ACTION_DONE)) {
+                String pass = etPassword.getEditText().getText().toString();
+                if (passwordTask == null) {
+                    passwordTask = new PasswordTask(pass, false);
+                    passwordTask.execute();
                 }
-                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;
         }
     }