Merge branch '4.3.1rc'

gradle.properties

@@ -1,2 +1,2 @@
 group = com.mixpanel.android
-version = 4.3.0
+version = 4.3.1-SNAPSHOT

src/main/java/com/mixpanel/android/mpmetrics/InAppFragment.java

@@ -42,7 +42,7 @@ public void setDisplayState(final int stateId, final UpdateDisplayState.DisplayS
         // Fragments require a default constructor that is called when Activities recreate them.
         // This means that when the Activity recreates this Fragment (due to rotation, or
         // the Activity going away and coming back), mDisplayStateId and mDisplayState are not
-        // initialized, but this is okay since we remove the Fragment in onStart.
+        // initialized. Lifecycle methods should be aware of this case, and decline to show.
         mDisplayStateId = stateId;
         mDisplayState = displayState;
     }
@@ -146,24 +146,27 @@ public boolean onSingleTapUp(MotionEvent event) {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-        mKill = false;
+        mCleanedUp = false;
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
 
-        mInAppView = inflater.inflate(R.layout.com_mixpanel_android_activity_notification_mini, container, false);
-        final TextView titleView = (TextView) mInAppView.findViewById(R.id.com_mixpanel_android_notification_title);
-        final ImageView notifImage = (ImageView) mInAppView.findViewById(R.id.com_mixpanel_android_notification_image);
+        if (null == mDisplayState) {
+            cleanUp();
+        } else {
+            mInAppView = inflater.inflate(R.layout.com_mixpanel_android_activity_notification_mini, container, false);
+            final TextView titleView = (TextView) mInAppView.findViewById(R.id.com_mixpanel_android_notification_title);
+            final ImageView notifImage = (ImageView) mInAppView.findViewById(R.id.com_mixpanel_android_notification_image);
 
-        InAppNotification inApp = mDisplayState.getInAppNotification();
+            InAppNotification inApp = mDisplayState.getInAppNotification();
 
-        titleView.setText(inApp.getTitle());
-        notifImage.setImageBitmap(inApp.getImage());
+            titleView.setText(inApp.getTitle());
+            notifImage.setImageBitmap(inApp.getImage());
 
-        mHandler.postDelayed(mRemover, MINI_REMOVE_TIME);
+            mHandler.postDelayed(mRemover, MINI_REMOVE_TIME);
+        }
 
         return mInAppView;
     }
@@ -172,7 +175,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     public void onStart() {
         super.onStart();
 
-        if (mKill) {
+        if (mCleanedUp) {
             mParent.getFragmentManager().beginTransaction().remove(this).commit();
         }
     }
@@ -188,28 +191,43 @@ public void onResume() {
     }
 
     @Override
-    public void onStop() {
-        super.onStop();
-
-        mHandler.removeCallbacks(mRemover);
-        mHandler.removeCallbacks(mDisplayMini);
-
-        // This Fragment when registered on the Activity is part of its state, and so gets
-        // restored / recreated when the Activity goes away and comes back. We prefer to just not
-        // keep the notification around in the case of mini, so we have to remember to kill it.
-        // If the Activity object fully dies, then it is not remembered, so onSaveInstanceState is not necessary.
-        mKill = true;
-        UpdateDisplayState.releaseDisplayState(mDisplayStateId);
+    public void onSaveInstanceState(Bundle outState) {
+        cleanUp();
+        super.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        cleanUp();
+    }
+
+    private void cleanUp() {
+        if (!mCleanedUp) {
+            mHandler.removeCallbacks(mRemover);
+            mHandler.removeCallbacks(mDisplayMini);
+            UpdateDisplayState.releaseDisplayState(mDisplayStateId);
+
+            final FragmentManager fragmentManager = mParent.getFragmentManager();
+            FragmentTransaction transaction = fragmentManager.beginTransaction();
+            transaction.remove(this).commit();
+        }
+
+        mCleanedUp = true;
     }
 
     private void remove() {
-        if (mParent != null) {
+        if (mParent != null && !mCleanedUp) {
+            mHandler.removeCallbacks(mRemover);
+            mHandler.removeCallbacks(mDisplayMini);
+
             final FragmentManager fragmentManager = mParent.getFragmentManager();
 
             // setCustomAnimations works on a per transaction level, so the animations set
             // when this fragment was created do not apply
             FragmentTransaction transaction = fragmentManager.beginTransaction();
             transaction.setCustomAnimations(0, R.anim.com_mixpanel_android_slide_down).remove(this).commit();
+            mCleanedUp = true;
         }
     }
 
@@ -228,7 +246,7 @@ public float getInterpolation(float t) {
     private Runnable mRemover, mDisplayMini;
     private View mInAppView;
 
-    private boolean mKill;
+    private boolean mCleanedUp;
 
     private static final String LOGTAG = "InAppFragment";
     private static final int MINI_REMOVE_TIME = 6000;

src/main/java/com/mixpanel/android/mpmetrics/MPConfig.java

@@ -11,7 +11,7 @@
  * Stores global configuration options for the Mixpanel library.
  */
 public class MPConfig {
-    public static final String VERSION = "4.3.0";
+    public static final String VERSION = "4.3.1-SNAPSHOT";
 
     public static boolean DEBUG = false;
 

src/main/java/com/mixpanel/android/surveys/SurveyActivity.java

@@ -75,9 +75,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
         if (isShowingInApp()) {
             onCreateInAppNotification(savedInstanceState);
-        }
-        if (isShowingSurvey()) {
+        } else if (isShowingSurvey()) {
             onCreateSurvey(savedInstanceState);
+        } else {
+            finish();
         }
     }
 
@@ -251,8 +252,8 @@ public void onQuestionAnswered(Question question, String answer) {
     @Override
     protected void onStart() {
         super.onStart();
-
-        if (mUpdateDisplayState.getDisplayState().getType() == UpdateDisplayState.DisplayState.SurveyState.TYPE) {
+        final UpdateDisplayState.DisplayState displayState = mUpdateDisplayState.getDisplayState();
+        if (null != displayState && displayState.getType() == UpdateDisplayState.DisplayState.SurveyState.TYPE) {
             onStartSurvey();
         }
     }
@@ -395,11 +396,13 @@ private UpdateDisplayState.DisplayState.InAppNotificationState getInAppState() {
     }
 
     private boolean isShowingSurvey() {
-        return mUpdateDisplayState.getDisplayState().getType() == UpdateDisplayState.DisplayState.SurveyState.TYPE;
+        final UpdateDisplayState.DisplayState displayState = mUpdateDisplayState.getDisplayState();
+        return displayState != null && displayState.getType() == UpdateDisplayState.DisplayState.SurveyState.TYPE;
     }
 
     private boolean isShowingInApp() {
-        return mUpdateDisplayState.getDisplayState().getType() == UpdateDisplayState.DisplayState.InAppNotificationState.TYPE;
+        final UpdateDisplayState.DisplayState displayState = mUpdateDisplayState.getDisplayState();
+        return displayState != null && displayState.getType() == UpdateDisplayState.DisplayState.InAppNotificationState.TYPE;
     }
 
     private void trackSurveyAttempted() {