Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android

Commits:

1 changed file:

Changes:

  • fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
    ... ... @@ -34,7 +34,6 @@ import androidx.annotation.VisibleForTesting.Companion.PROTECTED
    34 34
     import androidx.appcompat.app.ActionBar
    
    35 35
     import androidx.appcompat.widget.Toolbar
    
    36 36
     import androidx.core.app.NotificationManagerCompat
    
    37
    -import androidx.core.content.ContentProviderCompat.requireContext
    
    38 37
     import androidx.lifecycle.lifecycleScope
    
    39 38
     import androidx.navigation.NavDestination
    
    40 39
     import androidx.navigation.NavDirections
    
    ... ... @@ -81,6 +80,7 @@ import mozilla.components.support.utils.BootUtils
    81 80
     import mozilla.components.support.utils.ManufacturerCodes
    
    82 81
     import mozilla.components.support.utils.SafeIntent
    
    83 82
     import mozilla.components.support.utils.TorUtils
    
    83
    +import mozilla.components.support.utils.ext.getParcelableExtraCompat
    
    84 84
     import mozilla.components.support.utils.toSafeIntent
    
    85 85
     import mozilla.components.support.webextensions.WebExtensionPopupFeature
    
    86 86
     import mozilla.telemetry.glean.private.NoExtras
    
    ... ... @@ -681,7 +681,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
    681 681
         }
    
    682 682
     
    
    683 683
         open fun handleNewIntent(intent: Intent) {
    
    684
    -        val startIntent = intent.getParcelableExtra(TorUtils.TORBROWSER_START_ACTIVITY_PROMPT, PendingIntent::class.java); //  getParcelableExtra<PendingIntent>(TorUtils.TORBROWSER_START_ACTIVITY_PROMPT)
    
    684
    +        val startIntent = intent.getParcelableExtraCompat(TorUtils.TORBROWSER_START_ACTIVITY_PROMPT, PendingIntent::class.java)
    
    685 685
             if (startIntent != null) {
    
    686 686
                 if (startIntent.creatorPackage == applicationContext.packageName) {
    
    687 687
                     val dialog = getOrCreateDialog()