Merge pull request #5538 from grzesiek2010/castException

seadowg · seadowg · commit 4f848b80d061 · 2023-04-04T16:04:43.000+02:00
Catch ClassCastException and log it with more details
diff --git a/androidshared/src/main/java/org/odk/collect/androidshared/data/AppState.kt b/androidshared/src/main/java/org/odk/collect/androidshared/data/AppState.kt
@@ -62,8 +62,12 @@ interface StateStore {
 }
 
 fun Application.getState(): AppState {
-    val stateStore = this as StateStore
-    return stateStore.getState()
+    try {
+        val stateStore = this as StateStore
+        return stateStore.getState()
+    } catch (e: ClassCastException) {
+        throw ClassCastException("${this.javaClass} cannot be cast to StateStore")
+    }
 }
 
 fun Context.getState(): AppState {

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,12 @@ interface StateStore {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`fun Application.getState(): AppState {`
`65`		`- val stateStore = this as StateStore`
`66`		`- return stateStore.getState()`
	`65`	`+ try {`
	`66`	`+ val stateStore = this as StateStore`
	`67`	`+ return stateStore.getState()`
	`68`	`+ } catch (e: ClassCastException) {`
	`69`	`+ throw ClassCastException("${this.javaClass} cannot be cast to StateStore")`
	`70`	`+ }`
`67`	`71`	`}`
`68`	`72`
`69`	`73`	`fun Context.getState(): AppState {`