corrected loading the settings view

- Fixed #101 NullPointerException in SettingsActivity

Author: Michael Farb

safeslinger-messenger/res/xml/ss_preferences.xml

@@ -95,7 +95,7 @@
             android:title="@string/menu_auto_attach_retrieval" />
         -->
         <Preference
-            android:key="PushRegistrationIdDirect"
+            android:key="PushRegistrationIdLinkedDisplay"
             android:persistent="false"
             android:title="@string/label_PushTokenID" />
         <Preference

safeslinger-messenger/src/edu/cmu/cylab/starslinger/SafeSlingerPrefs.java

@@ -121,6 +121,7 @@ public static final class pref {
         public static final String PENDING_GETMSG_BACKOFF_TIMEOUT = "PendingGetMessageBackoff";
         public static final String PUSH_BACKOFF = "PushBackoff";
         public static final String PUSH_REG_ID_LINKED = "PushRegistrationIdLinked";
+        public static final String PUSH_REG_ID_LINKED_DISPLAY = "PushRegistrationIdLinkedDisplay";
         public static final String PUSH_REG_ID_POSTED = "PushRegistrationIdPosted";
         public static final String PUSHREG_BACKOFF_TIMEOUT = "pushRegistrationBackoff";
         public static final String REMIND_BACKUP_DELAY = "RemindBackupDelay";
@@ -420,7 +421,11 @@ public static void setPushRegistrationIdPosted(boolean registrationIdPosted) {
 
     public static String getPushRegistrationId() {
         // add version to get updated push registration every new release
-        return getString(pref.PUSH_REG_ID_LINKED + SafeSlingerConfig.getVersionName(), null, false);
+        final String registrationId = getString(
+                pref.PUSH_REG_ID_LINKED + SafeSlingerConfig.getVersionName(), null, false);
+        // set a simple display to allow preferences to view an accurate id
+        setString(pref.PUSH_REG_ID_LINKED_DISPLAY, registrationId, false);
+        return registrationId;
     }
 
     public static void setPushRegistrationId(String registrationId) {

safeslinger-messenger/src/edu/cmu/cylab/starslinger/view/SettingsActivity.java

@@ -140,7 +140,7 @@ private void setPrefs() {
         mRemindBackupDelay = (CheckBoxPreference) findPreference(SafeSlingerPrefs.pref.REMIND_BACKUP_DELAY);
         mPassPhraseCacheTtl = (IntegerListPreference) findPreference(SafeSlingerPrefs.pref.PASSPHRASE_CACHE_TTL);
         mContactName = (EditTextPreference) findPreference(SafeSlingerPrefs.pref.CONTACT_NAME);
-        mContactPushToken = findPreference(SafeSlingerPrefs.pref.PUSH_REG_ID_LINKED);
+        mContactPushToken = findPreference(SafeSlingerPrefs.pref.PUSH_REG_ID_LINKED_DISPLAY);
         mContactPubKeyId = findPreference(SafeSlingerPrefs.pref.KEYID_STRING);
         mBackupRequestDate = findPreference(SafeSlingerPrefs.pref.BACKUP_REQUEST_DATE);
         mBackupCompleteDate = findPreference(SafeSlingerPrefs.pref.BACKUP_COMPLETE_DATE);