Monnethic/app-mobile
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix major bug - crash when search

Browse source
This commit is contained in:
GME 2019-06-14 18:21:09 +02:00
parent 32f5d4c99b
commit 6340e3b5b8
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/monnethic/mobile/history/HistoryActivity.java
View file

@ -45,8 +45,8 @@ public class HistoryActivity extends AppCompatActivity {
final Calendar calendar2 = Calendar.getInstance(); final Calendar calendar2 = Calendar.getInstance();
private Button btnSearchTransactions; private Button btnSearchTransactions;
private EditText inputSize; private EditText inputSize;
private EditText fromDate; private Button fromDate;
private EditText toDate; private Button toDate;
private Spinner spinner; private Spinner spinner;
private Switch aSwitch; private Switch aSwitch;
private ListView listView; private ListView listView;

12
app/src/main/java/monnethic/mobile/search/SearchUser.java
View file

@ -81,11 +81,15 @@ public class SearchUser extends AppCompatActivity {
String uPhone = phoneNumber.getText().toString(); String uPhone = phoneNumber.getText().toString();
if(InputController.isEmptyEdit(emailAddress) && InputController.isEmptyEdit(phoneNumber)){ if(InputController.isEmptyEdit(emailAddress) && InputController.isEmptyEdit(phoneNumber)){
Toast.makeText(this, "Enter an email or phone number", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "Enter an email or a phone number", Toast.LENGTH_SHORT).show();
} else if(InputController.isEmptyEdit(emailAddress)){ } else if(InputController.isEmptyEdit(emailAddress)){
new SearchUserTask().execute(null,uPhone); new SearchUserTask().execute(null,uPhone);
} else if(InputController.isEmptyEdit(phoneNumber)){ } else if(InputController.isEmptyEdit(phoneNumber)){
new SearchUserTask().execute(uEmail,null); if(!InputController.validEmail(emailAddress.getText().toString())){
Toast.makeText(SearchUser.this, "Invalid format for email", Toast.LENGTH_SHORT).show();
}else{
new SearchUserTask().execute(uEmail,null);
}
} else { } else {
new SearchUserTask().execute(uEmail,uPhone); new SearchUserTask().execute(uEmail,uPhone);
} }
@ -107,7 +111,7 @@ public class SearchUser extends AppCompatActivity {
@Override @Override
protected void onPostExecute(ArrayList<Wallet> wallets) { protected void onPostExecute(ArrayList<Wallet> wallets) {
try{ try{
if(wallets!=null){ if(wallets!=null && !wallets.isEmpty()){
ArrayList<DisplayWallet> displayWallets = new ArrayList<>(); ArrayList<DisplayWallet> displayWallets = new ArrayList<>();
for(Wallet w : wallets){ for(Wallet w : wallets){
displayWallets.add(new DisplayWallet(u_dest_n,u_dest_fn,w.getWallet_hash(),w.getType())); displayWallets.add(new DisplayWallet(u_dest_n,u_dest_fn,w.getWallet_hash(),w.getType()));
@ -119,7 +123,7 @@ public class SearchUser extends AppCompatActivity {
SearchUser.this.startActivity(displayWalletIntent); SearchUser.this.startActivity(displayWalletIntent);
finish(); finish();
}else{ }else{
Toast.makeText(SearchUser.this,"User dosen't exist",Toast.LENGTH_SHORT).show(); Toast.makeText(SearchUser.this,"User doesn't exist or don't have a wallet",Toast.LENGTH_SHORT).show();
emailAddress.setEnabled(true); emailAddress.setEnabled(true);
phoneNumber.setEnabled(true); phoneNumber.setEnabled(true);
buttonCancel.setEnabled(true); buttonCancel.setEnabled(true);

14
app/src/main/res/layout/activity_history.xml
View file

@ -51,27 +51,26 @@
<Switch <Switch
android:id="@+id/switchDate" android:id="@+id/switchDate"
android:layout_marginStart="5dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="35dp" /> android:layout_height="35dp" />
<EditText <Button
android:id="@+id/fromDate" android:id="@+id/fromDate"
android:layout_width="130dp" android:layout_width="140dp"
android:layout_height="35dp" android:layout_height="35dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginStart="30dp" android:layout_marginStart="30dp"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:layout_toEndOf="@+id/switchDate" android:layout_toEndOf="@+id/switchDate"
android:clickable="true" android:clickable="true"
android:editable="false"
android:ems="10"
android:hint="From" android:hint="From"
android:inputType="none" android:inputType="none"
android:textSize="14sp" /> android:textSize="14sp" />
<EditText <Button
android:id="@+id/toDate" android:id="@+id/toDate"
android:layout_width="match_parent" android:layout_width="140dp"
android:layout_height="35dp" android:layout_height="35dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
@ -80,8 +79,6 @@
android:layout_marginEnd="25dp" android:layout_marginEnd="25dp"
android:layout_toEndOf="@+id/fromDate" android:layout_toEndOf="@+id/fromDate"
android:clickable="true" android:clickable="true"
android:editable="false"
android:ems="10"
android:hint="To" android:hint="To"
android:inputType="none" android:inputType="none"
android:textSize="14sp" /> android:textSize="14sp" />
@ -99,6 +96,7 @@
<Spinner <Spinner
android:id="@+id/spinner" android:id="@+id/spinner"
android:layout_marginStart="5dp"
android:layout_width="120dp" android:layout_width="120dp"
android:layout_height="40dp" /> android:layout_height="40dp" />