From 79675261d22f59e264b4fe9571bdfdfaf3be158e Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 1 Dec 2020 17:17:47 +0200 Subject: [PATCH] Fix build following changes. --- .../syncadapter/resource/LocalAddressBook.kt | 2 +- .../syncadapter/resource/LocalCalendar.kt | 24 ++++++------- .../syncadapter/resource/LocalContact.kt | 35 ++++++++----------- .../syncadapter/resource/LocalEvent.kt | 6 ++-- .../syncadapter/resource/LocalGroup.kt | 17 ++++----- .../etesync/syncadapter/resource/LocalTask.kt | 9 ++--- .../syncadapter/ContactsSyncManager.kt | 6 ++-- .../etesync/syncadapter/ui/AboutActivity.kt | 2 +- .../etesync/syncadapter/ui/AccountActivity.kt | 2 +- .../syncadapter/ui/AccountSettingsActivity.kt | 6 ++-- .../ui/CollectionMembersActivity.kt | 2 +- .../ui/CreateCollectionFragment.kt | 2 +- .../etesync/syncadapter/ui/WebViewActivity.kt | 2 +- .../ui/etebase/ItemRevisionsListFragment.kt | 2 +- .../ui/etebase/ListEntriesFragment.kt | 2 +- .../setup/LoginCredentialsChangeFragment.kt | 2 +- 16 files changed, 50 insertions(+), 71 deletions(-) diff --git a/app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.kt b/app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.kt index b4788739..da43839f 100644 --- a/app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.kt +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.kt @@ -424,7 +424,7 @@ class LocalAddressBook( val values = ContentValues(1) values.put(Groups.TITLE, title) val uri = provider.insert(syncAdapterURI(Groups.CONTENT_URI), values) - return ContentUris.parseId(uri) + return ContentUris.parseId(uri!!) } fun removeEmptyGroups() { diff --git a/app/src/main/java/com/etesync/syncadapter/resource/LocalCalendar.kt b/app/src/main/java/com/etesync/syncadapter/resource/LocalCalendar.kt index 8017e033..b9963659 100644 --- a/app/src/main/java/com/etesync/syncadapter/resource/LocalCalendar.kt +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalCalendar.kt @@ -10,7 +10,6 @@ package com.etesync.syncadapter.resource import android.accounts.Account import android.content.ContentProviderClient -import android.content.ContentProviderOperation import android.content.ContentUris import android.content.ContentValues import android.net.Uri @@ -24,7 +23,6 @@ import com.etesync.syncadapter.log.Logger import com.etesync.syncadapter.model.JournalEntity import com.etesync.syncadapter.resource.LocalEvent.Companion.COLUMN_UID import org.apache.commons.lang3.StringUtils -import org.dmfs.tasks.contract.TaskContract import java.util.* import java.util.logging.Level @@ -210,15 +208,15 @@ class LocalCalendar private constructor( cursor2!!.close() val batch = BatchOperation(provider) // re-schedule original event and set it to DIRTY - batch.enqueue(BatchOperation.Operation( - ContentProviderOperation.newUpdate(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, originalID))) + batch.enqueue( + BatchOperation.CpoBuilder.newUpdate(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, originalID))) .withValue(LocalEvent.COLUMN_SEQUENCE, originalSequence + 1) .withValue(Events.DIRTY, 1) - )) + ) // remove exception - batch.enqueue(BatchOperation.Operation( - ContentProviderOperation.newDelete(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, id))) - )) + batch.enqueue( + BatchOperation.CpoBuilder.newDelete(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, id))) + ) batch.commit() } cursor!!.close() @@ -242,16 +240,14 @@ class LocalCalendar private constructor( val batch = BatchOperation(provider) // original event to DIRTY - batch.enqueue(BatchOperation.Operation( - ContentProviderOperation.newUpdate(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, originalID))) + batch.enqueue(BatchOperation.CpoBuilder.newUpdate(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, originalID))) .withValue(Events.DIRTY, 1) - )) + ) // increase SEQUENCE and set DIRTY to 0 - batch.enqueue(BatchOperation.Operation( - ContentProviderOperation.newUpdate(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, id))) + batch.enqueue(BatchOperation.CpoBuilder.newUpdate(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, id))) .withValue(LocalEvent.COLUMN_SEQUENCE, sequence + 1) .withValue(Events.DIRTY, 0) - )) + ) batch.commit() } cursor!!.close() diff --git a/app/src/main/java/com/etesync/syncadapter/resource/LocalContact.kt b/app/src/main/java/com/etesync/syncadapter/resource/LocalContact.kt index b6c9d6a3..88d4dc1d 100644 --- a/app/src/main/java/com/etesync/syncadapter/resource/LocalContact.kt +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalContact.kt @@ -141,17 +141,15 @@ class LocalContact : AndroidContact, LocalAddress { super.insertDataRows(batch) if (contact?.unknownProperties != null) { - val op: BatchOperation.Operation - val builder = ContentProviderOperation.newInsert(dataSyncURI()) + var builder = BatchOperation.CpoBuilder.newInsert(dataSyncURI()) if (id == null) { - op = BatchOperation.Operation(builder, UnknownProperties.RAW_CONTACT_ID, 0) + builder = builder.withValue(UnknownProperties.RAW_CONTACT_ID, 0) } else { - op = BatchOperation.Operation(builder) - builder.withValue(UnknownProperties.RAW_CONTACT_ID, id) + builder = builder.withValue(UnknownProperties.RAW_CONTACT_ID, id) } builder.withValue(UnknownProperties.MIMETYPE, UnknownProperties.CONTENT_ITEM_TYPE) .withValue(UnknownProperties.UNKNOWN_PROPERTIES, contact?.unknownProperties) - batch.enqueue(op) + batch.enqueue(builder) } } @@ -166,7 +164,7 @@ class LocalContact : AndroidContact, LocalAddress { return this.add() } - override fun buildContact(builder: ContentProviderOperation.Builder, update: Boolean) { + override fun buildContact(builder: BatchOperation.CpoBuilder, update: Boolean) { super.buildContact(builder, update) builder.withValue(ContactsContract.RawContacts.DIRTY, if (saveAsDirty) 1 else 0) } @@ -202,10 +200,10 @@ class LocalContact : AndroidContact, LocalAddress { if (batch == null) addressBook.provider!!.update(rawContactSyncURI(), values, null, null) else { - val builder = ContentProviderOperation + val builder = BatchOperation.CpoBuilder .newUpdate(rawContactSyncURI()) - .withValues(values) - batch.enqueue(BatchOperation.Operation(builder)) + .withValue(COLUMN_HASHCODE, hashCode) + batch.enqueue(builder) } } @@ -223,33 +221,28 @@ class LocalContact : AndroidContact, LocalAddress { fun addToGroup(batch: BatchOperation, groupID: Long) { - batch.enqueue(BatchOperation.Operation( - ContentProviderOperation.newInsert(dataSyncURI()) + batch.enqueue(BatchOperation.CpoBuilder.newInsert(dataSyncURI()) .withValue(GroupMembership.MIMETYPE, GroupMembership.CONTENT_ITEM_TYPE) .withValue(GroupMembership.RAW_CONTACT_ID, id) .withValue(GroupMembership.GROUP_ROW_ID, groupID) - )) + ) groupMemberships.add(groupID) - batch.enqueue(BatchOperation.Operation( - ContentProviderOperation.newInsert(dataSyncURI()) + batch.enqueue(BatchOperation.CpoBuilder.newInsert(dataSyncURI()) .withValue(CachedGroupMembership.MIMETYPE, CachedGroupMembership.CONTENT_ITEM_TYPE) .withValue(CachedGroupMembership.RAW_CONTACT_ID, id) .withValue(CachedGroupMembership.GROUP_ID, groupID) - .withYieldAllowed(true) - )) + ) cachedGroupMemberships.add(groupID) } fun removeGroupMemberships(batch: BatchOperation) { - batch.enqueue(BatchOperation.Operation( - ContentProviderOperation.newDelete(dataSyncURI()) + batch.enqueue(BatchOperation.CpoBuilder.newDelete(dataSyncURI()) .withSelection( Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + " IN (?,?)", arrayOf(id.toString(), GroupMembership.CONTENT_ITEM_TYPE, CachedGroupMembership.CONTENT_ITEM_TYPE) ) - .withYieldAllowed(true) - )) + ) groupMemberships.clear() cachedGroupMemberships.clear() } diff --git a/app/src/main/java/com/etesync/syncadapter/resource/LocalEvent.kt b/app/src/main/java/com/etesync/syncadapter/resource/LocalEvent.kt index e5206ee5..e0e90f1e 100644 --- a/app/src/main/java/com/etesync/syncadapter/resource/LocalEvent.kt +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalEvent.kt @@ -83,7 +83,7 @@ class LocalEvent : AndroidEvent, LocalResource { weAreOrganizer = isOrganizer != null && isOrganizer != 0 } - override fun buildEvent(recurrence: Event?, builder: ContentProviderOperation.Builder) { + override fun buildEvent(recurrence: Event?, builder: BatchOperation.CpoBuilder) { super.buildEvent(recurrence, builder) val buildException = recurrence != null @@ -101,7 +101,7 @@ class LocalEvent : AndroidEvent, LocalResource { .withValue(COLUMN_ETAG, eTag) } - override fun insertReminder(batch: BatchOperation, idxEvent: Int, alarm: VAlarm) { + override fun insertReminder(batch: BatchOperation, idxEvent: Int?, alarm: VAlarm) { // We only support DISPLAY and AUDIO alarms so modify when inserting val action = alarm.action val modifiedAlarm = when (action?.value) { @@ -133,7 +133,7 @@ class LocalEvent : AndroidEvent, LocalResource { override fun legacyPrepareForUpload(fileName_: String?) { var uid: String? = null - val c = calendar.provider.query(eventSyncURI(), arrayOf(COLUMN_UID), null, null, null) + val c = calendar.provider.query(eventSyncURI(), arrayOf(COLUMN_UID), null, null, null)!! if (c.moveToNext()) uid = c.getString(0) if (uid == null) diff --git a/app/src/main/java/com/etesync/syncadapter/resource/LocalGroup.kt b/app/src/main/java/com/etesync/syncadapter/resource/LocalGroup.kt index 6af2801a..eb25a461 100644 --- a/app/src/main/java/com/etesync/syncadapter/resource/LocalGroup.kt +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalGroup.kt @@ -135,23 +135,20 @@ class LocalGroup : AndroidGroup, LocalAddress { val batch = BatchOperation(addressBook.provider!!) // delete cached group memberships - batch.enqueue(BatchOperation.Operation( - ContentProviderOperation.newDelete(addressBook.syncAdapterURI(ContactsContract.Data.CONTENT_URI)) + batch.enqueue(BatchOperation.CpoBuilder.newDelete(addressBook.syncAdapterURI(ContactsContract.Data.CONTENT_URI)) .withSelection( CachedGroupMembership.MIMETYPE + "=? AND " + CachedGroupMembership.GROUP_ID + "=?", arrayOf(CachedGroupMembership.CONTENT_ITEM_TYPE, id.toString()) ) - )) + ) // insert updated cached group memberships for (member in getMembers()) - batch.enqueue(BatchOperation.Operation( - ContentProviderOperation.newInsert(addressBook.syncAdapterURI(ContactsContract.Data.CONTENT_URI)) + batch.enqueue(BatchOperation.CpoBuilder.newInsert(addressBook.syncAdapterURI(ContactsContract.Data.CONTENT_URI)) .withValue(CachedGroupMembership.MIMETYPE, CachedGroupMembership.CONTENT_ITEM_TYPE) .withValue(CachedGroupMembership.RAW_CONTACT_ID, member) .withValue(CachedGroupMembership.GROUP_ID, id) - .withYieldAllowed(true) - )) + ) batch.commit() } @@ -214,11 +211,9 @@ class LocalGroup : AndroidGroup, LocalAddress { .forEach { it.updateHashCode(batch) } // remove pending memberships - batch.enqueue(BatchOperation.Operation( - ContentProviderOperation.newUpdate(addressBook.syncAdapterURI(ContentUris.withAppendedId(Groups.CONTENT_URI, id))) + batch.enqueue(BatchOperation.CpoBuilder.newUpdate(addressBook.syncAdapterURI(ContentUris.withAppendedId(Groups.CONTENT_URI, id))) .withValue(COLUMN_PENDING_MEMBERS, null) - .withYieldAllowed(true) - )) + ) } diff --git a/app/src/main/java/com/etesync/syncadapter/resource/LocalTask.kt b/app/src/main/java/com/etesync/syncadapter/resource/LocalTask.kt index d39d8d4b..15ed97fb 100644 --- a/app/src/main/java/com/etesync/syncadapter/resource/LocalTask.kt +++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalTask.kt @@ -12,10 +12,7 @@ import android.content.ContentProviderOperation import android.content.ContentValues import android.net.Uri import android.text.TextUtils -import at.bitfire.ical4android.AndroidTask -import at.bitfire.ical4android.AndroidTaskFactory -import at.bitfire.ical4android.AndroidTaskList -import at.bitfire.ical4android.Task +import at.bitfire.ical4android.* import com.etesync.syncadapter.log.Logger import org.dmfs.tasks.contract.TaskContract import java.io.ByteArrayOutputStream @@ -75,7 +72,7 @@ class LocalTask : AndroidTask, LocalResource { task?.sequence = values.getAsInteger(COLUMN_SEQUENCE) } - override fun buildTask(builder: ContentProviderOperation.Builder, update: Boolean) { + override fun buildTask(builder: BatchOperation.CpoBuilder, update: Boolean) { super.buildTask(builder, update) builder.withValue(TaskContract.Tasks._SYNC_ID, fileName) .withValue(COLUMN_UID, task?.uid) @@ -98,7 +95,7 @@ class LocalTask : AndroidTask, LocalResource { override fun legacyPrepareForUpload(fileName_: String?) { var uid: String? = null - val c = taskList.provider.client.query(taskSyncURI(), arrayOf(COLUMN_UID), null, null, null) + val c = taskList.provider.client.query(taskSyncURI(), arrayOf(COLUMN_UID), null, null, null)!! if (c.moveToNext()) uid = c.getString(0) if (uid == null) diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.kt index e58f864b..cb99d777 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.kt +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.kt @@ -102,11 +102,9 @@ constructor(context: Context, account: Account, settings: AccountSettings, extra val currentGroups = contact.getGroupMemberships() for (groupID in SetUtils.disjunction(cachedGroups, currentGroups)) { Logger.log.fine("Marking group as dirty: " + groupID!!) - batch.enqueue(BatchOperation.Operation( - ContentProviderOperation.newUpdate(addressBook.syncAdapterURI(ContentUris.withAppendedId(ContactsContract.Groups.CONTENT_URI, groupID))) + batch.enqueue(BatchOperation.CpoBuilder.newUpdate(addressBook.syncAdapterURI(ContentUris.withAppendedId(ContactsContract.Groups.CONTENT_URI, groupID))) .withValue(ContactsContract.Groups.DIRTY, 1) - .withYieldAllowed(true) - )) + ) } } catch (ignored: FileNotFoundException) { } diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AboutActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AboutActivity.kt index 1953c47f..9853dac8 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AboutActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/AboutActivity.kt @@ -100,7 +100,7 @@ class AboutActivity : BaseActivity() { } override fun onCreateLoader(id: Int, args: Bundle?): Loader { - return LicenseLoader(context!!, args!!.getString(KEY_FILE_NAME)) + return LicenseLoader(requireContext(), args!!.getString(KEY_FILE_NAME)!!) } override fun onLoadFinished(loader: Loader, license: Spanned) { diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt index 1a9231ab..5b275254 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt @@ -108,7 +108,7 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - account = intent.getParcelableExtra(EXTRA_ACCOUNT) + account = intent.getParcelableExtra(EXTRA_ACCOUNT)!! title = account.name settings = AccountSettings(this, account) diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.kt index 23c720b5..0cad0e8d 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.kt @@ -42,7 +42,7 @@ class AccountSettingsActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - account = intent.getParcelableExtra(KEY_ACCOUNT) + account = intent.getParcelableExtra(KEY_ACCOUNT)!! title = getString(R.string.settings_title, account.name) supportActionBar!!.setDisplayHomeAsUpEnabled(true) @@ -85,7 +85,7 @@ class AccountSettingsFragment() : PreferenceFragmentCompat(), LoaderManager.Load } override fun onCreateLoader(id: Int, args: Bundle?): Loader { - return AccountSettingsLoader(context!!, args!!.getParcelable(KEY_ACCOUNT) as Account) + return AccountSettingsLoader(requireContext(), (args!!.getParcelable(KEY_ACCOUNT) as Account?)!!) } override fun onLoadFinished(loader: Loader, settings: AccountSettings?) { @@ -197,7 +197,7 @@ class LegacyAccountSettingsFragment : PreferenceFragmentCompat(), LoaderManager. } override fun onCreateLoader(id: Int, args: Bundle?): Loader { - return AccountSettingsLoader(context!!, args!!.getParcelable(KEY_ACCOUNT) as Account) + return AccountSettingsLoader(context!!, (args!!.getParcelable(KEY_ACCOUNT) as? Account)!!) } override fun onLoadFinished(loader: Loader, settings: AccountSettings?) { diff --git a/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersActivity.kt index 5371cd1e..6b17693f 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersActivity.kt @@ -68,7 +68,7 @@ class CollectionMembersActivity : BaseActivity(), Refreshable { supportActionBar!!.setDisplayHomeAsUpEnabled(true) - account = intent.extras!!.getParcelable(EXTRA_ACCOUNT) + account = intent.extras!!.getParcelable(EXTRA_ACCOUNT)!! info = intent.extras!!.getSerializable(EXTRA_COLLECTION_INFO) as CollectionInfo refresh() diff --git a/app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionFragment.kt index d61e4ba9..a1f1768c 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionFragment.kt @@ -37,7 +37,7 @@ class CreateCollectionFragment : DialogFragment(), LoaderManager.LoaderCallbacks override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - account = arguments!!.getParcelable(ARG_ACCOUNT) + account = arguments!!.getParcelable(ARG_ACCOUNT)!! info = arguments!!.getSerializable(ARG_COLLECTION_INFO) as CollectionInfo loaderManager.initLoader(0, null, this) diff --git a/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt index 7d8b46f2..06b36560 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt @@ -31,7 +31,7 @@ class WebViewActivity : BaseActivity() { mToolbar = supportActionBar mToolbar!!.setDisplayHomeAsUpEnabled(true) - var uri = intent.getParcelableExtra(KEY_URL) + var uri = intent.getParcelableExtra(KEY_URL)!! uri = addQueryParams(uri) mWebView = findViewById(R.id.webView) as WebView mProgressBar = findViewById(R.id.progressBar) as ProgressBar diff --git a/app/src/main/java/com/etesync/syncadapter/ui/etebase/ItemRevisionsListFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/etebase/ItemRevisionsListFragment.kt index 3244a2e9..d41d0474 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/etebase/ItemRevisionsListFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/etebase/ItemRevisionsListFragment.kt @@ -98,7 +98,7 @@ class ItemRevisionsListFragment : ListFragment(), AdapterView.OnItemClickListene if (v == null) v = LayoutInflater.from(context).inflate(R.layout.journal_viewer_list_item, parent, false)!! - val item = getItem(position) + val item = getItem(position)!! setItemView(v, cachedCollection.collectionType, item) diff --git a/app/src/main/java/com/etesync/syncadapter/ui/etebase/ListEntriesFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/etebase/ListEntriesFragment.kt index 51629ee2..e6118112 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/etebase/ListEntriesFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/etebase/ListEntriesFragment.kt @@ -83,7 +83,7 @@ class ListEntriesFragment : ListFragment(), AdapterView.OnItemClickListener { if (v == null) v = LayoutInflater.from(context).inflate(R.layout.journal_viewer_list_item, parent, false)!! - val item = getItem(position) + val item = getItem(position)!! setItemView(v, cachedCollection.collectionType, item) diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt index 0887276e..4ed7036e 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt @@ -47,7 +47,7 @@ class LoginCredentialsChangeFragment : DialogFragment(), LoaderManager.LoaderCal } override fun onCreateLoader(id: Int, args: Bundle?): Loader { - return ServerConfigurationLoader(context!!, args!!.getParcelable(ARG_LOGIN_CREDENTIALS) as LoginCredentials) + return ServerConfigurationLoader(requireContext(), (args!!.getParcelable(ARG_LOGIN_CREDENTIALS) as LoginCredentials?)!!) } override fun onLoadFinished(loader: Loader, data: Configuration?) {