Fix build after Firefox v92.1.1 merge

app/src/main/java/com/adjust/sdk/Adjust.java

@@ -37,4 +37,7 @@ public class Adjust {
 
     public static void setEnabled(boolean enabled) {
     }
+    
+    public static void gdprForgetMe(Object ignored) {
+    }
 }

app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt

@@ -119,7 +119,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
         addons?.forEach { addon ->
             val names = addon.translatableName
             names["en-US"]?.let { name ->
-                if (name.toLowerCase(Locale.ENGLISH).contains(addonNameSubStr.toLowerCase(Locale.ENGLISH))) {
+                if (name.lowercase().contains(addonNameSubStr.lowercase())) {
                     searchedAddons.add(addon)
                 }
             }

app/src/main/java/org/mozilla/fenix/session/PerformanceActivityLifecycleCallbacks.kt

@@ -59,12 +59,12 @@ class PerformanceActivityLifecycleCallbacks(
         }
     }
 
-    override fun onActivityStarted(activity: Activity?) {}
-    override fun onActivityStopped(activity: Activity?) {}
-    override fun onActivityResumed(activity: Activity?) {}
-    override fun onActivityPaused(activity: Activity?) {}
-    override fun onActivitySaveInstanceState(activity: Activity?, bundle: Bundle?) {}
-    override fun onActivityDestroyed(activity: Activity?) {}
+    override fun onActivityStarted(activity: Activity) {}
+    override fun onActivityStopped(activity: Activity) {}
+    override fun onActivityResumed(activity: Activity) {}
+    override fun onActivityPaused(activity: Activity) {}
+    override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) {}
+    override fun onActivityDestroyed(activity: Activity) {}
 
     companion object {
         /**

app/src/main/java/org/mozilla/fenix/session/VisibilityLifecycleCallback.kt

@@ -44,23 +44,23 @@ class VisibilityLifecycleCallback(private val activityManager: ActivityManager?)
         return false
     }
 
-    override fun onActivityStarted(activity: Activity?) {
+    override fun onActivityStarted(activity: Activity) {
         activitiesInStartedState++
     }
 
-    override fun onActivityStopped(activity: Activity?) {
+    override fun onActivityStopped(activity: Activity) {
         activitiesInStartedState--
     }
 
-    override fun onActivityResumed(activity: Activity?) {}
+    override fun onActivityResumed(activity: Activity) {}
 
-    override fun onActivityPaused(activity: Activity?) {}
+    override fun onActivityPaused(activity: Activity) {}
 
-    override fun onActivityCreated(activity: Activity?, bundle: Bundle?) {}
+    override fun onActivityCreated(activity: Activity, bundle: Bundle?) {}
 
-    override fun onActivitySaveInstanceState(activity: Activity?, bundle: Bundle?) {}
+    override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) {}
 
-    override fun onActivityDestroyed(activity: Activity?) {}
+    override fun onActivityDestroyed(activity: Activity) {}
 
     companion object {
         /**

app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt

@@ -159,11 +159,11 @@ class SitePermissionsManageExceptionsPhoneFeatureFragment : Fragment() {
             AlertDialog.Builder(requireContext()).apply {
                 setMessage(R.string.confirm_clear_permission_site)
                 setTitle(R.string.clear_permission)
-                setPositiveButton(android.R.string.yes) { dialog: DialogInterface, _ ->
+                setPositiveButton(android.R.string.ok) { dialog: DialogInterface, _ ->
                     clearPermissions()
                     dialog.dismiss()
                 }
-                setNegativeButton(android.R.string.no) { dialog: DialogInterface, _ ->
+                setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _ ->
                     dialog.cancel()
                 }
             }.show()

app/src/main/java/org/mozilla/fenix/share/ShareViewModel.kt

@@ -47,8 +47,8 @@ class ShareViewModel(application: Application) : AndroidViewModel(application) {
 
     @VisibleForTesting
     internal val networkCallback = object : ConnectivityManager.NetworkCallback() {
-        override fun onLost(network: Network?) = reloadDevices(network)
-        override fun onAvailable(network: Network?) = reloadDevices(network)
+        override fun onLost(network: Network) = reloadDevices(network)
+        override fun onAvailable(network: Network) = reloadDevices(network)
 
         private fun reloadDevices(network: Network?) {
             viewModelScope.launch(ioDispatcher) {