Add yubikey default PIN preference

1 files changed, 17 insertions, 5 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
index 64c1e16be..1221966e1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
@@ -53,11 +53,6 @@ public class PreferencesActivity extends PreferenceActivity {
         sPreferences = Preferences.getPreferences(this);
         super.onCreate(savedInstanceState);
 
-//        final ActionBar actionBar = getSupportActionBar();
-//        actionBar.setDisplayShowTitleEnabled(true);
-//        actionBar.setDisplayHomeAsUpEnabled(false);
-//        actionBar.setHomeButtonEnabled(false);
-
         String action = getIntent().getAction();
 
         if (action != null && action.equals(ACTION_PREFS_GEN)) {
@@ -122,6 +117,9 @@ public class PreferencesActivity extends PreferenceActivity {
             initializeWriteVersionHeader(
                     (CheckBoxPreference) findPreference(Constants.Pref.WRITE_VERSION_HEADER));
 
+            initializeUseDefaultYubikeyPin(
+                    (CheckBoxPreference) findPreference(Constants.Pref.USE_DEFAULT_YUBIKEY_PIN));
+
         } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
             // Load the legacy preferences headers
             addPreferencesFromResource(R.xml.preference_headers_legacy);
@@ -265,6 +263,9 @@ public class PreferencesActivity extends PreferenceActivity {
 
             initializeWriteVersionHeader(
                     (CheckBoxPreference) findPreference(Constants.Pref.WRITE_VERSION_HEADER));
+
+            initializeUseDefaultYubikeyPin(
+                    (CheckBoxPreference) findPreference(Constants.Pref.USE_DEFAULT_YUBIKEY_PIN));
         }
     }
 
@@ -396,4 +397,15 @@ public class PreferencesActivity extends PreferenceActivity {
             }
         });
     }
+
+    private static void initializeUseDefaultYubikeyPin(final CheckBoxPreference mUseDefaultYubikeyPin) {
+        mUseDefaultYubikeyPin.setChecked(sPreferences.useDefaultYubikeyPin());
+        mUseDefaultYubikeyPin.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                mUseDefaultYubikeyPin.setChecked((Boolean) newValue);
+                sPreferences.setUseDefaultYubikeyPin((Boolean) newValue);
+                return false;
+            }
+        });
+    }
 }