coding
diff --git a/‎app/src/main/java/net/coding/program/setting/AccountSetting.java‎
Lines changed: 19 additions & 7 deletions b/‎app/src/main/java/net/coding/program/setting/AccountSetting.java‎
Lines changed: 19 additions & 7 deletions
diff --git a/‎app/src/main/java/net/coding/program/setting/ModifyEmailActivity.java‎
Lines changed: 10 additions & 0 deletions b/‎app/src/main/java/net/coding/program/setting/ModifyEmailActivity.java‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎common-coding/src/main/java/net/coding/program/common/model/UserObject.java‎
Lines changed: 4 additions & 0 deletions b/‎common-coding/src/main/java/net/coding/program/common/model/UserObject.java‎
Lines changed: 4 additions & 0 deletions
@@ -105,19 +105,31 @@ void emailLayout() {
         String emailString = GlobalData.sUserObject.email;
         boolean emailValid = GlobalData.sUserObject.isEmailValidation();
         if (!emailString.isEmpty() && !emailValid) {
-            new AlertDialog.Builder(this, R.style.MyAlertDialogStyle)
-                    .setTitle("激活邮件")
-                    .setMessage(R.string.alert_activity_email2)
-                    .setPositiveButton("重发激活邮件", (dialog, which) -> {
-                        Login.resendActivityEmail(AccountSetting.this);
-                    })
-                    .setNegativeButton("取消", null)
+            new AlertDialog.Builder(this)
+                    .setItems(new String[]{"修改邮箱", "重发激活邮件"}, ((dialog, which) -> {
+                        if (which == 1) {
+                            popResendEmailDialog();
+                        } else {
+                            ModifyEmailActivity_.intent(this).start();
+                        }
+                    }))
                     .show();
         } else {
             ModifyEmailActivity_.intent(this).start();
         }
     }
 
+    private void popResendEmailDialog() {
+        new AlertDialog.Builder(this, R.style.MyAlertDialogStyle)
+                .setTitle("激活邮件")
+                .setMessage(R.string.alert_activity_email2)
+                .setPositiveButton("重发激活邮件", (dialog, which) -> {
+                    Login.resendActivityEmail(AccountSetting.this);
+                })
+                .setNegativeButton("取消", null)
+                .show();
+    }
+
     @Click
     void close2FA() {
         Close2FAActivity_.intent(this).start();
 
@@ -66,6 +66,14 @@ protected void onDestroy() {
 
     @Override
     protected void afterMenuInit(MenuItem actionSend) {
+        if (!GlobalData.sUserObject.isEmailValidation() &&
+                !GlobalData.sUserObject.isPhoneValidation()) {
+            passwordEdit.setVisibility(View.GONE);
+            twoFAEdit.setVisibility(View.GONE);
+            ViewStyleUtil.editTextBindButton(actionSend, emailEdit, captchaEdit);
+            return;
+        }
+
         final String url = Global.HOST_API + "/user/2fa/method";
         MyAsyncHttpClient.get(this, url, new MyJsonResponse(this) {
             @Override
@@ -99,6 +107,8 @@ protected void actionSend() {
         }
         param.put("email", email);
         param.put("j_captcha", captch);
+
+
         param.put("two_factor_code", twoFA);
 
         MyAsyncHttpClient.post(this, url, param, new MyJsonResponse(this) {
 
@@ -306,6 +306,10 @@ public boolean isEmailValidation() {
         return email_validation != 0;
     }
 
+    public boolean isPhoneValidation() {
+        return phone_validation != 0;
+    }
+
     public boolean isFillInfo() {
         if (TextUtils.isEmpty(birthday) ||
                 TextUtils.isEmpty(location) ||