Skip to content

Guard remaining mListener accesses against null (refs #25) #29

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

Open
jim-daf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Guard remaining mListener accesses against null (refs #25) #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions rxp-hpp-android/src/main/java/com/realexpayments/hpp/HPPManagerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ private String getRelativePathEncoded(String urlString) {

@Override
public void onDestroy() {
if (!isResultReceived) {
if (!isResultReceived && mListener != null) {
mListener.hppManagerCancelled();
}
mListener = null;
Comment on lines +144 to 147
Expand All @@ -165,7 +165,9 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK && webView.canGoBack()) {
if (!isResultReceived) {
webView.goBack();
mListener.hppManagerCancelled();
if (mListener != null) {
mListener.hppManagerCancelled();
}
isResultReceived = true;
Comment on lines +168 to 171
}
return false;
Expand Down Expand Up @@ -322,6 +324,9 @@ public void callbackHandler(String data, String url) {
@Override
public void success(Response s, Response response) {
String msg = new String(((TypedByteArray) response.getBody()).getBytes());
if (mListener == null) {
return;
}
Method[] methods = mListener.getClass().getDeclaredMethods();
for (int i = 0; i < methods.length; i++) {
if (methods[i].getName().equals(HPPManagerListener.HPP_MANAGER_COMPLETED_WITH_RESULT)) {
Expand Down
Loading