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

- Now the import seed button sends the user to the import seed activity

Browse source 
- Fixed account seed kotlin viewmodel so it can be instantiated with the ViewModelProvider
This commit is contained in:
Javier Varona 2018-09-06 22:13:28 -04:00
parent e569986864
commit 4a34c3a8ae
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -108,4 +108,6 @@ dependencies {
exclude group: 'org.json', module: 'json'
}
kapt "android.arch.lifecycle:compiler:1.1.1"
kapt "android.arch.persistence.room:compiler:1.1.0"
}

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

@ -22,6 +22,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.activities.ImportSeedActivity;
import cy.agorise.crystalwallet.activities.IntroActivity;
import cy.agorise.crystalwallet.requestmanagers.FileServiceRequestListener;
import cy.agorise.crystalwallet.requestmanagers.FileServiceRequests;
@ -97,6 +98,12 @@ public class ImportAccountOptionsFragment extends DialogFragment {
}
@OnClick (R.id.btnImportSeed)
public void importSeed(){
Intent intent = new Intent(this.getActivity(), ImportSeedActivity.class);
startActivity(intent);
}
@Override
public void onActivityResult(int requestCode, int resultCode, final Intent data) {
super.onActivityResult(requestCode, resultCode, data);

9
app/src/main/java/cy/agorise/crystalwallet/viewmodels/AccountSeedViewModel.kt
View file

@ -6,15 +6,14 @@ import android.arch.lifecycle.LiveData
import cy.agorise.crystalwallet.dao.CrystalDatabase
import cy.agorise.crystalwallet.models.AccountSeed
class AccountSeedViewModel : AndroidViewModel {
class AccountSeedViewModel(application: Application) : AndroidViewModel(application) {
private var accountSeed: LiveData<AccountSeed>? = null
private val db: CrystalDatabase
private val app: Application
private val app: Application = application
constructor(application: Application,db:CrystalDatabase): super(application) {
this.app = application;
this.db = db;
init{
this.db = CrystalDatabase.getAppDatabase(this.app.getApplicationContext());
}
fun loadSeed(seedId: Long) {