Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed some memory leaks

This commit is contained in:
Mariotaku Lee 2017-04-23 16:39:19 +08:00
parent c239a0af1c
commit 481ff297ca
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
3 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
View File

@ -551,7 +551,18 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
IntentUtils.openDrafts(this)
}
R.id.delete -> {
TaskStarter.execute(DeleteMediaTask(this, media))
val media = this.media
val task = DeleteMediaTask(this, media)
task.callback = { result ->
setProgressVisible(false)
removeMedia(media.filterIndexed { i, _ -> result[i] })
setMenu()
if (result.contains(false)) {
Toast.makeText(this, R.string.message_toast_error_occurred,
Toast.LENGTH_SHORT).show()
}
}
TaskStarter.execute(task)
}
R.id.toggle_sensitive -> {
if (!hasMedia) return true
@ -1974,14 +1985,12 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
private class AddMediaTask(activity: ComposeActivity, sources: Array<Uri>, copySrc: Boolean,
deleteSrc: Boolean) : AbsAddMediaTask<((List<ParcelableMediaUpdate>?) -> Unit)?>(
activity,
sources, copySrc, deleteSrc) {
private val activityRef = WeakReference(activity)
activity, sources, copySrc, deleteSrc) {
override fun afterExecute(callback: ((List<ParcelableMediaUpdate>?) -> Unit)?,
result: List<ParcelableMediaUpdate>?) {
val activity = activityRef.get() ?: return
callback?.invoke(result)
val activity = context as? ComposeActivity ?: return
activity.setProgressVisible(false)
if (result != null) {
activity.addMedia(result)
@ -1991,31 +2000,24 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
}
override fun beforeExecute() {
val activity = activityRef.get() ?: return
val activity = context as? ComposeActivity ?: return
activity.setProgressVisible(true)
}
}
private class DeleteMediaTask(activity: ComposeActivity, val media: Array<ParcelableMediaUpdate>) :
AbsDeleteMediaTask<ComposeActivity>(activity, media.mapToArray { Uri.parse(it.uri) }) {
init {
this.callback = activity
}
private class DeleteMediaTask(
activity: ComposeActivity,
val media: Array<ParcelableMediaUpdate>
) : AbsDeleteMediaTask<((BooleanArray) -> Unit)?>(activity, media.mapToArray { Uri.parse(it.uri) }) {
override fun beforeExecute() {
callback?.setProgressVisible(true)
val activity = context as? ComposeActivity ?: return
activity.setProgressVisible(true)
}
override fun afterExecute(callback: ComposeActivity?, result: BooleanArray?) {
if (callback == null || result == null) return
callback.setProgressVisible(false)
callback.removeMedia(media.filterIndexed { i, _ -> result[i] })
callback.setMenu()
if (result.any { false }) {
Toast.makeText(callback, R.string.message_toast_error_occurred, Toast.LENGTH_SHORT).show()
}
override fun afterExecute(callback: ((BooleanArray) -> Unit)?, result: BooleanArray) {
callback?.invoke(result)
}
}

6
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt
View File

@ -517,11 +517,11 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment<Messages
callback = fragment
}
override fun afterExecute(callback: MessagesConversationFragment?, result: BooleanArray?) {
if (callback == null || result == null) return
override fun afterExecute(callback: MessagesConversationFragment?, result: BooleanArray) {
if (callback == null) return
callback.setProgressVisible(false)
callback.removeMedia(media.filterIndexed { i, _ -> result[i] })
if (result.any { false }) {
if (result.contains(false)) {
Toast.makeText(callback.context, R.string.message_toast_error_occurred, Toast.LENGTH_SHORT).show()
}
}

6
twidere/src/main/kotlin/org/mariotaku/twidere/task/compose/AbsDeleteMediaTask.kt
View File

@ -28,13 +28,13 @@ import java.lang.ref.WeakReference
open class AbsDeleteMediaTask<Callback>(
context: Context,
val sources: Array<Uri>
) : AbstractTask<Unit, BooleanArray?, Callback>() {
) : AbstractTask<Unit, BooleanArray, Callback>() {
private val contextRef = WeakReference(context)
val context: Context? get() = contextRef.get()
override fun doLongOperation(params: Unit?): BooleanArray? {
val context = contextRef.get() ?: return null
override fun doLongOperation(params: Unit?): BooleanArray {
val context = contextRef.get() ?: return kotlin.BooleanArray(sources.size) { false }
return BooleanArray(sources.size) { Utils.deleteMedia(context, sources[it]) }
}