Simplify prefs

2 files changed, 17 insertions, 5 deletions

diff --git a/src/main/java/org/openintents/openpgp/util/OpenPgpAppPreference.java b/src/main/java/org/openintents/openpgp/util/OpenPgpAppPreference.java
index a69bd31..3e1cbf9 100644
--- a/src/main/java/org/openintents/openpgp/util/OpenPgpAppPreference.java
+++ b/src/main/java/org/openintents/openpgp/util/OpenPgpAppPreference.java
@@ -162,6 +162,12 @@ public class OpenPgpAppPreference extends DialogPreference {
             return;
         }
 
+        setAndPersist(mSelectedPackage);
+    }
+
+    private void setAndPersist(String packageName) {
+        mSelectedPackage = packageName;
+
         // Save to persistent storage (this method will make sure this
         // preference should be persistent, along with other useful checks)
         persistString(mSelectedPackage);
@@ -173,6 +179,7 @@ public class OpenPgpAppPreference extends DialogPreference {
         setSummary(getEntry());
     }
 
+
     private int getIndexOfProviderList(String packageName) {
         for (OpenPgpProviderEntry app : mList) {
             if (app.packageName.equals(packageName)) {
@@ -191,6 +198,10 @@ public class OpenPgpAppPreference extends DialogPreference {
         return mSelectedPackage;
     }
 
+    public void setValue(String packageName) {
+        setAndPersist(mSelectedPackage);
+    }
+
     @Override
     protected Object onGetDefaultValue(TypedArray a, int index) {
         return a.getString(index);
@@ -206,9 +217,7 @@ public class OpenPgpAppPreference extends DialogPreference {
         } else {
             // Set state
             String value = (String) defaultValue;
-            mSelectedPackage = value;
-            persistString(value);
-            setSummary(getEntry());
+            setAndPersist(value);
         }
     }
 
diff --git a/src/main/java/org/openintents/openpgp/util/OpenPgpKeyPreference.java b/src/main/java/org/openintents/openpgp/util/OpenPgpKeyPreference.java
index 725d3c4..e5bd8ea 100644
--- a/src/main/java/org/openintents/openpgp/util/OpenPgpKeyPreference.java
+++ b/src/main/java/org/openintents/openpgp/util/OpenPgpKeyPreference.java
@@ -142,6 +142,10 @@ public class OpenPgpKeyPreference extends Preference {
             return;
         }
 
+        setAndPersist(newValue);
+    }
+
+    private void setAndPersist(long newValue) {
         mKeyId = newValue;
 
         // Save to persistent storage (this method will make sure this
@@ -167,8 +171,7 @@ public class OpenPgpKeyPreference extends Preference {
         } else {
             // Set state
             long value = (Long) defaultValue;
-            mKeyId = value;
-            persistLong(value);
+            setAndPersist(value);
         }
     }