Upgrade Android Component version to 121.0

Upgrade AGP to 8.0.2 An R8 error stops us from upgrading to 8.2.0: https://issuetracker.google.com/issues/277166577 Since we don't use `whenTaskAdded` anywhere, maybe it's caused by one of our dependency Signed-off-by: Songlin Jiang <[email protected]>
Igalia · Dec 31, 2023 · 6ab0fa7 · 6ab0fa7
1 parent f070274
commit 6ab0fa7
Show file tree

Hide file tree

Showing 21 changed files with 111 additions and 49 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ on:
         description: 'Gradle version'
         required: false
         type: string
-        default: "7.5"
+        default: "8.0"
 
 jobs:
   build:

diff --git a/app/build.gradle b/app/build.gradle
@@ -699,7 +699,7 @@ dependencies {
     // HVR
     hvrImplementation fileTree(dir: "${project.rootDir}/third_party/hvr", include: ['*.jar'])
     hvrImplementation 'com.huawei.agconnect:agconnect-core-harmony:1.1.0.300'
-    hvrImplementation 'com.huawei.agconnect:agconnect-core:1.6.5.300'
+    hvrImplementation 'com.huawei.agconnect:agconnect-core:1.9.1.301'
     hvrImplementation 'com.huawei.hms:hianalytics:6.3.2.300'
     hvrImplementation 'com.huawei.hms:ml-computer-voice-asr:3.1.0.300'
     hvrImplementation 'com.huawei.hms:location:6.2.0.300'

diff --git a/app/src/common/gecko/com/igalia/wolvic/browser/api/impl/GeckoWebExtension.kt b/app/src/common/gecko/com/igalia/wolvic/browser/api/impl/GeckoWebExtension.kt
@@ -342,20 +342,29 @@ class GeckoWebExtension(
      */
     override fun getMetadata(): Metadata {
         return nativeExtension.metaData.let {
-            Metadata(
+            mozilla.components.concept.engine.webextension.Metadata(
                     name = it.name,
                     description = it.description,
                     developerName = it.creatorName,
                     developerUrl = it.creatorUrl,
-                    homePageUrl = it.homepageUrl,
+                    homepageUrl = it.homepageUrl,
                     version = it.version,
                     permissions = it.permissions.toList(),
                     // Origins is marked as @NonNull but may be null: https://bugzilla.mozilla.org/show_bug.cgi?id=1629957
                     hostPermissions = it.origins.orEmpty().toList(),
                     disabledFlags = DisabledFlags.select(it.disabledFlags),
                     optionsPageUrl = it.optionsPageUrl,
                     openOptionsPageInTab = it.openOptionsPageInTab,
-                    baseUrl = it.baseUrl
+                    baseUrl = it.baseUrl,
+                    averageRating = it.averageRating.toFloat(),
+                    creatorName = it.creatorName,
+                    creatorUrl = it.creatorUrl,
+                    detailUrl = it.homepageUrl,
+                    downloadUrl = it.downloadUrl,
+                    fullDescription = it.fullDescription,
+                    reviewCount = it.reviewCount,
+                    reviewUrl = it.reviewUrl,
+                    updateDate = it.updateDate
             )
         }
     }

diff --git a/app/src/common/shared/com/igalia/wolvic/addons/adapters/AddonsListViewAdapter.kt b/app/src/common/shared/com/igalia/wolvic/addons/adapters/AddonsListViewAdapter.kt
@@ -30,7 +30,7 @@ import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import mozilla.components.feature.addons.Addon
-import mozilla.components.feature.addons.amo.AddonCollectionProvider
+import mozilla.components.feature.addons.amo.AMOAddonsProvider
 import mozilla.components.feature.addons.ui.AddonsManagerAdapterDelegate
 import mozilla.components.feature.addons.ui.CustomViewHolder
 import mozilla.components.feature.addons.ui.CustomViewHolder.AddonViewHolder
@@ -57,7 +57,7 @@ private const val VIEW_HOLDER_TYPE_ADDON = 1
  */
 @Suppress("TooManyFunctions", "LargeClass")
 class AddonsManagerAdapter(
-        private val addonCollectionProvider: AddonCollectionProvider,
+        private val addonCollectionProvider: AMOAddonsProvider,
         private val addonsManagerDelegate: AddonsManagerAdapterDelegate,
         addons: List<Addon>,
         private val style: Style? = null
@@ -105,6 +105,7 @@ class AddonsManagerAdapter(
         val userCountView = view.findViewById<TextView>(R.id.users_count)
         val addButton = view.findViewById<ImageView>(R.id.add_button)
         val allowedInPrivateBrowsingLabel = view.findViewById<ImageView>(R.id.allowed_in_private_browsing_label)
+        val statusErrorView = view.findViewById<TextView>(R.id.add_on_status_error_message)
         return AddonViewHolder(
             view,
             iconView,
@@ -114,7 +115,8 @@ class AddonsManagerAdapter(
             ratingAccessibleView,
             userCountView,
             addButton,
-            allowedInPrivateBrowsingLabel
+            allowedInPrivateBrowsingLabel,
+            statusErrorView
         )
     }
 
@@ -158,15 +160,12 @@ class AddonsManagerAdapter(
             // for contentDescription for the TalkBack feature
             holder.ratingAccessibleView.text = ratingContentDescription
             holder.ratingView.rating = addon.rating!!.average
-            holder.userCountView.text = String.format(userCount, getFormattedAmount(addon.rating!!.reviews))
 
             holder.ratingView.visibility = View.VISIBLE
             holder.ratingAccessibleView.visibility = View.VISIBLE
-            holder.userCountView.visibility = View.VISIBLE
         } else {
             holder.ratingView.visibility = View.GONE
             holder.ratingAccessibleView.visibility = View.GONE
-            holder.userCountView.visibility = View.GONE
         }
 
         val displayLanguage = LocaleUtils.getDisplayLanguage(context).locale.language
@@ -236,7 +235,7 @@ class AddonsManagerAdapter(
                 // if takes less than a second, we assume it comes
                 // from a cache and we don't show any transition animation.
                 val startTime = System.currentTimeMillis()
-                val iconBitmap = addonCollectionProvider.getAddonIconBitmap(addon) ?: addon.installedState?.icon
+                val iconBitmap = addon.icon?: addon.installedState?.icon
                 val timeToFetch: Double = (System.currentTimeMillis() - startTime) / 1000.0
                 val isFromCache = timeToFetch < 1
                 if (iconBitmap != null) iconDrawable = BitmapDrawable(iconView.resources, iconBitmap)

diff --git a/app/src/common/shared/com/igalia/wolvic/addons/views/AddonOptionsDetailsView.java b/app/src/common/shared/com/igalia/wolvic/addons/views/AddonOptionsDetailsView.java
@@ -79,7 +79,7 @@ public void bind(Addon addon) {
             // If the addon is not installed we set the homepage link
             mBinding.homepage.setOnClickListener(view -> {
                 view.requestFocusFromTouch();
-                mWidgetManager.openNewTabForeground(mBinding.getAddon().getSiteUrl());
+                mWidgetManager.openNewTabForeground(mBinding.getAddon().getHomepageUrl());
             });
 
             bindTranslatedDescription(mBinding.addonDescription, addon);
@@ -133,9 +133,7 @@ public void onClick(@NonNull View view) {
     private void bindAuthors(@NonNull TextView view, Addon addon) {
         String text = view.getContext().getString(R.string.addons_no_authors);
         if (addon != null) {
-            String authors = addon.getAuthors().stream()
-                    .map(Addon.Author::getName)
-                    .collect(Collectors.joining( "," ));
+            String authors = addon.getAuthor().getName();
             if (!authors.isEmpty()) {
                 text = authors;
             }

diff --git a/app/src/common/shared/com/igalia/wolvic/addons/views/AddonsListView.java b/app/src/common/shared/com/igalia/wolvic/addons/views/AddonsListView.java
@@ -275,4 +275,16 @@ public void onAddonsUpdated() {
         });
     }
 
+    @Override
+    public void onFindMoreAddonsButtonClicked() {
+    }
+
+    @Override
+    public boolean shouldShowFindMoreAddonsButton() {
+        return false;
+    }
+
+    @Override
+    public void onLearnMoreLinkClicked(@NonNull LearnMoreLinks learnMoreLinks, @NonNull Addon addon) {
+    }
 }
diff --git a/app/src/common/shared/com/igalia/wolvic/browser/Addons.kt b/app/src/common/shared/com/igalia/wolvic/browser/Addons.kt
@@ -28,7 +28,7 @@ import mozilla.components.concept.engine.webextension.Action
 import mozilla.components.concept.engine.webextension.EnableSource
 import mozilla.components.feature.addons.Addon
 import mozilla.components.feature.addons.AddonManager
-import mozilla.components.feature.addons.amo.AddonCollectionProvider
+import mozilla.components.feature.addons.amo.AMOAddonsProvider
 import mozilla.components.feature.addons.update.DefaultAddonUpdater
 import mozilla.components.feature.addons.update.GlobalAddonDependencyProvider
 import mozilla.components.support.base.android.NotificationsDelegate
@@ -52,14 +52,14 @@ class Addons(val context: Context, private val sessionStore: SessionStore) {
 
     val addonCollectionProvider by lazy {
         if (BuildConfig.AMO_COLLECTION.isNotEmpty()) {
-            AddonCollectionProvider(
+            AMOAddonsProvider(
                     context,
                     EngineProvider.getDefaultClient(context),
                     collectionName = BuildConfig.AMO_COLLECTION,
                     maxCacheAgeInMinutes = DAY_IN_MINUTES
             )
         } else {
-            AddonCollectionProvider(
+            AMOAddonsProvider(
                     context,
                     EngineProvider.getDefaultClient(context),
                     maxCacheAgeInMinutes = DAY_IN_MINUTES)
@@ -220,7 +220,7 @@ class Addons(val context: Context, private val sessionStore: SessionStore) {
                 val enabled = installedExtensions[addons[i].id]?.isEnabled() ?: false
                 val icon = CoroutineScope(Dispatchers.Main).future {
                     try {
-                        installedExtensions[addons[i].id]?.loadIcon(AddonManager.TEMPORARY_ADDON_ICON_SIZE)
+                        installedExtensions[addons[i].id]?.loadIcon(AddonManager.ADDON_ICON_SIZE)
                     } catch (throwable: Throwable) {
                         Logger.warn("Failed to load addon icon.", throwable)
                         null

diff --git a/app/src/common/shared/com/igalia/wolvic/browser/HistoryStore.kt b/app/src/common/shared/com/igalia/wolvic/browser/HistoryStore.kt
@@ -83,7 +83,6 @@ class HistoryStore constructor(val context: Context) {
 
     fun getDetailedHistory(): CompletableFuture<List<VisitInfo>?> = GlobalScope.future {
         storage.getDetailedVisits(0, excludeTypes = listOf(
-                VisitType.NOT_A_VISIT,
                 VisitType.DOWNLOAD,
                 VisitType.REDIRECT_TEMPORARY,
                 VisitType.RELOAD,
@@ -94,7 +93,6 @@ class HistoryStore constructor(val context: Context) {
 
     fun getVisitsPaginated(offset: Long, count: Long): CompletableFuture<List<VisitInfo>?> = GlobalScope.future {
         storage.getVisitsPaginated(offset, count, excludeTypes = listOf(
-                VisitType.NOT_A_VISIT,
                 VisitType.DOWNLOAD,
                 VisitType.REDIRECT_TEMPORARY,
                 VisitType.RELOAD,

diff --git a/app/src/common/shared/com/igalia/wolvic/browser/Services.kt b/app/src/common/shared/com/igalia/wolvic/browser/Services.kt
@@ -24,6 +24,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import mozilla.appservices.Megazord
+import mozilla.appservices.fxaclient.FxaServer
 import mozilla.appservices.rustlog.LogAdapterCannotEnable
 import mozilla.components.concept.sync.*
 import mozilla.components.service.fxa.*
@@ -86,7 +87,7 @@ class Services(val context: Context, places: Places): WSession.NavigationDelegat
             }
         }
     }
-    val serverConfig = ServerConfig(if (BuildConfig.FXA_USE_CHINA_SERVER) Server.CHINA else Server.RELEASE, CLIENT_ID, REDIRECT_URL)
+    val serverConfig = ServerConfig(if (BuildConfig.FXA_USE_CHINA_SERVER) FxaServer.China else FxaServer.Release, CLIENT_ID, REDIRECT_URL)
 
     val accountManager = FxaAccountManager(
         context = context,

diff --git a/app/src/common/shared/com/igalia/wolvic/browser/components/WolvicEngineSession.kt b/app/src/common/shared/com/igalia/wolvic/browser/components/WolvicEngineSession.kt
@@ -10,6 +10,9 @@ import com.igalia.wolvic.browser.engine.Session
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.EngineSessionState
 import mozilla.components.concept.engine.Settings
+import mozilla.components.concept.engine.shopping.ProductAnalysis
+import mozilla.components.concept.engine.shopping.ProductRecommendation
+import mozilla.components.concept.engine.translate.TranslationOptions
 import org.json.JSONObject
 
 class WolvicEngineSession(
@@ -36,13 +39,44 @@ class WolvicEngineSession(
     ) = Unit
     override fun loadData(data: String, mimeType: String, encoding: String) = Unit
     override fun reload(flags: LoadUrlFlags) = Unit
+    override fun requestAnalysisStatus(
+        url: String,
+        onResult: (String) -> Unit,
+        onException: (Throwable) -> Unit
+    ) = Unit;
+
     override fun requestPdfToDownload() = Unit
     override fun requestPrintContent() = Unit
+    override fun requestProductAnalysis(
+        url: String,
+        onResult: (ProductAnalysis) -> Unit,
+        onException: (Throwable) -> Unit
+    ) = Unit
+
+    override fun requestProductRecommendations(
+        url: String,
+        onResult: (List<ProductRecommendation>) -> Unit,
+        onException: (Throwable) -> Unit
+    ) = Unit
+
+    override fun requestTranslate(fromLanguage: String, toLanguage: String, options: TranslationOptions?) = Unit
+
+    override fun requestTranslationRestore() = Unit
+
     override fun restoreState(state: EngineSessionState) = true
+    override fun sendClickAttributionEvent(aid: String, onResult: (Boolean) -> Unit, onException: (Throwable) -> Unit) = Unit
+
+    override fun sendImpressionAttributionEvent(aid: String, onResult: (Boolean) -> Unit, onException: (Throwable) -> Unit) = Unit
+
     override fun stopLoading() = Unit
     override fun toggleDesktopMode(enable: Boolean, reload: Boolean) = Unit
     override fun updateTrackingProtection(policy: TrackingProtectionPolicy) = Unit
     override fun purgeHistory() = Unit;
+    override fun reanalyzeProduct(
+        url: String,
+        onResult: (String) -> Unit,
+        onException: (Throwable) -> Unit
+    ) = Unit;
 }
 
 private class DummyEngineSessionState : EngineSessionState {

diff --git a/app/src/common/shared/com/igalia/wolvic/search/SearchEngineWrapper.kt b/app/src/common/shared/com/igalia/wolvic/search/SearchEngineWrapper.kt
@@ -210,7 +210,7 @@ class SearchEngineWrapper private constructor(aContext: Context) :
         private get() = if (hasContext() && context is VRBrowserActivity) context as VRBrowserActivity? else null
 
     // SharedPreferences.OnSharedPreferenceChangeListener
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         if (mContextRef.get() != null) {
             if (key == mContextRef.get()!!
                     .getString(R.string.settings_key_geolocation_data) || key == mContextRef.get()!!

diff --git a/app/src/common/shared/com/igalia/wolvic/ui/adapters/HistoryAdapter.java b/app/src/common/shared/com/igalia/wolvic/ui/adapters/HistoryAdapter.java
@@ -112,7 +112,7 @@ public void removeItem(VisitInfo historyItem) {
     public int itemCount() {
         if (mHistoryList != null) {
             return mHistoryList.stream().allMatch(item ->
-                    item.getVisitType() == VisitType.NOT_A_VISIT) ?
+                    item.getVisitType() == VisitType.TYPED) ?
                     0 :
                     mHistoryList.size();
         }
@@ -271,7 +271,7 @@ public int getItemViewType(int position) {
     }
 
     private boolean isPositionHeader(int position) {
-        return mHistoryList.get(position).getVisitType() == VisitType.NOT_A_VISIT;
+        return mHistoryList.get(position).getVisitType() == VisitType.TYPED;
     }
 
     private View.OnHoverListener mIconHoverListener = (view, motionEvent) -> {

diff --git a/app/src/common/shared/com/igalia/wolvic/ui/views/library/HistoryView.java b/app/src/common/shared/com/igalia/wolvic/ui/views/library/HistoryView.java
@@ -403,15 +403,15 @@ private void updateHistory() {
 
     private void addSection(final @NonNull List<VisitInfo> items, @NonNull String section, long rangeStart, long rangeEnd) {
         for (int i = 0; i < items.size(); i++) {
-            if (items.get(i).getVisitTime() == rangeStart && items.get(i).getVisitType() == VisitType.NOT_A_VISIT)
+            if (items.get(i).getVisitTime() == rangeStart && items.get(i).getVisitType() == VisitType.TYPED)
                 break;
 
             if (items.get(i).getVisitTime() < rangeStart && items.get(i).getVisitTime() > rangeEnd) {
                 items.add(i, new VisitInfo(
                         section,
                         section,
                         rangeStart,
-                        VisitType.NOT_A_VISIT,
+                        VisitType.TYPED,
                         null,
                         false
                 ));

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,6 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:extractNativeLibs="true"
         android:theme="@style/FxR.Dark">
         <activity
             android:name="com.igalia.wolvic.VRBrowserActivity"

diff --git a/app/src/main/res/layout/addons_item.xml b/app/src/main/res/layout/addons_item.xml
@@ -86,6 +86,14 @@
 
         </LinearLayout>
 
+        <TextView
+            android:id="@+id/add_on_status_error_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:textColor="@color/mozac_feature_addons_error_text_color"
+            tools:text="@string/mozac_feature_addons_status_blocklisted" />
+
         <TextView
             android:id="@+id/add_on_description"
             android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/deprecated_version_dialog.xml b/app/src/main/res/layout/deprecated_version_dialog.xml
@@ -50,13 +50,13 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:src="@drawable/mozac_ic_warning"
+                android:src="@drawable/mozac_ic_warning_fill_24"
                 android:layout_gravity="center_vertical|start" />
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:src="@drawable/mozac_ic_warning"
+                android:src="@drawable/mozac_ic_warning_fill_24"
                 android:layout_gravity="center_vertical|end" />
 
             <TextView

diff --git a/build.gradle b/build.gradle
@@ -4,11 +4,11 @@ buildscript {
     apply from: 'versions.gradle'
     addRepos(repositories)
     dependencies {
-        classpath "org.mozilla.telemetry:glean-gradle-plugin:53.2.0"
+        classpath "org.mozilla.telemetry:glean-gradle-plugin:56.0.0"
         classpath "com.android.tools.build:gradle:$versions.android_gradle_plugin"
         classpath 'com.android.tools:r8:8.2.33'
         classpath "$deps.kotlin.plugin"
-        classpath 'com.huawei.agconnect:agcp:1.6.5.300'
+        classpath 'com.huawei.agconnect:agcp:1.9.1.301'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -22,7 +22,7 @@ allprojects {
     addRepos(repositories)
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
     delete "${rootDir}/third_party/wavesdk/build"
 }
diff --git a/docs/metrics.md b/docs/metrics.md
@@ -1,4 +1,4 @@
-<!-- AUTOGENERATED BY glean_parser v8.1.1. DO NOT EDIT. -->
+<!-- AUTOGENERATED BY glean_parser v10.0.3. DO NOT EDIT. -->
 
 # Metrics
 
@@ -11,5 +11,5 @@ This means you might have to go searching through the dependency tree to get a f
 
 Data categories are [defined here](https://wiki.mozilla.org/Firefox/Data_Collection).
 
-<!-- AUTOGENERATED BY glean_parser v8.1.1. DO NOT EDIT. -->
+<!-- AUTOGENERATED BY glean_parser v10.0.3. DO NOT EDIT. -->
 
diff --git a/gradle.properties b/gradle.properties
@@ -23,3 +23,7 @@ android.injected.testOnly=false
 
 android.useAndroidX=true
 android.enableJetifier=true
+
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false