From b2da811687b8a64d999222651c8a252a713e6780 Mon Sep 17 00:00:00 2001 From: Javier Varona Date: Wed, 12 Sep 2018 21:08:22 -0400 Subject: [PATCH 1/2] - Fixing compile errors --- .../BitsharesAccountMnemonicValidationField.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/validationfields/BitsharesAccountMnemonicValidationField.java b/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/validationfields/BitsharesAccountMnemonicValidationField.java index cbbbe72..6339c26 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/validationfields/BitsharesAccountMnemonicValidationField.java +++ b/app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/validationfields/BitsharesAccountMnemonicValidationField.java @@ -31,7 +31,7 @@ public class BitsharesAccountMnemonicValidationField extends ValidationField { this.startValidating(); final ValidationField field = this; - final ValidateImportBitsharesAccountRequest request = new ValidateImportBitsharesAccountRequest(newAccountNameValue,newMnemonicValue); + final ValidateImportBitsharesAccountRequest request = new ValidateImportBitsharesAccountRequest(newAccountNameValue,newMnemonicValue,view.getContext()); request.setListener(new CryptoNetInfoRequestListener() { @Override public void onCarryOut() { From 68296f6306979cad4b82b2adc085a84aad3d6a2c Mon Sep 17 00:00:00 2001 From: Javier Varona Date: Wed, 12 Sep 2018 21:56:04 -0400 Subject: [PATCH 2/2] - Fixing some errors importing accounts - After importing an account using a seed, the user gets to the balance page and the intent history is cleared --- .../agorise/crystalwallet/activities/ImportSeedActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/ImportSeedActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/ImportSeedActivity.java index 21844fe..8e75c1a 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/ImportSeedActivity.java +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/ImportSeedActivity.java @@ -141,7 +141,8 @@ public class ImportSeedActivity extends AppCompatActivity implements UIValidator Toast.makeText(thisActivity.getApplicationContext(),errorText,Toast.LENGTH_LONG).show(); } else { - Intent intent = new Intent(thisActivity, IntroActivity.class); + Intent intent = new Intent(thisActivity, BoardActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); startActivity(intent); } } @@ -170,6 +171,7 @@ public class ImportSeedActivity extends AppCompatActivity implements UIValidator grapheneAccountInfoViewModel.addGrapheneAccountInfo(grapheneAccountInfo); this.finish();*/ + CryptoNetInfoRequests.getInstance().addRequest(validatorRequest); } }