From 1965b3eebd7db9919b1244d90d64b61b14d1a133 Mon Sep 17 00:00:00 2001 From: Bananeweizen Date: Sun, 15 Sep 2013 09:15:53 +0200 Subject: refactoring: remove duplicated code * AuthorizeTwitterPreference and AuthorizeOcPreference do the same --- .../geocaching/settings/AuthorizeOcPreference.java | 80 --------------------- .../settings/AuthorizeTwitterPreference.java | 46 ------------ .../cgeo/geocaching/settings/OAuthPreference.java | 82 ++++++++++++++++++++++ .../cgeo/geocaching/settings/SettingsActivity.java | 3 + 4 files changed, 85 insertions(+), 126 deletions(-) delete mode 100644 main/src/cgeo/geocaching/settings/AuthorizeOcPreference.java delete mode 100644 main/src/cgeo/geocaching/settings/AuthorizeTwitterPreference.java create mode 100644 main/src/cgeo/geocaching/settings/OAuthPreference.java (limited to 'main/src') diff --git a/main/src/cgeo/geocaching/settings/AuthorizeOcPreference.java b/main/src/cgeo/geocaching/settings/AuthorizeOcPreference.java deleted file mode 100644 index ddf349e..0000000 --- a/main/src/cgeo/geocaching/settings/AuthorizeOcPreference.java +++ /dev/null @@ -1,80 +0,0 @@ -package cgeo.geocaching.settings; - -import cgeo.geocaching.CgeoApplication; -import cgeo.geocaching.R; -import cgeo.geocaching.connector.oc.OCDEAuthorizationActivity; -import cgeo.geocaching.connector.oc.OCPLAuthorizationActivity; - -import android.content.Context; -import android.content.Intent; -import android.preference.Preference; -import android.util.AttributeSet; -import android.view.View; -import android.view.ViewGroup; - -public class AuthorizeOcPreference extends Preference { - - private static final int NO_KEY = -1; - - private enum OCAuthorizations { - NONE(NO_KEY, null), - OCDE(R.string.pref_fakekey_ocde_authorization, OCDEAuthorizationActivity.class), - OCPL(R.string.pref_fakekey_ocpl_authorization, OCPLAuthorizationActivity.class); - - public int prefKeyId; - public Class authActivity; - - OCAuthorizations(int prefKeyId, Class clazz) { - this.prefKeyId = prefKeyId; - this.authActivity = clazz; - } - } - - private final OCAuthorizations ocAuth; - - private OCAuthorizations getAuthorization() { - final String prefKey = getKey(); - for (OCAuthorizations auth : OCAuthorizations.values()) { - if (auth.prefKeyId != NO_KEY && prefKey.equals(CgeoApplication.getInstance().getString(auth.prefKeyId))) { - return auth; - } - } - return OCAuthorizations.NONE; - } - - public AuthorizeOcPreference(Context context) { - super(context); - this.ocAuth = getAuthorization(); - } - - public AuthorizeOcPreference(Context context, AttributeSet attrs) { - super(context, attrs); - this.ocAuth = getAuthorization(); - } - - public AuthorizeOcPreference(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - this.ocAuth = getAuthorization(); - } - - @Override - protected View onCreateView(ViewGroup parent) { - final SettingsActivity activity = (SettingsActivity) getContext(); - - setOnPreferenceClickListener(new OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - if (ocAuth.authActivity != null) { - Intent authIntent = new Intent(preference.getContext(), - ocAuth.authActivity); - activity.startActivityForResult(authIntent, - ocAuth.prefKeyId); - } - return false; // no shared preference has to be changed - } - }); - - activity.setOcAuthTitle(ocAuth.prefKeyId); - return super.onCreateView(parent); - } -} diff --git a/main/src/cgeo/geocaching/settings/AuthorizeTwitterPreference.java b/main/src/cgeo/geocaching/settings/AuthorizeTwitterPreference.java deleted file mode 100644 index 1fdd0de..0000000 --- a/main/src/cgeo/geocaching/settings/AuthorizeTwitterPreference.java +++ /dev/null @@ -1,46 +0,0 @@ -package cgeo.geocaching.settings; - -import cgeo.geocaching.R; -import cgeo.geocaching.twitter.TwitterAuthorizationActivity; - -import android.content.Context; -import android.content.Intent; -import android.preference.Preference; -import android.util.AttributeSet; -import android.view.View; -import android.view.ViewGroup; - -public class AuthorizeTwitterPreference extends Preference { - - public AuthorizeTwitterPreference(Context context) { - super(context); - } - - public AuthorizeTwitterPreference(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public AuthorizeTwitterPreference(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - } - - @Override - protected View onCreateView(ViewGroup parent) { - final SettingsActivity activity = (SettingsActivity) getContext(); - - setOnPreferenceClickListener(new OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - Intent authIntent = new Intent(preference.getContext(), - TwitterAuthorizationActivity.class); - activity.startActivityForResult(authIntent, - R.string.pref_fakekey_twitter_authorization); - - return false; // no shared preference has to be changed - } - }); - - activity.setTwitterAuthTitle(); - return super.onCreateView(parent); - } -} diff --git a/main/src/cgeo/geocaching/settings/OAuthPreference.java b/main/src/cgeo/geocaching/settings/OAuthPreference.java new file mode 100644 index 0000000..3550947 --- /dev/null +++ b/main/src/cgeo/geocaching/settings/OAuthPreference.java @@ -0,0 +1,82 @@ +package cgeo.geocaching.settings; + +import cgeo.geocaching.CgeoApplication; +import cgeo.geocaching.R; +import cgeo.geocaching.connector.oc.OCDEAuthorizationActivity; +import cgeo.geocaching.connector.oc.OCPLAuthorizationActivity; +import cgeo.geocaching.twitter.TwitterAuthorizationActivity; + +import android.content.Context; +import android.content.Intent; +import android.preference.Preference; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewGroup; + +public class OAuthPreference extends Preference { + + private static final int NO_KEY = -1; + + private enum OAuthActivityMapping { + NONE(NO_KEY, null), + OCDE(R.string.pref_fakekey_ocde_authorization, OCDEAuthorizationActivity.class), + OCPL(R.string.pref_fakekey_ocpl_authorization, OCPLAuthorizationActivity.class), + TWITTER(R.string.pref_fakekey_twitter_authorization, TwitterAuthorizationActivity.class); + + public int prefKeyId; + public Class authActivity; + + OAuthActivityMapping(int prefKeyId, Class clazz) { + this.prefKeyId = prefKeyId; + this.authActivity = clazz; + } + } + + private final OAuthActivityMapping oAuthMapping; + + private OAuthActivityMapping getAuthorization() { + final String prefKey = getKey(); + for (OAuthActivityMapping auth : OAuthActivityMapping.values()) { + if (auth.prefKeyId != NO_KEY && prefKey.equals(CgeoApplication.getInstance().getString(auth.prefKeyId))) { + return auth; + } + } + return OAuthActivityMapping.NONE; + } + + public OAuthPreference(Context context) { + super(context); + this.oAuthMapping = getAuthorization(); + } + + public OAuthPreference(Context context, AttributeSet attrs) { + super(context, attrs); + this.oAuthMapping = getAuthorization(); + } + + public OAuthPreference(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + this.oAuthMapping = getAuthorization(); + } + + @Override + protected View onCreateView(ViewGroup parent) { + final SettingsActivity activity = (SettingsActivity) getContext(); + + setOnPreferenceClickListener(new OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + if (oAuthMapping.authActivity != null) { + Intent authIntent = new Intent(preference.getContext(), + oAuthMapping.authActivity); + activity.startActivityForResult(authIntent, + oAuthMapping.prefKeyId); + } + return false; // no shared preference has to be changed + } + }); + + activity.setOcAuthTitle(oAuthMapping.prefKeyId); + return super.onCreateView(parent); + } +} diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java index e2b9b9b..df9e36f 100644 --- a/main/src/cgeo/geocaching/settings/SettingsActivity.java +++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java @@ -407,6 +407,9 @@ public class SettingsActivity extends PreferenceActivity { case R.string.pref_fakekey_ocpl_authorization: setOCPLAuthTitle(); break; + case R.string.pref_fakekey_twitter_authorization: + setTwitterAuthTitle(); + break; default: Log.e(String.format(Locale.ENGLISH, "Invalid key %d in SettingsActivity.setTitle()", prefKeyId)); } -- cgit v1.1