Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 05d18bb8 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Do not use application context when requesting resources

Application context is not properly themed, resulting in ugly UI on some devices
parent a7b2b7e3
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class PushNotificationAllAppsFragment : PreferenceFragmentCompat() {
    }

    private fun updateContent() {
        val context = requireContext().applicationContext
        val context = requireContext()
        lifecycleScope.launchWhenResumed {
            val apps = withContext(Dispatchers.IO) {
                val res = database.appList.map { app ->
+3 −3
Original line number Diff line number Diff line
@@ -46,13 +46,13 @@ class PushNotificationAppFragment : Fragment(R.layout.push_notification_fragment

    override fun onResume() {
        super.onResume()
        val appContext = requireContext().applicationContext
        val context = requireContext()
        lifecycleScope.launchWhenResumed {
            val pm = appContext.packageManager
            val pm = context.packageManager
            val applicationInfo = pm.getApplicationInfoIfExists(packageName)
            binding.appName = applicationInfo?.loadLabel(pm)?.toString() ?: packageName
            binding.appIcon = applicationInfo?.loadIcon(pm)
                    ?: AppCompatResources.getDrawable(appContext, android.R.mipmap.sym_def_app_icon)
                    ?: AppCompatResources.getDrawable(context, android.R.mipmap.sym_def_app_icon)
        }
    }
}
+4 −4
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ class SettingsFragment : ResourceSettingsFragment() {

    override fun onResume() {
        super.onResume()
        val appContext = requireContext().applicationContext
        val context = requireContext()
        lifecycleScope.launchWhenResumed {
            updateDetails(appContext)
            updateDetails(context)
        }
    }

@@ -63,7 +63,7 @@ class SettingsFragment : ResourceSettingsFragment() {
            val database = GcmDatabase(context)
            val regCount = database.registrationList.size
            database.close()
            findPreference<Preference>(PREF_GCM)!!.summary = getString(R.string.service_status_enabled_short) + " - " + resources.getQuantityString(R.plurals.gcm_registered_apps_counter, regCount, regCount)
            findPreference<Preference>(PREF_GCM)!!.summary = context.getString(R.string.service_status_enabled_short) + " - " + context.resources.getQuantityString(R.plurals.gcm_registered_apps_counter, regCount, regCount)
        } else {
            findPreference<Preference>(PREF_GCM)!!.setSummary(R.string.service_status_disabled_short)
        }
@@ -72,7 +72,7 @@ class SettingsFragment : ResourceSettingsFragment() {
        findPreference<Preference>(PREF_SNET)!!.setSummary(if (getSafetyNetServiceInfo(context).configuration.enabled) R.string.service_status_enabled_short else R.string.service_status_disabled_short)

        val backendCount = UnifiedLocationClient[context].getLocationBackends().size + UnifiedLocationClient[context].getGeocoderBackends().size
        findPreference<Preference>(PREF_UNIFIEDNLP)!!.summary = resources.getQuantityString(R.plurals.pref_unifiednlp_summary, backendCount, backendCount)
        findPreference<Preference>(PREF_UNIFIEDNLP)!!.summary = context.resources.getQuantityString(R.plurals.pref_unifiednlp_summary, backendCount, backendCount)

        findPreference<Preference>(PREF_EXPOSURE)?.isVisible = NearbyPreferencesIntegration.isAvailable
        findPreference<Preference>(PREF_EXPOSURE)?.icon = NearbyPreferencesIntegration.getIcon(context)
+3 −3
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ class ExposureNotificationsAppFragment : Fragment(R.layout.exposure_notification

    override fun onResume() {
        super.onResume()
        val appContext = requireContext().applicationContext
        val context = requireContext()
        lifecycleScope.launchWhenResumed {
            val pm = appContext.packageManager
            val pm = context.packageManager
            val applicationInfo = pm.getApplicationInfoIfExists(packageName)
            binding.appName = applicationInfo?.loadLabel(pm)?.toString() ?: packageName
            binding.appIcon = applicationInfo?.loadIcon(pm)
                    ?: AppCompatResources.getDrawable(appContext, android.R.mipmap.sym_def_app_icon)
                    ?: AppCompatResources.getDrawable(context, android.R.mipmap.sym_def_app_icon)
        }
    }
}
+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ class ExposureNotificationsPreferencesFragment : PreferenceFragmentCompat() {
    }

    private fun updateContent() {
        val context = requireContext().applicationContext
        val context = requireContext()
        lifecycleScope.launchWhenResumed {
            handler.postDelayed(updateContentRunnable, UPDATE_CONTENT_INTERVAL)
            val (apps, lastHourKeys, currentId) = ExposureDatabase.with(context) { database ->