Send money privileges added

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

@@ -21,8 +21,7 @@ public class PrefKeys {
     public static final String USER_ACCESS_CODE = "USER_PRIMARY_BANK_V2";
     public static final String USER_DP_URL = "USER_DP_UR_V2L";
     public static final String USER_KYC_SUBMITTED = "USER_KYC_SUBMITTED_V2";
-    public static final String USER_KYC_VERIFIED = "USER_KYC_VERIFIED_V2";
-    public static final String USER_VERIFIED = "USER_VERIFIED_V2";
+    public static final String USER_KYC_VERIFIED = "USER_VERIFIED_V2";
     public static final String USER_ACTIVE = "USER_ACTIVE_V2";
     public static final String USER_CM_REGISTRATION_ID = "USER_CM_REGISTRATION_ID_V2";
     public static final String USER_IS_REFERRED = "USER_IS_REFERRED_V2";

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

@@ -1,9 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.base;
 
-import android.util.Log;
-
 import com.gmeremit.online.gmeremittance_native.GmeApplication;
-import com.gmeremit.online.gmeremittance_native.utils.Utils;
 
 
 public abstract class PrivilegedGateway implements PrivilegedGatewayInterface {
@@ -62,4 +59,14 @@ public abstract class PrivilegedGateway implements PrivilegedGatewayInterface {
     public String getLastKnownFcmId() {
         return GmeApplication.getStorage().getString(PrefKeys.USER_FCM_ID,"");
     }
+
+    @Override
+    public boolean isUserKYCVerified() {
+        return GmeApplication.getStorage().getBoolean(PrefKeys.USER_KYC_VERIFIED,false);
+    }
+
+    @Override
+    public boolean hasUserSubmittedKYC() {
+        return GmeApplication.getStorage().getBoolean(PrefKeys.USER_KYC_SUBMITTED,false);
+    }
 }

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

@@ -25,4 +25,7 @@ public interface PrivilegedGatewayInterface extends BaseGatewayInterface {
    String getUserPreferredCurrency();
 
    String getLastKnownFcmId();
+
+   boolean isUserKYCVerified();
+   boolean hasUserSubmittedKYC();
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/gateway/HomeV2Gateway.java

@@ -12,8 +12,6 @@ import com.gmeremit.online.gmeremittance_native.homeV2.presenter.HomeV2Interacto
 import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2;
 import com.google.gson.JsonObject;
 
-import java.util.concurrent.TimeUnit;
-
 import io.reactivex.Observable;
 
 public class HomeV2Gateway extends PrivilegedGateway implements HomeV2InteractorInterface.HomeV2GatewayInterface {
@@ -54,7 +52,7 @@ public class HomeV2Gateway extends PrivilegedGateway implements HomeV2Interactor
                 sharedPreferenceEditor.putString(PrefKeys.USER_ID_NUMBER, loginApiResponseModelV2.getSenderId());
                 sharedPreferenceEditor.putString(PrefKeys.USER_ID_TYPE, loginApiResponseModelV2.getIdType());
                 sharedPreferenceEditor.putBoolean(PrefKeys.USER_IS_REFERRED, loginApiResponseModelV2.getReferred());
-                sharedPreferenceEditor.putBoolean(PrefKeys.USER_KYC_VERIFIED, loginApiResponseModelV2.getKyc());
+                sharedPreferenceEditor.putBoolean(PrefKeys.USER_KYC_SUBMITTED, loginApiResponseModelV2.getKyc());
                 sharedPreferenceEditor.putString(PrefKeys.USER_LAST_NAME, loginApiResponseModelV2.getLastName());
                 sharedPreferenceEditor.putString(PrefKeys.USER_MIDDLE_NAME, loginApiResponseModelV2.getMiddleName());
                 sharedPreferenceEditor.putString(PrefKeys.USER_MSISDN, loginApiResponseModelV2.getMobileNumber());
@@ -64,10 +62,15 @@ public class HomeV2Gateway extends PrivilegedGateway implements HomeV2Interactor
                 sharedPreferenceEditor.putString(PrefKeys.USER_PROVINCE_ID, loginApiResponseModelV2.getProvinceId());
                 sharedPreferenceEditor.putString(PrefKeys.USER_REWAD_POINT, loginApiResponseModelV2.getRewardPoint());
                 sharedPreferenceEditor.putString(PrefKeys.USER_SOURCE_ID, loginApiResponseModelV2.getSourceId());
-                sharedPreferenceEditor.putBoolean(PrefKeys.USER_VERIFIED, loginApiResponseModelV2.getVerified());
+                sharedPreferenceEditor.putBoolean(PrefKeys.USER_KYC_VERIFIED, loginApiResponseModelV2.getVerified());
                 sharedPreferenceEditor.putString(PrefKeys.USER_WALLET_NUMBER, loginApiResponseModelV2.getWalletNumber());
                 sharedPreferenceEditor.putString(PrefKeys.USER_YEARLY_REMAINING_LIMIT, loginApiResponseModelV2.getYearlyLimit());
                 sharedPreferenceEditor.commit();
+
+                boolean vAfterSaving= GmeApplication.getStorage().getBoolean(PrefKeys.USER_KYC_VERIFIED,false);
+                boolean kAfterSaving= GmeApplication.getStorage().getBoolean(PrefKeys.USER_KYC_SUBMITTED,false);
+
+
             }
             catch (Exception e )
             {
@@ -107,7 +110,7 @@ public class HomeV2Gateway extends PrivilegedGateway implements HomeV2Interactor
         userInfoModelV2.setSenderId(sharedPreferenceEditor.getString(PrefKeys.USER_ID_NUMBER,""));
         userInfoModelV2.setIdType(sharedPreferenceEditor.getString(PrefKeys.USER_ID_TYPE,""));
         userInfoModelV2.setReferred(sharedPreferenceEditor.getBoolean(PrefKeys.USER_IS_REFERRED,false));
-        userInfoModelV2.setKyc(sharedPreferenceEditor.getBoolean(PrefKeys.USER_KYC_VERIFIED,false));
+        userInfoModelV2.setKyc(sharedPreferenceEditor.getBoolean(PrefKeys.USER_KYC_SUBMITTED,false));
         userInfoModelV2.setLastName(sharedPreferenceEditor.getString(PrefKeys.USER_LAST_NAME,""));
         userInfoModelV2.setMiddleName(sharedPreferenceEditor.getString(PrefKeys.USER_MIDDLE_NAME,""));
         userInfoModelV2.setMobileNumber(sharedPreferenceEditor.getString(PrefKeys.USER_MSISDN,""));
@@ -117,7 +120,7 @@ public class HomeV2Gateway extends PrivilegedGateway implements HomeV2Interactor
         userInfoModelV2.setProvinceId(sharedPreferenceEditor.getString(PrefKeys.USER_PROVINCE_ID,""));
         userInfoModelV2.setRewardPoint(sharedPreferenceEditor.getString(PrefKeys.USER_REWAD_POINT,""));
         userInfoModelV2.setSourceId(sharedPreferenceEditor.getString(PrefKeys.USER_SOURCE_ID,""));
-        userInfoModelV2.setVerified(sharedPreferenceEditor.getBoolean(PrefKeys.USER_VERIFIED,false));
+        userInfoModelV2.setVerified(sharedPreferenceEditor.getBoolean(PrefKeys.USER_KYC_VERIFIED,false));
         userInfoModelV2.setWalletNumber(sharedPreferenceEditor.getString(PrefKeys.USER_WALLET_NUMBER,""));
         userInfoModelV2.setYearlyLimit(sharedPreferenceEditor.getString(PrefKeys.USER_YEARLY_REMAINING_LIMIT,""));
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java

@@ -69,10 +69,23 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
         view.showKYCVerifiedIfRequired(true,message,title,true);
     }
 
+    @Override
+    public String checkIfUserVerified() {
+        String resultMessage=null;
+
+        if(!gateway.hasUserSubmittedKYC())
+        resultMessage="Kindly complete your kyc registration process with us to start using GME services";
+        else if(!gateway.isUserKYCVerified())
+            resultMessage="Your registration request is in approval process. You will soon be able to use GME services.";
+
+        return resultMessage;
+    }
+
     private Observable<UserInfoModelV2> getDataFromServerAndCacheIt() {
         return this.gateway.getUserRelatedData(this.gateway.getAuth(),this.gateway.getUserID()).flatMap(userInfoV2DataApiResponse -> {
             if (userInfoV2DataApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
-                return Observable.just(userInfoV2DataApiResponse.getData());
+
+                return this.gateway.saveUserInfo(userInfoV2DataApiResponse.getData());
             }
             else
                 return Observable.error(new SessionExpiredException(userInfoV2DataApiResponse.getMsg()));

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2PresenterInterface.java

@@ -14,6 +14,9 @@ public interface HomeV2PresenterInterface extends BasePresenterInterface {
 
     void manuallyUpdateKYCForStatusToSubmitted();
 
+    String checkIfUserVerified();
+
+
     interface HomeV2ContractInterface extends BaseContractInterface
     {
         void  showInfoInDrawer(String fullname, String email, String balance, String walletNumber, String bankName, String contact);
@@ -23,5 +26,6 @@ public interface HomeV2PresenterInterface extends BasePresenterInterface {
         void showKYCVerifiedIfRequired(boolean shouldShowView, String message, String title, boolean disableKYCViewClick);
 
         void performLogout();
+
     }
 }

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

@@ -239,10 +239,13 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
     }
 
 
-
     @Override
     public void showSendMoneyView() {
+        String unverifiedMessage = presenter.checkIfUserVerified();
+        if (unverifiedMessage == null)
             startActivity(new Intent(getApplicationContext(), RecipientListingV2Activity.class));
+        else
+            showPopUpMessage(unverifiedMessage, CustomAlertDialog.AlertType.ALERT, null);
     }
 
     @Override
@@ -275,8 +278,8 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
 
     @Override
     public HomeV2PresenterInterface getPresenter() {
-        if(this.presenter==null)
-            presenter=new HomeV2Presenter(this);
+        if (this.presenter == null)
+            presenter = new HomeV2Presenter(this);
         return presenter;
     }
 
@@ -313,14 +316,14 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
 
     @Override
     public void updateUserInfoInChildView(String userName, String yearlyLimit, String rewardPoint) {
-            if(currentFragment!=null&&currentFragment instanceof HomeFragmentV2)
-                ((HomeFragmentV2)currentFragment).updateInfo(userName,yearlyLimit,rewardPoint);
+        if (currentFragment != null && currentFragment instanceof HomeFragmentV2)
+            ((HomeFragmentV2) currentFragment).updateInfo(userName, yearlyLimit, rewardPoint);
     }
 
     @Override
     public void showKYCVerifiedIfRequired(boolean shouldShowView, String message, String title, boolean disableKYCViewClick) {
-        if(currentFragment!=null&&currentFragment instanceof HomeFragmentV2)
-            ((HomeFragmentV2)currentFragment).showKYCVerifiedIfRequired(shouldShowView,message,title,disableKYCViewClick);
+        if (currentFragment != null && currentFragment instanceof HomeFragmentV2)
+            ((HomeFragmentV2) currentFragment).showKYCVerifiedIfRequired(shouldShowView, message, title, disableKYCViewClick);
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/gateway/LoginV2Gateway.java

@@ -52,7 +52,7 @@ public class LoginV2Gateway extends PrivilegedGateway implements LoginV2Interact
            sharedPreferenceEditor.putString(PrefKeys.USER_ID_NUMBER,loginApiResponseModelV2.getSenderId());
            sharedPreferenceEditor.putString(PrefKeys.USER_ID_TYPE,loginApiResponseModelV2.getIdType());
            sharedPreferenceEditor.putBoolean(PrefKeys.USER_IS_REFERRED,loginApiResponseModelV2.getReferred());
-           sharedPreferenceEditor.putBoolean(PrefKeys.USER_KYC_VERIFIED,loginApiResponseModelV2.getKyc());
+           sharedPreferenceEditor.putBoolean(PrefKeys.USER_KYC_SUBMITTED,loginApiResponseModelV2.getKyc());
            sharedPreferenceEditor.putString(PrefKeys.USER_LAST_NAME,loginApiResponseModelV2.getLastName());
            sharedPreferenceEditor.putString(PrefKeys.USER_MIDDLE_NAME,loginApiResponseModelV2.getMiddleName());
            sharedPreferenceEditor.putString(PrefKeys.USER_MSISDN,loginApiResponseModelV2.getMobileNumber());
@@ -62,7 +62,7 @@ public class LoginV2Gateway extends PrivilegedGateway implements LoginV2Interact
            sharedPreferenceEditor.putString(PrefKeys.USER_PROVINCE_ID,loginApiResponseModelV2.getProvinceId());
            sharedPreferenceEditor.putString(PrefKeys.USER_REWAD_POINT,loginApiResponseModelV2.getRewardPoint());
            sharedPreferenceEditor.putString(PrefKeys.USER_SOURCE_ID,loginApiResponseModelV2.getSourceId());
-           sharedPreferenceEditor.putBoolean(PrefKeys.USER_VERIFIED,loginApiResponseModelV2.getVerified());
+           sharedPreferenceEditor.putBoolean(PrefKeys.USER_KYC_VERIFIED,loginApiResponseModelV2.getVerified());
            sharedPreferenceEditor.putString(PrefKeys.USER_WALLET_NUMBER,loginApiResponseModelV2.getWalletNumber());
 
            sharedPreferenceEditor.putString(PrefKeys.USER_LOGGED_IN_STATUS,"HOME");

app/src/main/java/com/gmeremit/online/gmeremittance_native/sign_in/model/LoginModel.java

@@ -51,7 +51,7 @@ public class LoginModel implements LoginContract.LoginModel {
                 public void onResponse(Call<SignInResponse> call, Response<SignInResponse> response) {
                     if (response.isSuccessful()) {
 
-                        updateLoginCredential(new Gson().toJson(response.body()));
+//                        updateLoginCredential(new Gson().toJson(response.body()));
                         loginListener.onSuccessLogin(response.body(), signInJsonBody);
                     } else {
                         Gson gson = new GsonBuilder().create();
@@ -97,7 +97,7 @@ public class LoginModel implements LoginContract.LoginModel {
             sharedPreferenceEditor.putString(PrefKeys.USER_ID_NUMBER,loginApiResponseModelV2.getSenderId());
             sharedPreferenceEditor.putString(PrefKeys.USER_ID_TYPE,loginApiResponseModelV2.getIdType());
             sharedPreferenceEditor.putBoolean(PrefKeys.USER_IS_REFERRED,loginApiResponseModelV2.getReferred());
-            sharedPreferenceEditor.putBoolean(PrefKeys.USER_KYC_VERIFIED,loginApiResponseModelV2.getKyc());
+            sharedPreferenceEditor.putBoolean(PrefKeys.USER_KYC_SUBMITTED,loginApiResponseModelV2.getKyc());
             sharedPreferenceEditor.putString(PrefKeys.USER_LAST_NAME,loginApiResponseModelV2.getLastName());
             sharedPreferenceEditor.putString(PrefKeys.USER_MIDDLE_NAME,loginApiResponseModelV2.getMiddleName());
             sharedPreferenceEditor.putString(PrefKeys.USER_MSISDN,loginApiResponseModelV2.getMobileNumber());
@@ -107,7 +107,7 @@ public class LoginModel implements LoginContract.LoginModel {
             sharedPreferenceEditor.putString(PrefKeys.USER_PROVINCE_ID,loginApiResponseModelV2.getProvinceId());
             sharedPreferenceEditor.putString(PrefKeys.USER_REWAD_POINT,loginApiResponseModelV2.getRewardPoint());
             sharedPreferenceEditor.putString(PrefKeys.USER_SOURCE_ID,loginApiResponseModelV2.getSourceId());
-            sharedPreferenceEditor.putBoolean(PrefKeys.USER_VERIFIED,loginApiResponseModelV2.getVerified());
+            sharedPreferenceEditor.putBoolean(PrefKeys.USER_KYC_VERIFIED,loginApiResponseModelV2.getVerified());
             sharedPreferenceEditor.putString(PrefKeys.USER_WALLET_NUMBER,loginApiResponseModelV2.getWalletNumber());
 
             sharedPreferenceEditor.apply();

app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/HttpClientV2.java

@@ -26,8 +26,9 @@ public class HttpClientV2 {
 
 
         OkHttpClient.Builder httpClient = new OkHttpClient.Builder();
-        httpClient.connectTimeout(30, TimeUnit.SECONDS);
-        httpClient.readTimeout(30, TimeUnit.SECONDS);
+        httpClient.connectTimeout(20, TimeUnit.SECONDS);
+        httpClient.readTimeout(20, TimeUnit.SECONDS);
+        httpClient.writeTimeout(20, TimeUnit.SECONDS);
         if (BuildConfig.DEBUG) {
             HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
             logging.setLevel(HttpLoggingInterceptor.Level.BODY);

app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/other/PersistenceStorageManager.java

@@ -153,7 +153,7 @@ public class PersistenceStorageManager {
     }
 
     public boolean getIsVerifiedUser() {
-        return pref.getBoolean(PrefKeys.USER_KYC_VERIFIED, false);
+        return pref.getBoolean(PrefKeys.USER_KYC_SUBMITTED, false);
 
         }
 
@@ -258,7 +258,7 @@ public class PersistenceStorageManager {
     }
     public void setUserKYCVerifiedV2(boolean action)
     {
-        editor.putBoolean(PrefKeys.USER_KYC_VERIFIED,action);
+        editor.putBoolean(PrefKeys.USER_KYC_SUBMITTED,action);
         editor.commit();
     }
 
@@ -266,7 +266,7 @@ public class PersistenceStorageManager {
         return pref.getBoolean(PrefKeys.USER_KYC_SUBMITTED, false);
     }
     public boolean isUserKYCVerifiedV2() {
-        return pref.getBoolean(PrefKeys.USER_KYC_VERIFIED, false);
+        return pref.getBoolean(PrefKeys.USER_KYC_SUBMITTED, false);
     }
     public String getLoggedin() {
         return pref.getString(LOGGEDIN, null);