From f591bf3be4c85c033dcb745c735fbba1ccce1935 Mon Sep 17 00:00:00 2001
From: preyearegmi <preyearegmi@outlook.com>
Date: Thu, 23 Aug 2018 18:34:55 +0900
Subject: [PATCH] Flow done

---
 .../gmeremittance_native/base/BaseActivity.java   | 15 ++++++++++-----
 .../customwidgets/CustomProgressDialog.java       |  3 +++
 .../view/ExchangeMethodV2Activity.java            |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java
index 0a6b2202..af5c2ce6 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java
@@ -20,23 +20,28 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter
 
     private CustomProgressDialog dialog;
     private AlertDialog alertDialog;
+    private boolean isProgressBarShowing;
 
     @Override
     public void showProgressBar(boolean action, String message) {
         try {
             if (action) {
-                if (dialog != null)
-                    dialog.dismiss();
-
+                if (dialog != null&&isProgressBarShowing) {
+                    dialog.updateMessage(message);
+                    return;
+                }
                 dialog = new CustomProgressDialog();
                 dialog.setMessage(message);
                 android.app.FragmentManager fragmentManager = this.getFragmentManager();
                 if (fragmentManager != null)
                     dialog.show(fragmentManager, "CustomProgressBar");
-
+                     isProgressBarShowing=true;
             } else {
-                if (dialog != null)
+                if (dialog != null) {
                     dialog.dismiss();
+                    isProgressBarShowing=false;
+                    dialog=null;
+                }
             }
         } catch (Exception e) {
         }
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/CustomProgressDialog.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/CustomProgressDialog.java
index 171a47d6..ea23059a 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/CustomProgressDialog.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/CustomProgressDialog.java
@@ -45,4 +45,7 @@ public class CustomProgressDialog extends DialogFragment{
         this.message="";
     }
 
+    public void updateMessage(String message) {
+        progressBarTxt.setText(message);
+    }
 }
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java
index 994d1b2c..5b73bcd8 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java
@@ -1,6 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.exchange_rate.view;
 
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
@@ -103,6 +104,7 @@ public class ExchangeMethodV2Activity extends BaseActivity implements PaymentMod
         toolbarTitle.setText("Today's Rate");
         this.presenter.getAllData();
 
+
     }