commented the OnResponse interface
Fixed error feedback on import request
This commit is contained in:
hvarona
parent
d456ee49a8
commit
b426076eea
7 changed files with 47 additions and 40 deletions
|
|
@ -25,7 +25,7 @@ import butterknife.ButterKnife;
|
|||
import butterknife.OnTextChanged;
|
||||
import cy.agorise.crystalwallet.R;
|
||||
import cy.agorise.crystalwallet.application.CrystalSecurityMonitor;
|
||||
import cy.agorise.crystalwallet.interfaces.OnResponse;
|
||||
//import cy.agorise.crystalwallet.interfaces.OnResponse;
|
||||
import cy.agorise.crystalwallet.models.GeneralSetting;
|
||||
import cy.agorise.crystalwallet.util.PasswordManager;
|
||||
import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel;
|
||||
|
|
@ -43,7 +43,7 @@ public class PatternRequestActivity extends AppCompatActivity {
|
|||
/*
|
||||
* External listener for success or fail
|
||||
* */
|
||||
private static OnResponse onResponse;
|
||||
//private static OnResponse onResponse;
|
||||
|
||||
/*
|
||||
* Contains the bad tries
|
||||
|
|
@ -109,23 +109,23 @@ public class PatternRequestActivity extends AppCompatActivity {
|
|||
//CrystalSecurityMonitor.getInstance(null).call2ndFactor(thisActivity);
|
||||
thisActivity.finish();
|
||||
|
||||
if(onResponse != null){
|
||||
/*if(onResponse != null){
|
||||
onResponse.onSuccess();
|
||||
}
|
||||
}*/
|
||||
|
||||
} else {
|
||||
thisActivity.finish();
|
||||
|
||||
if(onResponse != null){
|
||||
/*if(onResponse != null){
|
||||
onResponse.onSuccess();
|
||||
}
|
||||
}*/
|
||||
}
|
||||
} else {
|
||||
incorrect();
|
||||
|
||||
if(onResponse != null){
|
||||
/*if(onResponse != null){
|
||||
onResponse.onFailed();
|
||||
}
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -143,9 +143,9 @@ public class PatternRequestActivity extends AppCompatActivity {
|
|||
});
|
||||
}
|
||||
|
||||
public static void setOnResponse(OnResponse onResponse) {
|
||||
/*public static void setOnResponse(OnResponse onResponse) {
|
||||
PatternRequestActivity.onResponse = onResponse;
|
||||
}
|
||||
}*/
|
||||
|
||||
private void incorrect(){
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ import cy.agorise.crystalwallet.dialogs.material.DialogMaterial;
|
|||
import cy.agorise.crystalwallet.dialogs.material.NegativeResponse;
|
||||
import cy.agorise.crystalwallet.dialogs.material.PositiveResponse;
|
||||
import cy.agorise.crystalwallet.dialogs.material.QuestionDialog;
|
||||
import cy.agorise.crystalwallet.interfaces.OnResponse;
|
||||
//import cy.agorise.crystalwallet.interfaces.OnResponse;
|
||||
import cy.agorise.crystalwallet.models.AccountSeed;
|
||||
import cy.agorise.crystalwallet.models.GeneralSetting;
|
||||
import cy.agorise.crystalwallet.util.PasswordManager;
|
||||
|
|
@ -59,7 +59,7 @@ public class PinRequestActivity extends AppCompatActivity {
|
|||
/*
|
||||
* External listener for success or fail
|
||||
* */
|
||||
private static OnResponse onResponse;
|
||||
//private static OnResponse onResponse;
|
||||
|
||||
|
||||
|
||||
|
|
@ -113,16 +113,16 @@ public class PinRequestActivity extends AppCompatActivity {
|
|||
if (CrystalSecurityMonitor.getInstance(null).is2ndFactorSet()) {
|
||||
CrystalSecurityMonitor.getInstance(null).call2ndFactor(this);
|
||||
|
||||
if(onResponse != null){
|
||||
/*if(onResponse != null){
|
||||
onResponse.onSuccess();
|
||||
}
|
||||
}*/
|
||||
|
||||
} else {
|
||||
this.finish();
|
||||
|
||||
if(onResponse != null){
|
||||
/*if(onResponse != null){
|
||||
onResponse.onFailed();
|
||||
}
|
||||
}*/
|
||||
}
|
||||
}
|
||||
else{
|
||||
|
|
@ -221,9 +221,9 @@ public class PinRequestActivity extends AppCompatActivity {
|
|||
}
|
||||
|
||||
|
||||
public static void setOnResponse(OnResponse onResponse) {
|
||||
/*public static void setOnResponse(OnResponse onResponse) {
|
||||
PinRequestActivity.onResponse = onResponse;
|
||||
}
|
||||
}*/
|
||||
|
||||
|
||||
@OnTextChanged(value = R.id.etPassword,
|
||||
|
|
|
|||
|
|
@ -124,16 +124,23 @@ public abstract class GrapheneApiGenerator {
|
|||
new WitnessResponseListener() {
|
||||
@Override
|
||||
public void onSuccess(WitnessResponse response) {
|
||||
final List<List<UserAccount>> resp = (List<List<UserAccount>>) response.result;
|
||||
if(resp.size() > 0){
|
||||
List<UserAccount> accounts = resp.get(0);
|
||||
if(accounts.size() > 0){
|
||||
for(UserAccount account : accounts) {
|
||||
try {
|
||||
final List<List<UserAccount>> resp = (List<List<UserAccount>>) response.result;
|
||||
if (resp.size() > 0) {
|
||||
List<UserAccount> accounts = resp.get(0);
|
||||
if (accounts.size() > 0) {
|
||||
for (UserAccount account : accounts) {
|
||||
request.getListener().success(account, request.getId());
|
||||
break;
|
||||
}
|
||||
}else{
|
||||
request.getListener().fail(request.getId());
|
||||
}
|
||||
} else {
|
||||
request.getListener().fail(request.getId());
|
||||
}
|
||||
}else{
|
||||
}catch(Exception e){
|
||||
e.printStackTrace();
|
||||
request.getListener().fail(request.getId());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ import cy.agorise.crystalwallet.activities.PatternRequestActivity;
|
|||
import cy.agorise.crystalwallet.activities.PinRequestActivity;
|
||||
import cy.agorise.crystalwallet.activities.PocketRequestActivity;
|
||||
import cy.agorise.crystalwallet.fragments.PatternSecurityFragment;
|
||||
import cy.agorise.crystalwallet.interfaces.OnResponse;
|
||||
//import cy.agorise.crystalwallet.interfaces.OnResponse;
|
||||
import cy.agorise.crystalwallet.models.GeneralSetting;
|
||||
import cy.agorise.crystalwallet.notifiers.CrystalWalletNotifier;
|
||||
import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel;
|
||||
|
|
@ -131,7 +131,7 @@ public class CrystalSecurityMonitor implements Application.ActivityLifecycleCall
|
|||
public void onActivityStarted(Activity activity) {
|
||||
if (numStarted == 0) {
|
||||
if (!actualSecurity().equals("")){
|
||||
callPasswordRequest(activity,null);
|
||||
callPasswordRequest(activity);
|
||||
}
|
||||
}
|
||||
numStarted++;
|
||||
|
|
@ -142,39 +142,39 @@ public class CrystalSecurityMonitor implements Application.ActivityLifecycleCall
|
|||
numStarted--;
|
||||
if (numStarted == 0) {
|
||||
if (!actualSecurity().equals("")){
|
||||
callPasswordRequest(activity,null);
|
||||
callPasswordRequest(activity);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void callPasswordRequest(Activity activity, final OnResponse onResponsePattern){
|
||||
public void callPasswordRequest(Activity activity){
|
||||
if ((!activity.getIntent().hasExtra("ACTIVITY_TYPE")) || (!activity.getIntent().getStringExtra("ACTIVITY_TYPE").equals("PASSWORD_REQUEST"))) {
|
||||
Intent intent = null;
|
||||
if ((this.passwordEncrypted != null) && (!this.passwordEncrypted.equals(""))) {
|
||||
|
||||
intent = new Intent(activity, PinRequestActivity.class);
|
||||
|
||||
PinRequestActivity.setOnResponse(null);
|
||||
//PinRequestActivity.setOnResponse(null);
|
||||
|
||||
/*
|
||||
* Connect error and success listeners
|
||||
* */
|
||||
if(onResponsePattern != null){
|
||||
/*if(onResponsePattern != null){
|
||||
PinRequestActivity.setOnResponse(onResponsePattern);
|
||||
}
|
||||
}*/
|
||||
|
||||
} else if ((this.patternEncrypted != null) && (!this.patternEncrypted.equals(""))) {
|
||||
|
||||
intent = new Intent(activity, PatternRequestActivity.class);
|
||||
|
||||
PatternRequestActivity.setOnResponse(null);
|
||||
//PatternRequestActivity.setOnResponse(null);
|
||||
|
||||
/*
|
||||
* Connect error and success listeners
|
||||
* */
|
||||
if(onResponsePattern != null){
|
||||
/*if(onResponsePattern != null){
|
||||
PatternRequestActivity.setOnResponse(onResponsePattern);
|
||||
}
|
||||
}*/
|
||||
}
|
||||
if (intent != null) {
|
||||
intent.putExtra("ACTIVITY_TYPE", "PASSWORD_REQUEST");
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ import butterknife.OnTextChanged;
|
|||
import cy.agorise.crystalwallet.R;
|
||||
import cy.agorise.crystalwallet.application.CrystalSecurityMonitor;
|
||||
import cy.agorise.crystalwallet.dialogs.material.CrystalDialog;
|
||||
import cy.agorise.crystalwallet.interfaces.OnResponse;
|
||||
//import cy.agorise.crystalwallet.interfaces.OnResponse;
|
||||
import cy.agorise.crystalwallet.models.GeneralSetting;
|
||||
import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequests;
|
||||
import cy.agorise.crystalwallet.util.ChildViewPager;
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ import cy.agorise.crystalwallet.R;
|
|||
import cy.agorise.crystalwallet.application.CrystalSecurityMonitor;
|
||||
import cy.agorise.crystalwallet.dialogs.material.CrystalDialog;
|
||||
import cy.agorise.crystalwallet.dialogs.material.ToastIt;
|
||||
import cy.agorise.crystalwallet.interfaces.OnResponse;
|
||||
//import cy.agorise.crystalwallet.interfaces.OnResponse;
|
||||
import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequestListener;
|
||||
import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequests;
|
||||
import cy.agorise.crystalwallet.requestmanagers.ValidateBitsharesSendRequest;
|
||||
|
|
@ -623,14 +623,14 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat
|
|||
/*
|
||||
* If exists mode scurity show it and valide events in case of success or fail
|
||||
* */
|
||||
CrystalSecurityMonitor.getInstance(null).callPasswordRequest(this.getActivity(), new OnResponse() {
|
||||
/*CrystalSecurityMonitor.getInstance(null).callPasswordRequest(this.getActivity(), new OnResponse() {
|
||||
@Override
|
||||
public void onSuccess() {
|
||||
|
||||
/*
|
||||
* Show loading dialog
|
||||
* */
|
||||
crystalDialog = new CrystalDialog((Activity) getContext());
|
||||
/* crystalDialog = new CrystalDialog((Activity) getContext());
|
||||
crystalDialog.setText("Sending");
|
||||
crystalDialog.progress();
|
||||
crystalDialog.show();
|
||||
|
|
@ -642,7 +642,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat
|
|||
public void onFailed() {
|
||||
|
||||
}
|
||||
});
|
||||
});*/
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ public class BitsharesAccountManager implements CryptoAccountManager, CryptoNetI
|
|||
|
||||
@Override
|
||||
public void fail(int idPetition) {
|
||||
importRequest.setStatus(ImportBitsharesAccountRequest.StatusCode.PETITION_FAILED);
|
||||
importRequest.setStatus(ImportBitsharesAccountRequest.StatusCode.BAD_SEED);
|
||||
}
|
||||
});
|
||||
GrapheneApiGenerator.getAccountByOwnerOrActiveAddress(new Address(ECKey.fromPublicOnly(bip39.getBitsharesActiveKey(0).getPubKey())),getAccountNamesBP39);
|
||||
|
|
|
|||
Loading…
Reference in a new issue