From d017aa9a3b7fc53f4801096d8ba87021f4e7e056 Mon Sep 17 00:00:00 2001 From: Bananeweizen Date: Thu, 19 Dec 2013 16:36:34 +0100 Subject: refactoring: simplify confirmation dialogs, remove duplicate code --- .../geocaching/settings/AbstractCheckCredentialsPreference.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java') diff --git a/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java b/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java index 69f6188..d3aae5c 100644 --- a/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java +++ b/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java @@ -4,6 +4,7 @@ import cgeo.geocaching.R; import cgeo.geocaching.activity.ActivityMixin; import cgeo.geocaching.enumerations.StatusCode; import cgeo.geocaching.network.Cookies; +import cgeo.geocaching.ui.dialog.Dialogs; import cgeo.geocaching.utils.Log; import org.apache.commons.lang3.StringUtils; @@ -60,13 +61,9 @@ public abstract class AbstractCheckCredentialsPreference extends Preference { } if (msg.obj == null || (msg.obj instanceof Drawable)) { - ActivityMixin.helpDialog(activity, - res.getString(R.string.init_login_popup), - res.getString(R.string.init_login_popup_ok), - (Drawable) msg.obj); + Dialogs.message(activity, R.string.init_login_popup, R.string.init_login_popup_ok, (Drawable) msg.obj); } else { - ActivityMixin.helpDialog(activity, - res.getString(R.string.init_login_popup), + Dialogs.message(activity, R.string.init_login_popup, res.getString(R.string.init_login_popup_failed_reason) + " " + ((StatusCode) msg.obj).getErrorString(res) -- cgit v1.1