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

- Now the user can add seeds

Browse source
This commit is contained in:
Javier Varona 2017-10-01 15:58:08 -04:00
parent a21b0a8752
commit 7b0801eb97
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/cy/agorise/crystalwallet/activities/AccountSeedsManagementActivity.java
View file

@ -39,7 +39,7 @@ public class AccountSeedsManagementActivity extends AppCompatActivity {
accountSeedListViewModel = ViewModelProviders.of(this).get(AccountSeedListViewModel.class); accountSeedListViewModel = ViewModelProviders.of(this).get(AccountSeedListViewModel.class);
LiveData<List<AccountSeed>> accountSeedData = accountSeedListViewModel.getAccountSeedList(); LiveData<List<AccountSeed>> accountSeedData = accountSeedListViewModel.getAccountSeedList();
//vAccountSeedList = this.findViewById(R.id.vAccountSeedList); vAccountSeedList.setData(null);
accountSeedData.observe(this, new Observer<List<AccountSeed>>() { accountSeedData.observe(this, new Observer<List<AccountSeed>>() {
@Override @Override
@ -47,8 +47,6 @@ public class AccountSeedsManagementActivity extends AppCompatActivity {
vAccountSeedList.setData(accountSeeds); vAccountSeedList.setData(accountSeeds);
} }
}); });
//accountSeedListView.setData(null);
} }
@OnClick (R.id.btnImportAccountSeed) @OnClick (R.id.btnImportAccountSeed)

7
app/src/main/java/cy/agorise/crystalwallet/activities/ImportSeedActivity.java
View file

@ -6,6 +6,7 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView; import android.widget.TextView;
import java.util.List; import java.util.List;
@ -31,7 +32,10 @@ public class ImportSeedActivity extends AppCompatActivity {
TextView tvPinConfirmation; TextView tvPinConfirmation;
@BindView(R.id.etSeedWords) @BindView(R.id.etSeedWords)
TextView etSeedWords; EditText etSeedWords;
@BindView (R.id.etAccountName)
EditText etAccountName;
@BindView(R.id.btnImport) @BindView(R.id.btnImport)
Button btnImport; Button btnImport;
@ -54,6 +58,7 @@ public class ImportSeedActivity extends AppCompatActivity {
//TODO verify if PIN and PIN confirmation are not null and are the same //TODO verify if PIN and PIN confirmation are not null and are the same
//TODO verify if words are already in the db //TODO verify if words are already in the db
seed.setMasterSeed(etSeedWords.getText().toString()); seed.setMasterSeed(etSeedWords.getText().toString());
seed.setName(etAccountName.getText().toString());
accountSeedViewModel.addSeed(seed); accountSeedViewModel.addSeed(seed);
} }

4
app/src/main/java/cy/agorise/crystalwallet/activities/IntroActivity.java
View file

@ -42,12 +42,12 @@ public class IntroActivity extends AppCompatActivity {
//Checks if the user has any seed created //Checks if the user has any seed created
AccountSeedListViewModel accountSeedListViewModel = ViewModelProviders.of(this).get(AccountSeedListViewModel.class); AccountSeedListViewModel accountSeedListViewModel = ViewModelProviders.of(this).get(AccountSeedListViewModel.class);
if (accountSeedListViewModel.accountSeedsCount() == 0){ //if (accountSeedListViewModel.accountSeedsCount() == 0){
//If the user doesn't have any seeds created, then //If the user doesn't have any seeds created, then
//send the user to create/import an account //send the user to create/import an account
Intent intent = new Intent(this, AccountSeedsManagementActivity.class); Intent intent = new Intent(this, AccountSeedsManagementActivity.class);
startActivity(intent); startActivity(intent);
} //}
/*CrystalDatabase db = CrystalDatabase.getAppDatabase(getApplicationContext()); /*CrystalDatabase db = CrystalDatabase.getAppDatabase(getApplicationContext());
List<AccountSeed> seeds = RandomSeedGenerator.generateSeeds(2); List<AccountSeed> seeds = RandomSeedGenerator.generateSeeds(2);

2
app/src/main/java/cy/agorise/crystalwallet/apigenerator/GrapheneApiGenerator.java
View file

@ -28,7 +28,7 @@ public class GrapheneApiGenerator {
//TODO network connections //TODO network connections
private static int connectionTimeout = 5000; private static int connectionTimeout = 5000;
private static String url = "http://128.0.69.157:8090" private static String url = "http://128.0.69.157:8090";
/** /**
* Retrieves the data of an account searching by it's id * Retrieves the data of an account searching by it's id