#4 Remove message from event (not required for passphrase)

Multibit-Legacy · Apr 6, 2015 · e0a8537 · e0a8537
1 parent c44d163
commit e0a8537
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmChangePINState.java b/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmChangePINState.java
@@ -29,8 +29,8 @@ protected void internalTransition(HardwareWalletClient client, HardwareWalletCon
         // Further state transitions will occur after the user has provided the PIN via the service
         break;
       case PASSPHRASE_REQUEST:
-        // Device is asking for a passphrase screen to be displayed (not support)
-        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY, event.getMessage().get());
+        // Device is asking for a passphrase screen to be displayed
+        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY);
         // Further state transitions will occur after the user has provided the passphrase via the service
         break;
       case BUTTON_REQUEST:

diff --git a/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmCipherKeyState.java b/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmCipherKeyState.java
@@ -31,8 +31,8 @@ protected void internalTransition(HardwareWalletClient client, HardwareWalletCon
         // Further state transitions will occur after the user has provided the PIN via the service
         break;
       case PASSPHRASE_REQUEST:
-        // Device is asking for a passphrase screen to be displayed (not support)
-        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY, event.getMessage().get());
+        // Device is asking for a passphrase screen to be displayed
+        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY);
         // Further state transitions will occur after the user has provided the passphrase via the service
         break;
       case BUTTON_REQUEST:

diff --git a/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmGetAddressState.java b/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmGetAddressState.java
@@ -34,8 +34,8 @@ protected void internalTransition(HardwareWalletClient client, HardwareWalletCon
         // Further state transitions will occur after the user has provided the PIN via the service
         break;
       case PASSPHRASE_REQUEST:
-        // Device is asking for a passphrase screen to be displayed (not support)
-        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY, event.getMessage().get());
+        // Device is asking for a passphrase screen to be displayed
+        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY);
         // Further state transitions will occur after the user has provided the passphrase via the service
         break;
       case ADDRESS:

diff --git a/...rc/main/java/org/multibit/hd/hardware/core/fsm/ConfirmGetDeterministicHierarchyState.java b/...rc/main/java/org/multibit/hd/hardware/core/fsm/ConfirmGetDeterministicHierarchyState.java
@@ -42,8 +42,8 @@ protected void internalTransition(HardwareWalletClient client, HardwareWalletCon
         // Further state transitions will occur after the user has provided the PIN via the service
         break;
       case PASSPHRASE_REQUEST:
-        // Device is asking for a passphrase screen to be displayed (not support)
-        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY, event.getMessage().get());
+        // Device is asking for a passphrase screen to be displayed
+        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY);
         // Further state transitions will occur after the user has provided the passphrase via the service
         break;
       case PUBLIC_KEY:

diff --git a/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmGetPublicKeyState.java b/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmGetPublicKeyState.java
@@ -29,8 +29,8 @@ protected void internalTransition(HardwareWalletClient client, HardwareWalletCon
         // Further state transitions will occur after the user has provided the PIN via the service
         break;
       case PASSPHRASE_REQUEST:
-        // Device is asking for a passphrase screen to be displayed (not support)
-        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY, event.getMessage().get());
+        // Device is asking for a passphrase screen to be displayed
+        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY);
         // Further state transitions will occur after the user has provided the passphrase via the service
         break;
       case PUBLIC_KEY:

diff --git a/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmLoadState.java b/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmLoadState.java
@@ -33,8 +33,8 @@ protected void internalTransition(HardwareWalletClient client, HardwareWalletCon
         // Further state transitions will occur after the user has provided the PIN via the service
         break;
       case PASSPHRASE_REQUEST:
-        // Device is asking for a passphrase screen to be displayed (not support)
-        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY, event.getMessage().get());
+        // Device is asking for a passphrase screen to be displayed
+        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY);
         // Further state transitions will occur after the user has provided the passphrase via the service
         break;
       case SUCCESS:

diff --git a/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmPINState.java b/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmPINState.java
@@ -28,8 +28,8 @@ protected void internalTransition(HardwareWalletClient client, HardwareWalletCon
         // Further state transitions will occur after the user has provided the PIN via the service
         break;
       case PASSPHRASE_REQUEST:
-        // Device is asking for a passphrase screen to be displayed (not support)
-        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY, event.getMessage().get());
+        // Device is asking for a passphrase screen to be displayed
+        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY);
         // Further state transitions will occur after the user has provided the passphrase via the service
         break;
       case ENTROPY_REQUEST:

diff --git a/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmResetState.java b/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmResetState.java
@@ -33,8 +33,8 @@ protected void internalTransition(HardwareWalletClient client, HardwareWalletCon
         // Further state transitions will occur after the user has provided the PIN via the service
         break;
       case PASSPHRASE_REQUEST:
-        // Device is asking for a passphrase screen to be displayed (not support)
-        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY, event.getMessage().get());
+        // Device is asking for a passphrase screen to be displayed
+        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY);
         // Further state transitions will occur after the user has provided the passphrase via the service
         break;
       case FAILURE:

diff --git a/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmSignMessageState.java b/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmSignMessageState.java
@@ -29,8 +29,8 @@ protected void internalTransition(HardwareWalletClient client, HardwareWalletCon
         // Further state transitions will occur after the user has provided the PIN via the service
         break;
       case PASSPHRASE_REQUEST:
-        // Device is asking for a passphrase screen to be displayed (not support)
-        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY, event.getMessage().get());
+        // Device is asking for a passphrase screen to be displayed
+        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY);
         // Further state transitions will occur after the user has provided the passphrase via the service
         break;
       case BUTTON_REQUEST:

diff --git a/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmSignTxState.java b/core/src/main/java/org/multibit/hd/hardware/core/fsm/ConfirmSignTxState.java
@@ -56,8 +56,8 @@ protected void internalTransition(HardwareWalletClient client, HardwareWalletCon
         // Further state transitions will occur after the user has provided the PIN via the service
         break;
       case PASSPHRASE_REQUEST:
-        // Device is asking for a passphrase screen to be displayed (not support)
-        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY, event.getMessage().get());
+        // Device is asking for a passphrase screen to be displayed
+        HardwareWalletEvents.fireHardwareWalletEvent(HardwareWalletEventType.SHOW_PASSPHRASE_ENTRY);
         // Further state transitions will occur after the user has provided the passphrase via the service
         break;
       case TX_REQUEST: