修复Flomo笔记提交:API Key改为可选,添加content_type参数
This commit is contained in:
@@ -508,7 +508,7 @@ class MainActivity : AppCompatActivity() {
|
||||
val settings = Gson().fromJson(json, NoteSettingsData::class.java)
|
||||
val noteConfig = settings.noteApiConfig
|
||||
|
||||
if (noteConfig == null || noteConfig.apiUrl.isBlank() || noteConfig.apiKey.isBlank()) {
|
||||
if (noteConfig == null || noteConfig.apiUrl.isBlank()) {
|
||||
Toast.makeText(this, "请先配置笔记API", Toast.LENGTH_SHORT).show()
|
||||
return
|
||||
}
|
||||
@@ -541,10 +541,12 @@ class MainActivity : AppCompatActivity() {
|
||||
return withContext(Dispatchers.IO) {
|
||||
try {
|
||||
val client = OkHttpClient()
|
||||
val requestBody = when (apiType) {
|
||||
val (requestBody, useAuth) = when (apiType) {
|
||||
"Flomo" -> {
|
||||
val json = JSONObject().put("content", content)
|
||||
json.toString().toRequestBody("application/json".toMediaType())
|
||||
val json = JSONObject()
|
||||
.put("content", content)
|
||||
.put("content_type", "markdown")
|
||||
Pair(json.toString().toRequestBody("application/json".toMediaType()), false)
|
||||
}
|
||||
"Notion" -> {
|
||||
val json = JSONObject()
|
||||
@@ -556,20 +558,24 @@ class MainActivity : AppCompatActivity() {
|
||||
)
|
||||
)
|
||||
)
|
||||
json.toString().toRequestBody("application/json".toMediaType())
|
||||
Pair(json.toString().toRequestBody("application/json".toMediaType()), true)
|
||||
}
|
||||
else -> {
|
||||
val json = JSONObject().put("content", content)
|
||||
json.toString().toRequestBody("application/json".toMediaType())
|
||||
Pair(json.toString().toRequestBody("application/json".toMediaType()), apiKey.isNotBlank())
|
||||
}
|
||||
}
|
||||
|
||||
val request = Request.Builder()
|
||||
val requestBuilder = Request.Builder()
|
||||
.url(apiUrl)
|
||||
.addHeader("Authorization", "Bearer $apiKey")
|
||||
.addHeader("Content-Type", "application/json")
|
||||
.post(requestBody)
|
||||
.build()
|
||||
|
||||
if (useAuth && apiKey.isNotBlank()) {
|
||||
requestBuilder.addHeader("Authorization", "Bearer $apiKey")
|
||||
}
|
||||
|
||||
val request = requestBuilder.build()
|
||||
|
||||
val response = client.newCall(request).execute()
|
||||
response.isSuccessful
|
||||
|
||||
Reference in New Issue
Block a user