Merge pull request #11292 from wordpress-mobile/issue/fix-lifecycle-c…

…rash-with-appcompat-1-1-0 Issue/fix lifecycle crash with appcompat 1 1 0
wordpress-mobile · Feb 23, 2020 · eca27bd · eca27bd
2 parents 63da024 + 670c563
commit eca27bd
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 42 deletions.
diff --git a/...rc/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt b/...rc/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt
@@ -2,7 +2,6 @@ package org.wordpress.android.ui.sitecreation.domains
 
 import android.content.Context
 import android.os.Bundle
-import android.os.Parcelable
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.LayoutRes
@@ -23,8 +22,6 @@ import org.wordpress.android.ui.sitecreation.misc.SearchInputWithHeader
 import org.wordpress.android.ui.utils.UiHelpers
 import javax.inject.Inject
 
-private const val KEY_LIST_STATE = "list_state"
-
 class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
     private lateinit var nonNullActivity: FragmentActivity
     private lateinit var linearLayoutManager: LinearLayoutManager
@@ -87,16 +84,8 @@ class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
         (nonNullActivity.application as WordPress).component().inject(this)
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putParcelable(KEY_LIST_STATE, linearLayoutManager.onSaveInstanceState())
-    }
-
     override fun onViewStateRestored(savedInstanceState: Bundle?) {
         super.onViewStateRestored(savedInstanceState)
-        savedInstanceState?.getParcelable<Parcelable>(KEY_LIST_STATE)?.let {
-            linearLayoutManager.onRestoreInstanceState(it)
-        }
         // we need to set the `onTextChanged` after the viewState has been restored otherwise the viewModel.updateQuery
         // is called when the system sets the restored value to the EditText which results in an unnecessary request
         searchInputWithHeader.onTextChanged = { viewModel.updateQuery(it) }

diff --git a/.../main/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentsFragment.kt b/.../main/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentsFragment.kt
@@ -2,7 +2,6 @@ package org.wordpress.android.ui.sitecreation.segments
 
 import android.content.Context
 import android.os.Bundle
-import android.os.Parcelable
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
@@ -24,8 +23,6 @@ import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.image.ImageManager
 import javax.inject.Inject
 
-private const val KEY_LIST_STATE = "list_state"
-
 class SiteCreationSegmentsFragment : SiteCreationBaseFormFragment() {
     private lateinit var linearLayoutManager: LinearLayoutManager
     private lateinit var recyclerView: RecyclerView
@@ -133,18 +130,6 @@ class SiteCreationSegmentsFragment : SiteCreationBaseFormFragment() {
         (activity!!.application as WordPress).component().inject(this)
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putParcelable(KEY_LIST_STATE, linearLayoutManager.onSaveInstanceState())
-    }
-
-    override fun onViewStateRestored(savedInstanceState: Bundle?) {
-        super.onViewStateRestored(savedInstanceState)
-        savedInstanceState?.getParcelable<Parcelable>(KEY_LIST_STATE)?.let {
-            linearLayoutManager.onRestoreInstanceState(it)
-        }
-    }
-
     private fun updateContentLayout(segments: SegmentsContentUiState) {
         (recyclerView.adapter as SiteCreationSegmentsAdapter).update(segments.items)
     }

diff --git a/...ain/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationVerticalsFragment.kt b/...ain/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationVerticalsFragment.kt
@@ -2,7 +2,6 @@ package org.wordpress.android.ui.sitecreation.verticals
 
 import android.content.Context
 import android.os.Bundle
-import android.os.Parcelable
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.annotation.LayoutRes
@@ -28,8 +27,6 @@ import org.wordpress.android.ui.utils.UiHelpers
 import javax.inject.Inject
 import kotlin.properties.Delegates
 
-private const val KEY_LIST_STATE = "list_state"
-
 class SiteCreationVerticalsFragment : SiteCreationBaseFormFragment() {
     private lateinit var nonNullActivity: FragmentActivity
     private var segmentId by Delegates.notNull<Long>()
@@ -99,16 +96,8 @@ class SiteCreationVerticalsFragment : SiteCreationBaseFormFragment() {
         }
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putParcelable(KEY_LIST_STATE, linearLayoutManager.onSaveInstanceState())
-    }
-
     override fun onViewStateRestored(savedInstanceState: Bundle?) {
         super.onViewStateRestored(savedInstanceState)
-        savedInstanceState?.getParcelable<Parcelable>(KEY_LIST_STATE)?.let {
-            linearLayoutManager.onRestoreInstanceState(it)
-        }
         // we need to set the `onTextChanged` after the viewState has been restored otherwise the viewModel.updateQuery
         // is called when the system sets the restored value to the EditText which results in an unnecessary request
         searchInputWithHeader.onTextChanged = { viewModel.updateQuery(it) }

diff --git a/...essLoginFlow/src/main/java/org/wordpress/android/login/LoginMagicLinkRequestFragment.java b/...essLoginFlow/src/main/java/org/wordpress/android/login/LoginMagicLinkRequestFragment.java
@@ -54,7 +54,6 @@ public class LoginMagicLinkRequestFragment extends Fragment {
     public static final String TAG = "login_magic_link_request_fragment_tag";
 
     private static final String KEY_IN_PROGRESS = "KEY_IN_PROGRESS";
-    private static final String KEY_GRAVATAR_IN_PROGRESS = "KEY_GRAVATAR_IN_PROGRESS";
     private static final String ARG_EMAIL_ADDRESS = "ARG_EMAIL_ADDRESS";
     private static final String ARG_MAGIC_LINK_SCHEME = "ARG_MAGIC_LINK_SCHEME";
     private static final String ARG_IS_JETPACK_CONNECT = "ARG_IS_JETPACK_CONNECT";
@@ -224,9 +223,6 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
             if (mInProgress) {
                 showMagicLinkRequestProgressDialog();
             }
-
-            boolean gravatarInProgress = savedInstanceState.getBoolean(KEY_GRAVATAR_IN_PROGRESS);
-            mAvatarProgressBar.setVisibility(gravatarInProgress ? View.VISIBLE : View.GONE);
         }
         // important for accessibility - talkback
         getActivity().setTitle(R.string.magic_link_login_title);
@@ -243,7 +239,6 @@ public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
 
         outState.putBoolean(KEY_IN_PROGRESS, mInProgress);
-        outState.putBoolean(KEY_GRAVATAR_IN_PROGRESS, mAvatarProgressBar.getVisibility() == View.VISIBLE);
     }
 
     @Override