fix null error in JS logger when inserting PPT files

netless-io · Sep 19, 2024 · e4b66a2 · e4b66a2
1 parent cf011fb
commit e4b66a2
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 54 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -265,7 +265,7 @@ dependencies {
     api 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.8.0'
 
     // Agora
-    implementation("com.github.netless-io:whiteboard-android:nl_2.17.0-alpha.14") {
+    implementation("com.github.netless-io:whiteboard-android:nl_2.17.0-alpha.15") {
         force true
     }
     // for local fastboard debug

diff --git a/app/src/main/assets/flatboard/b280a53 b/app/src/main/assets/flatboard/b280a53
@@ -0,0 +1,9 @@
+here are what injected into build
+@netless/[email protected]
+@netless/[email protected]
+@netless/[email protected]
+@netless/[email protected]
+@netless/[email protected]
+@netless/[email protected]
+@netless/[email protected]
+@netless/[email protected]
diff --git a/app/src/main/assets/flatboard/whiteboard-bridge.js b/app/src/main/assets/flatboard/whiteboard-bridge.js
diff --git a/app/src/main/java/io/agora/flat/common/board/AgoraBoardRoom.kt b/app/src/main/java/io/agora/flat/common/board/AgoraBoardRoom.kt
@@ -131,6 +131,8 @@ class AgoraBoardRoom @Inject constructor(
             override fun onFastError(error: FastException) {
                 if (error.code == FastException.ROOM_KICKED) {
                     boardError.value = BoardError.Kicked
+                } else {
+                    boardError.value = BoardError.Unknown(error.message ?: "Unknown error")
                 }
             }
         })

diff --git a/app/src/main/java/io/agora/flat/common/board/BoardEntity.kt b/app/src/main/java/io/agora/flat/common/board/BoardEntity.kt
@@ -10,4 +10,5 @@ sealed class BoardPhase {
 
 sealed class BoardError {
     object Kicked : BoardError()
+    data class Unknown(val message: String) : BoardError()
 }
diff --git a/app/src/main/java/io/agora/flat/ui/activity/play/ExtComponent.kt b/app/src/main/java/io/agora/flat/ui/activity/play/ExtComponent.kt
@@ -66,6 +66,7 @@ class ExtComponent(
                 showLoading(it.loading)
                 it.error?.run {
                     handleErrorMessage(it.error)
+                    viewModel.clearError()
                 }
             }
         }

diff --git a/app/src/main/java/io/agora/flat/ui/activity/play/ExtensionViewModel.kt b/app/src/main/java/io/agora/flat/ui/activity/play/ExtensionViewModel.kt
@@ -19,7 +19,7 @@ import javax.inject.Inject
 class ExtensionViewModel @Inject constructor(
     private val errorManager: RoomErrorManager,
     private val boardRoom: AgoraBoardRoom,
-    private val eventBus: EventBus
+    private val eventBus: EventBus,
 ) : ViewModel() {
     private val _state = MutableStateFlow(ExtensionState())
     val state = _state.asStateFlow()
@@ -51,6 +51,10 @@ class ExtensionViewModel @Inject constructor(
                     is BoardError.Kicked -> {
                         eventBus.produceEvent(RoomKickedEvent)
                     }
+
+                    is BoardError.Unknown -> {
+                        _state.value = _state.value.copy(error = UiMessage(error.message))
+                    }
                 }
             }
         }
@@ -61,6 +65,10 @@ class ExtensionViewModel @Inject constructor(
             }
         }
     }
+
+    fun clearError() {
+        _state.value = _state.value.copy(error = null)
+    }
 }
 
 data class ExtensionState(