Penny test fixes

app/src/main/java/com/gmeremit/online/gmeremittance_native/appupdate/AppUpdateActivity.java

@@ -1,5 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.appupdate;
 
+import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -35,6 +36,7 @@ public class AppUpdateActivity extends AppCompatActivity implements View.OnClick
     public static final String APP_UPDATE_MESSAGE = "bundleKeyAppUpdateMessage";
     public static final String APP_PLAY_STORE_BUILD_NUMBER = "bundleKeyPlayStoreBuildNumber";
     public static final String APP_UPDATE_IS_FORCE_UPDATE = "bundleKeyIsForceUpdate";
+    public static final String APP_UPDATE_NOT_NOW_TEMPORARY = "bundleKeyNotNowTemp";
 
     private boolean isForcedUpdate = false;
 
@@ -103,11 +105,18 @@ public class AppUpdateActivity extends AppCompatActivity implements View.OnClick
                 break;
 
             case R.id.not_now_view:
-                onBackPressed();
+                finishActivityWithDeferDecision();
                 break;
         }
     }
 
+    private void finishActivityWithDeferDecision() {
+        Intent returnIntent = new Intent();
+        returnIntent.putExtra(APP_UPDATE_NOT_NOW_TEMPORARY,true);
+        setResult(Activity.RESULT_OK,returnIntent);
+        finish();
+    }
+
     private void gotoPlayStore() {
         String appId = this.getPackageName();
         Intent rateIntent = new Intent(Intent.ACTION_VIEW,

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

@@ -33,6 +33,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
     private final HomeV2GatewayInterface gateway;
     private final CompositeDisposable compositeDisposable;
     private final BehaviorSubject<HomeFragmentRelatedData> homeFragmentRelatedSubject;
+    private boolean shouldNotPromptAppUpdate;
 
     public HomeV2Presenter(HomeV2PresenterInterface.HomeV2ContractInterface view) {
         this.view = view;
@@ -40,6 +41,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
         this.compositeDisposable = new CompositeDisposable();
         this.homeFragmentRelatedSubject = BehaviorSubject.create();
         this.gateway.addPrivilegedGatewayDataObserver(this);
+        this.shouldNotPromptAppUpdate=false;
 
     }
 
@@ -137,6 +139,16 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
         return homeFragmentRelatedSubject;
     }
 
+    @Override
+    public void storeAppUpdateDecision(boolean booleanExtra) {
+        this.shouldNotPromptAppUpdate=booleanExtra;
+    }
+
+    @Override
+    public boolean shouldNotPromptAppUpdate() {
+        return this.shouldNotPromptAppUpdate;
+    }
+
     private Observable<UserInfoModelV2> getDataFromServerAndSaveIt() {
         String fcmID;
         try {

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

@@ -25,7 +25,9 @@ public interface HomeV2PresenterInterface extends BasePresenterInterface {
 
     Observable<HomeV2Presenter.HomeFragmentRelatedData> subscribeToHomeFragmentDataFetchEvent();
 
+    void storeAppUpdateDecision(boolean booleanExtra);
 
+    boolean shouldNotPromptAppUpdate();
 
 
     interface HomeV2ContractInterface extends BaseContractInterface

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

@@ -7,6 +7,7 @@ import android.content.res.Configuration;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Handler;
+import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.support.design.widget.NavigationView;
 import android.support.v4.app.Fragment;
@@ -56,6 +57,7 @@ import butterknife.OnClick;
 
 public class HomeActivityV2 extends BaseActivity implements HomeParentViewContractV2, HomeV2PresenterInterface.HomeV2ContractInterface {
 
+    private static final int APP_UPDATE_REQUEST = 98463;
     @BindView(R.id.nav_drawer)
     NavigationView nav_drawer;
     @BindView(R.id.iv_help)
@@ -363,13 +365,15 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
 
     @Override
     public void showUpdateScreen(String build, String info, boolean isForceUpdate) {
+        if(!this.presenter.shouldNotPromptAppUpdate()) {
             new Handler().postDelayed(() -> {
                 Intent intent = new Intent(HomeActivityV2.this, AppUpdateActivity.class);
                 intent.putExtra(AppUpdateActivity.APP_UPDATE_MESSAGE, info);
                 intent.putExtra(AppUpdateActivity.APP_PLAY_STORE_BUILD_NUMBER, build);
                 intent.putExtra(AppUpdateActivity.APP_UPDATE_IS_FORCE_UPDATE, isForceUpdate);
-            startActivity(intent);
+                startActivityForResult(intent, APP_UPDATE_REQUEST);
             }, 500);
+        }
 
 
     }
@@ -431,6 +435,16 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
         }
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if(requestCode==APP_UPDATE_REQUEST&&resultCode==RESULT_OK)
+        {
+            this.presenter.storeAppUpdateDecision(data.getBooleanExtra(AppUpdateActivity.APP_UPDATE_NOT_NOW_TEMPORARY,false));
+        }
+
+
+    }
 
     @Override
     protected void onDestroy() {

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestOperationFragment.java

@@ -80,12 +80,12 @@ public class PennyTestOperationFragment extends BaseFragment implements View.OnC
 
 
     public String getCertNumber() {
-        if(creditNumber.getText().toString().length()>0) {
+        if(creditNumber.getText().toString().length()!=4) {
             accountWrapper.setError(null);
             return creditNumber.getText().toString();
         }
         else {
-            accountWrapper.setError("Please enter a valid code");
+            accountWrapper.setError("Please enter a valid 4 digit code");
             return null;
         }
     }

app/src/main/res/layout/fragment_penny_test_operation.xml

@@ -15,7 +15,6 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
-            android:text="Please enter the amount deposited by GME inorder to complete your bank account verification process."
             android:textSize="17sp"
             app:layout_constraintBottom_toTopOf="@+id/accountWrapper"
             app:layout_constraintEnd_toEndOf="parent"
@@ -46,7 +45,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:imeOptions="actionDone"
-                android:inputType="text"
+                android:inputType="number"
+                android:maxLength="4"
                 android:singleLine="false" />
 
         </android.support.design.widget.TextInputLayout>