From 98e2170a89be06023a81a829171b0d247efbcc96 Mon Sep 17 00:00:00 2001
From: fuwa <echowss@gmail.com>
Date: Fri, 26 Oct 2018 16:00:38 +0000
Subject: [PATCH] auto generate subaddresses

---
 .../wownero/wownerujo/ReceiveFragment.java    | 60 ++++++++++---------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java b/app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java
index eb9fca2..c129366 100644
--- a/app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java
+++ b/app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java
@@ -173,31 +173,7 @@ public class ReceiveFragment extends Fragment {
         bSubaddress.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                enableSubaddressButton(false);
-                enableCopyAddress(false);
-
-                final Runnable resetSize = new Runnable() {
-                    public void run() {
-                        tvAddress.animate().setDuration(125).scaleX(1).scaleY(1).start();
-                    }
-                };
-
-                final Runnable newAddress = new Runnable() {
-                    public void run() {
-                        tvAddress.setText(wallet.getNewSubaddress());
-                        tvAddressLabel.setText(getString(R.string.generate_address_label_sub,
-                                wallet.getNumSubaddresses() - 1));
-                        storeWallet();
-                        generateQr();
-                        enableCopyAddress(true);
-                        tvAddress.animate().alpha(1).setDuration(125)
-                                .scaleX(1.2f).scaleY(1.2f)
-                                .withEndAction(resetSize).start();
-                    }
-                };
-
-                tvAddress.animate().alpha(0).setDuration(250)
-                        .withEndAction(newAddress).start();
+                generateNewSubaddress();
             }
         });
 
@@ -276,6 +252,34 @@ public class ReceiveFragment extends Fragment {
         etDummy.requestFocus();
     }
 
+    void generateNewSubaddress() {
+        enableSubaddressButton(false);
+        enableCopyAddress(false);
+
+        final Runnable resetSize = new Runnable() {
+            public void run() {
+                tvAddress.animate().setDuration(125).scaleX(1).scaleY(1).start();
+            }
+        };
+
+        final Runnable newAddress = new Runnable() {
+            public void run() {
+                tvAddress.setText(wallet.getNewSubaddress());
+                tvAddressLabel.setText(getString(R.string.generate_address_label_sub,
+                        wallet.getNumSubaddresses() - 1));
+                storeWallet();
+                generateQr();
+                enableCopyAddress(true);
+                tvAddress.animate().alpha(1).setDuration(125)
+                        .scaleX(1.2f).scaleY(1.2f)
+                        .withEndAction(resetSize).start();
+            }
+        };
+
+        tvAddress.animate().alpha(0).setDuration(250)
+                .withEndAction(newAddress).start();
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -292,6 +296,7 @@ public class ReceiveFragment extends Fragment {
 
     private boolean isLoaded = false;
 
+
     private void show() {
         Timber.d("name=%s", wallet.getName());
         isLoaded = true;
@@ -300,10 +305,9 @@ public class ReceiveFragment extends Fragment {
         tvAddress.setText(wallet.getAddress());
         etPaymentId.setEnabled(true);
         bPaymentId.setEnabled(true);
-        enableCopyAddress(true);
         hideProgress();
-        generateQr();
-    }
+        generateNewSubaddress();
+8    }
 
     private void enableCopyAddress(boolean enable) {
         bCopyAddress.setClickable(enable);