Occupation field added

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/gateway/KYCV3Gateway.java

@@ -69,7 +69,7 @@ public class KYCV3Gateway extends PrivilegedGateway implements KYCV3GatewayInter
             map.put("city", createStringUploadValue(personalInfoDTO.getCity()));
             map.put("address", createStringUploadValue(personalInfoDTO.getAddress()));
             map.put("nativeCountry", createStringUploadValue(personalInfoDTO.getNativeCountry()));
-//            map.put("occupation", createStringUploadValue(personalInfoDTO.getOccupation()));
+            map.put("occupation", createStringUploadValue(personalInfoDTO.getOccupation()));
         }
 
         PrimaryInformationDTO primaryInformationDTO = requestBody.getPrimaryInformation();

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/presenter/KYCV3ViewModel.java

@@ -342,10 +342,9 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
                 form1ViewBindings.getEmailChangeEvent().map(val -> validator.validateEmail(val.toString())),
                 form1ViewBindings.getCityChangeEvent().map(val -> validator.validateCity(val)),
                 form1ViewBindings.getAddressChangeEvent().map(val -> validator.validateKoreaAddress(val.toString())),
-                //TODO Ocuupation field added
-//                this.view.getCustomerDetailViewContract().getForm1ViewBindings().getOccupationChangeEvent().map(val -> validator.validateOccupation(val)),
-                (isFullNameValid, isGenderValid, isDobValid, isEmailValid, isCityValid, isAddressValid) -> {
-                    boolean result = isFullNameValid && isEmailValid && isAddressValid && isDobValid && isGenderValid && isCityValid;
+                form1ViewBindings.getOccupationChangeEvent().map(val -> validator.validateOccupation(val)),
+                (isFullNameValid, isGenderValid, isDobValid, isEmailValid, isCityValid, isAddressValid,isOccupationValid) -> {
+                    boolean result = isFullNameValid && isEmailValid && isAddressValid && isDobValid && isGenderValid && isCityValid&&isOccupationValid;
                     Log.d(TAG, "Form 1 valid: " + result);
                     customerDetailForm1Button.setValue(result);
                     if (!result)

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/view/personal/CustomerDetailFragment.java

@@ -142,11 +142,10 @@ public class CustomerDetailFragment extends BaseFragment implements KYCV3Present
     @BindView(R.id.cityWrapper)
     TextInputLayout cityWrapper;
 
-    //TODO Ocuupation field added
-//    @BindView(R.id.ed_occupation)
-//    EditText ed_occupation;
-//    @BindView(R.id.occupationSelectionWrapper)
-//    TextInputLayout occupationSelectionWrapper;
+    @BindView(R.id.ed_occupation)
+    EditText ed_occupation;
+    @BindView(R.id.occupationSelectionWrapper)
+    TextInputLayout occupationSelectionWrapper;
 
     @BindView(R.id.ed_address)
     EditText ed_address;
@@ -360,11 +359,11 @@ public class CustomerDetailFragment extends BaseFragment implements KYCV3Present
                 }
 
                 //TODO Ocuupation field added
-//                IDTextDTO selectedOccupation = val.getSelectedOccupationFromId(val.getPersonalInformation().getOccupation());
-//                if (selectedOccupation != null) {
-//                    ed_occupation.setText(selectedOccupation.toString());
-//                    form1ViewBindings.occupationPublishSubject.onNext(selectedOccupation);
-//                }
+                IDTextDTO selectedOccupation = val.getSelectedOccupationFromId(val.getPersonalInformation().getOccupation());
+                if (selectedOccupation != null) {
+                    ed_occupation.setText(selectedOccupation.toString());
+                    form1ViewBindings.occupationPublishSubject.onNext(selectedOccupation);
+                }
 
                 ed_dob.setText(val.getPersonalInformation().getDob());
 
@@ -1140,25 +1139,25 @@ public class CustomerDetailFragment extends BaseFragment implements KYCV3Present
     }
 
     //TODO Ocuupation field added
-//    @OnClick(R.id.ed_occupation)
-//    public void promptOccupation() {
-//        hideKeyBoard();
-//        if (occupationSelectionDialog == null)
-//            occupationSelectionDialog = new GenericTextListingDialog<>();
-//
-//        occupationSelectionDialog.setData(ViewModelProviders.of(getActivity()).get(KYCV3ViewModel.class).getAvailableOccupationList());
-//
-//        occupationSelectionDialog.setListener(selectedBranch ->
-//        {
-//            ed_occupation.setText(selectedBranch.toString());
-//            form1ViewBindings.occupationPublishSubject.onNext(selectedBranch);
-//            occupationSelectionDialog.dismiss();
-//
-//        });
-//        occupationSelectionDialog.setHintAndTitle(getString(R.string.search_occupation_text), getString(R.string.select_occupation_text), getString(R.string.no_occupation_found_text));
-//        if (!occupationSelectionDialog.isAdded())
-//            occupationSelectionDialog.show(getActivity().getSupportFragmentManager(), "OCCUPATIONCHOOSER");
-//    }
+    @OnClick(R.id.ed_occupation)
+    public void promptOccupation() {
+        hideKeyBoard();
+        if (occupationSelectionDialog == null)
+            occupationSelectionDialog = new GenericTextListingDialog<>();
+
+        occupationSelectionDialog.setData(ViewModelProviders.of(getActivity()).get(KYCV3ViewModel.class).getAvailableOccupationList());
+
+        occupationSelectionDialog.setListener(selectedBranch ->
+        {
+            ed_occupation.setText(selectedBranch.toString());
+            form1ViewBindings.occupationPublishSubject.onNext(selectedBranch);
+            occupationSelectionDialog.dismiss();
+
+        });
+        occupationSelectionDialog.setHintAndTitle(getString(R.string.search_occupation_text), getString(R.string.select_occupation_text), getString(R.string.no_occupation_found_text));
+        if (!occupationSelectionDialog.isAdded())
+            occupationSelectionDialog.show(getActivity().getSupportFragmentManager(), "OCCUPATIONCHOOSER");
+    }
 
     @OnClick(R.id.ed_primaryBank)
     public void promptBank() {

app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserFragmentV2.java

@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.ConnectivityManager;
+import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.net.http.SslError;
@@ -21,6 +22,7 @@ import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceError;
 import android.webkit.WebResourceRequest;
+import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
@@ -100,18 +102,16 @@ public abstract class WebBrowserFragmentV2 extends BaseFragment {
         webView.getSettings().setSaveFormData(false);
         webView.clearCache(true);
         webView.clearHistory();
-        webView.getSettings().setJavaScriptEnabled(true);
+        WebSettings settings = webView.getSettings();
+        settings.setJavaScriptEnabled(true);
+        settings.setTextZoom(100);
+        settings.setSupportMultipleWindows(true);
+        settings.setJavaScriptCanOpenWindowsAutomatically(true);
         webView.getSettings().setAllowFileAccess(true);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             CookieManager.getInstance().setAcceptThirdPartyCookies(webView, true);
         }
-        //(필수!!) 일부폰에서 접근성 설정에 의해 CSS 깨짐 발생 아래 설정
-        //(REQUIRED!!) set up when CSS crack for some phone depending on accessability setting
-        webView.getSettings().setTextZoom(100);
-        webView.getSettings().setSupportMultipleWindows(true);
-        webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
-        //(필수!!) 모바일 브라우저와 웹뷰(하이브리드 앱)를 구분하기 위한 UserAgent 설정
-        //(REQUIRED!!) set up UserAgent for distingushing between mobile browser and webview(hybrid app)
+
         StringBuffer sb = new StringBuffer(webView.getSettings().getUserAgentString()).append(STR_USER_AGENT_YESSIGN_ANDROID);
         webView.getSettings().setUserAgentString(sb.toString());
 
@@ -121,9 +121,24 @@ public abstract class WebBrowserFragmentV2 extends BaseFragment {
         ConnectivityManager cm = (ConnectivityManager)
                 getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
         if (null != cm) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                NetworkCapabilities capabilities = cm.getNetworkCapabilities(cm.getActiveNetwork());
+                if (capabilities != null) {
+                    return (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+                            || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
+                            || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)
+                            || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)
+                    );
+
+                } else {
+                    return false;
+                }
+            } else {
                 NetworkInfo info = cm.getActiveNetworkInfo();
                 return (info != null && info.isConnected());
             }
+
+        }
         return false;
     }
 
@@ -278,9 +293,7 @@ public abstract class WebBrowserFragmentV2 extends BaseFragment {
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
                 contentSelectionIntent.setAction(Intent.ACTION_OPEN_DOCUMENT);
-            }
-            else
-            {
+            } else {
                 contentSelectionIntent.setAction(Intent.ACTION_GET_CONTENT);
 
             }
@@ -355,7 +368,6 @@ public abstract class WebBrowserFragmentV2 extends BaseFragment {
     }
 
 
-
     public interface WebBrowserFragmentActionListener {
         void updateTitle(String title);
 

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

@@ -244,43 +244,43 @@
             </FrameLayout>
 
 
-<!--            <FrameLayout-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_marginTop="@dimen/kycTextUpperMargin"-->
-<!--                android:layout_marginEnd="5dp"-->
-<!--                android:layout_marginRight="5dp"-->
-<!--                android:orientation="horizontal">-->
-
-<!--                <com.gmeremit.online.gmeremittance_native.customwidgets.GMETextInputLayout-->
-<!--                    android:id="@+id/occupationSelectionWrapper"-->
-<!--                    android:layout_width="match_parent"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:hint="@string/select_occupation_text"-->
-<!--                    android:textColorHint="@color/darkgray"-->
-<!--                    app:errorEnabled="true">-->
-
-<!--                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText-->
-<!--                        android:id="@+id/ed_occupation"-->
-<!--                        style="@style/editetxtsingleline"-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:layout_marginEnd="12dp"-->
-<!--                        android:layout_marginRight="12dp"-->
-<!--                        android:cursorVisible="false"-->
-<!--                        android:enabled="true"-->
-<!--                        android:focusable="false"-->
-<!--                        android:imeOptions="actionDone"-->
-<!--                        android:singleLine="false" />-->
-<!--                </com.gmeremit.online.gmeremittance_native.customwidgets.GMETextInputLayout>-->
-
-<!--                <ImageView-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:layout_gravity="center_vertical|end"-->
-<!--                    android:layout_marginBottom="8dp"-->
-<!--                    android:background="@drawable/ic_arrow_down" />-->
-<!--            </FrameLayout>-->
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/kycTextUpperMargin"
+                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
+                android:orientation="horizontal">
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GMETextInputLayout
+                    android:id="@+id/occupationSelectionWrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/select_occupation_text"
+                    android:textColorHint="@color/darkgray"
+                    app:errorEnabled="true">
+
+                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                        android:id="@+id/ed_occupation"
+                        style="@style/editetxtsingleline"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="12dp"
+                        android:layout_marginRight="12dp"
+                        android:cursorVisible="false"
+                        android:enabled="true"
+                        android:focusable="false"
+                        android:imeOptions="actionDone"
+                        android:singleLine="false" />
+                </com.gmeremit.online.gmeremittance_native.customwidgets.GMETextInputLayout>
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|end"
+                    android:layout_marginBottom="8dp"
+                    android:background="@drawable/ic_arrow_down" />
+            </FrameLayout>