Merge remote-tracking branch 'origin/master'

xidian-rs · Aug 1, 2018 · 7a4f482 · 7a4f482
2 parents 598d107 + 3fad6d0
commit 7a4f482
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -107,7 +107,7 @@
         <activity android:name=".activity.ReplyCzActivity" />
         <activity android:name=".activity.ThemeActivity" />
         <activity android:name=".activity.ChangePasswordActivity" />
-        <activity android:name=".activity.ForgetPasswordActivity"></activity>
+        <activity android:name=".activity.ForgetPasswordActivity" />
     </application>
 
-</manifest>
+</manifest>
diff --git a/app/src/main/java/me/yluo/ruisiapp/activity/ForgetPasswordActivity.java b/app/src/main/java/me/yluo/ruisiapp/activity/ForgetPasswordActivity.java
@@ -42,15 +42,10 @@ protected void onCreate(Bundle savedInstanceState) {
         btnSubmit = findViewById(R.id.btn_submit);
         emailTextInput = findViewById(R.id.email_input);
         TextView infoView = findViewById(R.id.info_view);
-
-        String urlReplace = App.BASE_URL_ME.replace("http://", "");
-        urlReplace = urlReplace.substring(0, urlReplace.lastIndexOf("/"));
-
-        infoView.setText("注意: 外网用户无法访问邮件里面的找回密码链接，需要将域名修改为外网域名["
-                + urlReplace
-                + "]并加上尾缀[&mobile=2]\n举例: 原始链接[http://rs.xidian.edu.cn/xxx]\n" +
-                "修改后: [" + App.BASE_URL_ME + "xxx&mobile=2]");
-
+        infoView.setText("外网用户无法访问邮件里面的找回密码链接，需要将域名修改为外网域名"
+                + App.BASE_URL_ME
+                + "并加上尾缀&mobile=2\n举例:原始链接[http://rs.xidian.edu.cn/xxx]\n修改后:["
+                + App.BASE_URL_ME + "xxx&mobile=2]");
         btnSubmit.setOnClickListener(v -> submit());
         edEmail.addTextChangedListener(new TextWatcher() {
             @Override