messenger release 1.8.1.1

- Fixed #87 push registration update scenarios, refresh on install.
- Added warning when registration id is out of sync from exchange.

Author: Michael Farb

safeslinger-messenger/AndroidManifest.xml

@@ -25,8 +25,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="edu.cmu.cylab.starslinger"
-    android:versionCode="0x01080100"
-    android:versionName="1.8.1" >
+    android:versionCode="0x01080101"
+    android:versionName="1.8.1.1" >
 
     <!-- API 9 is the minimum required for password-based encryption PBKDF2WithHmacSHA1. -->
     <!-- API 8 is the minimum required to receive push messages. -->

safeslinger-messenger/res/values/strings.xml

@@ -335,6 +335,8 @@
     <string name="label_Device">Device:</string>
     <!-- screen label (match English casing); used in many UIs to show that receiving push messages is not supported. -->
     <string name="label_DeviceInSendOnlyMode">Send-only mode</string>
+    <!-- error message (sentence case, period); used to warn the user that the push registration ID in the Recipients list screen has been exchanged once before with a different push registration from this user. -->
+    <string name="label_DisabledExchPushRegChange">Your device has changed: Sling Keys again.</string>
     <!-- error message (sentence case, period); used to warn the user that the key in the Recipients list screen has been exchanged once before with a different key from this user. -->
     <string name="label_DisabledExchSourceKeyChange">Your key has changed: Sling Keys again.</string>
     <!-- screen label (match English casing); used to remind users that an invite is only the beginning, and to Sling Keys before communicating. -->

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

@@ -397,11 +397,15 @@ public static void setRemindBackupDelay(boolean remindBackupDelay) {
     }
 
     public static String getPushRegistrationId() {
-        return getString(pref.PUSH_REGISTRATION_ID_DIRECT, null, false);
+        // add version to get updated push registration every new release
+        return getString(pref.PUSH_REGISTRATION_ID_DIRECT + SafeSlingerConfig.getVersionName(),
+                null, false);
     }
 
     public static void setPushRegistrationIdWriteOnlyC2dm(String registrationId) {
-        setString(pref.PUSH_REGISTRATION_ID_DIRECT, registrationId, false);
+        // add version to get updated push registration every new release
+        setString(pref.PUSH_REGISTRATION_ID_DIRECT + SafeSlingerConfig.getVersionName(),
+                registrationId, false);
     }
 
     public static long getBackupRequestDate() {

safeslinger-messenger/src/edu/cmu/cylab/starslinger/model/RecipientRow.java

@@ -76,7 +76,24 @@ public static RecipientRow createKeyIdOnlyRecipient(String keyid) {
 
     public boolean hasMyKeyChanged() {
         String myKeyId = SafeSlingerPrefs.getKeyIdString();
-        return (myKeyId == null ? false : !(myKeyId.compareTo(mMyKeyId) == 0));
+        if (myKeyId == null) {
+            return false;
+        } else if (mMyKeyId == null) {
+            return myKeyId.equals(mMyKeyId);
+        } else {
+            return (myKeyId.compareTo(mMyKeyId) != 0);
+        }
+    }
+
+    public boolean hasMyPushRegChanged() {
+        String myPushReg = SafeSlingerPrefs.getPushRegistrationId();
+        if (myPushReg == null) {
+            return false;
+        } else if (mMyPushToken == null) {
+            return myPushReg.equals(mMyPushToken);
+        } else {
+            return (myPushReg.compareTo(mMyPushToken) != 0);
+        }
     }
 
     public boolean isDeprecated() {
@@ -107,7 +124,7 @@ public boolean isRegistered() {
 
     public boolean isSendable() {
         return (mActive && isRegistered() && isPushable() && !isDeprecated()
-                && isFromTrustedSource() && !hasMyKeyChanged());
+                && isFromTrustedSource() && !hasMyKeyChanged() && !hasMyPushRegChanged());
     }
 
     public boolean isInvited() {

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

@@ -386,9 +386,10 @@ public void doSlingKeys() {
     public void doRecipientSelection(RecipientRow recip) {
         boolean pushable = recip.isPushable();
         boolean fromExch = recip.isFromTrustedSource();
-        boolean secretChanged = recip.hasMyKeyChanged();
+        boolean keyChanged = recip.hasMyKeyChanged();
+        boolean pushChanged = recip.hasMyPushRegChanged();
         boolean deprecated = recip.isDeprecated();
-        boolean useableKey = pushable && !secretChanged && !deprecated && fromExch;
+        boolean useableKey = pushable && !keyChanged && !pushChanged && !deprecated && fromExch;
         if (useableKey) {
             Intent data = new Intent();
             data.putExtra(extra.RECIPIENT_ROW_ID, recip.getRowId());

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

@@ -103,10 +103,11 @@ private void drawRecipientRow(View convertView, RecipientRow recip) {
         // ensure only push-compatible recipients
         boolean pushable = recip.isPushable();
         boolean fromExch = recip.isFromTrustedSource();
-        boolean secretChanged = recip.hasMyKeyChanged();
+        boolean keyChanged = recip.hasMyKeyChanged();
+        boolean pushChanged = recip.hasMyPushRegChanged();
         boolean deprecated = recip.isDeprecated();
         boolean registered = recip.isRegistered();
-        boolean useableKey = pushable && !secretChanged && !deprecated && fromExch;
+        boolean useableKey = pushable && !keyChanged && !pushChanged && !deprecated && fromExch;
         boolean invited = recip.isInvited();
         StringBuilder detailStr = new StringBuilder();
 
@@ -200,7 +201,12 @@ private void drawRecipientRow(View convertView, RecipientRow recip) {
             err.append(" ");
             err.append(mContext.getText(R.string.label_TapToSlingKeys));
             tvError.setTextAppearance(mContext, R.style.fromDirectionAvailableText);
-        } else if (secretChanged) { // error: their key out of date
+        } else if (pushChanged) { // error: their push reg is out of date
+            if (err.length() > 0)
+                err.append("\n");
+            err.append(mContext.getText(R.string.label_DisabledExchPushRegChange));
+            tvError.setTextAppearance(mContext, R.style.fromFileExpiredText);
+        } else if (keyChanged) { // error: their key out of date
             if (err.length() > 0)
                 err.append("\n");
             err.append(mContext.getText(R.string.label_DisabledExchSourceKeyChange));