Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Catching another exception in ContactsLoader + prevent crash if cursor is null

Browse source
This commit is contained in:
Sylvain Berfini 2022-04-19 09:09:40 +02:00
parent 4d6f614df8
commit 3599fd21da
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/org/linphone/contact/ContactLoader.kt
View file

@ -71,7 +71,11 @@ class ContactLoader : LoaderManager.LoaderCallbacks<Cursor> {
) )
} }
override fun onLoadFinished(loader: Loader<Cursor>, cursor: Cursor) { override fun onLoadFinished(loader: Loader<Cursor>, cursor: Cursor?) {
if (cursor == null) {
Log.e("[Contacts Loader] Cursor is null!")
return
}
Log.i("[Contacts Loader] Load finished, found ${cursor.count} entries in cursor") Log.i("[Contacts Loader] Load finished, found ${cursor.count} entries in cursor")
val core = coreContext.core val core = coreContext.core
@ -211,6 +215,9 @@ class ContactLoader : LoaderManager.LoaderCallbacks<Cursor> {
} }
} catch (sde: StaleDataException) { } catch (sde: StaleDataException) {
Log.e("[Contacts Loader] State Data Exception: $sde") Log.e("[Contacts Loader] State Data Exception: $sde")
} catch (ise: IllegalStateException) {
Log.e("[Contacts Loader] Illegal State Exception: $ise")
} finally {
cancel() cancel()
} }
} }