Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f453d069 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Minor method signature updates for SDK level 29

parent 0d07fe90

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

+5 −5
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ import android.net.Uri 
class AddressBookProvider: ContentProvider() {



    override fun onCreate() = false

    override fun insert(p0: Uri?, p1: ContentValues?) = null

    override fun query(p0: Uri?, p1: Array<out String>?, p2: String?, p3: Array<out String>?, p4: String?) = null

    override fun update(p0: Uri?, p1: ContentValues?, p2: String?, p3: Array<out String>?) = 0

    override fun delete(p0: Uri?, p1: String?, p2: Array<out String>?) = 0

    override fun getType(p0: Uri?) = null

    override fun insert(p0: Uri, p1: ContentValues?) = null

    override fun query(p0: Uri, p1: Array<out String>?, p2: String?, p3: Array<out String>?, p4: String?) = null

    override fun update(p0: Uri, p1: ContentValues?, p2: String?, p3: Array<out String>?) = 0

    override fun delete(p0: Uri, p1: String?, p2: Array<out String>?) = 0

    override fun getType(p0: Uri) = null



}

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

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ class AccountListFragment: ListFragment() { 
            context: Context

    ): ArrayAdapter<Account>(context, R.layout.account_list_item) {



        override fun getView(position: Int, _v: View?, parent: ViewGroup?): View {

        override fun getView(position: Int, _v: View?, parent: ViewGroup): View {

            val account = getItem(position)!!



            val v = _v ?: LayoutInflater.from(context).inflate(R.layout.account_list_item, parent, false)

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

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class DeleteCollectionFragment: DialogFragment() { 
        super.onCreate(savedInstanceState)

        model = ViewModelProviders.of(this).get(DeleteCollectionModel::class.java)

        model.initialize(

                arguments!!.getParcelable(ARG_ACCOUNT) as Account,

                arguments!!.getParcelable(ARG_ACCOUNT)!!,

                arguments!!.getLong(ARG_COLLECTION_ID)

        )

    }