Optimize the code logic.

Author: DaVinci9196

play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/MainActivity.kt

@@ -26,6 +26,9 @@ import org.json.JSONException
 import org.json.JSONObject
 import org.microg.gms.auth.AuthConstants
 import org.microg.gms.common.Constants
+import org.microg.gms.common.Constants.GMS_PACKAGE_NAME
+import org.microg.gms.gcm.ACTION_GCM_NOTIFY_COMPLETE
+import org.microg.gms.gcm.EXTRA_NOTIFICATION_ACCOUNT
 import org.microg.gms.people.PeopleManager
 
 private const val TAG = "AccountSettings"
@@ -136,6 +139,7 @@ class MainActivity : AppCompatActivity() {
     private lateinit var webView: WebView
     private var accountName: String? = null
     private var resultBundle: Bundle? = null
+    private var is2StepVerification: Boolean = false
 
     private fun getSelectedAccountName(): String? = null
 
@@ -148,6 +152,7 @@ class MainActivity : AppCompatActivity() {
         val product = intent?.getStringExtra(EXTRA_SCREEN_MY_ACTIVITY_PRODUCT)
         val kidOnboardingParams = intent?.getStringExtra(EXTRA_SCREEN_KID_ONBOARDING_PARAMS)
         val screenUrl = intent?.getStringExtra(EXTRA_URL)
+        is2StepVerification = intent?.getBooleanExtra(KEY_IS_2_STEP_VERIFICATION, false) ?: false
 
         val screenOptions = intent.extras?.keySet().orEmpty()
             .filter { it.startsWith(EXTRA_SCREEN_OPTIONS_PREFIX) }
@@ -200,6 +205,12 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onDestroy() {
+        if (is2StepVerification) {
+            Intent(ACTION_GCM_NOTIFY_COMPLETE).apply {
+                setPackage(GMS_PACKAGE_NAME)
+                putExtra(EXTRA_NOTIFICATION_ACCOUNT, accountName)
+            }.let { sendBroadcast(it) }
+        }
         super.onDestroy()
     }
 

play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/WebViewHelper.kt

@@ -64,10 +64,6 @@ class WebViewHelper(private val activity: AppCompatActivity, private val webView
                 }
                 val overrideUri = Uri.parse(url)
                 if (overrideUri.getQueryParameter(QUERY_GNOTS_ACTION) == ACTION_CLOSE || overrideUri.getQueryParameter(QUERY_WC_ACTION) == ACTION_CLOSE) {
-                    Intent(ACTION_GCM_NOTIFY_COMPLETE).apply {
-                        setPackage(GMS_PACKAGE_NAME)
-                        putExtra(EXTRA_NOTIFICATION_ACCOUNT, accountName)
-                    }.let { activity.sendBroadcast(it) }
                     activity.finish()
                     return true
                 }

play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/extensions.kt

@@ -29,5 +29,6 @@ const val QUERY_GNOTS_ACTION = "gnotswvaction"
 const val ACTION_CLOSE = "close"
 
 const val KEY_UPDATED_PHOTO_URL = "updatedPhotoUrl"
+const val KEY_IS_2_STEP_VERIFICATION = "is2StepVerification"
 
 const val OPTION_SCREEN_FLAVOR = "screenFlavor"

play-services-core/src/main/kotlin/org/microg/gms/gcm/GcmInGmsService.kt

@@ -38,6 +38,7 @@ import kotlinx.coroutines.withContext
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okio.ByteString
+import org.microg.gms.accountsettings.ui.KEY_IS_2_STEP_VERIFICATION
 import org.microg.gms.accountsettings.ui.MainActivity
 import org.microg.gms.auth.AuthConstants
 import org.microg.gms.auth.AuthManager
@@ -112,7 +113,9 @@ class GcmInGmsService : LifecycleService() {
             Log.d(TAG, "onStartCommand: $intent")
             lifecycleScope.launchWhenStarted {
                 if (checkGcmStatus()) {
-                    handleIntent(intent)
+                    withContext(Dispatchers.IO) {
+                        handleIntent(intent)
+                    }
                 } else {
                     val intent = Intent(ACTION_GCM_RECONNECT).apply {
                         setPackage(Constants.GMS_PACKAGE_NAME)
@@ -169,6 +172,7 @@ class GcmInGmsService : LifecycleService() {
         if (GMS_GCM_NOTIFICATIONS != gcmBodyType) return
         val payloadData = data.getString(GcmConstants.EXTRA_GMS_GNOTS_PAYLOAD) ?: return
         val notificationData = NotificationData.ADAPTER.decode(Base64.decode(payloadData, DEFAULT_FLAGS))
+        Log.w(TAG, "notifyVerificationInfo: $notificationData")
         if (notificationData.isActive == true) return
         val account = notificationData.userInfo?.userId?.let { id ->
             accountManager?.getAccountsByType(AuthConstants.DEFAULT_ACCOUNT_TYPE)?.find {
@@ -209,6 +213,7 @@ class GcmInGmsService : LifecycleService() {
         val intent = Intent(this, MainActivity::class.java).apply {
             `package` = Constants.GMS_PACKAGE_NAME
             flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            putExtra(KEY_IS_2_STEP_VERIFICATION, true)
             intentExtras.forEach { putExtra(it.key, it.value_) }
         }
         val requestCode = notificationIdGenerator.incrementAndGet()
@@ -315,16 +320,29 @@ class GcmInGmsService : LifecycleService() {
         }
         try {
             val identifier = notificationData.identifier
-            val actionButtons = notificationData.content?.actionButtons
-            if (actionButtons.isNullOrEmpty()) {
-                return
-            }
-            val readStateList = actionButtons.map { actionButton ->
-                ReadStateItem.Builder().apply {
-                    notification = identifier
-                    state = actionButton.icon
-                    status = readState
-                }.build()
+            val readStateList = when {
+                readState == NOTIFICATION_STATUS_COMPLETE -> {
+                    listOf(
+                            ReadStateItem.Builder().apply {
+                                this.notification = identifier
+                                this.state = null
+                                this.status = readState
+                            }.build()
+                    )
+                }
+                notificationData.content?.actionButtons.isNullOrEmpty() -> {
+                    Log.w(TAG, "No action buttons found, skipping read state update.")
+                    return
+                }
+                else -> {
+                    notificationData.content!!.actionButtons.map {
+                        ReadStateItem.Builder().apply {
+                            this.notification = identifier
+                            this.state = it.icon
+                            this.status = readState
+                        }.build()
+                    }
+                }
             }
             sendNotificationReadState(accountName, ReadStateList.Builder().apply { items = readStateList }.build())
             Log.i(TAG, "Notification read state updated successfully for account: $accountName")