Skip to content

Commit 31b2306

Browse files
committed
update error handler
1 parent 0be5ffc commit 31b2306

File tree

2 files changed

+8
-17
lines changed

2 files changed

+8
-17
lines changed

app/src/main/java/io/agora/flat/common/error/FlatErrorHandler.kt

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,17 @@ import io.agora.flat.R
55
import io.agora.flat.common.FlatErrorCode
66
import io.agora.flat.common.FlatException
77
import io.agora.flat.common.FlatNetException
8-
import io.agora.flat.common.FlatRtcException
9-
import io.agora.flat.common.FlatRtmException
108
import io.agora.flat.di.GlobalInstanceProvider
119

1210
object FlatErrorHandler {
1311
fun getErrorStr(context: Context, error: Throwable?, defaultValue: String = "Unhandled exceptions"): String {
14-
return if (error is FlatException) {
15-
when (error) {
12+
if (error is FlatException) {
13+
return when (error) {
1614
is FlatNetException -> getNetErrorString(context, error)
17-
18-
is FlatRtcException -> defaultValue
19-
20-
is FlatRtmException -> defaultValue
21-
22-
else -> defaultValue
15+
else -> error.message ?: defaultValue
2316
}
24-
} else {
25-
defaultValue
2617
}
18+
return error?.message ?: defaultValue
2719
}
2820

2921
private fun getNetErrorString(context: Context, error: FlatNetException): String {
@@ -59,12 +51,11 @@ object FlatErrorHandler {
5951
FlatErrorCode.Web.RoomLimit -> context.getString(R.string.pay_room_users_limit)
6052
FlatErrorCode.Web.RoomExpired -> context.getString(R.string.pay_room_expired)
6153
FlatErrorCode.Web.RoomNotBegin -> context.getString(
62-
R.string.room_not_started,
63-
appKVCenter.getJoinEarly()
54+
R.string.room_not_started, appKVCenter.getJoinEarly()
6455
)
56+
6557
FlatErrorCode.Web.RoomNotBeginAndAddList -> context.getString(
66-
R.string.room_not_started_added,
67-
appKVCenter.getJoinEarly()
58+
R.string.room_not_started_added, appKVCenter.getJoinEarly()
6859
)
6960

7061
FlatErrorCode.Web.RoomCreateLimit -> context.getString(R.string.pay_room_reached_limit)

app/src/main/java/io/agora/flat/ui/activity/play/ExtComponent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class ExtComponent(
136136
if (error.exception == null) {
137137
activity.showToast(error.text)
138138
} else {
139-
showRoomExitDialog(FlatErrorHandler.getErrorStr(activity, error.exception, ""))
139+
showRoomExitDialog(FlatErrorHandler.getErrorStr(activity, error.exception))
140140
}
141141
}
142142

0 commit comments

Comments
 (0)