Jetpack REST connection log into wp.com

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

@@ -149,6 +149,7 @@
 import static org.wordpress.android.analytics.AnalyticsTracker.Stat.STATS_ACCESS_ERROR;
 import static org.wordpress.android.imageeditor.preview.PreviewImageFragment.ARG_EDIT_IMAGE_DATA;
 import static org.wordpress.android.login.LoginMode.JETPACK_LOGIN_ONLY;
+import static org.wordpress.android.login.LoginMode.JETPACK_REST_CONNECT;
 import static org.wordpress.android.login.LoginMode.WPCOM_LOGIN_ONLY;
 import static org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE;
 import static org.wordpress.android.ui.WPWebViewActivity.ENCODING_UTF8;
@@ -1415,6 +1416,15 @@ public static void showSignInForResultWpComOnly(Activity activity) {
         activity.startActivityForResult(intent, RequestCodes.ADD_ACCOUNT);
     }
 
+    /**
+     * Sign in to wp.com from the Jetpack REST connection flow
+     */
+    public static void showJpRestConnectWpComSignInForResult(@NonNull Activity activity) {
+        Intent intent = new Intent(activity, LoginActivity.class);
+        JETPACK_REST_CONNECT.putInto(intent);
+        activity.startActivityForResult(intent, RequestCodes.ADD_ACCOUNT);
+    }
+
     public static void showSignInForResultJetpackOnly(Activity activity) {
         Intent intent = new Intent(activity, LoginActivity.class);
         intent.setFlags(

WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java

@@ -194,6 +194,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                     loginFromPrologue();
                     break;
                 case WPCOM_LOGIN_ONLY:
+                case JETPACK_REST_CONNECT:
                     mUnifiedLoginTracker.setSource(Source.ADD_WORDPRESS_COM_ACCOUNT);
                     mIsSignupFromLoginEnabled = mBuildConfigWrapper.isSignupEnabled();
                     checkSmartLockPasswordAndStartLogin();
@@ -357,6 +358,12 @@ private void loggedInAndFinish(ArrayList<Integer> oldSitesIds, boolean doLoginUp
             case JETPACK_STATS:
                 ActivityLauncher.showLoginEpilogueForResult(this, oldSitesIds, true);
                 break;
+            case JETPACK_REST_CONNECT:
+                // for the Jetpack REST connection we want to return to the caller activity instead of
+                // showing the login epilogue
+                setResult(Activity.RESULT_OK);
+                finish();
+                break;
             case WPCOM_LOGIN_DEEPLINK:
             case WPCOM_REAUTHENTICATE:
                 ActivityLauncher.showLoginEpilogueForResult(this, oldSitesIds, false);

WordPress/src/main/java/org/wordpress/android/ui/jetpackrestconnection/JetpackRestConnectionActivity.kt

@@ -11,13 +11,24 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.launch
 import org.wordpress.android.R
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.ui.ActivityLauncher
+import org.wordpress.android.ui.ActivityNavigator
+import org.wordpress.android.ui.RequestCodes
 import org.wordpress.android.ui.main.BaseAppCompatActivity
 import org.wordpress.android.util.extensions.setContent
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class JetpackRestConnectionActivity : BaseAppCompatActivity() {
     private val viewModel: JetpackRestConnectionViewModel by viewModels()
 
+    @Inject
+    lateinit var activityNavigator: ActivityNavigator
+
+    @Inject
+    lateinit var accountStore: AccountStore
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
@@ -34,13 +45,34 @@ class JetpackRestConnectionActivity : BaseAppCompatActivity() {
         lifecycleScope.launch {
             viewModel.uiEvent.filterNotNull().collect { event ->
                 when (event) {
-                    JetpackRestConnectionViewModel.UiEvent.Close -> finish()
-                    JetpackRestConnectionViewModel.UiEvent.ShowCancelConfirmation -> showCancelConfirmationDialog()
+                    JetpackRestConnectionViewModel.UiEvent.StartWPComLogin ->
+                        startWPComLogin()
+
+                    JetpackRestConnectionViewModel.UiEvent.Close ->
+                        finish()
+
+                    JetpackRestConnectionViewModel.UiEvent.ShowCancelConfirmation ->
+                        showCancelConfirmationDialog()
                 }
             }
         }
     }
 
+    private fun startWPComLogin() {
+        ActivityLauncher.showJpRestConnectWpComSignInForResult(this)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        // User returned from WordPress.com login - note the resultCode will always be RESULT_OK but
+        // we check it here in case that ever changes
+        if (requestCode == RequestCodes.ADD_ACCOUNT && viewModel.isWaitingForWPComLogin) {
+            val loginSuccessful = resultCode == RESULT_OK && (accountStore.accessToken?.isNotEmpty() == true)
+            viewModel.onWPComLoginCompleted(success = loginSuccessful)
+        }
+    }
+
     private fun showCancelConfirmationDialog() {
         MaterialAlertDialogBuilder(this)
             .setTitle(R.string.jetpack_rest_connection_cancel_title)

WordPress/src/main/java/org/wordpress/android/ui/jetpackrestconnection/JetpackRestConnectionScreen.kt

@@ -249,30 +249,29 @@ private fun ConnectionStepContent(
 
         Spacer(modifier = Modifier.height(4.dp))
 
-        Text(
-            text = getStatusText(status),
-            style = MaterialTheme.typography.bodyMedium,
-            color = style.statusColor
-        )
-
         if (errorType != null && status == ConnectionStatus.Failed) {
-            Spacer(modifier = Modifier.height(4.dp))
             Text(
                 text = getErrorText(LocalContext.current, errorType),
                 style = MaterialTheme.typography.bodySmall,
                 color = MaterialTheme.colorScheme.error
             )
+        } else {
+            Text(
+                text = getStatusText(status),
+                style = MaterialTheme.typography.bodyMedium,
+                color = style.statusColor
+            )
         }
     }
 }
 
 private fun getErrorText(context: Context, errorType: ErrorType): String {
     @StringRes val messageRes = when (errorType) {
-        is ErrorType.JetpackAlreadyInstalled -> R.string.jetpack_rest_connection_error_jetpack_already_installed
+        ErrorType.FailedToLoginWpCom -> R.string.jetpack_rest_connection_error_login_wpcom
+        ErrorType.FailedToConnectWpCom -> R.string.jetpack_rest_connection_error_connect_wpcom
         is ErrorType.Timeout -> R.string.jetpack_rest_connection_error_timeout
         is ErrorType.Offline -> R.string.jetpack_rest_connection_error_offline
         is ErrorType.Unknown -> R.string.jetpack_rest_connection_error_unknown
-        is ErrorType.FailedToConnectWpCom -> R.string.jetpack_rest_connection_error_wpcom
     }
     val baseMessage = context.getString(messageRes)
     return errorType.message?.let { "$baseMessage: $it" } ?: baseMessage
@@ -422,7 +421,7 @@ private fun JetpackRestConnectionScreenPreview() {
                 ConnectionStep.ConnectSite to StepState(ConnectionStatus.InProgress),
                 ConnectionStep.ConnectWpCom to StepState(
                     ConnectionStatus.Failed,
-                    ErrorType.FailedToConnectWpCom()
+                    ErrorType.FailedToConnectWpCom
                 ),
                 ConnectionStep.Finalize to StepState(ConnectionStatus.NotStarted)
             )
@@ -439,5 +438,7 @@ private fun JetpackRestConnectionScreenPreview() {
     )
 }
 
-@ColorRes private val IN_PROGRESS_BACKGROUND_COLOR = R.color.yellow_10 // Light yellow
-@ColorRes private val IN_PROGRESS_FOREGROUND_COLOR = R.color.yellow_90 // Dark brown for readability on the above
+@ColorRes
+private val IN_PROGRESS_BACKGROUND_COLOR = R.color.yellow_10 // Light yellow
+@ColorRes
+private val IN_PROGRESS_FOREGROUND_COLOR = R.color.yellow_90 // Dark brown for readability on the above