Merge pull request #2751 from wmathurin/unexpected_logout

Author: wmathurin

libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKUpgradeManager.java

@@ -130,6 +130,9 @@ else if (installedVersion.isGreaterThanOrEqualTo(new SdkVersion(9, 2, 0, false))
             if (installedVersion.isLessThan(new SdkVersion(12, 0, 0, false))) {
                 updateFromBefore12_0_0();
             }
+            if (installedVersion.isLessThan(new SdkVersion(13, 0, 2, false))) {
+                updateFromBefore13_0_2();
+            }
         } catch (Exception e) {
             SalesforceSDKLogger.e(
                     TAG,
@@ -306,4 +309,8 @@ private void updateFromBefore12_0_0() {
         PushMessaging.setReRegistrationRequested(true);
     }
 
+    private void updateFromBefore13_0_2() {
+        // Re-register all users for push notifications with new keys once push is setup
+        PushMessaging.setReRegistrationRequested(true);
+    }
 }

libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/app/SalesforceSDKUpgradeManagerTest.kt

@@ -156,9 +156,24 @@ class SalesforceSDKUpgradeManagerTest {
     }
 
     @Test
-    fun testUpgradeAfter12() {
+    fun testUpgradeFromBefore1302() {
+        // Set version to a version before 13.0.2
+        setVersion("12.2.0")
+
+        // Create public key for push notifications
+        KeyStoreWrapper.getInstance().getRSAPublicString(PushService.pushNotificationKeyName)
+
+        // Upgrade to latest
+        upgradeMgr.upgrade()
+
+        // Make sure re-registration is requested
+        Assert.assertTrue(PushMessaging.reRegistrationRequested)
+    }
+
+    @Test
+    fun testUpgradeAfter1302() {
         // Set version to 12.0.0
-        setVersion("12.0.0")
+        setVersion("13.0.2")
 
         // Create public key for push notifications
         KeyStoreWrapper.getInstance().getRSAPublicString(PushService.pushNotificationKeyName)