From dbd0dd0a9bcaa13e399884165833bd6f0fa8ce2c Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Mon, 12 Jul 2021 13:38:50 +0200 Subject: [PATCH] Lint cleanup --- .../main/java/at/bitfire/davdroid/AndroidSingleton.kt | 2 +- app/src/main/java/at/bitfire/davdroid/DavService.kt | 4 ++-- app/src/main/java/at/bitfire/davdroid/DavUtils.kt | 2 +- .../main/java/at/bitfire/davdroid/ForegroundService.kt | 2 +- app/src/main/java/at/bitfire/davdroid/HttpClient.kt | 4 ++-- .../main/java/at/bitfire/davdroid/PermissionUtils.kt | 2 +- .../main/java/at/bitfire/davdroid/model/AppDatabase.kt | 2 +- .../main/java/at/bitfire/davdroid/model/SyncableDao.kt | 1 - .../java/at/bitfire/davdroid/resource/LocalContact.kt | 1 - .../java/at/bitfire/davdroid/resource/LocalGroup.kt | 1 - .../at/bitfire/davdroid/settings/AccountSettings.kt | 10 ++++------ .../main/java/at/bitfire/davdroid/ui/AboutActivity.kt | 8 ++++---- .../java/at/bitfire/davdroid/ui/AccountListFragment.kt | 4 ++-- .../java/at/bitfire/davdroid/ui/AccountsActivity.kt | 2 +- .../java/at/bitfire/davdroid/ui/DebugInfoActivity.kt | 8 ++++---- .../main/java/at/bitfire/davdroid/ui/HomeSetAdapter.kt | 3 +-- .../java/at/bitfire/davdroid/ui/PermissionsFragment.kt | 2 +- .../at/bitfire/davdroid/ui/account/AccountActivity.kt | 2 +- .../davdroid/ui/account/AddressBooksFragment.kt | 2 +- .../bitfire/davdroid/ui/account/CalendarsFragment.kt | 2 +- .../davdroid/ui/account/CollectionInfoFragment.kt | 2 +- .../davdroid/ui/account/CreateAddressBookActivity.kt | 2 +- .../davdroid/ui/account/CreateCalendarActivity.kt | 7 +++---- .../at/bitfire/davdroid/ui/account/SettingsActivity.kt | 6 +++--- .../davdroid/ui/intro/BatteryOptimizationsFragment.kt | 4 ++-- .../at/bitfire/davdroid/ui/intro/WelcomeFragment.kt | 1 - .../davdroid/ui/setup/AccountDetailsFragment.kt | 4 ++-- app/src/main/res/drawable/accounts_background.xml | 1 - app/src/main/res/layout/about.xml | 1 - .../main/res/layout/activity_create_address_book.xml | 2 +- app/src/main/res/layout/activity_create_calendar.xml | 4 ++-- 31 files changed, 44 insertions(+), 54 deletions(-) diff --git a/app/src/main/java/at/bitfire/davdroid/AndroidSingleton.kt b/app/src/main/java/at/bitfire/davdroid/AndroidSingleton.kt index db46a3f3..360d6bb4 100644 --- a/app/src/main/java/at/bitfire/davdroid/AndroidSingleton.kt +++ b/app/src/main/java/at/bitfire/davdroid/AndroidSingleton.kt @@ -24,6 +24,6 @@ abstract class AndroidSingleton { return newSingleton } - abstract protected fun createInstance(context: Context): T + protected abstract fun createInstance(context: Context): T } \ No newline at end of file diff --git a/app/src/main/java/at/bitfire/davdroid/DavService.kt b/app/src/main/java/at/bitfire/davdroid/DavService.kt index 565ffaa3..7aa807ad 100644 --- a/app/src/main/java/at/bitfire/davdroid/DavService.kt +++ b/app/src/main/java/at/bitfire/davdroid/DavService.kt @@ -24,8 +24,8 @@ import at.bitfire.dav4jvm.UrlUtils import at.bitfire.dav4jvm.exception.HttpException import at.bitfire.dav4jvm.property.* import at.bitfire.davdroid.log.Logger -import at.bitfire.davdroid.model.* import at.bitfire.davdroid.model.Collection +import at.bitfire.davdroid.model.* import at.bitfire.davdroid.settings.AccountSettings import at.bitfire.davdroid.ui.DebugInfoActivity import at.bitfire.davdroid.ui.NotificationUtils @@ -299,7 +299,7 @@ class DavService: IntentService("DavService") { val itHomeSets = homeSets.iterator() while (itHomeSets.hasNext()) { val (homeSetUrl, homeSet) = itHomeSets.next() - Logger.log.fine("Listing home set ${homeSetUrl}") + Logger.log.fine("Listing home set $homeSetUrl") try { DavResource(httpClient, homeSetUrl).propfind(1, *DAV_COLLECTION_PROPERTIES) { response, relation -> diff --git a/app/src/main/java/at/bitfire/davdroid/DavUtils.kt b/app/src/main/java/at/bitfire/davdroid/DavUtils.kt index 00fa5511..9ba631d5 100644 --- a/app/src/main/java/at/bitfire/davdroid/DavUtils.kt +++ b/app/src/main/java/at/bitfire/davdroid/DavUtils.kt @@ -45,7 +45,7 @@ object DavUtils { fun lastSegmentOfUrl(url: HttpUrl): String { // the list returned by HttpUrl.pathSegments() is unmodifiable, so we have to create a copy - val segments = LinkedList(url.pathSegments) + val segments = LinkedList(url.pathSegments) segments.reverse() return segments.firstOrNull { it.isNotEmpty() } ?: "/" diff --git a/app/src/main/java/at/bitfire/davdroid/ForegroundService.kt b/app/src/main/java/at/bitfire/davdroid/ForegroundService.kt index f28d8075..87be8a28 100644 --- a/app/src/main/java/at/bitfire/davdroid/ForegroundService.kt +++ b/app/src/main/java/at/bitfire/davdroid/ForegroundService.kt @@ -27,7 +27,7 @@ class ForegroundService : Service() { fun startIfEnabled(context: Context) { if (isEnabled(context)) { - val serviceIntent = Intent(ForegroundService.ACTION_FOREGROUND, null, context, ForegroundService::class.java) + val serviceIntent = Intent(ACTION_FOREGROUND, null, context, ForegroundService::class.java) if (Build.VERSION.SDK_INT >= 26) context.startForegroundService(serviceIntent) else diff --git a/app/src/main/java/at/bitfire/davdroid/HttpClient.kt b/app/src/main/java/at/bitfire/davdroid/HttpClient.kt index 8a7eb697..b20bb253 100644 --- a/app/src/main/java/at/bitfire/davdroid/HttpClient.kt +++ b/app/src/main/java/at/bitfire/davdroid/HttpClient.kt @@ -171,11 +171,11 @@ class HttpClient private constructor( } fun build(): HttpClient { - val trustManager = certManager ?: { + val trustManager = certManager ?: run { val factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()) factory.init(null as KeyStore?) factory.trustManagers.first() as X509TrustManager - }() + } val hostnameVerifier = certManager?.hostnameVerifier(OkHostnameVerifier) ?: OkHostnameVerifier diff --git a/app/src/main/java/at/bitfire/davdroid/PermissionUtils.kt b/app/src/main/java/at/bitfire/davdroid/PermissionUtils.kt index a75174cc..ae43c22e 100644 --- a/app/src/main/java/at/bitfire/davdroid/PermissionUtils.kt +++ b/app/src/main/java/at/bitfire/davdroid/PermissionUtils.kt @@ -63,7 +63,7 @@ object PermissionUtils { /** * Whether this app declares the given permission (regardless of whether it has been granted or not). * - * @param permisssion permission to check + * @param permission permission to check * * @return *true* if this app declares [permission] in the manifest; *false* otherwise */ diff --git a/app/src/main/java/at/bitfire/davdroid/model/AppDatabase.kt b/app/src/main/java/at/bitfire/davdroid/model/AppDatabase.kt index 64efd220..230b93ad 100644 --- a/app/src/main/java/at/bitfire/davdroid/model/AppDatabase.kt +++ b/app/src/main/java/at/bitfire/davdroid/model/AppDatabase.kt @@ -203,7 +203,7 @@ abstract class AppDatabase: RoomDatabase() { val cols = cursor.columnCount // print rows while (cursor.moveToNext()) { - val values = Array(cols) { idx -> cursor.getStringOrNull(idx) } + val values = Array(cols) { idx -> cursor.getStringOrNull(idx) } table.addLine(*values) } writer.append(table.toString()) diff --git a/app/src/main/java/at/bitfire/davdroid/model/SyncableDao.kt b/app/src/main/java/at/bitfire/davdroid/model/SyncableDao.kt index 2f171d35..995c09c4 100644 --- a/app/src/main/java/at/bitfire/davdroid/model/SyncableDao.kt +++ b/app/src/main/java/at/bitfire/davdroid/model/SyncableDao.kt @@ -3,7 +3,6 @@ package at.bitfire.davdroid.model import androidx.room.Delete import androidx.room.Insert import androidx.room.Update -import java.util.* interface SyncableDao { diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.kt b/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.kt index f2cae162..226f2451 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.kt +++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.kt @@ -14,7 +14,6 @@ import android.os.RemoteException import android.provider.ContactsContract import android.provider.ContactsContract.CommonDataKinds.GroupMembership import android.provider.ContactsContract.RawContacts.Data -import androidx.annotation.RequiresApi import at.bitfire.davdroid.BuildConfig import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.model.UnknownProperties diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.kt b/app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.kt index f0656454..19711f60 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.kt +++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.kt @@ -8,7 +8,6 @@ package at.bitfire.davdroid.resource -import android.content.ContentProviderOperation import android.content.ContentUris import android.content.ContentValues import android.net.Uri diff --git a/app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt b/app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt index 62f31936..a770cc44 100644 --- a/app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt +++ b/app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt @@ -153,8 +153,7 @@ class AccountSettings( } // repair calendar sync - settings.getSavedCalendarsSyncInterval()?.let { strInterval -> - val shouldBe = strInterval.toLong() + settings.getSavedCalendarsSyncInterval()?.let { shouldBe -> val current = settings.getSyncInterval(CalendarContract.AUTHORITY) if (current != shouldBe) { Logger.log.warning("${account.name}: ${CalendarContract.AUTHORITY} sync interval should be $shouldBe but is $current -> setting to $current") @@ -164,8 +163,7 @@ class AccountSettings( if (taskAuthority != null) // repair calendar sync - settings.getSavedTasksSyncInterval()?.let { strInterval -> - val shouldBe = strInterval.toLong() + settings.getSavedTasksSyncInterval()?.let { shouldBe -> val current = settings.getSyncInterval(taskAuthority) if (current != shouldBe) { Logger.log.warning("${account.name}: $taskAuthority sync interval should be $shouldBe but is $current -> setting to $current") @@ -249,7 +247,7 @@ class AccountSettings( Logger.log.fine("Disabling automatic sync of $account/$authority") ContentResolver.setSyncAutomatically(account, authority, false) - /* return */ ContentResolver.getSyncAutomatically(account, authority) == false + /* return */ !ContentResolver.getSyncAutomatically(account, authority) } } else { { @@ -263,7 +261,7 @@ class AccountSettings( } // try up to 10 times with 100 ms pause - var success: Boolean = false + var success = false for (idxTry in 0 until 10) { success = setInterval() if (success) diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt index 9eb52fa4..4632da8a 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt @@ -124,7 +124,7 @@ class AboutActivity: AppCompatActivity() { private val binding get() = _binding!! val model by viewModels() - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { _binding = AboutBinding.inflate(inflater, container, false) return binding.root } @@ -268,9 +268,9 @@ class AboutActivity: AppCompatActivity() { // sort translations by localized language name val collator = Collator.getInstance() - result.sortWith({ - o1, o2 -> collator.compare(o1.language, o2.language) - }) + result.sortWith { o1, o2 -> + collator.compare(o1.language, o2.language) + } postValue(result) } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.kt index 92f45b7b..c43852b8 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.kt @@ -240,9 +240,9 @@ class AccountListFragment: Fragment() { val sortedAccounts = accountManager .getAccountsByType(context.getString(R.string.account_type)) - .sortedArrayWith({ a, b -> + .sortedArrayWith { a, b -> collator.compare(a.name, b.name) - }) + } val accountsWithInfo = sortedAccounts.map { account -> AccountInfo(account, DavUtils.accountSyncStatus(context, syncAuthorities, account)) } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.kt index 3ab7e3cf..3f89efb0 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.kt @@ -148,7 +148,7 @@ class AccountsActivity: AppCompatActivity(), NavigationView.OnNavigationItemSele class Model(app: Application): AndroidViewModel(app), SyncStatusObserver { private var syncStatusObserver: Any? = null - val showSyncDisabled = MutableLiveData(false) + val showSyncDisabled = MutableLiveData(false) init { syncStatusObserver = ContentResolver.addStatusChangeListener(ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS, this) diff --git a/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt index e882a580..3d978bae 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt @@ -184,7 +184,7 @@ class DebugInfoActivity: AppCompatActivity() { val remoteResource = MutableLiveData() val debugInfo = MutableLiveData() - val zipProgress = MutableLiveData(false) + val zipProgress = MutableLiveData(false) val zipFile = MutableLiveData() // private storage, not readable by others @@ -232,7 +232,7 @@ class DebugInfoActivity: AppCompatActivity() { remoteResource.postValue(remote) generateDebugInfo( - extras?.getParcelable(EXTRA_ACCOUNT), + extras?.getParcelable(EXTRA_ACCOUNT), extras?.getString(EXTRA_AUTHORITY), throwable, local, @@ -241,7 +241,7 @@ class DebugInfoActivity: AppCompatActivity() { } } - fun generateDebugInfo(syncAccount: Account?, syncAuthority: String?, cause: Throwable?, localResource: String?, remoteResource: String?) { + private fun generateDebugInfo(syncAccount: Account?, syncAuthority: String?, cause: Throwable?, localResource: String?, remoteResource: String?) { val debugInfoFile = File(debugInfoDir, FILE_DEBUG_INFO) debugInfoFile.writer().buffered().use { writer -> writer.append(ByteOrderMark.UTF_BOM) @@ -356,7 +356,7 @@ class DebugInfoActivity: AppCompatActivity() { } if (properties != null) { writer .append(" - DNS: ") - .append(properties.dnsServers.map { it.hostAddress }.joinToString(", ")) + .append(properties.dnsServers.joinToString(", ") { it.hostAddress }) if (Build.VERSION.SDK_INT >= 28 && properties.isPrivateDnsActive) writer.append(" (private mode)") writer.append('\n') diff --git a/app/src/main/java/at/bitfire/davdroid/ui/HomeSetAdapter.kt b/app/src/main/java/at/bitfire/davdroid/ui/HomeSetAdapter.kt index f90368cc..c6bd3482 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/HomeSetAdapter.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/HomeSetAdapter.kt @@ -19,8 +19,7 @@ class HomeSetAdapter( override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { val data = getItem(position)!! - val v: View - v = convertView ?: LayoutInflater.from(context).inflate(R.layout.text_list_item, parent, false) + val v: View = convertView ?: LayoutInflater.from(context).inflate(R.layout.text_list_item, parent, false) v.findViewById(android.R.id.text1).apply { text = data.displayName ?: DavUtils.lastSegmentOfUrl(data.url) } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/PermissionsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/PermissionsFragment.kt index 9aa4eeac..d554c7be 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/PermissionsFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/PermissionsFragment.kt @@ -31,7 +31,7 @@ class PermissionsFragment: Fragment() { val model by viewModels() - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { val binding = ActivityPermissionsBinding.inflate(inflater, container, false) binding.lifecycleOwner = viewLifecycleOwner binding.model = model diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/AccountActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/AccountActivity.kt index 685b77c6..c55b9c37 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/AccountActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/AccountActivity.kt @@ -249,7 +249,7 @@ class AccountActivity: AppCompatActivity() { } private val db = AppDatabase.getInstance(application) - val accountManager = AccountManager.get(application) + val accountManager = AccountManager.get(application)!! val accountSettings by lazy { AccountSettings(getApplication(), account) } val accountExists = MutableLiveData() diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/AddressBooksFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/AddressBooksFragment.kt index 1f61143b..7f66abfc 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/AddressBooksFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/AddressBooksFragment.kt @@ -15,7 +15,7 @@ class AddressBooksFragment: CollectionsFragment() { inflater.inflate(R.menu.carddav_actions, menu) override fun onPrepareOptionsMenu(menu: Menu) { - menu.findItem(R.id.create_address_book).setVisible(model.hasWriteableCollections.value ?: false) + menu.findItem(R.id.create_address_book).isVisible = model.hasWriteableCollections.value ?: false super.onPrepareOptionsMenu(menu) } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CalendarsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CalendarsFragment.kt index 246521fa..668c8061 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/CalendarsFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CalendarsFragment.kt @@ -17,7 +17,7 @@ class CalendarsFragment: CollectionsFragment() { inflater.inflate(R.menu.caldav_actions, menu) override fun onPrepareOptionsMenu(menu: Menu) { - menu.findItem(R.id.create_calendar).setVisible(model.hasWriteableCollections.value ?: false) + menu.findItem(R.id.create_calendar).isVisible = model.hasWriteableCollections.value ?: false super.onPrepareOptionsMenu(menu) } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionInfoFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionInfoFragment.kt index 1bc89aa1..ac666841 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionInfoFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionInfoFragment.kt @@ -43,7 +43,7 @@ class CollectionInfoFragment: DialogFragment() { val model by viewModels() - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { arguments?.getLong(ARGS_COLLECTION_ID)?.let { id -> model.initialize(id) } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateAddressBookActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateAddressBookActivity.kt index 311e5aee..1d064688 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateAddressBookActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateAddressBookActivity.kt @@ -51,7 +51,7 @@ class CreateAddressBookActivity: AppCompatActivity() { super.onCreate(savedInstanceState) supportActionBar?.setDisplayHomeAsUpEnabled(true) - binding = DataBindingUtil.setContentView(this, R.layout.activity_create_address_book) + binding = DataBindingUtil.setContentView(this, R.layout.activity_create_address_book) binding.lifecycleOwner = this binding.model = model diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCalendarActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCalendarActivity.kt index b8fbf66f..c6ce3442 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCalendarActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCalendarActivity.kt @@ -60,7 +60,7 @@ class CreateCalendarActivity: AppCompatActivity(), ColorPickerDialogListener { super.onCreate(savedInstanceState) supportActionBar?.setDisplayHomeAsUpEnabled(true) - binding = DataBindingUtil.setContentView(this, R.layout.activity_create_calendar) + binding = DataBindingUtil.setContentView(this, R.layout.activity_create_calendar) binding.lifecycleOwner = this binding.model = model @@ -185,8 +185,7 @@ class CreateCalendarActivity: AppCompatActivity(), ColorPickerDialogListener { val tzId = getItem(position)!! val tz = ZoneId.of(tzId) - val v: View - v = convertView ?: LayoutInflater.from(context).inflate(R.layout.text_list_item, parent, false) + val v: View = convertView ?: LayoutInflater.from(context).inflate(R.layout.text_list_item, parent, false) v.findViewById(android.R.id.text1).text = tz.id v.findViewById(android.R.id.text2).text = tz.getDisplayName(TextStyle.FULL, Locale.getDefault()) @@ -215,7 +214,7 @@ class CreateCalendarActivity: AppCompatActivity(), ColorPickerDialogListener { var homeSet: HomeSet? = null val timezones = TimeZoneAdapter(application) - val timezone = MutableLiveData(TimeZone.getDefault().id) + val timezone = MutableLiveData(TimeZone.getDefault().id) val timezoneError = MutableLiveData() val typeError = MutableLiveData() diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/SettingsActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/SettingsActivity.kt index da64f880..bb473eee 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/SettingsActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/SettingsActivity.kt @@ -363,12 +363,12 @@ class SettingsActivity: AppCompatActivity() { private fun checkWifiPermissions() { if (model.syncWifiOnlySSIDs.value != null && !PermissionUtils.canAccessWifiSsid(requireActivity())) Snackbar.make(requireView(), R.string.settings_sync_wifi_only_ssids_permissions_required, UiUtils.SNACKBAR_LENGTH_VERY_LONG) - .setAction(R.string.settings_sync_wifi_only_ssids_permissions_action, { + .setAction(R.string.settings_sync_wifi_only_ssids_permissions_action) { val intent = Intent(requireActivity(), WifiPermissionsActivity::class.java) intent.putExtra(WifiPermissionsActivity.EXTRA_ACCOUNT, account) startActivity(intent) - }) - .show() + } + .show() } } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/BatteryOptimizationsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/BatteryOptimizationsFragment.kt index 7e7a1c47..e15a20cf 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/intro/BatteryOptimizationsFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/BatteryOptimizationsFragment.kt @@ -57,7 +57,7 @@ class BatteryOptimizationsFragment: Fragment() { binding.autostartMoreInfo.setOnClickListener { UiUtils.launchUri(requireActivity(), App.homepageUrl(requireActivity()).buildUpon() .appendPath("faq").appendPath("synchronization-is-not-run-as-expected") - .appendQueryParameter("manufacturer", Build.MANUFACTURER.toLowerCase(Locale.ROOT)).build()) + .appendQueryParameter("manufacturer", Build.MANUFACTURER.lowercase(Locale.ROOT)).build()) } binding.infoLeaveUnchecked.text = getString(R.string.intro_leave_unchecked, getString(R.string.app_settings_reset_hints)) @@ -115,7 +115,7 @@ class BatteryOptimizationsFragment: Fragment() { * @see evilManufacturers */ val manufacturerWarning = - (evilManufacturers.contains(Build.MANUFACTURER.toLowerCase(Locale.ROOT)) || BuildConfig.DEBUG) + (evilManufacturers.contains(Build.MANUFACTURER.lowercase(Locale.ROOT)) || BuildConfig.DEBUG) fun isWhitelisted(context: Context) = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/WelcomeFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/WelcomeFragment.kt index c6513943..2709891f 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/intro/WelcomeFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/WelcomeFragment.kt @@ -8,7 +8,6 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import at.bitfire.davdroid.App import at.bitfire.davdroid.BuildConfig -import at.bitfire.davdroid.R import at.bitfire.davdroid.databinding.IntroWelcomeBinding import at.bitfire.davdroid.settings.SettingsManager diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt index 77199aa5..eebdfb72 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt @@ -74,7 +74,7 @@ class AccountDetailsFragment : Fragment() { // CalDAV-specific config.calDAV?.let { - val accountNameAdapter = ArrayAdapter(requireActivity(), android.R.layout.simple_list_item_1, it.emails) + val accountNameAdapter = ArrayAdapter(requireActivity(), android.R.layout.simple_list_item_1, it.emails) v.accountName.setAdapter(accountNameAdapter) } @@ -101,7 +101,7 @@ class AccountDetailsFragment : Fragment() { loginModel.credentials, config, GroupMethod.valueOf(groupMethodName) - ).observe(viewLifecycleOwner, Observer { success -> + ).observe(viewLifecycleOwner, Observer { success -> if (success) { // close Create account activity requireActivity().finish() diff --git a/app/src/main/res/drawable/accounts_background.xml b/app/src/main/res/drawable/accounts_background.xml index 25274bd5..e6c51440 100644 --- a/app/src/main/res/drawable/accounts_background.xml +++ b/app/src/main/res/drawable/accounts_background.xml @@ -3,7 +3,6 @@ open-source license: see doc/undraw-license.pdf --> + app:adapter="@{model.homeSets}" /> diff --git a/app/src/main/res/layout/activity_create_calendar.xml b/app/src/main/res/layout/activity_create_calendar.xml index c294e81e..275832ad 100644 --- a/app/src/main/res/layout/activity_create_calendar.xml +++ b/app/src/main/res/layout/activity_create_calendar.xml @@ -87,7 +87,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="none" - android:adapter="@{model.homeSets}"/> + app:adapter="@{model.homeSets}"/> + app:adapter="@{model.timezones}"/>