clairehurst pushed to branch tor-browser-140.4.0esr-15.0-1 at The Tor Project / Applications / Tor Browser

Commits:

2 changed files:

Changes:

  • mobile/android/android-components/components/feature/app-links/build.gradle
    ... ... @@ -36,7 +36,6 @@ dependencies {
    36 36
         implementation project(':ui-widgets')
    
    37 37
     
    
    38 38
         implementation libs.kotlin.coroutines
    
    39
    -    implementation project(path: ':support-utils')
    
    40 39
     
    
    41 40
         testImplementation project(':support-test')
    
    42 41
         testImplementation project(':support-test-libstate')
    

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
    ... ... @@ -870,17 +870,12 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorAn
    870 870
             if (existingDialog != null) {
    
    871 871
                 return existingDialog
    
    872 872
             }
    
    873
    -
    
    874
    -        // TODO: This is a temporary solution to keep RR rebases in motion.
    
    875
    -        // We need to figure out a proper fix here and then apply it as a fixup to
    
    876
    -        // "TB 34378: [android] Port external helper app prompting"
    
    877 873
             SimpleRedirectDialogFragment.newInstance(
    
    878
    -            dialogTitleString = "???",
    
    879
    -            dialogMessageString = "???"
    
    880
    -        ).also {
    
    881
    -            dialog = it
    
    882
    -            return it
    
    883
    -        }
    
    874
    +                getString(R.string.mozac_feature_applinks_normal_confirm_dialog_title),
    
    875
    +            ).also {
    
    876
    +                dialog = it
    
    877
    +                return it
    
    878
    +            }
    
    884 879
         }
    
    885 880
         private fun isAlreadyADialogCreated(): Boolean {
    
    886 881
             return findPreviousDialogFragment() != null