Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop
This commit is contained in:
commit
3fb3dc9cac
2 changed files with 7 additions and 5 deletions
|
@ -196,8 +196,6 @@ public class ImportAccountOptionsFragment extends DialogFragment {
|
|||
}
|
||||
});
|
||||
|
||||
FileServiceRequests.getInstance().addRequest(importBackupRequest);
|
||||
|
||||
/*
|
||||
* Show loading dialog
|
||||
* */
|
||||
|
@ -205,6 +203,8 @@ public class ImportAccountOptionsFragment extends DialogFragment {
|
|||
crystalDialog.setText(getContext().getString(R.string.Creating_backup_from_file));
|
||||
crystalDialog.progress();
|
||||
crystalDialog.show();
|
||||
|
||||
FileServiceRequests.getInstance().addRequest(importBackupRequest);
|
||||
}
|
||||
})
|
||||
.setNegativeButton("Cancel",
|
||||
|
|
|
@ -37,7 +37,9 @@ public abstract class CryptoNetInfoRequest {
|
|||
}
|
||||
|
||||
protected void _fireOnCarryOutEvent(){
|
||||
if (listener != null) {
|
||||
listener.onCarryOut();
|
||||
}
|
||||
CryptoNetInfoRequests.getInstance().removeRequest(this);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue