Merge remote-tracking branch 'origin/trunk' into merge/23.8-rc-5-to-trunk

Author: oguzkocer

WordPress/build.gradle

@@ -143,6 +143,7 @@ android {
         buildConfigField "boolean", "PLANS_IN_SITE_CREATION", "false"
         buildConfigField "boolean", "READER_IMPROVEMENTS", "false"
         buildConfigField "boolean", "BLOGANUARY_DASHBOARD_NUDGE", "false"
+        buildConfigField "boolean", "IN_APP_REVIEWS", "false"
 
         // Override these constants in jetpack product flavor to enable/ disable features
         buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"

WordPress/src/main/AndroidManifest.xml

@@ -1040,11 +1040,6 @@
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
 
-        <service
-            android:name=".push.GCMRegistrationIntentService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="false" />
-
         <service
             android:name=".push.GCMMessageService"
             android:exported="false">

WordPress/src/main/java/org/wordpress/android/AppInitializer.kt

@@ -11,7 +11,6 @@ import android.app.NotificationManager
 import android.app.SyncNotedAppOp
 import android.content.ComponentCallbacks2
 import android.content.Context
-import android.content.Intent
 import android.content.IntentFilter
 import android.content.res.Configuration
 import android.database.SQLException
@@ -76,7 +75,7 @@ import org.wordpress.android.modules.APPLICATION_SCOPE
 import org.wordpress.android.networking.ConnectionChangeReceiver
 import org.wordpress.android.networking.OAuthAuthenticator
 import org.wordpress.android.networking.RestClientUtils
-import org.wordpress.android.push.GCMRegistrationIntentService
+import org.wordpress.android.push.GCMRegistrationScheduler
 import org.wordpress.android.push.NotificationType
 import org.wordpress.android.support.ZendeskHelper
 import org.wordpress.android.ui.ActivityId
@@ -193,6 +192,9 @@ class AppInitializer @Inject constructor(
     @Inject
     lateinit var wordPressWorkerFactory: WordPressWorkersFactory
 
+    @Inject
+    lateinit var gcmRegistrationScheduler: GCMRegistrationScheduler
+
     @Inject
     lateinit var debugCookieManager: DebugCookieManager
 
@@ -646,10 +648,7 @@ class AppInitializer @Inject constructor(
 
         if (accountStore.hasAccessToken()) {
             // Make sure the Push Notification token is sent to our servers after a successful login
-            GCMRegistrationIntentService.enqueueWork(
-                application,
-                Intent(application, GCMRegistrationIntentService::class.java)
-            )
+            gcmRegistrationScheduler.scheduleRegistration()
 
             // Force a refresh if user has logged in. This can be removed once we start using an anonymous ID.
             exPlat.forceRefresh()
@@ -815,10 +814,7 @@ class AppInitializer @Inject constructor(
             // Sync Push Notifications settings
             if (isPushNotificationPingNeeded && accountStore.hasAccessToken()) {
                 // Register for Cloud messaging
-                GCMRegistrationIntentService.enqueueWork(
-                    context,
-                    Intent(context, GCMRegistrationIntentService::class.java)
-                )
+                gcmRegistrationScheduler.scheduleRegistration()
             }
         }
 

WordPress/src/main/java/org/wordpress/android/push/GCMMessageService.java

@@ -1,6 +1,5 @@
 package org.wordpress.android.push;
 
-import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
@@ -40,6 +39,8 @@ public class GCMMessageService extends FirebaseMessagingService {
     @Inject GCMMessageHandler mGCMMessageHandler;
     @Inject JetpackFeatureRemovalPhaseHelper mJetpackFeatureRemovalPhaseHelper;
 
+    @Inject GCMRegistrationScheduler mGCMRegistrationScheduler;
+
     private void synchronizedHandleDefaultPush(@NonNull Map<String, String> data) {
         // ACTIVE_NOTIFICATIONS_MAP being static, we can't just synchronize the method
         mSystemNotificationsTracker.track(AnalyticsTracker.Stat.NOTIFICATION_RECEIVED_PROCESSING_START);
@@ -98,7 +99,6 @@ public void onMessageReceived(RemoteMessage message) {
 
     @Override public void onNewToken(@NonNull String s) {
         super.onNewToken(s);
-        GCMRegistrationIntentService.enqueueWork(this,
-                new Intent(this, GCMRegistrationIntentService.class));
+        mGCMRegistrationScheduler.scheduleRegistration();
     }
 }

WordPress/src/main/java/org/wordpress/android/push/GCMRegistrationIntentService.java

@@ -0,0 +1,31 @@
+package org.wordpress.android.push
+
+import androidx.work.ExistingWorkPolicy
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
+import org.wordpress.android.viewmodel.ContextProvider
+import org.wordpress.android.workers.notification.push.GCMRegistrationWorker
+import javax.inject.Inject
+
+class GCMRegistrationScheduler @Inject constructor(
+    val contextProvider: ContextProvider
+) {
+    private val workManager by lazy { WorkManager.getInstance(contextProvider.getContext()) }
+
+    fun scheduleRegistration() {
+        workManager.enqueueUniqueWork(
+            UNIQUE_WORK_NAME,
+            ExistingWorkPolicy.KEEP,
+            buildOneTimeWorkRequest()
+        )
+    }
+
+    private fun buildOneTimeWorkRequest() =
+        OneTimeWorkRequestBuilder<GCMRegistrationWorker>()
+            .addTag(UNIQUE_WORK_NAME)
+            .build()
+
+    companion object {
+        const val UNIQUE_WORK_NAME = "GCMRegistrationWork"
+    }
+}

WordPress/src/main/java/org/wordpress/android/push/GCMRegistrationScheduler.kt

@@ -124,7 +124,7 @@ class BlazePromoteWebViewFragment: Fragment(), OnBlazeWebViewClientListener,
 
     @Suppress("DEPRECATION")
     override fun startActivityForFileChooserResult(intent: Intent?, requestCode: Int) {
-        startActivityForResult(intent, requestCode)
+        intent?.let { startActivityForResult(it, requestCode) }
     }
 
     @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")

WordPress/src/main/java/org/wordpress/android/ui/blaze/blazepromote/BlazePromoteWebViewFragment.kt

@@ -66,7 +66,7 @@
 import org.wordpress.android.networking.ConnectionChangeReceiver;
 import org.wordpress.android.push.GCMMessageHandler;
 import org.wordpress.android.push.GCMMessageService;
-import org.wordpress.android.push.GCMRegistrationIntentService;
+import org.wordpress.android.push.GCMRegistrationScheduler;
 import org.wordpress.android.push.NativeNotificationsUtils;
 import org.wordpress.android.push.NotificationType;
 import org.wordpress.android.push.NotificationsProcessingService;
@@ -276,6 +276,8 @@ public class WPMainActivity extends LocaleAwareActivity implements
 
     @Inject BuildConfigWrapper mBuildConfigWrapper;
 
+    @Inject GCMRegistrationScheduler mGCMRegistrationScheduler;
+
     /*
      * fragments implement this if their contents can be scrolled, called when user
      * requests to scroll to the top
@@ -471,8 +473,7 @@ && getIntent().getExtras().getBoolean(ARG_CONTINUE_JETPACK_CONNECT, false)) {
 
         if (isGooglePlayServicesAvailable(this)) {
             // Register for Cloud messaging
-            GCMRegistrationIntentService.enqueueWork(this,
-                    new Intent(this, GCMRegistrationIntentService.class));
+            mGCMRegistrationScheduler.scheduleRegistration();
         }
 
         if (canShowAppRatingPrompt) {
@@ -1386,8 +1387,7 @@ public void onClick(View v) {
             case RequestCodes.REAUTHENTICATE:
                 if (resultCode == RESULT_OK) {
                     // Register for Cloud messaging
-                    GCMRegistrationIntentService.enqueueWork(this,
-                            new Intent(this, GCMRegistrationIntentService.class));
+                    mGCMRegistrationScheduler.scheduleRegistration();
                 }
                 break;
             case RequestCodes.LOGIN_EPILOGUE:
@@ -1448,8 +1448,7 @@ private void appLanguageChanged() {
     }
 
     private void startWithNewAccount() {
-        GCMRegistrationIntentService.enqueueWork(this,
-                new Intent(this, GCMRegistrationIntentService.class));
+        mGCMRegistrationScheduler.scheduleRegistration();
         ReaderUpdateServiceStarter.startService(this, EnumSet.of(UpdateTask.TAGS, UpdateTask.FOLLOWED_BLOGS));
     }
 

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

@@ -37,10 +37,6 @@ class CardsBuilder @Inject constructor(
             bloggingPromptCardBuilder.build(dashboardCardsBuilderParams.bloggingPromptCardBuilderParams)
                 ?.let { add(it) }
 
-            domainTransferCardBuilder
-                .build(dashboardCardsBuilderParams.domainTransferCardBuilderParams)
-                ?.let { add(it) }
-
             if (dashboardCardsBuilderParams.blazeCardBuilderParams != null) {
                 add(blazeCardBuilder.build(dashboardCardsBuilderParams.blazeCardBuilderParams))
             }
@@ -57,6 +53,10 @@ class CardsBuilder @Inject constructor(
             pagesCardBuilder.build(dashboardCardsBuilderParams.pagesCardBuilderParams)?.let { add(it) }
 
             activityCardBuilder.build(dashboardCardsBuilderParams.activityCardBuilderParams)?.let { add(it) }
+
+            domainTransferCardBuilder
+                .build(dashboardCardsBuilderParams.domainTransferCardBuilderParams)
+                ?.let { add(it) }
         }
     }.toList()
 

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsBuilder.kt

@@ -68,6 +68,7 @@ class PersonalizationActivity : AppCompatActivity() {
                 PersonalizationScreen()
             }
         }
+        viewModel.onSelectedSiteMissing.observe(this) { finish() }
     }
 
     @Composable