Mastodon/SubwayTooter-Android-App
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
tateisu 2019-11-25 01:07:24 +09:00
parent 28133651ec
commit a36324f900
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
app/src/main/java/jp/juggler/subwaytooter/action/Action_Account.kt
View File

@ -33,14 +33,15 @@ object Action_Account {
override fun background(client : TootApiClient) : TootApiResult? { override fun background(client : TootApiClient) : TootApiResult? {
return when(action) { return when(action) {
LoginForm.Action.Existing -> client.authentication1(
Pref.spClientName(
activity
)
)
LoginForm.Action.Create -> client.createUser1(Pref.spClientName(activity))
LoginForm.Action.Pseudo, LoginForm.Action.Token -> { LoginForm.Action.Existing ->
client.authentication1(Pref.spClientName(activity))
LoginForm.Action.Create ->
client.createUser1(Pref.spClientName(activity))
LoginForm.Action.Pseudo,
LoginForm.Action.Token -> {
val (ti, ri) = TootInstance.get(client) val (ti, ri) = TootInstance.get(client)
if(ti != null) ri?.data = ti if(ti != null) ri?.data = ti
ri ri
@ -48,33 +49,15 @@ object Action_Account {
} }
} }
private fun handleError(result : TootApiResult) {
val error = result.error ?: "(no error information)"
if(error.contains("SSLHandshakeException")
&& (Build.VERSION.RELEASE.startsWith("7.0")
|| Build.VERSION.RELEASE.startsWith("7.1")
&& ! Build.VERSION.RELEASE.startsWith("7.1.")
)
) {
AlertDialog.Builder(activity)
.setMessage(error + "\n\n" + activity.getString(R.string.ssl_bug_7_0))
.setNeutralButton(R.string.close, null)
.show()
} else {
showToast(activity, true, "$error ${result.requestInfo}".trim())
}
}
override fun handleResult(result : TootApiResult?) { override fun handleResult(result : TootApiResult?) {
result ?: return // cancelled. result ?: return // cancelled.
val error = result.error
val data = result.data val data = result.data
if(error == null && data != null) { if(result.error == null && data != null) {
when(action) { when(action) {
LoginForm.Action.Existing -> if(data is String) { LoginForm.Action.Existing -> if(data is String) {
// ブラウザ用URLが生成された (LoginForm.Action.Existing) // ブラウザ用URLが生成された
val intent = Intent() val intent = Intent()
intent.data = data.toUri() intent.data = data.toUri()
activity.startAccessTokenUpdate(intent) activity.startAccessTokenUpdate(intent)
@ -138,7 +121,21 @@ object Action_Account {
} }
} }
} }
handleError(result)
val errorText = result.error ?: "(no error information)"
if(errorText.contains("SSLHandshakeException")
&& (Build.VERSION.RELEASE.startsWith("7.0")
|| Build.VERSION.RELEASE.startsWith("7.1")
&& ! Build.VERSION.RELEASE.startsWith("7.1.")
)
) {
AlertDialog.Builder(activity)
.setMessage(errorText + "\n\n" + activity.getString(R.string.ssl_bug_7_0))
.setNeutralButton(R.string.close, null)
.show()
} else {
showToast(activity, true, "$errorText ${result.requestInfo}".trim())
}
} }
}) })
} }