Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ae57a0bf09 |
@@ -20,8 +20,8 @@ android {
|
|||||||
applicationId = "com.docmost.app"
|
applicationId = "com.docmost.app"
|
||||||
minSdk = 26
|
minSdk = 26
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 4
|
versionCode = 5
|
||||||
versionName = "1.0.3"
|
versionName = "1.0.4"
|
||||||
}
|
}
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
|
|||||||
@@ -1877,9 +1877,9 @@ class PageEditorActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
private fun tiptapToMarkdown(tiptapJson: String): String {
|
private fun tiptapToMarkdown(tiptapJson: String): String {
|
||||||
return try {
|
return try {
|
||||||
val doc = gson.fromJson(tiptapJson, com.google.gson.JsonObject::class.java).asMap()
|
val type = object : com.google.gson.reflect.TypeToken<Map<String, Any?>>() {}.type
|
||||||
@Suppress("UNCHECKED_CAST")
|
val doc: Map<String, Any?> = gson.fromJson(tiptapJson, type)
|
||||||
extractText(doc as Map<String, Any?>)
|
extractText(doc)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
tiptapJson
|
tiptapJson
|
||||||
}
|
}
|
||||||
@@ -2492,6 +2492,15 @@ class PageEditorActivity : AppCompatActivity() {
|
|||||||
content
|
content
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (content is Map<*, *>) {
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
return try {
|
||||||
|
extractText(content as Map<String, Any?>)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
android.util.Log.e("PageEditor", "contentToMarkdown map error: ${e.message}")
|
||||||
|
""
|
||||||
|
}
|
||||||
|
}
|
||||||
return try {
|
return try {
|
||||||
val json = gson.toJson(content)
|
val json = gson.toJson(content)
|
||||||
if (json.isNotEmpty() && json != "null") {
|
if (json.isNotEmpty() && json != "null") {
|
||||||
|
|||||||
Reference in New Issue
Block a user