bug fix

src/main/java/com/common/activity/AgreementPolicyActivity.java

@@ -49,6 +49,11 @@ public class AgreementPolicyActivity extends BaseActivity {
         new EasyActivityResult(activity).startForResult(intent, requestCode, listener);
     }
 
+    public static void startForResult(FragmentActivity activity, int requestCode, EasyActivityResult.OnResultListener listener) {
+        Intent intent = new Intent(activity, AgreementPolicyActivity.class);
+        new EasyActivityResult(activity).startForResult(intent, requestCode, listener);
+    }
+
     CheckBox mCheckBox;
     WebView webView;
 
@@ -65,21 +70,28 @@ public class AgreementPolicyActivity extends BaseActivity {
 
     @Override
     public void initView() {
-        agreementType = (Type) getIntent().getSerializableExtra("agreementType");
+        if (getIntent().getSerializableExtra("agreementType") != null) {
+            agreementType = (Type) getIntent().getSerializableExtra("agreementType");
+        }
         EventBus.getDefault().register(this);
         mCheckBox = findViewById(R.id.activity_policy_checkbox);
         webView = findViewById(R.id.activity_policy_webview);
-
         UIHelper.bindClickListener(getContentView(), new OnEventClickListener() {
             @Override
             public void onEventClick(View v) {
                 if (v.getId() == R.id.activity_policy_ok_btn) {
                     if (mCheckBox.isChecked()) {
+                        if (agreementType == null) {
+                            PreferencesManager.get().setPolicyStatus(true);
+                            setResult(RESULT_OK);
+                            finish();
+                            return;
+                        }
                         switch (agreementType) {
                             case AGREEMENT_POLICY:
                                 PreferencesManager.get().setPolicyStatus(true);
                                 AgreementPolicyActivity.startForResult(AgreementPolicyActivity.this, Type.AGREEMENT_KSP, 0, (requestCode, resultCode, data) -> {
-                                    if(resultCode==RESULT_OK){
+                                    if (resultCode == RESULT_OK) {
                                         setResult(Activity.RESULT_OK);
                                     }
                                     finish();
@@ -98,7 +110,14 @@ public class AgreementPolicyActivity extends BaseActivity {
                 }
             }
         }, R.id.activity_policy_ok_btn);
-        String policyUrl = agreementType == Type.AGREEMENT_POLICY ? Gateway.getAgreementPolicyUrl() : Gateway.getKSPUrl();
+
+        String policyUrl;
+        if (agreementType != Type.AGREEMENT_KSP) {
+            policyUrl = Gateway.getAgreementPolicyUrl();
+        } else {
+            policyUrl = Gateway.getKSPUrl();
+        }
+
         if (!TextUtils.isEmpty(policyUrl)) {
             webView.loadUrl(policyUrl);
         }