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

コード整形

This commit is contained in:
tateisu 2022-12-27 15:09:47 +09:00
parent 1f8606b241
commit e7bbae83af
3 changed files with 76 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/androidTest/java/jp/juggler/subwaytooter/TestTootInstance.kt
View File

@ -50,7 +50,8 @@ class TestTootInstance {
.build()
private val dummyClientCallback = object : TootApiCallback {
override val isApiCancelled: Boolean = false
override suspend fun isApiCancelled() = false
override suspend fun publishApiProgress(s: String) {
log.d("apiProgress: $s")
}
@ -83,7 +84,6 @@ class TestTootInstance {
assertNotNull(ti)
assertNull(ri?.error)
ti!!.run { log.d("$instanceType $uri $version") }
}
a(Host.parse("mastodon.juggler.jp"))
a(Host.parse("misskey.io"))
@ -106,4 +106,4 @@ class TestTootInstance {
}
}
}
}
}

125
app/src/main/java/jp/juggler/util/MySslSocketFactory.kt
View File

@ -9,17 +9,16 @@ import javax.net.ssl.*
object MySslSocketFactory : SSLSocketFactory() {
private var debugCipherSuites = false
private val log = LogCategory("MySslSocketFactory")
private var debugCipherSuites = false
private val originalFactory: SSLSocketFactory =
SSLContext.getInstance("TLS").apply {
init(null, null, null)
}.socketFactory
private fun check(socket: Socket?): Socket? {
// 端末のデフォルトでは1.3が含まれないので追加する
(socket as? SSLSocket)?.enabledProtocols = arrayOf("TLSv1.1", "TLSv1.2", "TLSv1.3")
@ -34,85 +33,93 @@ object MySslSocketFactory : SSLSocketFactory() {
return socket
}
override fun getDefaultCipherSuites(): Array<String> {
return originalFactory.defaultCipherSuites
}
override fun getDefaultCipherSuites(): Array<String> =
originalFactory.defaultCipherSuites
override fun getSupportedCipherSuites(): Array<String> {
return originalFactory.supportedCipherSuites
}
override fun getSupportedCipherSuites(): Array<String> =
originalFactory.supportedCipherSuites
@Throws(IOException::class)
override fun createSocket(): Socket? {
return check(originalFactory.createSocket())
}
override fun createSocket(
): Socket? = check(
originalFactory.createSocket()
)
@Throws(IOException::class)
override fun createSocket(s: Socket, host: String, port: Int, autoClose: Boolean): Socket? {
return check(
originalFactory.createSocket(
s,
host,
port,
autoClose
)
override fun createSocket(
s: Socket,
host: String,
port: Int,
autoClose: Boolean,
): Socket? = check(
originalFactory.createSocket(
s,
host,
port,
autoClose
)
}
)
@Throws(IOException::class, UnknownHostException::class)
override fun createSocket(host: String, port: Int): Socket? {
return check(
originalFactory.createSocket(
host,
port
)
override fun createSocket(
host: String,
port: Int,
): Socket? = check(
originalFactory.createSocket(
host,
port
)
}
)
@Throws(IOException::class, UnknownHostException::class)
override fun createSocket(host: String, port: Int, localHost: InetAddress, localPort: Int): Socket? {
return check(
originalFactory.createSocket(
host,
port,
localHost,
localPort
)
override fun createSocket(
host: String,
port: Int,
localHost: InetAddress,
localPort: Int,
): Socket? = check(
originalFactory.createSocket(
host,
port,
localHost,
localPort
)
}
)
@Throws(IOException::class)
override fun createSocket(host: InetAddress, port: Int): Socket? {
return check(
originalFactory.createSocket(
host,
port
)
override fun createSocket(
host: InetAddress,
port: Int,
): Socket? = check(
originalFactory.createSocket(
host,
port
)
}
)
@Throws(IOException::class)
override fun createSocket(address: InetAddress, port: Int, localAddress: InetAddress, localPort: Int): Socket? {
return check(
originalFactory.createSocket(
address,
port,
localAddress,
localPort
)
override fun createSocket(
address: InetAddress,
port: Int,
localAddress: InetAddress,
localPort: Int,
): Socket? = check(
originalFactory.createSocket(
address,
port,
localAddress,
localPort
)
}
)
//
// App1, TestTootInstance 等で使われる
val trustManager: X509TrustManager by lazy {
val trustManagers = TrustManagerFactory
val list = TrustManagerFactory
.getInstance(TrustManagerFactory.getDefaultAlgorithm())
.apply { init(null as KeyStore?) }
.trustManagers
trustManagers
.find { it is X509TrustManager }
as? X509TrustManager
?: error("missing X509TrustManager in $trustManagers")
list?.firstNotNullOfOrNull { it as? X509TrustManager }
?: error("missing X509TrustManager in $list")
}
}

18
app/src/main/java/jp/juggler/util/UiUtils.kt
View File

@ -29,10 +29,7 @@ import androidx.core.content.ContextCompat
import androidx.fragment.app.FragmentActivity
import jp.juggler.subwaytooter.R
object UiUtils {
val log = LogCategory("UiUtils")
}
private val log = LogCategory("UiUtils")
// colorARGB.applyAlphaMultiplier(0.5f) でalpha値が半分になったARGB値を得る
fun Int.applyAlphaMultiplier(alphaMultiplier: Float? = null): Int {
@ -96,12 +93,11 @@ fun createRoundDrawable(
fillColor: Int? = null,
strokeColor: Int? = null,
strokeWidth: Int = 4,
) =
GradientDrawable().apply {
cornerRadius = radius
if (fillColor != null) setColor(fillColor)
if (strokeColor != null) setStroke(strokeWidth, strokeColor)
}
) = GradientDrawable().apply {
cornerRadius = radius
if (fillColor != null) setColor(fillColor)
if (strokeColor != null) setStroke(strokeWidth, strokeColor)
}
// 色を指定してRippleDrawableを生成する
fun getAdaptiveRippleDrawable(normalColor: Int, pressedColor: Int): Drawable {
@ -296,7 +292,7 @@ fun CharSequence.copyToClipboard(context: Context) {
context.showToast(false, R.string.copy_complete)
} catch (ex: Throwable) {
UiUtils.log.e(ex, "copy failed.")
log.e(ex, "copy failed.")
context.showToast(ex, "copy failed.")
}
}