From 4c9d08ea8d6a6c28a7559cebea71c75d3fbf57b8 Mon Sep 17 00:00:00 2001 From: fengyue Date: Sun, 10 Jan 2021 09:54:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=81=E5=AF=86=E4=B9=A6?= =?UTF-8?q?=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java | 4 +++- .../java/xyz/fycz/myreader/ui/fragment/WebDavFragment.java | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java b/app/src/main/java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java index d4ce4ee..8907ae6 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java +++ b/app/src/main/java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java @@ -89,7 +89,9 @@ public class MyAlertDialog { imm.toggleSoftInput(0, InputMethodManager.SHOW_FORCED); }) .setNegativeButton("取消", (dialog, which) -> { - negListener.onClick(dialog, which); + if (negListener != null) { + negListener.onClick(dialog, which); + } imm.toggleSoftInput(0, InputMethodManager.SHOW_FORCED); }) .show(); diff --git a/app/src/main/java/xyz/fycz/myreader/ui/fragment/WebDavFragment.java b/app/src/main/java/xyz/fycz/myreader/ui/fragment/WebDavFragment.java index 0d88f44..91832fc 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/fragment/WebDavFragment.java +++ b/app/src/main/java/xyz/fycz/myreader/ui/fragment/WebDavFragment.java @@ -84,13 +84,17 @@ public class WebDavFragment extends BaseFragment { llWebdavUrl.setOnClickListener(v -> { MyAlertDialog.createInputDia(getContext(), getString(R.string.webdav_url), "", webdavUrl.equals(APPCONST.DEFAULT_WEB_DAV_URL) ? - "" : webdavUrl, true, 100, + "" : webdavUrl, InputType.TYPE_CLASS_TEXT,true, 100, text -> webdavTexts[0] = text, (dialog, which) -> { webdavUrl = webdavTexts[0]; tvWebdavUrl.setText(webdavUrl); SharedPreUtils.getInstance().putString("webdavUrl", webdavUrl); dialog.dismiss(); + }, null, "恢复默认", (dialog, which) -> { + webdavUrl = APPCONST.DEFAULT_WEB_DAV_URL; + tvWebdavUrl.setText(webdavUrl); + SharedPreUtils.getInstance().putString("webdavUrl", webdavUrl); }); }); llWebdavAccount.setOnClickListener(v -> {