Fix UserAgent ANR (again) (#22174)

* Updated UserAgent to differentiate between API user agent and WebView user agent

* Use apiUserAgent for network calls

* Use webViewUserAgent for web views and cookie auth

* Use apiUserAgent for RestClientUtils

* Replaced userAgent.toString calls with webViewUserAgent

* Removed unnecessary logging

* Use webViewUserAgent for Blaze and auth

* Added TODO

* Removed toString()

* Restored toString(), fixed UserAgentTest

* Use webViewUserAgent for app passwords

* Restored apiUserAgent for app passwords

* Fixed broken GutenbergKitSettingsBuilderTest

* Removed toString() now that tests have passed

* Use apiUserAgent for User-Agent headers

* Use apiUserAgent for User-Agent headers, p2

Author: nbradbury

WordPress/src/androidTest/java/org/wordpress/android/UserAgentTest.java

@@ -39,7 +39,7 @@ public void setUp() {
 
     @Test
     public void testGetUserAgentAndGetDefaultUserAgent() {
-        String userAgent = mUserAgent.toString();
+        String userAgent = mUserAgent.getWebViewUserAgent();
         assertNotNull("User-Agent must be set", userAgent);
         assertTrue("User-Agent must not be an empty string", userAgent.length() > 0);
         assertTrue("User-Agent must contain app name substring", userAgent.contains(USER_AGENT_APPNAME));

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

@@ -322,7 +322,7 @@ class AppInitializer @Inject constructor(
                 .installDefaultEventBus()
         }
 
-        RestClientUtils.setUserAgent(userAgent.toString())
+        RestClientUtils.setUserAgent(userAgent.apiUserAgent)
 
         if (!initialized) {
             zendeskHelper.setupZendesk(
@@ -380,8 +380,6 @@ class AppInitializer @Inject constructor(
             initAppOpsManager()
         }
 
-        AppLog.i(T.UTILS, "AppInitializer.userAgentString: $userAgent")
-
         initialized = true
     }
 

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

@@ -70,7 +70,7 @@ public void handleOnBackPressed() {
         mWebView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);
         // Setting this user agent makes Calypso sites hide any WordPress UIs (e.g. Masterbar, banners, etc.).
         if (mUserAgent != null) {
-            mWebView.getSettings().setUserAgentString(mUserAgent.toString());
+            mWebView.getSettings().setUserAgentString(mUserAgent.getWebViewUserAgent());
         }
         configureWebView();
 

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

@@ -154,7 +154,7 @@ class BlazeFeatureUtils @Inject constructor(
         )
     }
 
-    fun getUserAgent() = userAgent.toString()
+    fun getUserAgent() = userAgent.webViewUserAgent
 
     fun getAuthenticationPostData(authenticationUrl: String,
                                   urlToLoad: String,

WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPreviewFragment.kt

@@ -129,7 +129,7 @@ abstract class LayoutPreviewFragment : FullscreenBottomSheetDialogFragment() {
 
         binding?.previewTypeSelectorButton?.setOnClickListener { viewModel.onPreviewModePressed() }
 
-        binding?.webView?.settings?.userAgentString = userAgent.toString()
+        binding?.webView?.settings?.userAgentString = userAgent.webViewUserAgent
         binding?.webView?.webViewClient = object : WebViewClient() {
             override fun onPageFinished(view: WebView?, url: String?) {
                 super.onPageFinished(view, url)

WordPress/src/main/java/org/wordpress/android/ui/media/ExoPlayerUtils.kt

@@ -34,7 +34,7 @@ class ExoPlayerUtils @Inject constructor(
 
     fun buildHttpDataSourceFactory(url: String): DefaultHttpDataSourceFactory {
         if (httpDataSourceFactory == null) {
-            httpDataSourceFactory = DefaultHttpDataSourceFactory(userAgent.toString())
+            httpDataSourceFactory = DefaultHttpDataSourceFactory(userAgent.webViewUserAgent)
         }
         httpDataSourceFactory?.defaultRequestProperties?.set(authenticationUtils.getAuthHeaders(url))
         return httpDataSourceFactory as DefaultHttpDataSourceFactory

WordPress/src/main/java/org/wordpress/android/ui/media/MediaSettingsActivity.java

@@ -1041,7 +1041,7 @@ private void saveMediaToDevice() {
         }
         request.allowScanningByMediaScanner();
         request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE);
-        request.addRequestHeader("User-Agent", mUserAgent.toString());
+        request.addRequestHeader("User-Agent", mUserAgent.getApiUserAgent());
 
         mDownloadId = dm.enqueue(request);
         invalidateOptionsMenu();

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt

@@ -2514,7 +2514,7 @@ class EditPostActivity : BaseAppCompatActivity(), EditorFragmentActivity, Editor
                 siteModel.password,
                 siteModel.isUsingWpComRestApi,
                 siteModel.webEditor,
-                userAgent.toString(),
+                userAgent.webViewUserAgent,
                 isJetpackSsoEnabled
             )
 
@@ -2540,7 +2540,7 @@ class EditPostActivity : BaseAppCompatActivity(), EditorFragmentActivity, Editor
                         editorMediaUploadListener = editorFragment as EditorMediaUploadListener?
 
                         // Set up custom headers for the visual editor's internal WebView
-                        editorFragment?.setCustomHttpHeader("User-Agent", userAgent.toString())
+                        editorFragment?.setCustomHttpHeader("User-Agent", userAgent.webViewUserAgent)
                         reattachUploadingMediaForAztec()
                     }
                 }

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostAuthViewModel.kt

@@ -36,7 +36,7 @@ class EditPostAuthViewModel @Inject constructor(
         val authParams = WordPressCookieAuthenticator.AuthParams(
             username = accountStore.account.userName ?: "",
             bearerToken = accountStore.accessToken ?: "",
-            userAgent = userAgent.toString()
+            userAgent = userAgent.webViewUserAgent
         )
 
         launch {

WordPress/src/main/java/org/wordpress/android/ui/posts/GutenbergKitActivity.kt

@@ -2258,7 +2258,7 @@ class GutenbergKitActivity : BaseAppCompatActivity(), EditorImageSettingsListene
                     }
 
                     // Set up custom headers for the visual editor's internal WebView
-                    editorFragment?.setCustomHttpHeader("User-Agent", userAgent.toString())
+                    editorFragment?.setCustomHttpHeader("User-Agent", userAgent.webViewUserAgent)
                 }
                 VIEW_PAGER_PAGE_SETTINGS -> editPostSettingsFragment = fragment as EditPostSettingsFragment
             }