Use .closeCompat for ContentProviderClient instances (40a17484) · Commits · e / os / AccountManager

app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.kt

+2 −5

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ import android.net.Uri
		import android.os.Build
		import at.bitfire.davdroid.Constants
		import at.bitfire.davdroid.DavUtils
		import at.bitfire.davdroid.closeCompat
		import at.bitfire.davdroid.log.Logger
		import at.bitfire.davdroid.model.CollectionInfo
		import at.bitfire.davdroid.model.SyncState
		@@ -70,11 +71,7 @@ class LocalTaskList private constructor(
		it.update(Tasks.getContentUri(TaskProvider.ProviderName.OpenTasks.authority), values, "${Tasks.ACCOUNT_NAME}=?", arrayOf(oldName))
		}
		} finally {
		@Suppress("DEPRECATION")
		if (Build.VERSION.SDK_INT >= 24)
		client?.close()
		else
		client?.release()
		client?.closeCompat()
		}
		}

app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt

+5 −26

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ import android.accounts.Account
		import android.accounts.AccountManager
		import android.annotation.SuppressLint
		import android.content.*
		import android.os.Build
		import android.os.Bundle
		import android.os.Parcel
		import android.os.RemoteException
		@@ -302,11 +301,7 @@ class AccountSettings(
		try {
		AndroidCalendar.insertColors(provider, account)
		} finally {
		@Suppress("DEPRECATION")
		if (Build.VERSION.SDK_INT >= 24)
		provider.close()
		else
		provider.release()
		provider.closeCompat()
		}
		}

		@@ -369,11 +364,7 @@ class AccountSettings(
		throw ContactsStorageException("Couldn't migrate contacts to new address book", e)
		} finally {
		parcel.recycle()
		@Suppress("DEPRECATION")
		if (Build.VERSION.SDK_INT >= 24)
		provider.close()
		else
		provider.release()
		provider.closeCompat()
		}
		}

		@@ -441,11 +432,7 @@ class AccountSettings(
		} catch (e: ContactsStorageException) {
		Logger.log.log(Level.SEVERE, "Couldn't migrate address book", e)
		} finally {
		if (Build.VERSION.SDK_INT >= 24)
		client.close()
		else
		@Suppress("deprecation")
		client.release()
		client.closeCompat()
		}
		}

		@@ -465,11 +452,7 @@ class AccountSettings(
		} catch (e: CalendarStorageException) {
		Logger.log.log(Level.SEVERE, "Couldn't migrate calendars", e)
		} finally {
		if (Build.VERSION.SDK_INT >= 24)
		client.close()
		else
		@Suppress("deprecation")
		client.release()
		client.closeCompat()
		}
		}

		@@ -557,11 +540,7 @@ class AccountSettings(
		addr.lastSyncState = SyncState(SyncState.Type.CTAG, cTag)
		accountManager.setUserData(account, "addressbook_ctag", null)
		} finally {
		if (Build.VERSION.SDK_INT >= 24)
		provider.close()
		else
		@Suppress("deprecation")
		provider.release()
		provider.closeCompat()
		}
		}

app/src/main/java/at/bitfire/davdroid/syncadapter/AddressBooksSyncAdapterService.kt

+2 −6

Original line number	Diff line number	Diff line
		@@ -12,10 +12,10 @@ import android.accounts.Account
		import android.content.*
		import android.content.pm.PackageManager
		import android.database.DatabaseUtils
		import android.os.Build
		import android.os.Bundle
		import android.provider.ContactsContract
		import androidx.core.content.ContextCompat
		import at.bitfire.davdroid.closeCompat
		import at.bitfire.davdroid.log.Logger
		import at.bitfire.davdroid.model.CollectionInfo
		import at.bitfire.davdroid.model.ServiceDB
		@@ -144,11 +144,7 @@ class AddressBooksSyncAdapterService : SyncAdapterService() {
		LocalAddressBook.create(context, contactsProvider, account, info)
		}
		} finally {
		@Suppress("DEPRECATION")
		if (Build.VERSION.SDK_INT >= 24)
		contactsProvider?.close()
		else
		contactsProvider?.release()
		contactsProvider?.closeCompat()
		}
		}
		}

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

+2 −5

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import androidx.fragment.app.DialogFragment
		import androidx.preference.*
		import at.bitfire.davdroid.App
		import at.bitfire.davdroid.R
		import at.bitfire.davdroid.closeCompat
		import at.bitfire.davdroid.model.Credentials
		import at.bitfire.davdroid.resource.LocalCalendar
		import at.bitfire.davdroid.settings.AccountSettings
		@@ -321,11 +322,7 @@ class AccountSettingsActivity: AppCompatActivity() {
		calendar.lastSyncState = null
		}
		} finally {
		@Suppress("DEPRECATION")
		if (Build.VERSION.SDK_INT >= 24)
		provider.close()
		else
		provider.release()
		provider.closeCompat()
		}
		}
		}

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

+4 −7

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ import androidx.core.content.ContextCompat
		import androidx.fragment.app.DialogFragment
		import at.bitfire.davdroid.DavUtils
		import at.bitfire.davdroid.R
		import at.bitfire.davdroid.closeCompat
		import at.bitfire.davdroid.log.Logger
		import at.bitfire.davdroid.model.ServiceDB
		import at.bitfire.davdroid.resource.LocalAddressBook
		@@ -46,10 +47,10 @@ class RenameAccountFragment: DialogFragment() {
		override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
		val oldAccount: Account = arguments!!.getParcelable(ARG_ACCOUNT)!!

		val editText = EditText(activity)
		val editText = EditText(requireActivity())
		editText.setText(oldAccount.name)

		return AlertDialog.Builder(activity!!)
		return AlertDialog.Builder(requireActivity())
		.setTitle(R.string.account_rename)
		.setMessage(R.string.account_rename_new_name)
		.setView(editText)
		@@ -94,11 +95,7 @@ class RenameAccountFragment: DialogFragment() {
		if (oldAccount == addressBook.mainAccount)
		addressBook.mainAccount = Account(newName, oldAccount.type)
		} finally {
		@Suppress("DEPRECATION")
		if (Build.VERSION.SDK_INT >= 24)
		provider.close()
		else
		provider.release()
		provider.closeCompat()
		}
		}
		} catch(e: Exception) {