Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

Acct,HostクラスにtoString()を追加

This commit is contained in:
tateisu 2020-02-03 21:34:58 +09:00
parent 7211538a63
commit 355d686a9c
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/main/java/jp/juggler/subwaytooter/api/entity/Acct.kt
View File

@ -10,26 +10,28 @@ class Host private constructor(
val pretty : String = ascii
) :Comparable<Host>{
override fun toString() : String = ascii
override fun hashCode() : Int =
ascii.hashCode()
override fun equals(other : Any?) : Boolean =
if( other is Host) ascii==other.ascii else false
// ソートはprettyのコード順
override fun compareTo(other : Host) : Int =
pretty.compareTo(other.pretty).notZero() ?: ascii.compareTo(other.ascii)
fun match(src : String?) : Boolean =
ascii==src || pretty ==src
override fun equals(other : Any?) : Boolean {
return if( other is Host) ascii==other.ascii else false
}
override fun hashCode() : Int = ascii.hashCode()
override fun compareTo(other : Host) : Int {
return pretty.compareTo(other.pretty).notZero() ?: ascii.compareTo(other.ascii)
}
val isValid :Boolean
get() = ascii.isNotEmpty() && ascii != "?"
fun valid() : Host? = if(isValid ) this else null
companion object {
// decl this first!
// declare this first!
private val hostSet = ConcurrentHashMap<String, Host>()
val EMPTY = Host("")
@ -56,32 +58,35 @@ class Acct private constructor(
val ascii:String = if(host==null) username else "$username@${host.ascii}"
val pretty:String = if(host==null) username else "$username@${host.pretty}"
fun followHost(accessHost : Host?) : Acct {
return if( this.host != null) this else Acct(username,accessHost)
}
override fun equals(other : Any?) : Boolean {
return if( other is Acct) username==other.username && host==other.host else false
}
override fun hashCode() : Int = ascii.hashCode()
override fun toString() : String = ascii
override fun hashCode() : Int = ascii.hashCode()
override fun equals(other : Any?) : Boolean =
if( other is Acct) ascii == other.ascii else false
// ソートはprettyのコード順
override fun compareTo(other : Acct) : Int {
return pretty.compareTo(other.pretty).notZero() ?: ascii.compareTo(other.ascii)
}
fun followHost(accessHost : Host?) : Acct {
return if( this.host != null) this else Acct(username,accessHost)
}
val isValid : Boolean
get() = username.isNotEmpty() && username != "?" && (host?.isValid != false)
@Suppress("unused")
private fun valid():Acct? = if(isValid) this else null
val isValidFull : Boolean
private val isValidFull : Boolean
get() = username.isNotEmpty() && username != "?" && (host?.isValid == true)
fun validFull():Acct ? = if(isValidFull) this else null
companion object {
// decl this first!
// declare this first!
private val acctSet = ConcurrentHashMap<String, Acct>()
val UNKNOWN = Acct("?",Host.UNKNOWN)