1. final commit iteration 3. small fixes

This commit is contained in:
vadym 2020-06-21 13:46:56 -07:00
parent be549f8421
commit 2a5c6b66e2
2 changed files with 12 additions and 2 deletions

View File

@ -38,6 +38,16 @@ android {
} }
} }
task ndkBuild(type: Exec) {
def rootDir = project.rootDir
workingDir = new File(rootDir,"yggdrasil")
commandLine 'make'
}
gradle.projectsEvaluated {
tasks.compileDebugKotlin.dependsOn(ndkBuild)
}
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])

View File

@ -41,11 +41,11 @@ class SelectPeerInfoListAdapter(
peerInfoHolder.countryFlag.setImageResource(currentPeer.getCountry(mContext)!!.flagID) peerInfoHolder.countryFlag.setImageResource(currentPeer.getCountry(mContext)!!.flagID)
val peerId = currentPeer.toString() val peerId = currentPeer.toString()
if(currentPeer.ping == Int.MAX_VALUE){ if(currentPeer.ping == Int.MAX_VALUE){
peerInfoHolder.peerInfoText.text = "$peerId" peerInfoHolder.peerInfoText.text = peerId
peerInfoHolder.ping.text="" peerInfoHolder.ping.text=""
peerInfoHolder.peerInfoText.setTextColor(Color.GRAY) peerInfoHolder.peerInfoText.setTextColor(Color.GRAY)
} else { } else {
peerInfoHolder.peerInfoText.text = "$peerId" //peerId + " " + currentPeer.ping + " ms" peerInfoHolder.peerInfoText.text = peerId
peerInfoHolder.ping.text = currentPeer.ping.toString() + " ms" peerInfoHolder.ping.text = currentPeer.ping.toString() + " ms"
peerInfoHolder.peerInfoText.setTextColor(Color.WHITE) peerInfoHolder.peerInfoText.setTextColor(Color.WHITE)
} }