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

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

Linuxtage Action

parent 77d6fc72

app/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ dependencies { 
    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'

    implementation 'androidx.lifecycle:lifecycle-livedata:2.0.0'

    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'

    implementation 'androidx.paging:paging-runtime-ktx:2.1.0'

    implementation 'androidx.preference:preference:1.0.0'

    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

    implementation 'com.google.android:flexbox:1.1.0'

app/src/main/AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -79,10 +79,12 @@ 
            </intent-filter>

        </activity>



        <activity

            android:name=".ui.account.AccountActivity2"

            android:parentActivityName=".ui.AccountsActivity"/>

        <activity

            android:name=".ui.AccountActivity"

            android:parentActivityName=".ui.AccountsActivity">

        </activity>

            android:parentActivityName=".ui.AccountsActivity"/>

        <activity android:name=".ui.AccountSettingsActivity"/>

        <activity android:name=".ui.CreateAddressBookActivity"

            android:label="@string/create_addressbook"/>

app/src/main/java/at/bitfire/davdroid/model/Collection.kt

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ data class Collection( 
    var confirmed: Boolean = false





    // calculated properties

    fun title() = displayName ?: DavUtils.lastSegmentOfUrl(url)

    fun readOnly() = forceReadOnly || !privWriteContent



}
 
 No newline at end of file

app/src/main/java/at/bitfire/davdroid/model/CollectionDao.kt

+10 −0
Original line number Diff line number Diff line 
package at.bitfire.davdroid.model



import androidx.lifecycle.LiveData

import androidx.paging.DataSource

import androidx.room.*



@Dao
@@ -12,12 +13,21 @@ interface CollectionDao { 
    @Query("SELECT * FROM collection WHERE serviceId=:serviceId ORDER BY displayName, url")

    fun getByService(serviceId: Long): List<Collection>



    @Query("SELECT * FROM collection WHERE serviceId=:serviceId ORDER BY displayName, url")

    fun pageByService(serviceId: Long): DataSource.Factory<Int, Collection>



    @Query("SELECT * FROM collection WHERE serviceId=:serviceId AND sync ORDER BY displayName, url")

    fun getByServiceAndSync(serviceId: Long): List<Collection>



    @Query("SELECT * FROM collection WHERE serviceId=:serviceId AND type=:type ORDER BY displayName, url")

    fun observeByServiceAndType(serviceId: Long, type: String): LiveData<List<Collection>>



    /*@Query("SELECT COUNT(*) FROM collection WHERE serviceId=:serviceId AND type=:type AND sync")

    fun observeHasSyncByServiceAndType(serviceId: Long, type: String): LiveData<Boolean>*/



    @Query("SELECT COUNT(*) FROM collection WHERE serviceId=:serviceId AND sync")

    fun observeHasSyncByService(serviceId: Long): LiveData<Boolean>



    @Query("SELECT * FROM collection WHERE serviceId=:serviceId AND supportsVEVENT AND sync ORDER BY displayName, url")

    fun getSyncCalendars(serviceId: Long): List<Collection>

app/src/main/java/at/bitfire/davdroid/model/HomeSetDao.kt

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ interface HomeSetDao { 
    @Query("SELECT * FROM homeset WHERE serviceId=:serviceId")

    fun getByService(serviceId: Long): List<HomeSet>



    @Query("SELECT * FROM homeset WHERE serviceId=:serviceId")

    fun observeByService(serviceId: Long): LiveData<List<HomeSet>>

    @Query("SELECT COUNT(*) FROM homeset WHERE serviceId=:serviceId")

    fun observeAvailableByService(serviceId: Long): LiveData<Boolean>



    @Insert(onConflict = OnConflictStrategy.REPLACE)

    fun insertOrReplace(homeSet: HomeSet): Long