Avoid EmptyList cannot be cast to ArrayList warning
This commit is contained in:
@@ -84,7 +84,9 @@ class CallHistoryNew(val aor: String, val peerUri: String, val direction: String
|
|||||||
val fis = FileInputStream(file)
|
val fis = FileInputStream(file)
|
||||||
val ois = ObjectInputStream(fis)
|
val ois = ObjectInputStream(fis)
|
||||||
@Suppress("UNCHECKED_CAST")
|
@Suppress("UNCHECKED_CAST")
|
||||||
BaresipService.callHistory = ois.readObject() as ArrayList<CallHistoryNew>
|
val restoredHistory = ois.readObject() as? List<CallHistoryNew>
|
||||||
|
if (restoredHistory != null)
|
||||||
|
BaresipService.callHistory = ArrayList(restoredHistory)
|
||||||
ois.close()
|
ois.close()
|
||||||
fis.close()
|
fis.close()
|
||||||
Log.d(TAG, "Restored history of ${BaresipService.callHistory.size} calls")
|
Log.d(TAG, "Restored history of ${BaresipService.callHistory.size} calls")
|
||||||
@@ -132,7 +134,9 @@ class CallHistory(val aor: String, val peerUri: String, val direction: String) :
|
|||||||
val fis = FileInputStream(file)
|
val fis = FileInputStream(file)
|
||||||
val ois = ObjectInputStream(fis)
|
val ois = ObjectInputStream(fis)
|
||||||
@Suppress("UNCHECKED_CAST")
|
@Suppress("UNCHECKED_CAST")
|
||||||
result = ois.readObject() as ArrayList<CallHistory>
|
val restoredHistory = ois.readObject() as? List<CallHistory>
|
||||||
|
if (restoredHistory != null)
|
||||||
|
result = ArrayList(restoredHistory)
|
||||||
ois.close()
|
ois.close()
|
||||||
fis.close()
|
fis.close()
|
||||||
Log.d(TAG, "Got history of ${result.size} calls")
|
Log.d(TAG, "Got history of ${result.size} calls")
|
||||||
|
|||||||
@@ -123,7 +123,9 @@ class Message(val aor: String, val peerUri: String, val message: String, val tim
|
|||||||
val fis = FileInputStream(file)
|
val fis = FileInputStream(file)
|
||||||
val ois = ObjectInputStream(fis)
|
val ois = ObjectInputStream(fis)
|
||||||
@Suppress("UNCHECKED_CAST")
|
@Suppress("UNCHECKED_CAST")
|
||||||
BaresipService.messages = ois.readObject() as ArrayList<Message>
|
val restoredMessages = ois.readObject() as? List<Message>
|
||||||
|
if (restoredMessages != null)
|
||||||
|
BaresipService.messages = restoredMessages
|
||||||
ois.close()
|
ois.close()
|
||||||
fis.close()
|
fis.close()
|
||||||
Log.d(TAG, "Restored ${BaresipService.messages.size} messages")
|
Log.d(TAG, "Restored ${BaresipService.messages.size} messages")
|
||||||
|
|||||||
Reference in New Issue
Block a user