Browse Source

fix signing dialog issue

V1.1.0-release
ZhangJun 5 years ago
parent
commit
29bfdbc155
  1. 3
      app/src/main/java/com/cobo/cold/ui/fragment/main/electrum/ElectrumTxConfirmFragment.java
  2. 1
      app/src/main/java/com/cobo/cold/viewmodel/TxConfirmViewModel.java

3
app/src/main/java/com/cobo/cold/ui/fragment/main/electrum/ElectrumTxConfirmFragment.java

@ -69,6 +69,7 @@ import static com.cobo.cold.viewmodel.ElectrumViewModel.exportSuccess;
import static com.cobo.cold.viewmodel.ElectrumViewModel.hasSdcard; import static com.cobo.cold.viewmodel.ElectrumViewModel.hasSdcard;
import static com.cobo.cold.viewmodel.ElectrumViewModel.showNoSdcardModal; import static com.cobo.cold.viewmodel.ElectrumViewModel.showNoSdcardModal;
import static com.cobo.cold.viewmodel.ElectrumViewModel.writeToSdcard; import static com.cobo.cold.viewmodel.ElectrumViewModel.writeToSdcard;
import static com.cobo.cold.viewmodel.TxConfirmViewModel.STATE_NONE;
public class ElectrumTxConfirmFragment extends BaseFragment<ElectrumTxConfirmFragmentBinding> { public class ElectrumTxConfirmFragment extends BaseFragment<ElectrumTxConfirmFragmentBinding> {
@ -302,6 +303,7 @@ public class ElectrumTxConfirmFragment extends BaseFragment<ElectrumTxConfirmFra
} }
signingDialog = null; signingDialog = null;
onSignSuccess(); onSignSuccess();
viewModel.getSignState().setValue(STATE_NONE);
}, 500); }, 500);
} else if (TxConfirmViewModel.STATE_SIGN_FAIL.equals(s)) { } else if (TxConfirmViewModel.STATE_SIGN_FAIL.equals(s)) {
if (signingDialog == null) { if (signingDialog == null) {
@ -315,6 +317,7 @@ public class ElectrumTxConfirmFragment extends BaseFragment<ElectrumTxConfirmFra
} }
signingDialog = null; signingDialog = null;
viewModel.getSignState().removeObservers(this); viewModel.getSignState().removeObservers(this);
viewModel.getSignState().setValue(STATE_NONE);
}, 2000); }, 2000);
} }
}); });

1
app/src/main/java/com/cobo/cold/viewmodel/TxConfirmViewModel.java

@ -80,6 +80,7 @@ import static com.cobo.cold.viewmodel.ElectrumViewModel.adapt;
public class TxConfirmViewModel extends AndroidViewModel { public class TxConfirmViewModel extends AndroidViewModel {
public static final String STATE_NONE = "";
public static final String STATE_SIGNING = "signing"; public static final String STATE_SIGNING = "signing";
public static final String STATE_SIGN_FAIL = "signing_fail"; public static final String STATE_SIGN_FAIL = "signing_fail";
public static final String STATE_SIGN_SUCCESS = "signing_success"; public static final String STATE_SIGN_SUCCESS = "signing_success";

Loading…
Cancel
Save