resolve conflict

Author: biodunalfet

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferContract.java

@@ -1,5 +1,7 @@
 package com.flutterwave.raveandroid.banktransfer;
 
+import android.os.Bundle;
+
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.ViewObject;
@@ -39,6 +41,10 @@ interface UserActionsListener {
 
         void cancelPolling();
 
+        Bundle getState();
+
+        void restoreState(Bundle savedInstanceState);
+
         void onAttachView(View view);
 
         void onDetachView();

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java

@@ -5,6 +5,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.constraint.ConstraintLayout;
 import android.support.design.widget.TextInputEditText;
 import android.support.design.widget.TextInputLayout;
@@ -62,6 +63,9 @@ public BankTransferFragment() {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         presenter = new BankTransferPresenter(getActivity(), this);
+        if (savedInstanceState != null) {
+            presenter.restoreState(savedInstanceState);
+        }
 
         // Inflate the layout for this fragment
         v = inflater.inflate(R.layout.fragment_bank_transfer, container, false);
@@ -209,6 +213,11 @@ public void onClick(View view) {
         });
     }
 
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putAll(presenter.getState());
+    }
 
     @Override
     public void showProgressIndicator(boolean active) {
@@ -271,14 +280,12 @@ public void onTransferDetailsReceived(String amount, String accountNumber, Strin
     }
 
     private void showTransferDetails(String amount, String accountNumber, String bankName, String beneficiaryName) {
-
-
         amountTv.setText(amount);
         beneficiaryNameTv.setText(beneficiaryName);
         bankNameTv.setText(bankName);
         accountNumberTv.setText(accountNumber);
         transferInstructionTv.setText(
-                String.format("%s %s", getString(R.string.bank_transfer_instructions_placeholder), beneficiaryName)
+                getString(R.string.bank_transfer_instructions_placeholder) + " " + beneficiaryName
         );
 
         initiateChargeLayout.setVisibility(GONE);

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferPresenter.java

@@ -1,6 +1,7 @@
 package com.flutterwave.raveandroid.banktransfer;
 
 import android.content.Context;
+import android.os.Bundle;
 import android.util.Log;
 
 import com.flutterwave.raveandroid.FeeCheckRequestBody;
@@ -21,17 +22,22 @@
 
 import java.util.HashMap;
 
-/**
- * Created by hfetuga on 27/06/2018.
- */
-
 public class BankTransferPresenter implements BankTransferContract.UserActionsListener {
+    private static final String ACCOUNT_NUMBER = "account_number";
+    private static final String BANK_NAME = "bank_name";
+    private static final String BENEFICIARY_NAME = "benef_name";
+    private static final String AMOUNT = "amount";
+    private static final String TX_REF = "txref";
+    private static final String FLW_REF = "flwref";
+    private static final String PUBLIC_KEY = "pbfkey";
     private Context context;
     private BankTransferContract.View mView;
     private AmountValidator amountValidator = new AmountValidator();
     private String txRef = null, flwRef = null, publicKey = null;
     private long requeryCountdownTime = 0;
     private boolean pollingCancelled = false;
+    private String beneficiaryName, accountNumber, amount, bankName;
+    private boolean hasTransferDetails = false;
 
     BankTransferPresenter(Context context, BankTransferContract.View mView) {
         this.context = context;
@@ -90,17 +96,21 @@ public void onSuccess(ChargeResponse response, String responseAsJSONString) {
 
                 if (response.getData() != null) {
                     Log.d("resp", responseAsJSONString);
+                    hasTransferDetails = true;
 
                     flwRef = response.getData().getFlw_reference();
                     txRef = response.getData().getTx_ref();
                     publicKey = payload.getPBFPubKey();
-                    String beneficiaryName = response.getData().getNote().substring(
+                    beneficiaryName = response.getData().getNote().substring(
                             response.getData().getNote().indexOf("to ") + 3
                     );
+                    amount = response.getData().getAmount();
+                    accountNumber = response.getData().getAccountnumber();
+                    bankName = response.getData().getBankname();
                     mView.onTransferDetailsReceived(
-                            response.getData().getAmount(),
-                            response.getData().getAccountnumber(),
-                            response.getData().getBankname(),
+                            amount,
+                            accountNumber,
+                            bankName,
                             beneficiaryName);
                 } else {
                     mView.onPaymentError("No response data was returned");
@@ -128,6 +138,38 @@ public void cancelPolling() {
         pollingCancelled = true;
     }
 
+    @Override
+    public Bundle getState() {
+        if (hasTransferDetails) {
+            Bundle state = new Bundle();
+            state.putString(ACCOUNT_NUMBER, accountNumber);
+            state.putString(BANK_NAME, bankName);
+            state.putString(BENEFICIARY_NAME, beneficiaryName);
+            state.putString(AMOUNT, amount);
+            state.putString(TX_REF, txRef);
+            state.putString(FLW_REF, flwRef);
+            state.putString(PUBLIC_KEY, publicKey);
+            return state;
+        } else return null;
+    }
+
+    @Override
+    public void restoreState(Bundle savedInstanceState) {
+        if (savedInstanceState != null) {
+            hasTransferDetails = true;
+            accountNumber = savedInstanceState.getString(ACCOUNT_NUMBER);
+            bankName = savedInstanceState.getString(BANK_NAME);
+            beneficiaryName = savedInstanceState.getString(BENEFICIARY_NAME);
+            amount = savedInstanceState.getString(AMOUNT);
+            txRef = savedInstanceState.getString(TX_REF);
+            flwRef = savedInstanceState.getString(FLW_REF);
+            publicKey = savedInstanceState.getString(PUBLIC_KEY);
+
+            mView.onTransferDetailsReceived(amount, accountNumber, bankName, beneficiaryName);
+        }
+
+    }
+
     @Override
     public void requeryTx() {