Skip to content

HW-50743 External Account Profile Information #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 17, 2019
Merged

HW-50743 External Account Profile Information #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1edfc08
HW-50743 External Account Profile Information
May 16, 2019
af7b6e9
fix for required/non required field can be submitted
May 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package com.hyperwallet.android.ui.transfermethod;

import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.PROFILE_TYPE;
import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_COUNTRY;
import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_CURRENCY;
import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TYPE;
Expand Down Expand Up @@ -209,13 +210,15 @@ public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
mCountry = savedInstanceState.getString(ARGUMENT_TRANSFER_METHOD_COUNTRY);
mCurrency = savedInstanceState.getString(ARGUMENT_TRANSFER_METHOD_CURRENCY);
mTransferMethodType = savedInstanceState.getString(ARGUMENT_TRANSFER_METHOD_TYPE);
mTransferMethodProfileType = savedInstanceState.getString(ARGUMENT_TRANSFER_METHOD_PROFILE_TYPE);
mShowCreateProgressBar = savedInstanceState.getBoolean(ARGUMENT_SHOW_CREATE_PROGRESS_BAR);
mTransferMethod = savedInstanceState.getParcelable(ARGUMENT_TRANSFER_METHOD);
} else { // same as AddTransferMethodFragment#newInstance
mWidgetInputStateHashMap = (HashMap) getArguments().getSerializable(ARGUMENT_WIDGET_STATE_MAP);
mCountry = getArguments().getString(ARGUMENT_TRANSFER_METHOD_COUNTRY);
mCurrency = getArguments().getString(ARGUMENT_TRANSFER_METHOD_CURRENCY);
mTransferMethodType = getArguments().getString(ARGUMENT_TRANSFER_METHOD_TYPE);
mTransferMethodProfileType = getArguments().getString(ARGUMENT_TRANSFER_METHOD_PROFILE_TYPE);
mTransferMethod = getArguments().getParcelable(ARGUMENT_TRANSFER_METHOD);
}
}
Expand All @@ -238,6 +241,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
outState.putString(ARGUMENT_TRANSFER_METHOD_COUNTRY, mCountry);
outState.putString(ARGUMENT_TRANSFER_METHOD_CURRENCY, mCurrency);
outState.putString(ARGUMENT_TRANSFER_METHOD_TYPE, mTransferMethodType);
outState.putString(ARGUMENT_TRANSFER_METHOD_PROFILE_TYPE, mTransferMethodProfileType);
outState.putBoolean(ARGUMENT_SHOW_CREATE_PROGRESS_BAR, mShowCreateProgressBar);
outState.putParcelable(ARGUMENT_TRANSFER_METHOD, mTransferMethod);
super.onSaveInstanceState(outState);
Expand Down Expand Up @@ -516,6 +520,8 @@ private void triggerSubmit() {
mTransferMethod.setField(widget.getName(), widget.getValue());
}
}

mTransferMethod.setField(PROFILE_TYPE, mTransferMethodProfileType);
mPresenter.createTransferMethod(mTransferMethod);
}
}
Expand Down Expand Up @@ -588,16 +594,7 @@ private boolean performValidation(boolean bypassFocusCheck) {
}
}
}
return valid && hasWidget && haveAllWidgetsReceivedFocus();
}

private boolean haveAllWidgetsReceivedFocus() {
for (String key : mWidgetInputStateHashMap.keySet()) {
if (!mWidgetInputStateHashMap.get(key).hasFocused()) {
return false;
}
}
return true;
return valid && hasWidget;
}

@Override
Expand Down