agorise/crystal-wallet-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop

Browse source
This commit is contained in:
Henry Varona 2018-09-15 21:59:39 -04:00
commit 3fb3dc9cac
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java
View file

@ -196,15 +196,15 @@ public class ImportAccountOptionsFragment extends DialogFragment {
} }
}); });
FileServiceRequests.getInstance().addRequest(importBackupRequest);
/* /*
* Show loading dialog * Show loading dialog
* */ * */
crystalDialog = new CrystalDialog((Activity) getContext()); crystalDialog = new CrystalDialog((Activity) getContext());
crystalDialog.setText(getContext().getString(R.string.Creating_backup_from_file)); crystalDialog.setText(getContext().getString(R.string.Creating_backup_from_file));
crystalDialog.progress(); crystalDialog.progress();
crystalDialog.show(); crystalDialog.show();
FileServiceRequests.getInstance().addRequest(importBackupRequest);
} }
}) })
.setNegativeButton("Cancel", .setNegativeButton("Cancel",

4
app/src/main/java/cy/agorise/crystalwallet/requestmanagers/CryptoNetInfoRequest.java
View file

@ -37,7 +37,9 @@ public abstract class CryptoNetInfoRequest {
} }
protected void _fireOnCarryOutEvent(){ protected void _fireOnCarryOutEvent(){
listener.onCarryOut(); if (listener != null) {
listener.onCarryOut();
}
CryptoNetInfoRequests.getInstance().removeRequest(this); CryptoNetInfoRequests.getInstance().removeRequest(this);
} }