Skip to content

Commit c6b9fd9

Browse files
authored
Merge pull request #8 from Knowre-Dev/hotfix/myscript-fix
Hotfix/myscript fix
2 parents f53493a + a7ec140 commit c6b9fd9

4 files changed

Lines changed: 25 additions & 8 deletions

File tree

‎myscript-iink/UIReferenceImplementation/src/main/java/com/myscript/iink/uireferenceimplementation/InputController.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package com.myscript.iink.uireferenceimplementation;
44

55
import android.content.Context;
6+
import android.os.Build;
67
import android.os.SystemClock;
78
import android.util.Log;
89
import android.view.GestureDetector;
@@ -188,7 +189,14 @@ else if (inputMode == INPUT_MODE_FORCE_TOUCH)
188189
ToolController toolController = editor.getToolController();
189190
PointerTool tool = toolController.getToolForType(iinkPointerType);
190191
if (tool == PointerTool.PEN || tool == PointerTool.HIGHLIGHTER)
191-
editorView.requestUnbufferedDispatch(event);
192+
{
193+
// API 27/28/29 의 ViewRootImpl 은 "즉시 배치 소비"(scheduleConsumeBatchedInputImmediately)가
194+
// 예약된 프레임 소비를 취소만 하고 실제로는 아무것도 소비하지 않는다. 그 결과 배치된 입력이
195+
// 영영 회수되지 않아 입력 디스패치 타임아웃 ANR 이 발생한다. API 30 에서 수정됨.
196+
// → trouble-shootings/myscript-iink-4.5-anr-rollback.md
197+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
198+
editorView.requestUnbufferedDispatch(event);
199+
}
192200

193201
try
194202
{

‎myscript-iink/src/main/java/com/knowre/android/myscript/iink/jiix/Expression.kt‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,15 @@ data class Expression(
1414
@SerializedName("bounding-box")
1515
val boundingBox: BoundingBox?,
1616
val symbols: List<Symbol>?,
17-
val operands: List<Expression>?
17+
/**
18+
* iink 4.5 부터 **미해결 피연산자 자리**(예: `2+` 처럼 한쪽을 비운 입력)를
19+
* 객체가 아닌 `null` 로 직렬화한다. 3.0.2 는 같은 자리를
20+
* `{"type":"number","label":"?","generated":true,"error":"Unsolved"}` 객체로 내보냈다.
21+
*
22+
* Gson 은 Kotlin 의 non-null 제네릭을 강제하지 않아 타입 선언만으로는 막을 수 없으므로,
23+
* 원소 타입을 nullable 로 선언하고 순회하는 쪽에서 걸러낸다.
24+
*/
25+
val operands: List<Expression?>?
1826
)
1927

2028
internal fun Expression.changeItem(newItem: Item): Expression =
@@ -23,6 +31,6 @@ internal fun Expression.changeItem(newItem: Item): Expression =
2331
if (item.id == newItem.id) newItem else item
2432
},
2533
operands = operands?.map { operand ->
26-
operand.changeItem(newItem)
34+
operand?.changeItem(newItem)
2735
}
2836
)

‎myscript-iink/src/main/java/com/knowre/android/myscript/iink/jiix/Jiix.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ data class Jiix(
77
val id: String,
88
val type: String,
99
val items: List<Item>?,
10-
val expressions: List<Expression>?,
10+
/** 원소가 null 일 수 있는 이유는 [Expression.operands] 주석 참고. */
11+
val expressions: List<Expression?>?,
1112
@SerializedName("bounding-box")
1213
val boundingBox: BoundingBox?,
1314
val version: String
1415
)
1516

1617
fun Jiix.isValid() =
1718
!expressions.isNullOrEmpty() &&
18-
expressions.all { it.id != null } &&
19+
expressions.all { it?.id != null } &&
1920
getAllItems().all { it.isValid }
2021

2122
fun Jiix.changeItem(itemId: String, func: Item.() -> Item) =
@@ -27,6 +28,6 @@ internal fun Jiix.changeItem(newItem: Item) =
2728
if (item.id == newItem.id) newItem else item
2829
},
2930
expressions = expressions?.map { expression ->
30-
expression.changeItem(newItem)
31+
expression?.changeItem(newItem)
3132
}
3233
)

‎myscript-iink/src/main/java/com/knowre/android/myscript/iink/jiix/JiixExtension.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import java.util.Collections
88
//region Jiix
99
internal fun Jiix.getAllExpressions(): List<Expression> {
1010
fun List<Expression>.flatten(): List<Expression> =
11-
this + this.flatMap { it.operands?.flatten() ?: Collections.emptyList() }
11+
this + this.flatMap { it.operands?.filterNotNull()?.flatten() ?: Collections.emptyList() }
1212

13-
return this.expressions?.flatten() ?: Collections.emptyList()
13+
return this.expressions?.filterNotNull()?.flatten() ?: Collections.emptyList()
1414
}
1515

1616
fun Jiix.getCandidates(item: Item): List<String> {

0 commit comments

Comments
 (0)