Merge branch 'trunk' into feature/update-compile-sdk-33

# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/ui/JetpackRemoteInstallActivity.kt
#	WordPress/src/main/java/org/wordpress/android/ui/JetpackRemoteInstallFragment.kt
#	WordPress/src/main/java/org/wordpress/android/ui/jpfullplugininstall/install/JetpackFullPluginInstallActivity.kt

WordPress/build.gradle

@@ -389,6 +389,7 @@ dependencies {
     implementation "androidx.cardview:cardview:$androidxCardviewVersion"
     implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion"
     implementation "com.google.android.material:material:$googleMaterialVersion"
+    implementation "com.google.android.flexbox:flexbox:$googleFlexboxlayoutVersion"
     implementation "androidx.percentlayout:percentlayout:$androidxPercentlayoutVersion"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:$androidxSwipeToRefreshVersion"
     implementation "androidx.preference:preference:$androidxPreferenceVersion"
@@ -413,6 +414,7 @@ dependencies {
     implementation "org.greenrobot:eventbus:$eventBusVersion"
     implementation "org.greenrobot:eventbus-java:$eventBusVersion"
     implementation "com.squareup.okio:okio:$squareupOkioVersion"
+    implementation "com.squareup.retrofit2:retrofit:$squareupRetrofitVersion"
     implementation "org.apache.commons:commons-text:$apacheCommonsTextVersion"
     implementation "com.airbnb.android:lottie:$lottieVersion"
     implementation "com.airbnb.android:lottie-compose:$lottieVersion"
@@ -437,10 +439,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$androidxComposeLifecycleVersion"
     implementation "io.coil-kt:coil-compose:$coilComposeVersion"
     implementation ('com.github.indexos.media-for-mobile:android:43a9026f0973a2f0a74fa813132f6a16f7499c3a')
-    implementation (group: 'com.zendesk', name: 'support', version: "$zendeskVersion") {
-        exclude group: 'com.google.dagger'
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
+    implementation "com.zendesk:support:$zendeskVersion"
     implementation (name:'tenor-android-core-jetified', ext:'aar') // Jetified Tenor Gif library
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinxCoroutinesVersion"

WordPress/src/main/AndroidManifest.xml

@@ -319,7 +319,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.JetpackRemoteInstallActivity"
+            android:name=".ui.jetpackplugininstall.remoteplugin.JetpackRemoteInstallActivity"
             android:label="@string/jetpack"
             android:theme="@style/WordPress.NoActionBar"/>
 
@@ -773,7 +773,7 @@
 
         <!-- Jetpack full plugin install -->
         <activity
-            android:name=".ui.jpfullplugininstall.install.JetpackFullPluginInstallActivity"
+            android:name=".ui.jetpackplugininstall.fullplugin.install.JetpackFullPluginInstallActivity"
             android:theme="@style/WordPress.NoActionBar" />
 
         <!-- Services -->

WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java

@@ -5,7 +5,6 @@
 import org.wordpress.android.ui.AddQuickPressShortcutActivity;
 import org.wordpress.android.ui.CommentFullScreenDialogFragment;
 import org.wordpress.android.ui.JetpackConnectionResultActivity;
-import org.wordpress.android.ui.JetpackRemoteInstallFragment;
 import org.wordpress.android.ui.ShareIntentReceiverActivity;
 import org.wordpress.android.ui.ShareIntentReceiverFragment;
 import org.wordpress.android.ui.WPWebViewActivity;
@@ -418,8 +417,6 @@ public interface AppComponent {
 
     void inject(PublicizeServiceAdapter object);
 
-    void inject(JetpackRemoteInstallFragment jetpackRemoteInstallFragment);
-
     void inject(PlansListAdapter object);
 
     void inject(PlanDetailsFragment object);

WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java

@@ -3,7 +3,6 @@
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
 
-import org.wordpress.android.ui.JetpackRemoteInstallViewModel;
 import org.wordpress.android.ui.accounts.LoginEpilogueViewModel;
 import org.wordpress.android.ui.accounts.LoginViewModel;
 import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel;
@@ -148,11 +147,6 @@ abstract class ViewModelModule {
     @ViewModelKey(SubfilterPageViewModel.class)
     abstract ViewModel subfilterPageViewModel(SubfilterPageViewModel viewModel);
 
-    @Binds
-    @IntoMap
-    @ViewModelKey(JetpackRemoteInstallViewModel.class)
-    abstract ViewModel jetpackRemoteInstallViewModel(JetpackRemoteInstallViewModel viewModel);
-
     @Binds
     @IntoMap
     @ViewModelKey(QuickStartViewModel.class)

WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java

@@ -69,6 +69,7 @@
 import org.wordpress.android.ui.jetpack.scan.ScanActivity;
 import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsActivity;
 import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryActivity;
+import org.wordpress.android.ui.jetpackplugininstall.remoteplugin.JetpackRemoteInstallActivity;
 import org.wordpress.android.ui.main.MeActivity;
 import org.wordpress.android.ui.main.SitePickerActivity;
 import org.wordpress.android.ui.main.SitePickerAdapter.SitePickerMode;
@@ -289,7 +290,7 @@ public static void showStockMediaPickerForResult(Activity activity,
     public static void startJetpackInstall(Context context, JetpackConnectionSource source, SiteModel site) {
         Intent intent = new Intent(context, JetpackRemoteInstallActivity.class);
         intent.putExtra(WordPress.SITE, site);
-        intent.putExtra(JetpackRemoteInstallFragment.TRACKING_SOURCE_KEY, source);
+        intent.putExtra(JetpackRemoteInstallActivity.TRACKING_SOURCE_KEY, source);
         context.startActivity(intent);
     }
 

WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionUtils.java

@@ -7,13 +7,13 @@
 /**
  * Wraps utility methods for Jetpack
  */
-class JetpackConnectionUtils {
+public class JetpackConnectionUtils {
     /**
      * Adds source as a parameter to the tracked Stat
      * @param stat to be tracked
      * @param source of tracking
      */
-    static void trackWithSource(AnalyticsTracker.Stat stat, JetpackConnectionSource source) {
+    public static void trackWithSource(AnalyticsTracker.Stat stat, JetpackConnectionSource source) {
         HashMap<String, String> sourceMap = new HashMap<>();
         sourceMap.put("source", source.toString());
         AnalyticsTracker.track(stat, sourceMap);

WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionWebViewActivity.java

@@ -44,7 +44,12 @@ public static void startJetpackConnectionFlow(Context context, JetpackConnection
         }
     }
 
-    static void startManualFlow(Context context, JetpackConnectionSource source, SiteModel site, boolean authorized) {
+    public static void startManualFlow(
+            Context context,
+            JetpackConnectionSource source,
+            SiteModel site,
+            boolean authorized
+    ) {
         String url = "https://wordpress.com/jetpack/connect?"
                      + "url=" + site.getUrl()
                      + "&mobile_redirect=" + JETPACK_CONNECTION_DEEPLINK

WordPress/src/main/java/org/wordpress/android/ui/JetpackRemoteInstallActivity.kt

@@ -1,44 +0,0 @@
-package org.wordpress.android.ui
-
-import android.os.Bundle
-import android.view.MenuItem
-import androidx.activity.addCallback
-import org.wordpress.android.R
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.INSTALL_JETPACK_CANCELLED
-import org.wordpress.android.databinding.JetpackRemoteInstallActivityBinding
-import org.wordpress.android.ui.JetpackConnectionUtils.trackWithSource
-import org.wordpress.android.ui.JetpackRemoteInstallFragment.Companion.TRACKING_SOURCE_KEY
-import org.wordpress.android.util.extensions.onBackPressedCompat
-import org.wordpress.android.util.extensions.getSerializableExtraCompat
-
-class JetpackRemoteInstallActivity : LocaleAwareActivity() {
-    public override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        with(JetpackRemoteInstallActivityBinding.inflate(layoutInflater)) {
-            setContentView(root)
-            setSupportActionBar(toolbarLayout.toolbarMain)
-        }
-
-        onBackPressedDispatcher.addCallback(this) {
-            trackWithSource(
-                INSTALL_JETPACK_CANCELLED,
-                requireNotNull(intent.getSerializableExtraCompat(TRACKING_SOURCE_KEY))
-            )
-            onBackPressedDispatcher.onBackPressedCompat(this)
-        }
-
-        supportActionBar?.let {
-            it.setHomeButtonEnabled(true)
-            it.setDisplayHomeAsUpEnabled(true)
-            it.setTitle(R.string.jetpack)
-        }
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
-            onBackPressedDispatcher.onBackPressed()
-            return true
-        }
-        return super.onOptionsItemSelected(item)
-    }
-}

WordPress/src/main/java/org/wordpress/android/ui/JetpackRemoteInstallFragment.kt

@@ -1,162 +0,0 @@
-package org.wordpress.android.ui
-
-import android.app.Activity
-import android.content.Intent
-import android.content.res.ColorStateList
-import android.os.Bundle
-import android.view.View
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
-import org.wordpress.android.R
-import org.wordpress.android.WordPress
-import org.wordpress.android.databinding.JetpackRemoteInstallFragmentBinding
-import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.login.LoginMode
-import org.wordpress.android.ui.JetpackRemoteInstallViewModel.JetpackResultActionData
-import org.wordpress.android.ui.JetpackRemoteInstallViewModel.JetpackResultActionData.Action.CONNECT
-import org.wordpress.android.ui.JetpackRemoteInstallViewModel.JetpackResultActionData.Action.LOGIN
-import org.wordpress.android.ui.JetpackRemoteInstallViewModel.JetpackResultActionData.Action.MANUAL_INSTALL
-import org.wordpress.android.ui.RequestCodes.JETPACK_LOGIN
-import org.wordpress.android.ui.accounts.LoginActivity
-import org.wordpress.android.util.AppLog
-import org.wordpress.android.util.extensions.getSerializableCompat
-import org.wordpress.android.util.extensions.getSerializableExtraCompat
-import javax.inject.Inject
-
-class JetpackRemoteInstallFragment : Fragment(R.layout.jetpack_remote_install_fragment) {
-    @Inject
-    lateinit var viewModelFactory: ViewModelProvider.Factory
-    private lateinit var viewModel: JetpackRemoteInstallViewModel
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        with(JetpackRemoteInstallFragmentBinding.bind(view)) {
-            initDagger()
-            initViewModel(savedInstanceState)
-        }
-    }
-
-    private fun initDagger() {
-        (requireActivity().application as WordPress).component().inject(this)
-    }
-
-    private fun JetpackRemoteInstallFragmentBinding.initViewModel(savedInstanceState: Bundle?) {
-        requireActivity().let { activity ->
-            val intent = activity.intent
-            val site = requireNotNull(intent.getSerializableExtraCompat<SiteModel>(WordPress.SITE))
-            val source = requireNotNull(intent.getSerializableExtraCompat<JetpackConnectionSource>(TRACKING_SOURCE_KEY))
-            val retrievedState =
-                savedInstanceState?.getSerializableCompat<JetpackRemoteInstallViewState.Type>(VIEW_STATE)
-            viewModel = ViewModelProvider(
-                this@JetpackRemoteInstallFragment,
-                viewModelFactory
-            )[JetpackRemoteInstallViewModel::class.java]
-            viewModel.start(site, retrievedState)
-
-            initLiveViewStateObserver()
-
-            viewModel.liveActionOnResult.observe(viewLifecycleOwner) { result ->
-                if (result != null) {
-                    when (result.action) {
-                        MANUAL_INSTALL -> onManualInstallResultAction(activity, source, result)
-                        LOGIN -> onLoginResultAction(activity, source)
-                        CONNECT -> onConnectResultAction(activity, source, result)
-                    }
-                }
-            }
-        }
-    }
-
-    private fun onManualInstallResultAction(
-        activity: FragmentActivity,
-        source: JetpackConnectionSource,
-        result: JetpackResultActionData
-    ) {
-        JetpackConnectionWebViewActivity.startManualFlow(
-            activity,
-            source,
-            result.site,
-            result.loggedIn
-        )
-        activity.finish()
-    }
-
-    @Suppress("DEPRECATION")
-    private fun onLoginResultAction(
-        activity: FragmentActivity,
-        source: JetpackConnectionSource
-    ) {
-        val loginIntent = Intent(activity, LoginActivity::class.java)
-        LoginMode.JETPACK_STATS.putInto(loginIntent)
-        loginIntent.putExtra(LoginActivity.ARG_JETPACK_CONNECT_SOURCE, source)
-        startActivityForResult(loginIntent, JETPACK_LOGIN)
-    }
-
-    private fun onConnectResultAction(
-        activity: FragmentActivity,
-        source: JetpackConnectionSource,
-        result: JetpackResultActionData
-    ) {
-        JetpackConnectionWebViewActivity.startJetpackConnectionFlow(
-            activity,
-            source,
-            result.site,
-            result.loggedIn
-        )
-        activity.finish()
-    }
-
-    private fun JetpackRemoteInstallFragmentBinding.initLiveViewStateObserver() {
-        viewModel.liveViewState.observe(viewLifecycleOwner, Observer { viewState ->
-            if (viewState != null) {
-                if (viewState is JetpackRemoteInstallViewState.Error) {
-                    AppLog.e(AppLog.T.JETPACK_REMOTE_INSTALL, "An error occurred while installing Jetpack")
-                }
-                jetpackInstallIcon.setImageResource(viewState.icon)
-                if (viewState.iconTint != null) {
-                    jetpackInstallIcon.imageTintList = ColorStateList.valueOf(
-                        ContextCompat.getColor(
-                            jetpackInstallIcon.context, viewState.iconTint
-                        )
-                    )
-                } else {
-                    jetpackInstallIcon.imageTintList = null
-                }
-                jetpackInstallTitle.setText(viewState.titleResource)
-                jetpackInstallMessage.setText(viewState.messageResource)
-                if (viewState.buttonResource != null) {
-                    jetpackInstallButton.visibility = View.VISIBLE
-                    jetpackInstallButton.setText(viewState.buttonResource)
-                } else {
-                    jetpackInstallButton.visibility = View.GONE
-                }
-                jetpackInstallButton.setOnClickListener { viewState.onClick() }
-                jetpackInstallProgress.visibility = if (viewState.progressBarVisible) View.VISIBLE else View.GONE
-            }
-        })
-    }
-
-    @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == JETPACK_LOGIN && resultCode == Activity.RESULT_OK) {
-            val site = requireNotNull(activity?.intent?.getSerializableExtraCompat<SiteModel>(WordPress.SITE))
-            viewModel.onLogin(site.id)
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        viewModel.liveViewState.value?.type?.let {
-            outState.putSerializable(VIEW_STATE, it)
-        }
-    }
-
-    companion object {
-        const val TRACKING_SOURCE_KEY = "tracking_source_key"
-        private const val VIEW_STATE = "view_state_key"
-    }
-}