xiaji/flomo-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复Flomo笔记提交：API Key改为可选，添加content_type参数

Browse Source
This commit is contained in:
xiaji
2026-04-06 08:20:15 +08:00
parent 0f0f1f8ea4
commit 7cd9d9a4bf
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
flomo-ai/app/src/main/java/com/example/flomo_ai/MainActivity.kt
View File

@@ -508,7 +508,7 @@ class MainActivity : AppCompatActivity() {
val settings = Gson().fromJson(json, NoteSettingsData::class.java) val settings = Gson().fromJson(json, NoteSettingsData::class.java)
val noteConfig = settings.noteApiConfig 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() Toast.makeText(this, "请先配置笔记API", Toast.LENGTH_SHORT).show()
return return
} }
@@ -541,10 +541,12 @@ class MainActivity : AppCompatActivity() {
return withContext(Dispatchers.IO) { return withContext(Dispatchers.IO) {
try { try {
val client = OkHttpClient() val client = OkHttpClient()
val requestBody = when (apiType) { val (requestBody, useAuth) = when (apiType) {
"Flomo" -> { "Flomo" -> {
val json = JSONObject().put("content", content) val json = JSONObject()
json.toString().toRequestBody("application/json".toMediaType()) .put("content", content)
.put("content_type", "markdown")
Pair(json.toString().toRequestBody("application/json".toMediaType()), false)
} }
"Notion" -> { "Notion" -> {
val json = JSONObject() 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 -> { else -> {
val json = JSONObject().put("content", content) 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) .url(apiUrl)
.addHeader("Authorization", "Bearer $apiKey")
.addHeader("Content-Type", "application/json") .addHeader("Content-Type", "application/json")
.post(requestBody) .post(requestBody)
.build()
if (useAuth && apiKey.isNotBlank()) {
requestBuilder.addHeader("Authorization", "Bearer $apiKey")
}
val request = requestBuilder.build()
val response = client.newCall(request).execute() val response = client.newCall(request).execute()
response.isSuccessful response.isSuccessful