Account for null theme on user

README.md

@@ -22,9 +22,9 @@ To build, run the following.
 ```
 ## Contributing
-Please fork this repository and contribute back! All Merge Requests should be made against the `develop` branch, as it is the active branch for development. Please make your best effort to break up commits as much as possible to improve the reviewing process.
-If you are making substantial changes, please refer to Commit 451's style [guidelines](https://github.com/Commit451/guidelines) for Android
+Please fork this repository and contribute back! Please make your best effort to break up commits as much as possible to improve the reviewing process.
+If you are making substantial changes, please refer to Commit 451's style [guidelines](https://github.com/Commit451/guidelines) for Android/Kotlin
 License
 --------

app/build.gradle

@@ -14,6 +14,7 @@ repositories {
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 apply plugin: 'io.fabric'
 def versionMajor = 2
@@ -98,7 +99,7 @@ android {
 }
 ext {
-    supportLibVersion = '26.0.2'
+    supportLibVersion = '26.1.0'
     retrofitVersion = '2.3.0'
     okHttpVersion = '3.9.0'
     butterknifeVersion = '8.8.1'
@@ -106,7 +107,7 @@ ext {
     reptarVersion = '2.5.1'
     adapterLayout = '1.1.1'
     materialDialogsVersion = '0.9.4.7'
-    leakCanaryVersion = '1.5'
+    leakCanaryVersion = '1.5.3'
     addendumVersion = '1.4.0'
     alakazamVersion = '1.0.1'
     moshiVersion = '1.5.0'
@@ -154,7 +155,7 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxjava:2.1.3'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    implementation 'com.trello.rxlifecycle2:rxlifecycle-components:2.1.0'
+    implementation 'com.trello.rxlifecycle2:rxlifecycle-components:2.2.0'
     implementation "org.parceler:parceler-api:$parcelerVersion"
     kapt "org.parceler:parceler:$parcelerVersion"

app/src/main/java/com/commit451/gitlab/model/api/User.kt

@@ -58,7 +58,7 @@ open class User {
     @field:Json(name = "email")
     var email: String? = null
     @field:Json(name = "theme_id")
-    var themeId: Int = 0
+    var themeId: Int? = 0
     @field:Json(name = "color_scheme_id")
     var colorSchemeId: Int = 0
     @field:Json(name = "projects_limit")

app/src/test/java/com/commit451/gitlab/ApiTests.kt

@@ -17,7 +17,7 @@ class ApiTests {
         private val FAKE_GROUP_PROJECT_ID: Long = 376651
         private var fakeProject: Project? = null
-        private var gitLab: GitLabService? = null
+        private lateinit var gitLab: GitLabService
         @JvmStatic
         @BeforeClass
@@ -26,7 +26,7 @@ class ApiTests {
             gitLab = TestUtil.login()
-            val projectResponse = gitLab!!
+            val projectResponse = gitLab
                     .getProject(FAKE_GROUP_PROJECT_ID.toString())
                     .blockingGet()
             assertNotNull(projectResponse)
@@ -37,7 +37,7 @@ class ApiTests {
     @Test
     fun getProjects() {
-        val projectsResponse = gitLab!!
+        val projectsResponse = gitLab
                 .getAllProjects()
                 .blockingGet()
         TestUtil.assertRetrofitResponseSuccess(projectsResponse)
@@ -46,7 +46,7 @@ class ApiTests {
     @Test
     fun getGroups() {
-        val groupResponse = gitLab!!
+        val groupResponse = gitLab
                 .getGroups()
                 .blockingGet()
         TestUtil.assertRetrofitResponseSuccess(groupResponse)
@@ -57,7 +57,7 @@ class ApiTests {
     fun getGroupMembers() {
         //GitLabService group id
         val gitLabGroupId: Long = 9970
-        val groupResponse = gitLab!!
+        val groupResponse = gitLab
                 .getGroupMembers(gitLabGroupId)
                 .blockingGet()
         TestUtil.assertRetrofitResponseSuccess(groupResponse)
@@ -67,7 +67,7 @@ class ApiTests {
     @Test
     fun getIssues() {
         val defaultState = "opened"
-        val issuesResponse = gitLab!!
+        val issuesResponse = gitLab
                 .getIssues(fakeProject!!.id, defaultState)
                 .blockingGet()
         TestUtil.assertRetrofitResponseSuccess(issuesResponse)
@@ -78,7 +78,7 @@ class ApiTests {
     fun getFiles() {
         val defaultBranch = "master"
         val currentPath = ""
-        val treeResponse = gitLab!!
+        val treeResponse = gitLab
                 .getTree(fakeProject!!.id, defaultBranch, currentPath)
                 .blockingGet()
         assertNotNull(treeResponse)
@@ -87,7 +87,7 @@ class ApiTests {
     @Test
     fun getCommits() {
         val defaultBranch = "master"
-        val commitsResponse = gitLab!!
+        val commitsResponse = gitLab
                 .getCommits(fakeProject!!.id, defaultBranch, 1)
                 .blockingGet()
         assertNotNull(commitsResponse)
@@ -96,7 +96,7 @@ class ApiTests {
     @Test
     fun getMergeRequests() {
         val defaultState = "opened"
-        val mergeRequestResponse = gitLab!!
+        val mergeRequestResponse = gitLab
                 .getMergeRequests(fakeProject!!.id, defaultState)
                 .blockingGet()
         TestUtil.assertRetrofitResponseSuccess(mergeRequestResponse)
@@ -105,7 +105,7 @@ class ApiTests {
     @Test
     fun getCurrentUser() {
-        val userFullResponse = gitLab!!
+        val userFullResponse = gitLab
                 .getThisUser()
                 .blockingGet()
         TestUtil.assertRetrofitResponseSuccess(userFullResponse)

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta4'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta6'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
         classpath 'com.github.Commit451:updatewrapper:1.1.2'