Skip to content

Commit 9e4aa04

Browse files
committed
Merge branch 'adjustValidateMessage'
# Conflicts: # rave_java_commons/src/main/java/com/flutterwave/raveandroid/rave_java_commons/RaveConstants.java
2 parents 6b4bf74 + dec0b2b commit 9e4aa04

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/ghmobilemoney/GhMobileMoneyHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,12 @@ public void requeryTx(final String flwRef, final String txRef, final String publ
135135
body.setTx_ref(txRef);
136136
body.setPBFPubKey(publicKey);
137137

138-
if (data.getProvider().equalsIgnoreCase(RaveConstants.eTransact_GH)){
138+
if (data.getProvider() != null && data.getProvider().equalsIgnoreCase(RaveConstants.eTransact_GH)){
139139
mInteractor.showPollingIndicator(true, data.getValidateInstructions());
140140
}else{
141141
mInteractor.showPollingIndicator(true, "");
142142
}
143143

144-
145144
logEvent(new RequeryEvent().getEvent(), publicKey);
146145

147146
networkRequest.requeryTx(body, new Callbacks.OnRequeryRequestComplete() {

rave_remote/src/main/java/com/flutterwave/raveandroid/rave_remote/responses/MobileMoneyChargeResponse.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.flutterwave.raveandroid.rave_remote.responses;
22

3+
import androidx.annotation.Nullable;
4+
35
import com.google.gson.annotations.SerializedName;
46

57
/**
@@ -47,14 +49,16 @@ public static class Data {
4749
@SerializedName("link")
4850
String captchaLink;
4951
String code;
52+
@Nullable
5053
String provider;
5154
String validateInstructions;
5255

56+
@Nullable
5357
public String getProvider() {
5458
return provider;
5559
}
5660

57-
public void setProvider(String provider) {
61+
public void setProvider(@Nullable String provider) {
5862
this.provider = provider;
5963
}
6064

0 commit comments

Comments
 (0)