crash fixes
This commit is contained in:
parent
f0b844c102
commit
9c92c88783
|
@ -258,7 +258,9 @@ public class MicroBlogException extends Exception implements TwitterResponse, Ht
|
|||
|
||||
@Override
|
||||
public String toString() {
|
||||
return getMessage();
|
||||
final String message = getMessage();
|
||||
if (message == null) return getClass().getSimpleName();
|
||||
return message;
|
||||
}
|
||||
|
||||
public String getErrorMessage() {
|
||||
|
|
|
@ -350,8 +350,10 @@ class MediaViewerActivity : BaseActivity(), IMediaViewerActivity, MediaSwipeClos
|
|||
ParcelableMedia.Type.EXTERNAL_PLAYER -> {
|
||||
return Fragment.instantiate(this, ExternalBrowserPageFragment::class.java.name, args) as MediaViewerFragment
|
||||
}
|
||||
else -> {
|
||||
return Fragment.instantiate(this, ExternalBrowserPageFragment::class.java.name, args) as MediaViewerFragment
|
||||
}
|
||||
}
|
||||
throw UnsupportedOperationException(media.toString())
|
||||
}
|
||||
|
||||
override fun getMediaCount(): Int {
|
||||
|
|
|
@ -53,5 +53,5 @@ private fun MicroBlogException.getMicroBlogErrorMessage(context: Context): Strin
|
|||
} else {
|
||||
errorMessage
|
||||
}
|
||||
return msg ?: message ?: toString()
|
||||
return msg ?: message ?: javaClass.simpleName
|
||||
}
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
package org.mariotaku.twidere.util
|
||||
|
||||
import android.graphics.Typeface
|
||||
import android.net.Uri
|
||||
import android.text.Editable
|
||||
import android.text.Spannable
|
||||
import android.text.SpannableStringBuilder
|
||||
|
|
|
@ -271,10 +271,12 @@ object Utils {
|
|||
return File(context.cacheDir, cacheDirName)
|
||||
}
|
||||
|
||||
fun getExternalCacheDir(context: Context?, cacheDirName: String,
|
||||
sizeInBytes: Long): File? {
|
||||
if (context == null) throw NullPointerException()
|
||||
val externalCacheDir = context.externalCacheDir ?: return null
|
||||
fun getExternalCacheDir(context: Context, cacheDirName: String, sizeInBytes: Long): File? {
|
||||
val externalCacheDir = try {
|
||||
context.externalCacheDir
|
||||
} catch (e: SecurityException) {
|
||||
null
|
||||
} ?: return null
|
||||
val cacheDir = File(externalCacheDir, cacheDirName)
|
||||
if (sizeInBytes > 0 && externalCacheDir.freeSpace < sizeInBytes / 10) {
|
||||
// Less then 10% space available
|
||||
|
|
Loading…
Reference in New Issue