API Integrated for KFTC

app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/autodebitaccountlisting/AutoDebitAccountListingV2Activity.java

@@ -168,7 +168,7 @@ public class AutoDebitAccountListingV2Activity extends BaseActivity implements A
         genericTextListingDialog.setHintAndTitle("Search Language","Select Language");
         genericTextListingDialog.disableSearch(true);
         if (!genericTextListingDialog.isAdded())
-            genericTextListingDialog.show(getFragmentManager(), "COUNTRY CHOOSER");
+            genericTextListingDialog.show(getSupportFragmentManager(), "COUNTRY CHOOSER");
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/autodebitaccountlisting/GenericTextListingDialog.java

@@ -23,7 +23,7 @@ import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDec
 import java.util.ArrayList;
 import java.util.List;
 
-public class GenericTextListingDialog<T> extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class GenericTextListingDialog<T> extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<T> data;
     private GenericTextListingDialogListener<T> listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java

@@ -2,6 +2,7 @@ package com.gmeremit.online.gmeremittance_native.base;
 
 import android.app.Activity;
 import android.content.Context;
+import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
@@ -28,7 +29,7 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter
                 }
                 dialog = new CustomProgressDialog();
                 dialog.setMessage(message);
-                android.app.FragmentManager fragmentManager = this.getFragmentManager();
+                FragmentManager fragmentManager = this.getSupportFragmentManager();
                 if (fragmentManager != null)
                     dialog.show(fragmentManager, "CustomProgressBar");
                 isProgressBarShowing = true;
@@ -48,7 +49,7 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter
     @Override
     public void showPopUpMessage(String message, CustomAlertDialog.AlertType alertType, CustomAlertDialog.CustomDialogActionListener listener) {
         try {
-            android.app.FragmentManager fragmentManager = this.getFragmentManager();
+            FragmentManager fragmentManager = this.getSupportFragmentManager();
             if (fragmentManager == null)
                 return;
             if (customAlertDialog != null && customAlertDialog.isAdded())

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/CustomAlertDialog.java

@@ -13,7 +13,7 @@ import android.widget.TextView;
 
 import com.gmeremit.online.gmeremittance_native.R;
 
-public class CustomAlertDialog extends DialogFragment {
+public class CustomAlertDialog extends android.support.v4.app.DialogFragment {
 
     private ImageView imgStatusImgView;
     private TextView dialogTitleTxt, dialogDescriptionTxt, dialogButtonTxt;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/CustomProgressDialog.java

@@ -10,7 +10,7 @@ import android.widget.TextView;
 
 import com.gmeremit.online.gmeremittance_native.R;
 
-public class CustomProgressDialog extends DialogFragment{
+public class CustomProgressDialog extends android.support.v4.app.DialogFragment{
 
     private String message="";
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/exchangecountrylistingdialog/ExchangeRateCurrencyListingDialog.java

@@ -25,7 +25,7 @@ import com.gmeremit.online.gmeremittance_native.exchange_rate.model.datav2.Count
 import java.util.ArrayList;
 import java.util.List;
 
-public class ExchangeRateCurrencyListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class ExchangeRateCurrencyListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<CountryPaymentService> data;
     private CountrySelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/genderdialog/GenderListingDialog.java

@@ -22,7 +22,7 @@ import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDec
 import java.util.ArrayList;
 import java.util.List;
 
-public class GenderListingDialog extends DialogFragment implements View.OnClickListener {
+public class GenderListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener {
 
     private List<Gender> data;
     private GenderSelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/passwordpromptdialog/PasswordPromptDialog.java

@@ -25,7 +25,7 @@ import com.gmeremit.online.gmeremittance_native.exchange_rate.model.datav2.Count
 import java.util.ArrayList;
 import java.util.List;
 
-public class PasswordPromptDialog extends DialogFragment implements View.OnClickListener {
+public class PasswordPromptDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener {
 
 
     private EditText passwordEditText;

app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java

@@ -166,7 +166,7 @@ public class ExchangeMethodV2Activity extends BaseActivity implements PaymentMod
         countryListingDialog.setCountryPaymentData(paymentServiceList);
         countryListingDialog.setListener(this);
         if (!countryListingDialog.isAdded())
-            countryListingDialog.show(getFragmentManager(), "GenericTextListingDialog");
+            countryListingDialog.show(getSupportFragmentManager(), "GenericTextListingDialog");
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/home/view/HomeFragment.java

@@ -12,6 +12,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.GridLayoutManager;
@@ -547,7 +548,7 @@ public class HomeFragment extends Fragment implements HomeContract.MenuItemClick
         CustomAlertDialog customAlertDialog = new CustomAlertDialog();
         customAlertDialog.setAlertType(CustomAlertDialog.AlertType.ALERT);
         customAlertDialog.setMessage("This feature is coming soon");
-        android.app.FragmentManager fragmentManager = getActivity().getFragmentManager();
+        FragmentManager fragmentManager = getActivity().getSupportFragmentManager();
         if (fragmentManager != null)
             customAlertDialog.show(fragmentManager, "CustomProgressBar");
     }

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java

@@ -474,7 +474,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
         CustomAlertDialog customAlertDialog = new CustomAlertDialog();
         customAlertDialog.setAlertType(CustomAlertDialog.AlertType.ALERT);
         customAlertDialog.setMessage("This feature is coming soon");
-        android.app.FragmentManager fragmentManager = getFragmentManager();
+        FragmentManager fragmentManager = getSupportFragmentManager();
         if (fragmentManager != null)
             customAlertDialog.show(fragmentManager, "CustomProgressBar");
     }

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/KYCView1Fragment.java

@@ -277,7 +277,7 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen
         });
 
         if (!nativeCountryListDialog.isAdded())
-            nativeCountryListDialog.show(getActivity().getFragmentManager(), "NATIVECOUNTRYDIALOG");
+            nativeCountryListDialog.show(getActivity().getSupportFragmentManager(), "NATIVECOUNTRYDIALOG");
 
 
     }
@@ -297,7 +297,7 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen
             }
         });
         if (!occupationListDialog.isAdded())
-            occupationListDialog.show(getActivity().getFragmentManager(), "OCCUPATIONCOUNTRYDIALOG");
+            occupationListDialog.show(getActivity().getSupportFragmentManager(), "OCCUPATIONCOUNTRYDIALOG");
     }
 
     private void showProvinceList() {
@@ -315,7 +315,7 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen
             }
         });
         if (!provinceCountryListDialog.isAdded())
-            provinceCountryListDialog.show(getActivity().getFragmentManager(), "PROVINCECOUNTRYDIALOG");
+            provinceCountryListDialog.show(getActivity().getSupportFragmentManager(), "PROVINCECOUNTRYDIALOG");
 
     }
 
@@ -334,7 +334,7 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen
             }
         });
         if (!genderListDialog.isAdded())
-            genderListDialog.show(getActivity().getFragmentManager(), "PROVINCECOUNTRYDIALOG");
+            genderListDialog.show(getActivity().getSupportFragmentManager(), "PROVINCECOUNTRYDIALOG");
     }
 
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/NativeCountryListingDialog.java

@@ -24,7 +24,7 @@ import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.NativeCountry;
 import java.util.ArrayList;
 import java.util.List;
 
-public class NativeCountryListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class NativeCountryListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<NativeCountry> data;
     private NativeCountrySelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/OccupationListingDialog.java

@@ -25,7 +25,7 @@ import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Occupation;
 import java.util.ArrayList;
 import java.util.List;
 
-public class OccupationListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class OccupationListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<Occupation> data;
     private OccupationSelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/ProvinceListingDialog.java

@@ -25,7 +25,7 @@ import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Province;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ProvinceListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class ProvinceListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<Province> data;
     private ProvinceSelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/IDListingDialog.java

@@ -25,7 +25,7 @@ import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.IdType;
 import java.util.ArrayList;
 import java.util.List;
 
-public class IDListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class IDListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<IdType> data;
     private IDSelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java

@@ -165,7 +165,7 @@ public class KYCView2Fragment extends BaseFragment implements View.OnClickListen
             }
         });
         if (!primaryBankListDialog.isAdded())
-            primaryBankListDialog.show(getActivity().getFragmentManager(), "PRIMARYBANKDIALOG");
+            primaryBankListDialog.show(getActivity().getSupportFragmentManager(), "PRIMARYBANKDIALOG");
 
     }
 
@@ -184,7 +184,7 @@ public class KYCView2Fragment extends BaseFragment implements View.OnClickListen
             }
         });
         if (!sourceOfFundListDialog.isAdded())
-            sourceOfFundListDialog.show(getActivity().getFragmentManager(), "SOURCEOFFUND");
+            sourceOfFundListDialog.show(getActivity().getSupportFragmentManager(), "SOURCEOFFUND");
 
     }
 
@@ -227,7 +227,7 @@ public class KYCView2Fragment extends BaseFragment implements View.OnClickListen
             }
         });
         if (!idTypeListDialog.isAdded())
-            idTypeListDialog.show(getActivity().getFragmentManager(), "IDTYPEDIALOGLIST");
+            idTypeListDialog.show(getActivity().getSupportFragmentManager(), "IDTYPEDIALOGLIST");
     }
 
     private String generateInitialForVerificationId() {

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/PrimaryBankListingDialog.java

@@ -25,7 +25,7 @@ import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Bank;
 import java.util.ArrayList;
 import java.util.List;
 
-public class PrimaryBankListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class PrimaryBankListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<Bank> data;
     private PrimaryBankSelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/SourceOfFundListingDialog.java

@@ -25,7 +25,7 @@ import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.SourceOfFund;
 import java.util.ArrayList;
 import java.util.List;
 
-public class SourceOfFundListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class SourceOfFundListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<SourceOfFund> data;
     private SourceOfFundListingListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view3/KYCView3Fragment.java

@@ -245,7 +245,7 @@ public class KYCView3Fragment extends BaseFragment implements View.OnClickListen
         WindowManager.LayoutParams lp = dialog.getWindow().getAttributes();
         lp.dimAmount = 0.8f;
         dialog.getWindow().setAttributes(lp);
-        dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
+        dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
     }
 
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/gateway/RecipientListingV2Gateway.java

@@ -22,8 +22,6 @@ import okhttp3.ResponseBody;
 public class RecipientListingV2Gateway extends PrivilegedGateway implements RecipientListingV2InteractorInterface.RecipientListingV2GatewayInterface {
 
 
-
-
     private final RecipientListingV2InteractorInterface interactor;
 
     private List<AutoDebitAccount> autoDebitAccountList;
@@ -284,7 +282,7 @@ public class RecipientListingV2Gateway extends PrivilegedGateway implements Reci
                 "        }\n" +
                 "      ]";
 
-        List<AutoDebitAccount> autoDebitAccountList= HttpClientV2.getDeserializer().fromJson(mockedDAta,TypeToken.getParameterized(List.class, AutoDebitAccount.class).getType());
-        return autoDebitAccountList;
+//        List<AutoDebitAccount> autoDebitAccountList= HttpClientV2.getDeserializer().fromJson(mockedDAta,TypeToken.getParameterized(List.class, AutoDebitAccount.class).getType());
+        return this.autoDebitAccountList;
     }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/model/recipientlisting/GetAllRecipientApiResponse.java

@@ -18,7 +18,7 @@ public class GetAllRecipientApiResponse {
     private String id;
     @SerializedName("Data")
     @Expose
-    private List<RecipientInfoModel> data;
+    private RecipientRelatedData data;
 
     public String getErrorCode() {
         return errorCode;
@@ -44,11 +44,11 @@ public class GetAllRecipientApiResponse {
         this.id = id;
     }
 
-    public List<RecipientInfoModel> getData() {
+    public RecipientRelatedData getData() {
         return data;
     }
 
-    public void setData(List<RecipientInfoModel> data) {
+    public void setData(RecipientRelatedData data) {
         this.data = data;
     }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/model/recipientlisting/RecipientRelatedData.java

@@ -0,0 +1,36 @@
+package com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientlisting;
+
+import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccountlisting.AutoDebitAccount;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class RecipientRelatedData {
+
+    @SerializedName("Receivers")
+    @Expose
+    private List<RecipientInfoModel> recipientList;
+
+
+    @SerializedName("AccountList")
+    @Expose
+    private List<AutoDebitAccount> accountList;
+
+
+    public List<RecipientInfoModel> getRecipientList() {
+        return recipientList;
+    }
+
+    public void setRecipientList(List<RecipientInfoModel> recipientList) {
+        this.recipientList = recipientList;
+    }
+
+    public List<AutoDebitAccount> getAccountList() {
+        return accountList;
+    }
+
+    public void setAccountList(List<AutoDebitAccount> accountList) {
+        this.accountList = accountList;
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientlisting/RecipientListingV2Presenter.java

@@ -87,7 +87,8 @@ public class RecipientListingV2Presenter extends BasePresenter implements Recipi
         @Override
         protected void onSuccess(GetAllRecipientApiResponse recipientRelatedDataApiResponse) {
             if (recipientRelatedDataApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
-                view.showAllRecipientToUser(recipientRelatedDataApiResponse.getData());
+                view.showAllRecipientToUser(recipientRelatedDataApiResponse.getData().getRecipientList());
+                gateway.saveAutoDebitAccountInMemory(recipientRelatedDataApiResponse.getData().getAccountList());
             } else {
                 view.showPopUpMessage(recipientRelatedDataApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
             }

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientCountryListingDialog.java

@@ -25,7 +25,7 @@ import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.C
 import java.util.ArrayList;
 import java.util.List;
 
-public class RecipientCountryListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class RecipientCountryListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<CountryDetailModel> data;
     private CountrySelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientDistrictListingDialog.java

@@ -25,7 +25,7 @@ import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.D
 import java.util.ArrayList;
 import java.util.List;
 
-public class RecipientDistrictListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class RecipientDistrictListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<DistrictDetailModel> data;
     private DistrictSelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientProvinceListingDialog.java

@@ -25,7 +25,7 @@ import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.P
 import java.util.ArrayList;
 import java.util.List;
 
-public class RecipientProvinceListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class RecipientProvinceListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<ProvinceDetailModel> data;
     private ProvinceSelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientRelationListingDialog.java

@@ -26,7 +26,7 @@ import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.R
 import java.util.ArrayList;
 import java.util.List;
 
-public class RecipientRelationListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class RecipientRelationListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<RelationDetailModel> data;
     private RelationSelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientTransferListingDialog.java

@@ -25,7 +25,7 @@ import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.T
 import java.util.ArrayList;
 import java.util.List;
 
-public class RecipientTransferListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class RecipientTransferListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<TransferDetailModel> data;
     private TransferReasonSelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientadd/RecipientAddV2Activity.java

@@ -273,7 +273,7 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
         transferListingDialog.setListener(this);
         transferListingDialog.setTransferReasonData(this.transferReasonList);
         if (!transferListingDialog.isAdded())
-            transferListingDialog.show(getFragmentManager(), "RecipientCountryListingDialog");
+            transferListingDialog.show(getSupportFragmentManager(), "RecipientCountryListingDialog");
     }
 
     private void showRelationListingInDialog() {
@@ -283,7 +283,7 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
         relationListingDialog.setListener(this);
         relationListingDialog.setTransferReasonData(this.relationList);
         if (!relationListingDialog.isAdded())
-            relationListingDialog.show(getFragmentManager(), "RecipientCountryListingDialog");
+            relationListingDialog.show(getSupportFragmentManager(), "RecipientCountryListingDialog");
     }
 
     private void showDistrictListingInDialog() {
@@ -294,7 +294,7 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
         if (this.selectedProvince != null) {
             districtListingDialog.setDistrictData(this.selectedProvince.getDistrict());
             if (!districtListingDialog.isAdded())
-                districtListingDialog.show(getFragmentManager(), "RecipientProvinceListingDialog");
+                districtListingDialog.show(getSupportFragmentManager(), "RecipientProvinceListingDialog");
         } else {
             showToastMessage("Select a State/Province first.");
         }
@@ -308,7 +308,7 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
         if (this.selectedCountry != null) {
             provinceListingDialog.setProvinceData(this.selectedCountry.getProvinces());
             if (!provinceListingDialog.isAdded())
-                provinceListingDialog.show(getFragmentManager(), "RecipientProvinceListingDialog");
+                provinceListingDialog.show(getSupportFragmentManager(), "RecipientProvinceListingDialog");
         } else {
             showToastMessage("Select a Country first.");
         }
@@ -321,7 +321,7 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
         recipientCountryListingDialog.setListener(this);
         recipientCountryListingDialog.setCountryData(this.countryList);
         if (!recipientCountryListingDialog.isAdded())
-            recipientCountryListingDialog.show(getFragmentManager(), "RecipientCountryListingDialog");
+            recipientCountryListingDialog.show(getSupportFragmentManager(), "RecipientCountryListingDialog");
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/presenter/RegisterV2Presenter.java

@@ -84,7 +84,14 @@ public class RegisterV2Presenter extends BasePresenter implements RegisterV2Pres
     public void registerUser(String userId, String password, String dob) {
         this.userId=userId;
         String auth = "Basic " + Utils.toBase64("172017F9EC11222E8107142733:QRK2UM0Q:" + GmeApplication.getAppRelatedMetaData().getDeviceId());
-        String fcmID = FirebaseInstanceId.getInstance().getToken();
+        String fcmID = null;
+        try {
+           fcmID= FirebaseInstanceId.getInstance().getToken();
+        }
+        catch(Exception e)
+        {
+
+        }
         if (fcmID == null||fcmID.length()<1)
             fcmID = this.gateway.getLastKnownFcmId();
         compositeDisposable.add(

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2Activity.java

@@ -256,7 +256,7 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction
     public void promptPassword(PasswordPromptDialog.PasswordPromptListener listener) {
         PasswordPromptDialog passwordPromptDialog = new PasswordPromptDialog();
         passwordPromptDialog.setListener(listener);
-        passwordPromptDialog.show(getFragmentManager(), "PasswordDialog");
+        passwordPromptDialog.show(getSupportFragmentManager(), "PasswordDialog");
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailExRateCountryListingDialog.java

@@ -27,7 +27,7 @@ import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.amountdetail.R
 import java.util.ArrayList;
 import java.util.List;
 
-public class AmountDetailExRateCountryListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class AmountDetailExRateCountryListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<RecipientCurrencyModel> data;
     private ExRateCurrencySelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java

@@ -180,7 +180,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
         exRateCountryListingDialog.setListener(this);
         exRateCountryListingDialog.setCountryPaymentData(amountDetailRelatedData.getAvailableCurrencyData());
         if (!exRateCountryListingDialog.isAdded())
-            exRateCountryListingDialog.show(getActivity().getFragmentManager(), "GenericTextListingDialog");
+            exRateCountryListingDialog.show(getActivity().getSupportFragmentManager(), "GenericTextListingDialog");
     }
 
     private void performDefaultAction(Bundle savedInstance) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeBankListingDialog.java

@@ -28,7 +28,7 @@ import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.Ban
 import java.util.ArrayList;
 import java.util.List;
 
-public class PayoutModeBankListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class PayoutModeBankListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private List<BankList> data;
     private BankSelectionListener listener;

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeBranchListingDialog.java

@@ -41,7 +41,7 @@ import java.util.List;
 
 import io.reactivex.disposables.CompositeDisposable;
 
-public class PayoutModeBranchListingDialog extends DialogFragment implements View.OnClickListener, TextWatcher {
+public class PayoutModeBranchListingDialog extends android.support.v4.app.DialogFragment implements View.OnClickListener, TextWatcher {
 
     private BranchSelectionListener listener;
     private RecyclerView countryListRv;

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java

@@ -361,7 +361,7 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
         payoutModeBranchListingDialog.setSelectedBank(this.selectedBank);
         payoutModeBranchListingDialog.setListener(this);
         if (!payoutModeBranchListingDialog.isAdded())
-            payoutModeBranchListingDialog.show(getActivity().getFragmentManager(), "BranchListingFragment");
+            payoutModeBranchListingDialog.show(getActivity().getSupportFragmentManager(), "BranchListingFragment");
     }
 
     private void showBankListInDialog() {
@@ -370,7 +370,7 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
         payoutModeBankListingDialog.setCountryData(this.selectedPayoutMode.getBankList());
         payoutModeBankListingDialog.setListener(this);
         if (!payoutModeBankListingDialog.isAdded())
-            payoutModeBankListingDialog.show(getActivity().getFragmentManager(), "BankListingFragment");
+            payoutModeBankListingDialog.show(getActivity().getSupportFragmentManager(), "BankListingFragment");
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/socials/view/SocialPrivateWallActivity.java

@@ -3,6 +3,7 @@ package com.gmeremit.online.gmeremittance_native.socials.view;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
@@ -218,7 +219,7 @@ public class SocialPrivateWallActivity extends AppCompatActivity implements Soci
         CustomAlertDialog customAlertDialog = new CustomAlertDialog();
         customAlertDialog.setAlertType(CustomAlertDialog.AlertType.ALERT);
         customAlertDialog.setMessage("This feature is coming soon");
-        android.app.FragmentManager fragmentManager = this.getFragmentManager();
+        FragmentManager fragmentManager = this.getSupportFragmentManager();
         if (fragmentManager != null)
             customAlertDialog.show(fragmentManager, "CustomProgressBar");
     }