okhttpの全てのcallをexecute()からawait()に変更した。不安しかない

tateisu · Dec 8, 2020 · f18e136 · f18e136
1 parent e0d1859
commit f18e136
Show file tree

Hide file tree

Showing 54 changed files with 7,329 additions and 7,255 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/app/src/androidTest/java/jp/juggler/subwaytooter/api/TestTootApiClient.kt b/app/src/androidTest/java/jp/juggler/subwaytooter/api/TestTootApiClient.kt
@@ -241,7 +241,7 @@ class TestTootApiClient {
 		override val isApiCancelled : Boolean
 			get() = cancelled
 
-		override fun publishApiProgress(s : String) {
+		override suspend fun publishApiProgress(s : String) {
 			progressString = s
 		}
 	}
@@ -498,12 +498,12 @@ class TestTootApiClient {
 						return true
 					}
 
-				override fun publishApiProgress(s : String) {
+				override suspend fun publishApiProgress(s : String) {
 					++ flag
 					progressString = s
 				}
 
-				override fun publishApiProgressRatio(value : Int, max : Int) {
+				override suspend fun publishApiProgressRatio(value : Int, max : Int) {
 					++ flag
 					progressValue = value
 					progressMax = max

diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt b/app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt
@@ -43,6 +43,7 @@ import okhttp3.RequestBody
 import okio.BufferedSink
 import org.jetbrains.anko.backgroundColor
 import org.jetbrains.anko.textColor
+import ru.gildor.coroutines.okhttp.await
 import java.io.*
 import kotlin.math.max
 
@@ -683,11 +684,11 @@ class ActAccountSetting : AsyncActivity(), View.OnClickListener,
 	private fun performLoadPreference() {
 
 		TootTaskRunner(this).run(account, object : TootTask {
-			override fun background(client : TootApiClient) : TootApiResult? {
+			override suspend fun background(client : TootApiClient) : TootApiResult? {
 				return client.request("/api/v1/preferences")
 			}
 
-			override fun handleResult(result : TootApiResult?) {
+			override suspend fun handleResult(result : TootApiResult?) {
 				result ?: return
 
 				val json = result.jsonObject
@@ -772,7 +773,7 @@ class ActAccountSetting : AsyncActivity(), View.OnClickListener,
 								.build()
 						)
 
-						val response = call.execute()
+						val response = call.await()
 
 						log.e("performAccountRemove: %s", response)
 					} catch(ex : Throwable) {
@@ -787,14 +788,14 @@ class ActAccountSetting : AsyncActivity(), View.OnClickListener,
 	private fun performAccessToken() {
 
 		TootTaskRunner(this@ActAccountSetting).run(account, object : TootTask {
-			override fun background(client : TootApiClient) : TootApiResult? {
+			override suspend fun background(client : TootApiClient) : TootApiResult? {
 				return client.authentication1(
 					Pref.spClientName(this@ActAccountSetting),
 					forceUpdateClient = true
 				)
 			}
 
-			override fun handleResult(result : TootApiResult?) {
+			override suspend fun handleResult(result : TootApiResult?) {
 				result ?: return // cancelled.
 
 				val uri = result.string.mayUri()
@@ -883,7 +884,7 @@ class ActAccountSetting : AsyncActivity(), View.OnClickListener,
 		TootTaskRunner(this).run(account, object : TootTask {
 
 			var data : TootAccount? = null
-			override fun background(client : TootApiClient) : TootApiResult? {
+			override suspend fun background(client : TootApiClient) : TootApiResult? {
 				if(account.isMisskey) {
 					val result = client.request(
 						"/api/i",
@@ -912,7 +913,7 @@ class ActAccountSetting : AsyncActivity(), View.OnClickListener,
 				}
 			}
 
-			override fun handleResult(result : TootApiResult?) {
+			override suspend fun handleResult(result : TootApiResult?) {
 				if(result == null) return  // cancelled.
 
 				val data = this.data
@@ -1075,7 +1076,7 @@ class ActAccountSetting : AsyncActivity(), View.OnClickListener,
 
 		TootTaskRunner(this).run(account, object : TootTask {
 
-			private fun uploadImageMisskey(
+			private suspend fun uploadImageMisskey(
 				client : TootApiClient,
 				opener : InputStreamOpener
 			) : Pair<TootApiResult?, TootAttachment?> {
@@ -1095,7 +1096,7 @@ class ActAccountSetting : AsyncActivity(), View.OnClickListener,
 					"file",
 					getDocumentName(contentResolver, opener.uri),
 					object : RequestBody() {
-						override fun contentType() : MediaType? {
+						override fun contentType() : MediaType {
 							return opener.mimeType.toMediaType()
 						}
 
@@ -1132,7 +1133,7 @@ class ActAccountSetting : AsyncActivity(), View.OnClickListener,
 			}
 
 			var data : TootAccount? = null
-			override fun background(client : TootApiClient) : TootApiResult? {
+			override suspend fun background(client : TootApiClient) : TootApiResult? {
 
 				try {
 					if(account.isMisskey) {
@@ -1239,7 +1240,7 @@ class ActAccountSetting : AsyncActivity(), View.OnClickListener,
 				}
 			}
 
-			override fun handleResult(result : TootApiResult?) {
+			override suspend fun handleResult(result : TootApiResult?) {
 				if(result == null) return  // cancelled.
 
 				val data = this.data
@@ -1580,13 +1581,11 @@ class ActAccountSetting : AsyncActivity(), View.OnClickListener,
 				verbose = true
 			)
 
-			override fun background(client : TootApiClient) : TootApiResult? {
-				return runBlocking{
-					wps.updateSubscription(client, true)
-				}
+			override suspend fun background(client : TootApiClient) : TootApiResult? {
+				return wps.updateSubscription(client, true)
 			}
 
-			override fun handleResult(result : TootApiResult?) {
+			override suspend fun handleResult(result : TootApiResult?) {
 				result ?: return
 				val log = wps.log
 				if(log.isNotEmpty()) {

diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActColumnCustomize.kt b/app/src/main/java/jp/juggler/subwaytooter/ActColumnCustomize.kt
@@ -242,7 +242,8 @@ class ActColumnCustomize : AppCompatActivity(), View.OnClickListener, ColorPicke
         TootTaskRunner(this).run(object : TootTask {
 			var bgUri: String? = null
 
-			override fun background(client: TootApiClient): TootApiResult? {
+			@Suppress("BlockingMethodInNonBlockingContext")
+			override suspend fun background(client: TootApiClient): TootApiResult? {
 				try {
 					val backgroundDir = Column.getBackgroundImageDir(this@ActColumnCustomize)
 					val file =
@@ -289,7 +290,7 @@ class ActColumnCustomize : AppCompatActivity(), View.OnClickListener, ColorPicke
 				}
 			}
 
-			override fun handleResult(result: TootApiResult?) {
+			override suspend fun handleResult(result: TootApiResult?) {
 				val bgUri = this.bgUri
 				when {
 					result == null -> return

diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActKeywordFilter.kt b/app/src/main/java/jp/juggler/subwaytooter/ActKeywordFilter.kt
@@ -162,7 +162,7 @@ class ActKeywordFilter
 		loading = true
 		TootTaskRunner(this).run(account, object : TootTask {
 			var filter : TootFilter? = null
-			override fun background(client : TootApiClient) : TootApiResult? {
+			override suspend fun background(client : TootApiClient) : TootApiResult? {
 				val result = client.request("${Column.PATH_FILTERS}/${filter_id}")
 				val jsonObject = result?.jsonObject
 				if(jsonObject != null) {
@@ -171,7 +171,7 @@ class ActKeywordFilter
 				return result
 			}
 
-			override fun handleResult(result : TootApiResult?) {
+			override suspend fun handleResult(result : TootApiResult?) {
 				loading = false
 				val filter = this.filter
 				if(filter != null) {
@@ -271,7 +271,7 @@ class ActKeywordFilter
 
 		TootTaskRunner(this).run(account, object : TootTask {
 
-			override fun background(client : TootApiClient) = if(filter_id == null) {
+			override suspend fun background(client : TootApiClient) = if(filter_id == null) {
 				client.request(
 					Column.PATH_FILTERS,
 					params.toPostRequestBuilder()
@@ -283,7 +283,7 @@ class ActKeywordFilter
 				)
 			}
 
-			override fun handleResult(result : TootApiResult?) {
+			override suspend fun handleResult(result : TootApiResult?) {
 				result ?: return
 				val error = result.error
 				if(error != null) {

diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt
@@ -1854,7 +1854,7 @@ class ActMain : AsyncActivity(), Column.Callback, View.OnClickListener,
 			var host: Host? = null
 			var ti: TootInstance? = null
 
-			override fun background(client: TootApiClient): TootApiResult? {
+			override suspend fun background(client: TootApiClient): TootApiResult? {
 
 				val uriStr = uri.toString()
 				if (uriStr.startsWith("subwaytooter://misskey/auth_callback")
@@ -1980,7 +1980,7 @@ class ActMain : AsyncActivity(), Column.Callback, View.OnClickListener,
 				}
 			}
 
-			override fun handleResult(result: TootApiResult?) {
+			override suspend fun handleResult(result: TootApiResult?) {
 				val host = this.host
 				val ta = this.ta
 				var sa = this.sa
@@ -2141,7 +2141,7 @@ class ActMain : AsyncActivity(), Column.Callback, View.OnClickListener,
 			var ta: TootAccount? = null
 			var ti: TootInstance? = null
 
-			override fun background(client: TootApiClient): TootApiResult? {
+			override suspend fun background(client: TootApiClient): TootApiResult? {
 
 				val (instance, instanceResult) = TootInstance.get(client, apiHost)
 				instance ?: return instanceResult
@@ -2163,7 +2163,7 @@ class ActMain : AsyncActivity(), Column.Callback, View.OnClickListener,
 				return result
 			}
 
-			override fun handleResult(result: TootApiResult?) {
+			override suspend fun handleResult(result: TootApiResult?) {
 				if (afterAccountVerify(result, ta, sa, ti, apiHost)) {
 					dialog_host?.dismissSafe()
 					dialog_token?.dismissSafe()

diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActMediaViewer.kt b/app/src/main/java/jp/juggler/subwaytooter/ActMediaViewer.kt
@@ -550,7 +550,7 @@ class ActMediaViewer : AppCompatActivity(), View.OnClickListener {
 				return Pair(bitmap2, null)
 			}
 
-			fun getHttpCached(
+			suspend fun getHttpCached(
 					client: TootApiClient,
 					url: String
 			): Pair<TootApiResult?, ByteArray?> {
@@ -599,7 +599,7 @@ class ActMediaViewer : AppCompatActivity(), View.OnClickListener {
 				}
 			}
 
-			override fun background(client: TootApiClient): TootApiResult? {
+			override suspend fun background(client: TootApiClient): TootApiResult? {
 				if (urlList.isEmpty()) return TootApiResult("missing url")
 				var lastResult: TootApiResult? = null
 				for (url in urlList) {
@@ -619,7 +619,7 @@ class ActMediaViewer : AppCompatActivity(), View.OnClickListener {
 				return lastResult
 			}
 
-			override fun handleResult(result: TootApiResult?) {
+			override suspend fun handleResult(result: TootApiResult?) {
 				val bitmap = this.bitmap
 				if (bitmap != null) {
 					pbvImage.setBitmap(bitmap)