pull/83/head
kunfei 5 years ago
parent 25aba898bf
commit 722f71c931
  1. 10
      app/src/main/java/io/legado/app/utils/ACache.kt
  2. 2
      app/src/main/java/io/legado/app/utils/FileUtils.kt

@ -171,7 +171,7 @@ class ACache private constructor(cacheDir: File, max_size: Long, max_count: Int)
* @return JSONObject数据 * @return JSONObject数据
*/ */
fun getAsJSONObject(key: String): JSONObject? { fun getAsJSONObject(key: String): JSONObject? {
val json = getAsString(key) val json = getAsString(key) ?: return null
return try { return try {
JSONObject(json) JSONObject(json)
} catch (e: Exception) { } catch (e: Exception) {
@ -311,17 +311,17 @@ class ACache private constructor(cacheDir: File, max_size: Long, max_count: Int)
fun getAsObject(key: String): Any? { fun getAsObject(key: String): Any? {
val data = getAsBinary(key) val data = getAsBinary(key)
if (data != null) { if (data != null) {
var bais: ByteArrayInputStream? = null var bis: ByteArrayInputStream? = null
var ois: ObjectInputStream? = null var ois: ObjectInputStream? = null
try { try {
bais = ByteArrayInputStream(data) bis = ByteArrayInputStream(data)
ois = ObjectInputStream(bais) ois = ObjectInputStream(bis)
return ois.readObject() return ois.readObject()
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
} finally { } finally {
try { try {
bais?.close() bis?.close()
} catch (e: IOException) { } catch (e: IOException) {
e.printStackTrace() e.printStackTrace()
} }

@ -43,7 +43,7 @@ object FileUtils {
val storageVolumeClazz = Class.forName("android.os.storage.StorageVolume") val storageVolumeClazz = Class.forName("android.os.storage.StorageVolume")
val getPath = storageVolumeClazz.getMethod("getPath") val getPath = storageVolumeClazz.getMethod("getPath")
val invokeVolumeList = getVolumeList.invoke(storageManager) val invokeVolumeList = getVolumeList.invoke(storageManager) ?: return null
val length = Array.getLength(invokeVolumeList) val length = Array.getLength(invokeVolumeList)
val list = ArrayList<String>() val list = ArrayList<String>()

Loading…
Cancel
Save