Skip to content

Commit 0ff5e11

Browse files
sicp618sicp618
committed
企业版删除成员需要两步认证
1 parent 507f3b5 commit 0ff5e11

6 files changed

Lines changed: 53 additions & 7 deletions

File tree

‎app/src/enterprise/java/net/coding/program/setting/ManageMemberActivity.java‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import net.coding.program.login.auth.AuthInfo;
3131
import net.coding.program.login.auth.TotpClock;
3232
import net.coding.program.network.BaseHttpObserver;
33+
import net.coding.program.network.HttpObserver;
3334
import net.coding.program.network.Network;
3435
import net.coding.program.network.constant.MemberAuthority;
3536

@@ -213,6 +214,23 @@ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object
213214
private EditText edit2fa;
214215

215216
private void actionRemove(TeamMember user) {
217+
Network.getRetrofit(this)
218+
.need2FA()
219+
.subscribeOn(Schedulers.io())
220+
.observeOn(AndroidSchedulers.mainThread())
221+
.subscribe(new HttpObserver<String>(ManageMemberActivity.this) {
222+
@Override
223+
public void onSuccess(String data) {
224+
if (data.equals("totp")) {
225+
actionRemove2FA(user);
226+
} else { // password
227+
actionRemoveNormal(user);
228+
}
229+
}
230+
});
231+
}
232+
233+
private void actionRemove2FA(TeamMember user) {
216234
hander2fa.sendEmptyMessage(0);
217235
LayoutInflater factory = LayoutInflater.from(this);
218236
final View textEntryView = factory.inflate(R.layout.dialog_delete_project_2fa, null);
@@ -237,6 +255,30 @@ private void actionRemove(TeamMember user) {
237255
});
238256
}
239257

258+
private void actionRemoveNormal(TeamMember user) {
259+
LayoutInflater factory = LayoutInflater.from(this);
260+
final View textEntryView = factory.inflate(R.layout.dialog_delete_project, null);
261+
edit2fa = textEntryView.findViewById(R.id.edit1);
262+
AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.MyAlertDialogStyle);
263+
AlertDialog dialog = builder
264+
.setView(textEntryView)
265+
.setPositiveButton("确定", (dialog1, whichButton) -> {
266+
String editStr1 = edit2fa.getText().toString().trim();
267+
if (TextUtils.isEmpty(editStr1)) {
268+
Toast.makeText(ManageMemberActivity.this, "密码不能为空", Toast.LENGTH_LONG).show();
269+
return;
270+
}
271+
actionDelete2FA(user, editStr1);
272+
})
273+
.setNegativeButton("取消", null)
274+
.show();
275+
276+
dialog.setOnDismissListener(dialog1 -> {
277+
hander2fa.removeMessages(0);
278+
edit2fa = null;
279+
});
280+
}
281+
240282
private void actionDelete2FA(TeamMember user, String code) {
241283
Network.getRetrofit(this)
242284
.removeEnterpriseMember(GlobalData.getEnterpriseGK(), user.user.global_key, code)

‎app/src/main/java/net/coding/program/project/init/setting/ProjectAdvanceSetBaseActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private void showDeleteDialog2fa() {
108108
hander2fa.sendEmptyMessage(0);
109109
LayoutInflater factory = LayoutInflater.from(this);
110110
final View textEntryView = factory.inflate(R.layout.dialog_delete_project_2fa, null);
111-
edit2fa = (EditText) textEntryView.findViewById(R.id.edit1);
111+
edit2fa = textEntryView.findViewById(R.id.edit1);
112112
AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.MyAlertDialogStyle);
113113
AlertDialog dialog = builder
114114
.setView(textEntryView)

‎app/src/main/res/layout/activity_login.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
android:id="@+id/edit2FA"
153153
style="@style/EditLogin"
154154
android:layout_marginTop="25dp"
155-
android:hint="动态验证码"
155+
android:hint="两步验证码"
156156
android:imeOptions="actionUnspecified"
157157
android:inputType="number"
158158
app:dark="true" />

‎app/src/main/res/layout/dialog_delete_project.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
android:autoText="false"
4141
android:background="@drawable/edit"
4242
android:capitalize="none"
43+
android:hint="输入登录密码"
4344
android:gravity="fill_horizontal"
4445
android:inputType="textPassword"
4546
android:scrollHorizontally="true"

‎app/src/main/res/layout/dialog_delete_project_2fa.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@
4040
android:autoText="false"
4141
android:background="@drawable/edit"
4242
android:capitalize="none"
43+
android:singleLine="true"
4344
android:gravity="fill_horizontal"
44-
android:hint="请输入动态验证码"
45+
android:hint="输入两步验证码"
4546
android:scrollHorizontally="true"
4647
android:textAppearance="?android:attr/textAppearanceMedium" />
4748
</LinearLayout>

‎app/src/main/res/layout/init_fragment_project_set.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
android:layout_width="60dp"
2525
android:layout_height="60dp"
2626
android:background="@drawable/round_icon_path"
27+
android:layout_marginRight="8dp"
2728
android:src="@color/font_black">
2829

2930
<ImageView
@@ -46,9 +47,10 @@
4647

4748
<View
4849
android:id="@+id/iconPrivate"
49-
android:layout_width="18dp"
50-
android:layout_height="18dp"
51-
android:layout_marginLeft="14dp"
50+
android:layout_width="16dp"
51+
android:layout_height="16dp"
52+
android:layout_marginTop="2dp"
53+
android:layout_marginLeft="8dp"
5254
android:background="@drawable/ic_share_project1"
5355
android:layout_marginRight="-4dp"
5456
tools:visibility="visible"
@@ -60,7 +62,7 @@
6062
android:layout_height="wrap_content"
6163
android:layout_marginLeft="8dp"
6264
android:singleLine="true"
63-
android:text="Medium Text"
65+
android:text="这是 Coding 的客户端"
6466
android:background="@null"
6567
android:textColor="@color/font_1"
6668
android:textSize="16sp" />

0 commit comments

Comments
 (0)