Minor improvements

Author: vbabenkoru

iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java

@@ -219,8 +219,7 @@ public static void initialize(Context context, String apiKey, IterableConfig con
         }
         sharedInstance.sdkCompatEnabled = false;
         sharedInstance.retrieveEmailAndUserId();
-        if (sharedInstance.config.autoPushRegistration &&
-                (sharedInstance._email != null || sharedInstance._userId != null)) {
+        if (sharedInstance.config.autoPushRegistration && sharedInstance.isInitialized()) {
             sharedInstance.registerForPush();
         }
     }
@@ -1289,13 +1288,13 @@ private void retrieveEmailAndUserId() {
     }
 
     private void onLogOut() {
-        if (config.autoPushRegistration) {
+        if (config.autoPushRegistration && isInitialized()) {
             disablePush();
         }
     }
 
     private void onLogIn() {
-        if (config.autoPushRegistration) {
+        if (config.autoPushRegistration && isInitialized()) {
             registerForPush();
         }
     }

iterableapi/src/test/java/com/iterable/iterableapi/IterableApiTest.java

@@ -168,7 +168,7 @@ public void testSetEmailWithoutAutomaticPushRegistration() throws Exception {
         IterableApi.sharedInstance = Mockito.spy(new IterableApi());
         IterableApi.initialize(RuntimeEnvironment.application, "fake_key", new IterableConfig.Builder().setPushIntegrationName("pushIntegration").setAutoPushRegistration(false).build());
 
-        // Check that setEmail calls registerForPush
+        // Check that setEmail doesn't call registerForPush or disablePush
         IterableApi.getInstance().setEmail("[email protected]");
         IterableApi.getInstance().setEmail(null);
         verify(IterableApi.sharedInstance, never()).registerForPush();
@@ -181,12 +181,12 @@ public void testSetUserIdWithAutomaticPushRegistration() throws Exception {
         IterableApi.sharedInstance = Mockito.spy(new IterableApi());
         IterableApi.initialize(RuntimeEnvironment.application, "fake_key", new IterableConfig.Builder().setPushIntegrationName("pushIntegration").setAutoPushRegistration(true).build());
 
-        // Check that setEmail calls registerForPush
+        // Check that setUserId calls registerForPush
         IterableApi.getInstance().setUserId("userId");
         verify(IterableApi.sharedInstance).registerForPush();
         Mockito.reset(IterableApi.sharedInstance);
 
-        // Check that setEmail(null) disables the device
+        // Check that setUserId(null) disables the device
         IterableApi.getInstance().setUserId(null);
         verify(IterableApi.sharedInstance).disablePush();
         Mockito.reset(IterableApi.sharedInstance);