Mastodon/SubwayTooter-Android-App
1
0
Fork 0
mirror of https://github.com/tateisu/SubwayTooter synced 2025-01-29 18:19:22 +01:00
Code Issues Releases Wiki Activity

version 2.8.0

Browse Source
This commit is contained in:
tateisu 2018-08-30 15:57:41 +09:00
parent a58ad7403d
commit 8be857c8f1
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -12,8 +12,8 @@ android {
minSdkVersion 21
targetSdkVersion 27
versionCode 279
versionName "2.7.9"
versionCode 280
versionName "2.8.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
// https://stackoverflow.com/questions/47791227/java-lang-illegalstateexception-dex-archives-setting-dex-extension-only-for

4
app/src/main/java/jp/juggler/subwaytooter/Column.kt
View File

@ -1978,7 +1978,7 @@ class Column(
return result
}
override fun doInBackground(vararg params : Void) : TootApiResult? {
override fun doInBackground(vararg unused : Void) : TootApiResult? {
ctStarted.set(true)
val client = TootApiClient(context, callback = object : TootApiCallback {
@ -2364,7 +2364,7 @@ class Column(
}
TYPE_SEARCH -> if(isMisskey){
var result : TootApiResult? = null
result = TootApiResult()
val parser = TootParser(context,access_info)
var params:JSONObject

30
app/src/main/java/jp/juggler/subwaytooter/util/PushSubscriptionHelper.kt
View File

@ -135,21 +135,21 @@ class PushSubscriptionHelper(
// FCMのデバイスIDを取得
val device_id = PollingWorker.getDeviceId(context)
?: return TootApiResult(error = context.getString(R.string.missing_fcm_device_id))
// アクセストークン
val accessToken = account.misskeyApiToken
?: return TootApiResult(error = "missing misskeyApiToken.")
// インストールIDを取得
val install_id = PollingWorker.prepareInstallId(context)
?: return TootApiResult(error = context.getString(R.string.missing_install_id))
// アクセストークンのダイジェスト
val tokenDigest = accessToken.digestSHA256Base64Url()
// クライアント識別子
val clientIdentifier = "$accessToken$install_id".digestSHA256Base64Url()
// // アクセストークン
// val accessToken = account.misskeyApiToken
// ?: return TootApiResult(error = "missing misskeyApiToken.")
//
// // インストールIDを取得
// val install_id = PollingWorker.prepareInstallId(context)
// ?: return TootApiResult(error = context.getString(R.string.missing_install_id))
//
// // アクセストークンのダイジェスト
// val tokenDigest = accessToken.digestSHA256Base64Url()
//
// // クライアント識別子
// val clientIdentifier = "$accessToken$install_id".digestSHA256Base64Url()
//
val endpoint =
"${PollingWorker.APP_SERVER}/webpushcallback/${device_id.encodePercent()}/${account.acct.encodePercent()}/$flags"
// FIXME 現時点ではサーバキーの検証を行えないので clientIdentifier を指定しない

4
app/src/main/res/values-ja/strings.xml
View File

@ -1061,7 +1061,7 @@
<string name="remove_endorse_succeeded">紹介を削除しました</string>
<string name="follow_request_cancelled">フォローリクエストを取り消しました</string>
<string name="confirm_cancel_follow_request_who_from">%2$s から %1$s へのフォローリクエストを取り消します。よろしいですか?</string>
<string name="reaction">Reaction (Misskey)</string>
<string name="vote">Vote (Misskey)</string>
<string name="reaction">リアクション (Misskey)</string>
<string name="vote">投票 (Misskey)</string>
</resources>