Update dependencies; new findPreference syntax (e74a9198) · Commits · e / os / AccountManager

app/build.gradle

+10 −9

Original line number	Diff line number	Diff line
		@@ -83,17 +83,17 @@ dependencies {
		implementation 'androidx.multidex:multidex:2.0.1'
		implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"

		implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
		implementation 'androidx.appcompat:appcompat:1.1.0'
		implementation 'androidx.cardview:cardview:1.0.0'
		implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
		implementation 'androidx.fragment:fragment-ktx:1.0.0'
		implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
		implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
		implementation 'androidx.fragment:fragment-ktx:1.1.0'
		implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
		implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'
		implementation 'androidx.paging:paging-runtime-ktx:2.1.0'
		implementation 'androidx.preference:preference:1.0.0'
		implementation 'androidx.preference:preference:1.1.0'
		implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02'
		implementation 'com.google.android:flexbox:1.1.0'
		implementation 'com.google.android.material:material:1.1.0-alpha09'
		implementation 'com.google.android.material:material:1.1.0-alpha10'

		def room_version = '2.1.0'
		implementation "androidx.room:room-runtime:$room_version"
		@@ -106,7 +106,8 @@ dependencies {

		implementation 'com.jaredrummler:colorpicker:1.1.0'
		implementation 'com.mikepenz:aboutlibraries:6.2.3'
		implementation 'com.squareup.okhttp3:logging-interceptor:3.12.3'
		implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
		implementation "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}"
		implementation 'commons-io:commons-io:2.6'
		implementation 'dnsjava:dnsjava:2.1.9'
		implementation 'org.apache.commons:commons-collections4:4.4'
		@@ -116,8 +117,8 @@ dependencies {
		androidTestImplementation 'androidx.test:runner:1.2.0'
		androidTestImplementation 'androidx.test:rules:1.2.0'
		androidTestImplementation 'junit:junit:4.12'
		androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.12.3'
		androidTestImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttp}"

		testImplementation 'junit:junit:4.12'
		testImplementation 'com.squareup.okhttp3:mockwebserver:3.12.3'
		testImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttp}"
		}

app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.kt

+12 −12

Original line number	Diff line number	Diff line
		@@ -119,9 +119,9 @@ class AccountSettingsActivity: AppCompatActivity() {
		val accountSettings = AccountSettings(requireActivity(), account)

		// preference group: authentication
		val prefUserName = findPreference("username") as EditTextPreference
		val prefPassword = findPreference("password") as EditTextPreference
		val prefCertAlias = findPreference("certificate_alias") as Preference
		val prefUserName = findPreference<EditTextPreference>("username")!!
		val prefPassword = findPreference<EditTextPreference>("password")!!
		val prefCertAlias = findPreference<Preference>("certificate_alias")!!

		val credentials = accountSettings.credentials()
		when (credentials.type) {
		@@ -168,7 +168,7 @@ class AccountSettingsActivity: AppCompatActivity() {
		val syncIntervalCalendars = accountSettings.getSyncInterval(CalendarContract.AUTHORITY)
		val syncIntervalTasks = accountSettings.getSyncInterval(TaskProvider.ProviderName.OpenTasks.authority)

		(findPreference("sync_interval_contacts") as ListPreference).let {
		findPreference<ListPreference>("sync_interval_contacts")!!.let {
		if (syncIntervalContacts != null) {
		it.isEnabled = true
		it.isVisible = true
		@@ -189,7 +189,7 @@ class AccountSettingsActivity: AppCompatActivity() {
		it.isVisible = false
		}

		(findPreference("sync_interval_calendars") as ListPreference).let {
		findPreference<ListPreference>("sync_interval_calendars")!!.let {
		if (syncIntervalCalendars != null) {
		it.isEnabled = true
		it.isVisible = true
		@@ -210,7 +210,7 @@ class AccountSettingsActivity: AppCompatActivity() {
		it.isVisible = false
		}

		(findPreference("sync_interval_tasks") as ListPreference).let {
		findPreference<ListPreference>("sync_interval_tasks")!!.let {
		if (syncIntervalTasks != null) {
		it.isEnabled = true
		it.isVisible = true
		@@ -231,7 +231,7 @@ class AccountSettingsActivity: AppCompatActivity() {
		it.isVisible = false
		}

		val prefWifiOnly = findPreference("sync_wifi_only") as SwitchPreferenceCompat
		val prefWifiOnly = findPreference<SwitchPreferenceCompat>("sync_wifi_only")!!
		prefWifiOnly.isEnabled = !settings.has(AccountSettings.KEY_WIFI_ONLY)
		prefWifiOnly.isChecked = accountSettings.getSyncWifiOnly()
		prefWifiOnly.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, wifiOnly ->
		@@ -240,7 +240,7 @@ class AccountSettingsActivity: AppCompatActivity() {
		false
		}

		val prefWifiOnlySSIDs = findPreference("sync_wifi_only_ssids") as EditTextPreference
		val prefWifiOnlySSIDs = findPreference<EditTextPreference>("sync_wifi_only_ssids")!!
		val onlySSIDs = accountSettings.getSyncWifiOnlySSIDs()?.joinToString(", ")
		prefWifiOnlySSIDs.text = onlySSIDs
		if (onlySSIDs != null)
		@@ -262,7 +262,7 @@ class AccountSettingsActivity: AppCompatActivity() {
		requestPermissions(arrayOf(Manifest.permission.ACCESS_COARSE_LOCATION), 0)

		// preference group: CardDAV
		(findPreference("contact_group_method") as ListPreference).let {
		findPreference<ListPreference>("contact_group_method")!!.let {
		if (syncIntervalContacts != null) {
		it.isVisible = true
		it.value = accountSettings.getGroupMethod().name
		@@ -296,7 +296,7 @@ class AccountSettingsActivity: AppCompatActivity() {
		}

		// preference group: CalDAV
		(findPreference("time_range_past_days") as EditTextPreference).let {
		findPreference<EditTextPreference>("time_range_past_days")!!.let {
		if (syncIntervalCalendars != null) {
		it.isVisible = true
		val pastDays = accountSettings.getTimeRangePastDays()
		@@ -335,7 +335,7 @@ class AccountSettingsActivity: AppCompatActivity() {
		it.isVisible = false
		}

		(findPreference("manage_calendar_colors") as SwitchPreferenceCompat).let {
		findPreference<SwitchPreferenceCompat>("manage_calendar_colors")!!.let {
		if (syncIntervalCalendars != null \|\| syncIntervalTasks != null) {
		it.isVisible = true
		it.isEnabled = !settings.has(AccountSettings.KEY_MANAGE_CALENDAR_COLORS)
		@@ -349,7 +349,7 @@ class AccountSettingsActivity: AppCompatActivity() {
		it.isVisible = false
		}

		(findPreference("event_colors") as SwitchPreferenceCompat).let {
		findPreference<SwitchPreferenceCompat>("event_colors")!!.let {
		if (syncIntervalCalendars != null) {
		it.isVisible = true
		it.isEnabled = !settings.has(AccountSettings.KEY_EVENT_COLORS)

app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.kt

+8 −8

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ class AppSettingsActivity: AppCompatActivity() {
		loadSettings()

		// UI settings
		findPreference("notification_settings").apply {
		findPreference<Preference>("notification_settings")!!.apply {
		if (Build.VERSION.SDK_INT >= 26)
		onPreferenceClickListener = Preference.OnPreferenceClickListener {
		startActivity(Intent(android.provider.Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
		@@ -61,17 +61,17 @@ class AppSettingsActivity: AppCompatActivity() {
		else
		isVisible = false
		}
		findPreference("reset_hints").onPreferenceClickListener = Preference.OnPreferenceClickListener {
		findPreference<Preference>("reset_hints")!!.onPreferenceClickListener = Preference.OnPreferenceClickListener {
		resetHints()
		false
		}

		// security settings
		findPreference(Settings.DISTRUST_SYSTEM_CERTIFICATES).apply {
		findPreference<SwitchPreferenceCompat>(Settings.DISTRUST_SYSTEM_CERTIFICATES)!!.apply {
		isVisible = BuildConfig.customCerts
		isEnabled = true
		}
		findPreference("reset_certificates").apply {
		findPreference<Preference>("reset_certificates")!!.apply {
		isVisible = BuildConfig.customCerts
		isEnabled = true
		onPreferenceClickListener = Preference.OnPreferenceClickListener {
		@@ -89,12 +89,12 @@ class AppSettingsActivity: AppCompatActivity() {
		val settings = Settings.getInstance(requireActivity())

		// connection settings
		(findPreference(Settings.OVERRIDE_PROXY) as SwitchPreferenceCompat).apply {
		findPreference<SwitchPreferenceCompat>(Settings.OVERRIDE_PROXY)!!.apply {
		isChecked = settings.getBoolean(Settings.OVERRIDE_PROXY) ?: Settings.OVERRIDE_PROXY_DEFAULT
		isEnabled = settings.isWritable(Settings.OVERRIDE_PROXY)
		}

		(findPreference(Settings.OVERRIDE_PROXY_HOST) as EditTextPreference).apply {
		findPreference<EditTextPreference>(Settings.OVERRIDE_PROXY_HOST)!!.apply {
		isEnabled = settings.isWritable(Settings.OVERRIDE_PROXY_HOST)
		val proxyHost = settings.getString(Settings.OVERRIDE_PROXY_HOST) ?: Settings.OVERRIDE_PROXY_HOST_DEFAULT
		text = proxyHost
		@@ -113,7 +113,7 @@ class AppSettingsActivity: AppCompatActivity() {
		}
		}

		(findPreference(Settings.OVERRIDE_PROXY_PORT) as EditTextPreference).apply {
		findPreference<EditTextPreference>(Settings.OVERRIDE_PROXY_PORT)!!.apply {
		isEnabled = settings.isWritable(Settings.OVERRIDE_PROXY_PORT)
		val proxyPort = settings.getInt(Settings.OVERRIDE_PROXY_PORT) ?: Settings.OVERRIDE_PROXY_PORT_DEFAULT
		text = proxyPort.toString()
		@@ -135,7 +135,7 @@ class AppSettingsActivity: AppCompatActivity() {
		}

		// security settings
		(findPreference(Settings.DISTRUST_SYSTEM_CERTIFICATES) as SwitchPreferenceCompat)
		findPreference<SwitchPreferenceCompat>(Settings.DISTRUST_SYSTEM_CERTIFICATES)!!
		.isChecked = settings.getBoolean(Settings.DISTRUST_SYSTEM_CERTIFICATES) ?: Settings.DISTRUST_SYSTEM_CERTIFICATES_DEFAULT
		}

build.gradle

+3 −2

Original line number	Diff line number	Diff line
		@@ -8,9 +8,10 @@

		buildscript {
		ext.versions = [
		kotlin: '1.3.50',
		conscrypt: '2.1.0',
		dokka: '0.9.18',
		conscrypt: '2.1.0'
		kotlin: '1.3.50',
		okhttp: '3.12.5'
		]

		repositories {