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

Commit 22b9624c authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Use ViewModel and data binding for login process

parent f22dd3e0

app/build.gradle

+3 −3
Original line number Original line Diff line number Diff line
@@ -96,7 +96,7 @@ dependencies { 
    implementation 'com.jaredrummler:colorpicker:1.1.0'

    implementation 'com.jaredrummler:colorpicker:1.1.0'

    implementation 'com.mikepenz:aboutlibraries:6.2.3'

    implementation 'com.mikepenz:aboutlibraries:6.2.3'





    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.1'

    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.2'

    implementation 'commons-io:commons-io:2.6'

    implementation 'commons-io:commons-io:2.6'

    implementation 'dnsjava:dnsjava:2.1.8'

    implementation 'dnsjava:dnsjava:2.1.8'

    implementation 'org.apache.commons:commons-collections4:4.3'

    implementation 'org.apache.commons:commons-collections4:4.3'
@@ -105,8 +105,8 @@ dependencies { 
    androidTestImplementation 'androidx.test:runner:1.1.1'

    androidTestImplementation 'androidx.test:runner:1.1.1'

    androidTestImplementation 'androidx.test:rules:1.1.1'

    androidTestImplementation 'androidx.test:rules:1.1.1'

    androidTestImplementation 'junit:junit:4.12'

    androidTestImplementation 'junit:junit:4.12'

    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.12.1'

    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.12.2'





    testImplementation 'junit:junit:4.12'

    testImplementation 'junit:junit:4.12'

    testImplementation 'com.squareup.okhttp3:mockwebserver:3.12.1'

    testImplementation 'com.squareup.okhttp3:mockwebserver:3.12.2'

}
 
}

app/src/androidTest/java/at/bitfire/davdroid/ui/setup/DavResourceFinderTest.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -44,14 +44,14 @@ class DavResourceFinderTest { 




    lateinit var finder: DavResourceFinder

    lateinit var finder: DavResourceFinder

    lateinit var client: HttpClient

    lateinit var client: HttpClient

    lateinit var loginInfo: LoginInfo

    lateinit var loginInfo: LoginModel





    @Before

    @Before

    fun initServerAndClient() {

    fun initServerAndClient() {

        server.setDispatcher(TestDispatcher())

        server.setDispatcher(TestDispatcher())

        server.start()

        server.start()





        loginInfo = LoginInfo(URI.create("/"), Credentials("mock", "12345"))

        loginInfo = LoginModel(URI.create("/"), Credentials("mock", "12345"))

        finder = DavResourceFinder(InstrumentationRegistry.getInstrumentation().targetContext, loginInfo)

        finder = DavResourceFinder(InstrumentationRegistry.getInstrumentation().targetContext, loginInfo)





        client = HttpClient.Builder()

        client = HttpClient.Builder()

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -8,13 +8,11 @@ 




package at.bitfire.davdroid.model

package at.bitfire.davdroid.model





import java.io.Serializable



class Credentials(

class Credentials(

        val userName: String? = null,

        val userName: String? = null,

        val password: String? = null,

        val password: String? = null,

        val certificateAlias: String? = null

        val certificateAlias: String? = null

): Serializable {

) {





    enum class Type {

    enum class Type {

        UsernamePassword,

        UsernamePassword,

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -535,7 +535,7 @@ class AccountSettings( 
           - KEY_LAST_ANDROID_VERSION ("last_android_version") has been added

           - KEY_LAST_ANDROID_VERSION ("last_android_version") has been added

        */

        */





        // move previous address book info to ContactsContract.SyncState

        // move previous address book model to ContactsContract.SyncState

        val provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY) ?:

        val provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY) ?:

            throw ContactsStorageException("Couldn't access Contacts provider")

            throw ContactsStorageException("Couldn't access Contacts provider")

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ class CollectionInfoFragment : DialogFragment() { 




    companion object {

    companion object {





        private const val ARGS_INFO = "info"

        private const val ARGS_INFO = "model"





        fun newInstance(info: CollectionInfo): CollectionInfoFragment {

        fun newInstance(info: CollectionInfo): CollectionInfoFragment {

            val frag = CollectionInfoFragment()

            val frag = CollectionInfoFragment()