Skip to content

Commit fe14215

Browse files
committed
fix getActivity() nullability bugs
1 parent bdb540f commit fe14215

File tree

10 files changed

+12
-13
lines changed

10 files changed

+12
-13
lines changed

rave_android/src/main/java/com/flutterwave/raveandroid/barter/BarterFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ else if (resultCode == RavePayActivity.RESULT_ERROR)
230230

231231
@Override
232232
public void showPollingIndicator(boolean active) {
233-
if (getActivity().isFinishing()) {
233+
if (getActivity() == null || getActivity().isFinishing()) {
234234
return;
235235
}
236236

rave_android/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ public class CardFragment extends Fragment implements View.OnClickListener, Card
142142
public View onCreateView(LayoutInflater inflater, ViewGroup container,
143143
Bundle savedInstanceState) {
144144

145+
injectComponents();
146+
145147
if (savedInstanceState != null) {
146148
if (savedInstanceState.containsKey(STATE_PRESENTER_SAVEDCARDS)) {
147149
Type savedCardsListType = new TypeToken<List<SavedCard>>() {
@@ -152,8 +154,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
152154
}
153155
}
154156

155-
injectComponents();
156-
157157
v = inflater.inflate(R.layout.rave_sdk_fragment_card, container, false);
158158

159159
initializeViews();

rave_android/src/main/java/com/flutterwave/raveandroid/francMobileMoney/FrancMobileMoneyFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public void onPaymentError(String message) {
258258

259259
@Override
260260
public void showPollingIndicator(boolean active) {
261-
if (getActivity().isFinishing()) {
261+
if (getActivity() == null || getActivity().isFinishing()) {
262262
return;
263263
}
264264

rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ public void onPaymentError(String message) {
361361

362362
@Override
363363
public void showPollingIndicator(boolean active) {
364-
if (getActivity().isFinishing()) {
364+
if (getActivity() == null || getActivity().isFinishing()) {
365365
return;
366366
}
367367

rave_android/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ public void onPaymentError(String message) {
260260

261261
@Override
262262
public void showPollingIndicator(boolean active) {
263-
if (getActivity().isFinishing()) {
263+
if (getActivity() == null || getActivity().isFinishing()) {
264264
return;
265265
}
266266

rave_android/src/main/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public void onPaymentError(String message) {
269269

270270
@Override
271271
public void showPollingIndicator(boolean active) {
272-
if (getActivity().isFinishing()) {
272+
if (getActivity() == null || getActivity().isFinishing()) {
273273
return;
274274
}
275275

rave_android/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ public void onPaymentError(String message) {
284284

285285
@Override
286286
public void showPollingIndicator(boolean active) {
287-
if (getActivity().isFinishing()) {
287+
if (getActivity() == null || getActivity().isFinishing()) {
288288
return;
289289
}
290290

rave_android/src/main/java/com/flutterwave/raveandroid/uk/UkFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public void onPaymentError(String message) {
272272

273273
@Override
274274
public void showPollingIndicator(boolean active) {
275-
if (getActivity().isFinishing()) {
275+
if (getActivity() == null || getActivity().isFinishing()) {
276276
return;
277277
}
278278

rave_android/src/main/java/com/flutterwave/raveandroid/ussd/UssdFragment.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,8 @@ public void onPaymentError(String message) {
338338

339339
@Override
340340
public void showPollingIndicator(boolean active) {
341-
if (getActivity() != null) {
342-
if (getActivity().isFinishing())
343-
return;
341+
if (getActivity() == null || getActivity().isFinishing()) {
342+
return;
344343
}
345344

346345
if (pollingProgressDialog == null) {

rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ public void onPaymentError(String message) {
315315

316316
@Override
317317
public void showPollingIndicator(boolean active) {
318-
if (getActivity().isFinishing()) {
318+
if (getActivity() == null || getActivity().isFinishing()) {
319319
return;
320320
}
321321

0 commit comments

Comments
 (0)