Mastodon/SubwayTooter-Android-App
1
0
Fork 0
mirror of https://github.com/tateisu/SubwayTooter synced 2025-01-31 02:54:57 +01:00
Code Issues Releases Wiki Activity

アカウント追加時に非対応のPixelfedサーバを指定すると勝手にアカウント作成ダイアログを開いてしまうのを修正

Browse Source
This commit is contained in:
tateisu 2019-11-25 00:28:37 +09:00
parent 5fd43462c9
commit 28133651ec
3 changed files with 69 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/jp/juggler/subwaytooter/ActAbout.kt
View File

@ -57,7 +57,6 @@ class ActAbout : AppCompatActivity() {
)
}
override fun onCreate(savedInstanceState : Bundle?) {
super.onCreate(savedInstanceState)
App1.setActivityTheme(this)

8
app/src/main/java/jp/juggler/subwaytooter/MyAppGlideModule.kt
View File

@ -23,14 +23,18 @@ import kotlin.math.min
class MyAppGlideModule : AppGlideModule() {
companion object{
private val svgSig = "<svg".toByteArray(Charsets.UTF_8)
private fun findBytes(data:ByteArray,dataSize:Int = data.size,key:ByteArray):Int{
fun check(start:Int):Boolean{
for(j in key.indices){
if( data[start+j] != key[j] ) return false
}
return true
}
for(i in 0 .. dataSize - key.size){
if(check(i)) return i
}
@ -41,13 +45,13 @@ class MyAppGlideModule : AppGlideModule() {
// Decodes an SVG internal representation from an [InputStream].
inner class SvgDecoder : ResourceDecoder<InputStream, SVG> {
@Throws(IOException::class)
override fun handles(source : InputStream, options : Options) : Boolean {
val size = min(source.available(),1024)
if(size<=0) return false
val buf = ByteArray(size)
val nRead = source.read(buf,0,size)
val isSvg = -1 != findBytes(buf,nRead,svgSig)
return isSvg
return -1 != findBytes(buf,nRead, svgSig)
}

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

@ -31,14 +31,37 @@ object Action_Account {
) { dialog, instance, action ->
TootTaskRunner(activity).run(instance, object : TootTask {
override fun background(client : TootApiClient) : TootApiResult? = when(action) {
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)
if(ti != null) ri?.data = ti
ri
override fun background(client : TootApiClient) : TootApiResult? {
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 -> {
val (ti, ri) = TootInstance.get(client)
if(ti != null) ri?.data = ti
ri
}
}
}
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())
}
}
@ -46,31 +69,32 @@ object Action_Account {
result ?: return // cancelled.
when(val data = result.data) {
// ブラウザ用URLが生成された (LoginForm.Action.Existing)
is String -> {
val intent = Intent()
intent.data = data.toUri()
activity.startAccessTokenUpdate(intent)
dialog.dismissSafe()
}
// インスタンスを確認できた (LoginForm.Action.Create)
is JSONObject -> {
createAccount(
activity,
instance,
data,
dialog
)
}
// インスタンス情報を取得した( Pseudo, Token )
is TootInstance -> {
when(action) {
LoginForm.Action.Pseudo -> addPseudoAccount(
val error = result.error
val data = result.data
if(error == null && data != null) {
when(action) {
LoginForm.Action.Existing -> if(data is String) {
// ブラウザ用URLが生成された (LoginForm.Action.Existing)
val intent = Intent()
intent.data = data.toUri()
activity.startAccessTokenUpdate(intent)
dialog.dismissSafe()
return
}
LoginForm.Action.Create -> if(data is JSONObject) {
// インスタンスを確認できた
createAccount(
activity,
instance,
data,
dialog
)
return
}
LoginForm.Action.Pseudo -> if(data is TootInstance) {
addPseudoAccount(
activity,
instance,
instanceInfo = data
@ -80,8 +104,10 @@ object Action_Account {
activity.addColumn(pos, a, ColumnType.LOCAL)
dialog.dismissSafe()
}
LoginForm.Action.Token -> DlgTextInput.show(
}
LoginForm.Action.Token -> if(data is TootInstance) {
DlgTextInput.show(
activity,
activity.getString(R.string.access_token_or_api_token),
null,
@ -109,30 +135,10 @@ object Action_Account {
}
}
)
// never happen
else -> {
}
}
}
else -> {
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())
}
}
}
handleError(result)
}
})
}
@ -253,7 +259,7 @@ object Action_Account {
) {
activity.post_helper.closeAcctPopup()
val db_id = activity.currentPostTarget?.db_id ?: -1L
val db_id = activity.currentPostTarget?.db_id ?: - 1L
if(db_id != - 1L) {
ActPost.open(activity, ActMain.REQUEST_CODE_POST, db_id, initial_text = initial_text)
} else {