Solve some lint errors (5167b8a6) · Commits · e / os / android_packages_apps_Etar

src/com/android/calendar/settings/AddOfflineCalendarDialogFragment.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ class AddOfflineCalendarDialogFragment : DialogFragment() {
		return
		}

		val repository = CalendarRepository(activity!!.application)
		val repository = CalendarRepository(requireActivity().application)
		repository.addLocalCalendar(accountName, displayName)
		dismiss()
		}

src/com/android/calendar/settings/MainListPreferences.kt

+12 −12

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ class MainListPreferences : PreferenceFragmentCompat() {
		super.onActivityCreated(savedInstanceState)
		activity?.title = getString(R.string.preferences_title)

		val factory = MainListViewModelFactory(activity!!.application)
		val factory = MainListViewModelFactory(requireActivity().application)
		mainListViewModel = ViewModelProvider(this, factory).get(MainListViewModel::class.java)

		// Add an observer on the LiveData returned by getCalendarsOrderedByAccount.
		@@ -77,7 +77,7 @@ class MainListPreferences : PreferenceFragmentCompat() {
		accountCategory = PreferenceCategory(context).apply {
		key = accountCategoryUniqueKey
		title = calendar.accountName
		icon = ContextCompat.getDrawable(context!!, R.drawable.ic_account_circle)
		icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_account_circle)
		order = if (calendar.isLocal) 10 else 11 // show offline calendar first
		isOrderingAsAdded = false // use alphabetic ordering for children
		}
		@@ -139,11 +139,11 @@ class MainListPreferences : PreferenceFragmentCompat() {

		private fun getCalendarIcon(color: Int, visible: Boolean, syncEvents: Boolean): Drawable {
		val icon = if (!syncEvents) {
		ContextCompat.getDrawable(context!!, R.drawable.ic_sync_off_light)
		ContextCompat.getDrawable(requireContext(), R.drawable.ic_sync_off_light)
		} else if (visible) {
		ContextCompat.getDrawable(context!!, R.drawable.circle)
		ContextCompat.getDrawable(requireContext(), R.drawable.circle)
		} else {
		ContextCompat.getDrawable(context!!, R.drawable.circle_outline)
		ContextCompat.getDrawable(requireContext(), R.drawable.circle_outline)
		}

		icon!!.mutate().setColorFilter(color, Mode.SRC_IN)
		@@ -153,12 +153,12 @@ class MainListPreferences : PreferenceFragmentCompat() {
		private fun addGeneralPreferences(screen: PreferenceScreen) {
		val generalPreference = Preference(context).apply {
		title = getString(R.string.preferences_list_general)
		icon = ContextCompat.getDrawable(context!!, R.drawable.ic_settings)
		icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_settings)
		fragment = GeneralPreferences::class.java.name
		}
		val addCaldavPreference = Preference(context).apply {
		title = getString(R.string.preferences_list_add_remote)
		icon = ContextCompat.getDrawable(context!!, R.drawable.ic_add)
		icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_add)
		}
		addCaldavPreference.setOnPreferenceClickListener {
		launchDavX5Login()
		@@ -166,7 +166,7 @@ class MainListPreferences : PreferenceFragmentCompat() {
		}
		val addEtesyncPreference = Preference(context).apply {
		title = getString(R.string.preferences_list_add_remote_etesync)
		icon = ContextCompat.getDrawable(context!!, R.drawable.ic_add)
		icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_add)
		}
		addEtesyncPreference.setOnPreferenceClickListener {
		launchAddEtesync()
		@@ -174,7 +174,7 @@ class MainListPreferences : PreferenceFragmentCompat() {
		}
		val addOfflinePreference = Preference(context).apply {
		title = getString(R.string.preferences_list_add_offline)
		icon = ContextCompat.getDrawable(context!!, R.drawable.ic_add)
		icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_add)
		}
		addOfflinePreference.setOnPreferenceClickListener {
		addOfflineCalendar()
		@@ -198,20 +198,20 @@ class MainListPreferences : PreferenceFragmentCompat() {
		val davX5Intent = Intent()
		davX5Intent.setClassName("at.bitfire.davdroid", "at.bitfire.davdroid.ui.setup.LoginActivity")

		if (activity!!.packageManager.resolveActivity(davX5Intent, 0) != null) {
		if (requireActivity().packageManager.resolveActivity(davX5Intent, 0) != null) {
		startActivityForResult(davX5Intent, ACTION_REQUEST_CODE_DAVX5_SETUP)
		} else {
		// DAVx5 is not installed
		val installIntent = Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=at.bitfire.davdroid"))

		// launch market
		if (installIntent.resolveActivity(activity!!.packageManager) != null) {
		if (installIntent.resolveActivity(requireActivity().packageManager) != null) {
		startActivity(installIntent)
		} else {
		// no f-droid market app or Play store installed -> launch browser for f-droid url
		val downloadIntent = Intent(Intent.ACTION_VIEW,
		Uri.parse("https://f-droid.org/repository/browse/?fdid=at.bitfire.davdroid"))
		if (downloadIntent.resolveActivity(activity!!.packageManager) != null) {
		if (downloadIntent.resolveActivity(requireActivity().packageManager) != null) {
		startActivity(downloadIntent)
		} else {
		Toast.makeText(activity, "No browser available!", Toast.LENGTH_LONG).show()