Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
67c1decf07
2 changed files with 8 additions and 3 deletions
|
@ -22,6 +22,7 @@ import cy.agorise.crystalwallet.models.GrapheneAccount;
|
|||
import cy.agorise.crystalwallet.models.GrapheneAccountInfo;
|
||||
import cy.agorise.crystalwallet.viewmodels.AccountSeedViewModel;
|
||||
import cy.agorise.crystalwallet.viewmodels.CryptoNetAccountViewModel;
|
||||
import cy.agorise.crystalwallet.viewmodels.GrapheneAccountInfoViewModel;
|
||||
import cy.agorise.crystalwallet.viewmodels.validators.ImportSeedValidator;
|
||||
import cy.agorise.crystalwallet.viewmodels.validators.UIValidatorListener;
|
||||
import cy.agorise.crystalwallet.viewmodels.validators.ValidationField;
|
||||
|
@ -115,12 +116,15 @@ public class ImportSeedActivity extends AppCompatActivity implements UIValidator
|
|||
accountSeedViewModel.addSeed(seed);
|
||||
|
||||
CryptoNetAccountViewModel cryptoNetAccountViewModel = ViewModelProviders.of(this).get(CryptoNetAccountViewModel.class);
|
||||
GrapheneAccountInfoViewModel grapheneAccountInfoViewModel = ViewModelProviders.of(this).get(GrapheneAccountInfoViewModel.class);
|
||||
CryptoNetAccount cryptoNetAccount = new CryptoNetAccount();
|
||||
cryptoNetAccount.setSeedId(seed.getId());
|
||||
cryptoNetAccount.setAccountIndex(0);
|
||||
cryptoNetAccount.setCryptoNet(cy.agorise.crystalwallet.enums.CryptoNet.BITSHARES);
|
||||
cryptoNetAccountViewModel.addCryptoNetAccount(cryptoNetAccount);
|
||||
GrapheneAccountInfo grapheneAccountInfo = new GrapheneAccountInfo(cryptoNetAccount.getId());
|
||||
grapheneAccountInfo.setName(etAccountName.getText().toString());
|
||||
grapheneAccountInfoViewModel.addGrapheneAccountInfo(grapheneAccountInfo);
|
||||
|
||||
this.finish();
|
||||
}
|
||||
|
|
|
@ -2,6 +2,7 @@ package cy.agorise.crystalwallet.service;
|
|||
|
||||
|
||||
import android.app.Service;
|
||||
import android.arch.lifecycle.LifecycleService;
|
||||
import android.arch.lifecycle.LiveData;
|
||||
import android.arch.lifecycle.Observer;
|
||||
import android.content.Intent;
|
||||
|
@ -24,7 +25,7 @@ import cy.agorise.crystalwallet.models.CryptoNetAccount;
|
|||
*/
|
||||
|
||||
|
||||
public class CrystalWalletService extends Service {
|
||||
public class CrystalWalletService extends LifecycleService {
|
||||
|
||||
private Looper mServiceLooper;
|
||||
private ServiceHandler mServiceHandler;
|
||||
|
@ -50,7 +51,7 @@ public class CrystalWalletService extends Service {
|
|||
}
|
||||
|
||||
public void loadAccountTransactions(){
|
||||
/*this.keepLoadingAccountTransactions = true;
|
||||
this.keepLoadingAccountTransactions = true;
|
||||
final CrystalWalletService thisService = this;
|
||||
|
||||
CrystalDatabase db = CrystalDatabase.getAppDatabase(this);
|
||||
|
@ -62,7 +63,7 @@ public class CrystalWalletService extends Service {
|
|||
bitsharesAccountManager.loadAccountFromDB(nextAccount,thisService);
|
||||
}
|
||||
}
|
||||
});*/
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue