Serializing Story in onSaveInstanceState, retrieving it in onCreate

photoeditor/src/main/java/com/automattic/photoeditor/OnPhotoEditorListener.kt

@@ -1,5 +1,6 @@
 package com.automattic.photoeditor
 
+import android.graphics.Rect
 import android.view.View
 import com.automattic.photoeditor.views.ViewType
 
@@ -70,4 +71,6 @@ interface OnPhotoEditorListener {
     fun onStopViewChangeListener(viewType: ViewType)
 
     fun onRemoveViewReadyListener(removedView: View, ready: Boolean)
+
+    fun getWorkingAreaRect(): Rect?
 }

photoeditor/src/main/java/com/automattic/photoeditor/PhotoEditor.kt

@@ -162,7 +162,6 @@ class PhotoEditor private constructor(builder: Builder) :
             return MultiTouchListener(
                 mainView,
                 deleteView,
-                workAreaRect,
                 parentView,
                 imageView,
                 isTextPinchZoomable,
@@ -402,6 +401,7 @@ class PhotoEditor private constructor(builder: Builder) :
         } ?: buildViewFromAddedViewInfo(addedView.viewInfo, addedView.viewType)
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     private fun buildViewFromAddedViewInfo(addedViewInfo: AddedViewInfo, viewType: ViewType): View? {
         var view: View? = null
         when (viewType) {
@@ -412,6 +412,9 @@ class PhotoEditor private constructor(builder: Builder) :
                 val emojiTextView = view?.findViewById<TextView>(R.id.tvPhotoEditorEmoji)
                 // the actual calculated text size as obtained from the view is expressed in px.
                 emojiTextView?.setTextSize(TypedValue.COMPLEX_UNIT_PX, addedViewInfo.addedViewTextInfo.fontSizePx)
+
+                val multiTouchListenerInstance = getNewMultitouchListener(view) // newMultiTouchListener
+                view?.touchableArea?.setOnTouchListener(multiTouchListenerInstance)
             }
             TEXT -> {
                 // create TEXT view layout
@@ -425,6 +428,9 @@ class PhotoEditor private constructor(builder: Builder) :
                 // the actual calculated text size as obtained from the view is expressed in px.
                 normalTextView?.setTextSize(TypedValue.COMPLEX_UNIT_PX, addedViewInfo.addedViewTextInfo.fontSizePx)
                 normalTextView?.setTextColor(addedViewInfo.addedViewTextInfo.textColor)
+
+                val multiTouchListenerInstance = getNewMultitouchListener(view) // newMultiTouchListener
+                view?.setOnTouchListener(multiTouchListenerInstance)
             }
         }
 

photoeditor/src/main/java/com/automattic/photoeditor/gesture/MultiTouchListener.kt

@@ -22,7 +22,6 @@ import com.automattic.photoeditor.views.ViewType
 internal class MultiTouchListener(
     private val mainView: View?,
     private val deleteView: View?,
-    private val workingAreaRect: Rect?,
     private val parentView: RelativeLayout,
     private val photoEditImageView: ImageView,
     private val mIsTextPinchZoomable: Boolean,
@@ -94,7 +93,7 @@ internal class MultiTouchListener(
                     val currY = event.getY(pointerIndexMove)
                     if (!mScaleGestureDetector.isInProgress) {
                         // if workingAreaRect is set, verify movement is within the area
-                        workingAreaRect?.let {
+                        mOnPhotoEditorListener?.getWorkingAreaRect()?.let {
                             if (isViewCenterInWorkingAreaBounds(view, currX - mPrevX, currY - mPrevY)) {
                                 adjustTranslation(
                                     view,
@@ -207,7 +206,7 @@ internal class MultiTouchListener(
         val deltaVector = getWouldBeTranslation(view, deltaX, deltaY)
         val wouldBeY = deltaVector[1] + view.y
 
-        workingAreaRect?.let {
+        mOnPhotoEditorListener?.getWorkingAreaRect()?.let {
             val distanceToCenter = view.height / 2
             return ((wouldBeY - distanceToCenter) > it.top) && ((wouldBeY + distanceToCenter) < it.bottom)
         } ?: return true

photoeditor/src/main/java/com/automattic/photoeditor/state/BackgroundSurfaceManager.kt

@@ -169,8 +169,10 @@ class BackgroundSurfaceManager(
             stopRecordingVideo()
         }
         isCameraVisible = false
-        isVideoPlayerVisible = false
-        videoPlayerHandling.deactivate()
+        if (isVideoPlayerVisible) {
+            isVideoPlayerVisible = false
+            videoPlayerHandling.deactivate()
+        }
         photoEditorView.hideLoading()
         photoEditorView.turnTextureViewOff()
     }
@@ -179,12 +181,21 @@ class BackgroundSurfaceManager(
         photoEditorView.turnTextureViewOn()
     }
 
+    fun isTextureViewAvailable(): Boolean {
+        if (lifeCycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
+            return videoPlayerHandling.textureView.isAvailable && cameraBasicHandler.textureView.isAvailable
+        }
+        return false
+    }
+
     fun switchCameraPreviewOn() {
         isCameraVisible = true
-        isVideoPlayerVisible = false
         // now, start showing camera preview
         photoEditorView.turnTextureViewOn()
-        videoPlayerHandling.deactivate()
+        if (isVideoPlayerVisible) {
+            isVideoPlayerVisible = false
+            videoPlayerHandling.deactivate()
+        }
         photoEditorView.hideLoading()
         cameraBasicHandler.activate()
     }
@@ -271,11 +282,15 @@ class BackgroundSurfaceManager(
     }
 
     fun videoPlayerMute() {
-        videoPlayerHandling.mute()
+        if (isVideoPlayerVisible) {
+            videoPlayerHandling.mute()
+        }
     }
 
     fun videoPlayerUnmute() {
-        videoPlayerHandling.unmute()
+        if (isVideoPlayerVisible) {
+            videoPlayerHandling.unmute()
+        }
     }
 
     private fun cameraXAwareSurfaceDeactivate() {