Commit a7e8b0c3 authored by Beatriz Rizental's avatar Beatriz Rizental Committed by Pier Angelo Vendrame
Browse files

Various Android workarounds

parent 53b031c4

mobile/android/android-components/components/service/sync-logins/src/main/java/mozilla/components/service/sync/logins/SyncableLoginsStorage.kt

+3 −1
Original line number Diff line number Diff line
@@ -88,7 +88,9 @@ class SyncableLoginsStorage( 
    val crypto by lazy { LoginsCrypto(context, securePrefs.value, this) }



    private val conn: Deferred<DatabaseLoginsStorage> = CoroutineScope(coroutineContext).async {

        val key = crypto.getOrGenerateKey().key

        // val key = crypto.getOrGenerateKey().key

        // I think this error goes away with a-s noop.

        val key = "???"

        val keyManager = object : mozilla.appservices.logins.KeyManager {

            override fun getKey(): ByteArray {

                return key.toByteArray()

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt

+10 −4
Original line number Diff line number Diff line
@@ -705,9 +705,9 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorAn 
                MessageNotificationWorker.setMessageNotificationWorker(applicationContext)

            }



            if (components.core.sentFromFirefoxManager.shouldShowSnackbar) {

                components.appStore.dispatch(ShareAction.ShareToWhatsApp)

            }

            // if (components.core.sentFromFirefoxManager.shouldShowSnackbar) {

            //     components.appStore.dispatch(ShareAction.ShareToWhatsApp)

            // }

        }



        onBackPressedCallback.isEnabled = true
@@ -891,7 +891,13 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorAn 
            return existingDialog

        }



        SimpleRedirectDialogFragment.newInstance().also {

        // TODO: This is a temporary solution to keep RR rebases in motion.

        // We need to figure out a proper fix here and then apply it as a fixup to

        // "TB 34378: [android] Port external helper app prompting"

        SimpleRedirectDialogFragment.newInstance(

            dialogTitleString = "???",

            dialogMessageString = "???"

        ).also {

            dialog = it

            return it

        }

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/ui/Homepage.kt

+4 −4
Original line number Diff line number Diff line
@@ -109,10 +109,10 @@ internal fun Homepage( 
            }

            .verticalScroll(scrollState),

    ) {

        HomepageHeader(

            browsingMode = state.browsingMode,

            browsingModeChanged = interactor::onPrivateModeButtonClicked,

        )

        // HomepageHeader(

        //     browsingMode = state.browsingMode,

        //     browsingModeChanged = interactor::onPrivateModeButtonClicked,

        // )



        with(state) {

            when (this) {