Set contents of README in more direct way

app/src/main/java/com/commit451/gitlab/api/GitLabService.kt

@@ -291,7 +291,7 @@ interface GitLabService {
     @GET(API_VERSION + "/projects/{id}/repository/tree")
     fun getTree(@Path("id") projectId: Long,
-                @Query("ref_name") branchName: String,
+                @Query("ref_name") branchName: String?,
                 @Query("path") path: String?): Single<List<RepositoryTreeObject>>
     @GET(API_VERSION + "/projects/{id}/repository/files/{file_path}")

app/src/main/java/com/commit451/gitlab/fragment/ProjectFragment.kt

@@ -17,15 +17,11 @@ import com.commit451.gitlab.event.ProjectReloadEvent
 import com.commit451.gitlab.extension.*
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.model.api.RepositoryFile
-import com.commit451.gitlab.model.api.RepositoryTreeObject
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.InternalLinkMovementMethod
-import com.commit451.reptar.Optional
 import com.trello.rxlifecycle2.android.FragmentEvent
 import io.reactivex.Single
-import io.reactivex.SingleSource
-import io.reactivex.functions.Function
 import org.greenrobot.eventbus.Subscribe
 import retrofit2.Response
 import timber.log.Timber
@@ -156,70 +152,59 @@ class ProjectFragment : ButterKnifeFragment() {
     }
     override fun loadData() {
-        if (view == null) {
-            return
-        }
-
-        if (project == null || branchName.isNullOrEmpty()) {
-            swipeRefreshLayout.isRefreshing = false
-            return
-        }
-
-        swipeRefreshLayout.isRefreshing = true
-
-        val result = ReadmeResult()
-        App.get().gitLab.getTree(project!!.id, branchName!!, null)
-                .flatMap(Function<List<RepositoryTreeObject>, SingleSource<Optional<RepositoryTreeObject>>> { repositoryTreeObjects ->
-                    for (treeItem in repositoryTreeObjects) {
-                        if (getReadmeType(treeItem.name!!) != README_TYPE_UNKNOWN) {
-                            return@Function Single.just(Optional(treeItem))
-                        }
-                    }
-                    Single.just(Optional.empty())
-                })
-                .flatMap(Function<Optional<RepositoryTreeObject>, SingleSource<Optional<RepositoryFile>>> { repositoryTreeObjectResult ->
-                    if (repositoryTreeObjectResult.isPresent) {
-                        val repositoryFile = App.get().gitLab.getFile(project!!.id, repositoryTreeObjectResult.get().name!!, branchName!!)
+        val project = project
+        val branchName = branchName
+        if (view != null && project != null && branchName != null) {
+            swipeRefreshLayout.isRefreshing = true
+            Single.defer {
+
+                val readmeResult = ReadmeResult()
+                val rootItems = App.get().gitLab.getTree(project.id, branchName, null)
+                        .blockingGet()
+                for (treeItem in rootItems) {
+                    val treeItemName = treeItem.name
+                    if (treeItemName != null && getReadmeType(treeItemName) != README_TYPE_UNKNOWN) {
+                        //found a README
+                        val repositoryFile = App.get().gitLab.getFile(project.id, treeItemName, branchName)
                                 .blockingGet()
-                        result.repositoryFile = repositoryFile
-                        return@Function Single.just(Optional(repositoryFile))
-                    }
-                    Single.just(Optional.empty<RepositoryFile>())
-                })
-                .flatMap(Function<Optional<RepositoryFile>, SingleSource<ReadmeResult>> { repositoryFileResult ->
-                    if (repositoryFileResult.isPresent) {
-                        result.bytes = repositoryFileResult.get().content.base64Decode()
+                        readmeResult.repositoryFile = repositoryFile
+                        readmeResult.bytes = repositoryFile.content.base64Decode()
                                 .blockingGet()
-                        return@Function Single.just(result)
+                        break
                     }
-                    Single.just(result)
-                })
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
-                .subscribe(object : CustomSingleObserver<ReadmeResult>() {
-                    override fun error(t: Throwable) {
-                        Timber.e(t)
-                        swipeRefreshLayout.isRefreshing = false
-                        textOverview.setText(R.string.connection_error_readme)
-                    }
-                    override fun success(readmeResult: ReadmeResult) {
-                        swipeRefreshLayout.isRefreshing = false
-                        if (result.repositoryFile != null && result.bytes != null) {
-                            val text = String(result.bytes!!)
-                            when (getReadmeType(result.repositoryFile!!.fileName!!)) {
-                                README_TYPE_MARKDOWN -> {
-                                    textOverview.setMarkdownText(text, project)
+                }
+                Single.just(readmeResult)
+            }
+                    .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                    .subscribe(object : CustomSingleObserver<ReadmeResult>() {
+                        override fun error(t: Throwable) {
+                            Timber.e(t)
+                            swipeRefreshLayout.isRefreshing = false
+                            textOverview.setText(R.string.connection_error_readme)
+                        }
+                        override fun success(result: ReadmeResult) {
+                            swipeRefreshLayout.isRefreshing = false
+                            val repositoryFile = result.repositoryFile
+                            val bytes = result.bytes
+                            if (repositoryFile != null && bytes != null) {
+                                val text = String(bytes)
+                                when (getReadmeType(repositoryFile.fileName!!)) {
+                                    README_TYPE_MARKDOWN -> textOverview.setMarkdownText(text, project)
+                                    README_TYPE_HTML -> textOverview.text = text.formatAsHtml()
+                                    README_TYPE_TEXT -> textOverview.text = text
+                                    README_TYPE_NO_EXTENSION -> textOverview.text = text
                                 }
-                                README_TYPE_HTML -> textOverview.text = text.formatAsHtml()
-                                README_TYPE_TEXT -> textOverview.text = text
-                                README_TYPE_NO_EXTENSION -> textOverview.text = text
+                            } else {
+                                textOverview.setText(R.string.no_readme_found)
                             }
-                        } else {
-                            textOverview.setText(R.string.no_readme_found)
                         }
-                    }
-                })
+                    })
+
+        } else {
+            swipeRefreshLayout.isRefreshing = false
+        }
     }
     fun bindProject(project: Project?) {