archive-gh-me/FastHub
1
0
Fork 0
mirror of https://github.com/k0shk0sh/FastHub.git synced 2025-12-08 19:05:54 +00:00
Code Issues Projects Releases Wiki Activity

this commit fixes #1517

Browse Source
This commit is contained in:
k0shk0sh 2018-02-18 13:29:11 +01:00
parent b3fdc30088
commit 4e5da4e977
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt
View File

@ -19,7 +19,6 @@ import com.fastaccess.data.dao.wiki.WikiContentModel
import com.fastaccess.helper.ActivityHelper
import com.fastaccess.helper.BundleConstant
import com.fastaccess.helper.Bundler
import com.fastaccess.helper.Logger
import com.fastaccess.provider.scheme.LinkParserHelper
import com.fastaccess.ui.base.BaseActivity
import com.fastaccess.ui.modules.repos.RepoPagerActivity
@ -53,18 +52,21 @@ class WikiActivity : BaseActivity<WikiMvp.View, WikiPresenter>(), WikiMvp.View {
loadMenu()
}
if (wiki.content != null) {
val baseUrl = Uri.Builder().scheme("https")
val baseUrl = Uri.Builder().scheme(LinkParserHelper.PROTOCOL_HTTPS)
.authority(LinkParserHelper.HOST_DEFAULT)
.appendPath(presenter.login)
.appendPath(presenter.repoId)
.appendPath("wiki")
.build()
.toString()
Logger.e(baseUrl)
webView.setWikiContent(wiki.content, baseUrl)
}
}
override fun onSetPage(page: String) {
selectedTitle = page
}
private fun loadMenu() {
navMenu.menu.clear()
wiki.sidebar.onEach {

1
app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiMvp.kt
View File

@ -11,6 +11,7 @@ import com.fastaccess.ui.base.mvp.BaseMvp
interface WikiMvp {
interface View : BaseMvp.FAView {
fun onLoadContent(wiki: WikiContentModel)
fun onSetPage(page: String)
}
interface Presenter {

3
app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiPresenter.kt
View File

@ -25,6 +25,9 @@ class WikiPresenter : BasePresenter<WikiMvp.View>(), WikiMvp.Presenter {
repoId = bundle.getString(BundleConstant.ID)
login = bundle.getString(BundleConstant.EXTRA)
val page = bundle.getString(BundleConstant.EXTRA_TWO)
if (!page.isNullOrEmpty()) {
sendToView { it.onSetPage(page) }
}
if (!repoId.isNullOrEmpty() && !login.isNullOrEmpty()) {
onSidebarClicked(WikiSideBarModel("Home", "$login/$repoId/wiki" +
if (!page.isNullOrEmpty()) "/$page" else ""))