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

added draft notification

This commit is contained in:
Mariotaku Lee 2016-08-17 11:40:15 +08:00
parent db347550d2
commit de6df9d381
3 changed files with 71 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
twidere/src/main/java/org/mariotaku/twidere/task/twitter/UpdateStatusTask.kt
View File

@ -49,7 +49,10 @@ import javax.inject.Inject
/**
* Created by mariotaku on 16/5/22.
*/
class UpdateStatusTask(internal val context: Context, internal val stateCallback: UpdateStatusTask.StateCallback) : AbstractTask<Pair<String, ParcelableStatusUpdate>, UpdateStatusTask.UpdateStatusResult, Context>(), Constants {
class UpdateStatusTask(
internal val context: Context,
internal val stateCallback: UpdateStatusTask.StateCallback
) : AbstractTask<Pair<String, ParcelableStatusUpdate>, UpdateStatusTask.UpdateStatusResult, Context>(), Constants {
@Inject
lateinit var twitterWrapper: AsyncTwitterWrapper
@ -64,11 +67,11 @@ class UpdateStatusTask(internal val context: Context, internal val stateCallback
val draftId = saveDraft(params.first, params.second)
twitterWrapper.addSendingDraftId(draftId)
try {
val result = doUpdateStatus(params.second)
val result = doUpdateStatus(params.second, draftId)
deleteOrUpdateDraft(params.second, result, draftId)
return result
} catch (e: UpdateStatusException) {
return UpdateStatusResult(e)
return UpdateStatusResult(e, draftId)
} finally {
twitterWrapper.removeSendingDraftId(draftId)
}
@ -78,12 +81,12 @@ class UpdateStatusTask(internal val context: Context, internal val stateCallback
stateCallback.beforeExecute()
}
override fun afterExecute(handler: Context?, result: UpdateStatusResult?) {
override fun afterExecute(handler: Context?, result: UpdateStatusResult) {
stateCallback.afterExecute(handler, result)
}
@Throws(UpdateStatusException::class)
private fun doUpdateStatus(update: ParcelableStatusUpdate): UpdateStatusResult {
private fun doUpdateStatus(update: ParcelableStatusUpdate, draftId: Long): UpdateStatusResult {
val app = TwidereApplication.getInstance(context)
val uploader = getMediaUploader(app)
val shortener = getStatusShortener(app)
@ -96,9 +99,9 @@ class UpdateStatusTask(internal val context: Context, internal val stateCallback
val result: UpdateStatusResult
try {
result = requestUpdateStatus(update, pendingUpdate)
result = requestUpdateStatus(update, pendingUpdate, draftId)
} catch (e: IOException) {
return UpdateStatusResult(UpdateStatusException(e))
return UpdateStatusResult(UpdateStatusException(e), draftId)
}
mediaUploadCallback(uploader, pendingUpdate, result)
@ -207,14 +210,16 @@ class UpdateStatusTask(internal val context: Context, internal val stateCallback
}
@Throws(IOException::class)
private fun requestUpdateStatus(statusUpdate: ParcelableStatusUpdate, pendingUpdate: PendingStatusUpdate): UpdateStatusResult {
private fun requestUpdateStatus(statusUpdate: ParcelableStatusUpdate,
pendingUpdate: PendingStatusUpdate,
draftId: Long): UpdateStatusResult {
stateCallback.onUpdatingStatus()
val result = UpdateStatusResult(arrayOfNulls<ParcelableStatus>(pendingUpdate.length),
arrayOfNulls<MicroBlogException>(pendingUpdate.length))
arrayOfNulls<MicroBlogException>(pendingUpdate.length), draftId)
for (i in 0..pendingUpdate.length - 1) {
for (i in 0 until pendingUpdate.length) {
val account = statusUpdate.accounts[i]
val microBlog = MicroBlogAPIFactory.getInstance(context, account.account_key, true)
var body: Body? = null
@ -492,7 +497,7 @@ class UpdateStatusTask(internal val context: Context, internal val stateCallback
}
private fun saveDraft(draftAction: String?, statusUpdate: ParcelableStatusUpdate): Long {
private fun saveDraft(@Draft.Action draftAction: String?, statusUpdate: ParcelableStatusUpdate): Long {
val draft = Draft()
draft.account_keys = ParcelableAccountUtils.getAccountKeys(statusUpdate.accounts)
if (draftAction != null) {
@ -548,48 +553,45 @@ class UpdateStatusTask(internal val context: Context, internal val stateCallback
val exceptions: Array<MicroBlogException?>
val exception: UpdateStatusException?
val draftId: Long
constructor(statuses: Array<ParcelableStatus?>, exceptions: Array<MicroBlogException?>) {
val succeed: Boolean get() = !statuses.contains(null)
constructor(statuses: Array<ParcelableStatus?>, exceptions: Array<MicroBlogException?>, draftId: Long) {
this.statuses = statuses
this.exceptions = exceptions
this.exception = null
this.draftId = draftId
}
constructor(exception: UpdateStatusException) {
constructor(exception: UpdateStatusException, draftId: Long) {
this.exception = exception
this.statuses = arrayOfNulls<ParcelableStatus>(0)
this.exceptions = arrayOfNulls<MicroBlogException>(0)
this.draftId = draftId
}
}
open class UpdateStatusException : Exception {
constructor() : super() {
}
constructor() : super()
constructor(detailMessage: String, throwable: Throwable) : super(detailMessage, throwable) {
}
constructor(detailMessage: String, throwable: Throwable) : super(detailMessage, throwable)
constructor(throwable: Throwable) : super(throwable) {
}
constructor(throwable: Throwable) : super(throwable)
constructor(message: String) : super(message) {
}
constructor(message: String) : super(message)
}
class UploaderNotFoundException : UpdateStatusException {
constructor() : super() {
}
constructor() : super()
constructor(detailMessage: String, throwable: Throwable) : super(detailMessage, throwable) {
}
constructor(detailMessage: String, throwable: Throwable) : super(detailMessage, throwable)
constructor(throwable: Throwable) : super(throwable) {
}
constructor(throwable: Throwable) : super(throwable)
constructor(message: String) : super(message) {
}
constructor(message: String) : super(message)
}
class UploadException : UpdateStatusException {
@ -640,7 +642,7 @@ class UpdateStatusTask(internal val context: Context, internal val stateCallback
fun onUpdatingStatus()
@UiThread
fun afterExecute(handler: Context?, result: UpdateStatusResult?)
fun afterExecute(handler: Context?, result: UpdateStatusResult)
@UiThread
fun beforeExecute()

10
twidere/src/main/kotlin/org/mariotaku/ktextension/SyntacticSugar.kt Normal file
View File

@ -0,0 +1,10 @@
package org.mariotaku.ktextension
/**
* Created by mariotaku on 16/8/17.
*/
inline fun <T> configure(receiver: T, block: T.() -> Unit): T {
receiver.block()
return receiver
}

55
twidere/src/main/kotlin/org/mariotaku/twidere/service/BackgroundOperationService.kt
View File

@ -22,10 +22,14 @@ package org.mariotaku.twidere.service
import android.app.IntentService
import android.app.Notification
import android.app.Service
import android.content.ContentValues
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Handler
import android.os.Looper
import android.provider.BaseColumns
import android.support.annotation.UiThread
import android.support.annotation.WorkerThread
import android.support.v4.app.NotificationCompat
import android.support.v4.app.NotificationCompat.Builder
@ -41,6 +45,7 @@ import org.apache.commons.lang3.ArrayUtils
import org.apache.commons.lang3.math.NumberUtils
import org.mariotaku.abstask.library.ManualTaskStarter
import org.mariotaku.ktextension.asTypedArray
import org.mariotaku.ktextension.configure
import org.mariotaku.ktextension.toLong
import org.mariotaku.microblog.library.MicroBlogException
import org.mariotaku.microblog.library.twitter.TwitterUpload
@ -74,7 +79,7 @@ import javax.inject.Inject
class BackgroundOperationService : IntentService("background_operation"), Constants {
private var handler: Handler? = null
private val handler: Handler by lazy { Handler(Looper.getMainLooper()) }
@Inject
lateinit var preferences: SharedPreferencesWrapper
@Inject
@ -90,7 +95,6 @@ class BackgroundOperationService : IntentService("background_operation"), Consta
override fun onCreate() {
super.onCreate()
GeneralComponentHelper.build(this).inject(this)
handler = Handler()
}
override fun onDestroy() {
@ -103,15 +107,15 @@ class BackgroundOperationService : IntentService("background_operation"), Consta
}
fun showErrorMessage(message: CharSequence, longMessage: Boolean) {
handler!!.post { Utils.showErrorMessage(this@BackgroundOperationService, message, longMessage) }
handler.post { Utils.showErrorMessage(this@BackgroundOperationService, message, longMessage) }
}
fun showErrorMessage(actionRes: Int, e: Exception?, longMessage: Boolean) {
handler!!.post { Utils.showErrorMessage(this@BackgroundOperationService, actionRes, e, longMessage) }
handler.post { Utils.showErrorMessage(this@BackgroundOperationService, actionRes, e, longMessage) }
}
fun showErrorMessage(actionRes: Int, message: String, longMessage: Boolean) {
handler!!.post { Utils.showErrorMessage(this@BackgroundOperationService, actionRes, message, longMessage) }
handler.post { Utils.showErrorMessage(this@BackgroundOperationService, actionRes, message, longMessage) }
}
fun showOkMessage(messageRes: Int, longMessage: Boolean) {
@ -119,7 +123,7 @@ class BackgroundOperationService : IntentService("background_operation"), Consta
}
private fun showToast(message: CharSequence, longMessage: Boolean) {
handler!!.post { Toast.makeText(this@BackgroundOperationService, message, if (longMessage) Toast.LENGTH_LONG else Toast.LENGTH_SHORT).show() }
handler.post { Toast.makeText(this@BackgroundOperationService, message, if (longMessage) Toast.LENGTH_LONG else Toast.LENGTH_SHORT).show() }
}
override fun onHandleIntent(intent: Intent?) {
@ -282,9 +286,10 @@ class BackgroundOperationService : IntentService("background_operation"), Consta
builder, 0, item))
}
override fun afterExecute(handler: Context?, result: UpdateStatusTask.UpdateStatusResult?) {
@UiThread
override fun afterExecute(handler: Context?, result: UpdateStatusTask.UpdateStatusResult) {
var failed = false
val exception = result!!.exception
val exception = result.exception
val exceptions = result.exceptions
if (exception != null) {
Toast.makeText(context, exception.message, Toast.LENGTH_SHORT).show()
@ -302,9 +307,7 @@ class BackgroundOperationService : IntentService("background_operation"), Consta
break
}
}
if (failed) {
// TODO show draft notification
} else {
if (!failed) {
Toast.makeText(context, R.string.status_updated, Toast.LENGTH_SHORT).show()
}
}
@ -313,27 +316,27 @@ class BackgroundOperationService : IntentService("background_operation"), Consta
}
})
task.setCallback(this)
task.callback = this
task.params = Pair.create(actionType, item)
handler!!.post { ManualTaskStarter.invokeBeforeExecute(task) }
handler.post { ManualTaskStarter.invokeBeforeExecute(task) }
val result = ManualTaskStarter.invokeExecute(task)
handler!!.post { ManualTaskStarter.invokeAfterExecute(task, result) }
handler.post { ManualTaskStarter.invokeAfterExecute(task, result) }
val exception = result.exception
val updatedStatuses = result.statuses
if (exception != null) {
Log.w(LOGTAG, exception)
} else
for (status in updatedStatuses) {
if (status == null) continue
val event = TweetEvent.create(context, status, TimelineType.OTHER)
event.setAction(TweetEvent.Action.TWEET)
HotMobiLogger.getInstance(context).log(status.account_key, event)
}
if (!result.succeed) {
contentResolver.insert(Drafts.CONTENT_URI_NOTIFICATIONS, configure(ContentValues()) {
put(BaseColumns._ID, result.draftId)
})
}
for (status in result.statuses) {
if (status == null) continue
val event = TweetEvent.create(context, status, TimelineType.OTHER)
event.setAction(TweetEvent.Action.TWEET)
HotMobiLogger.getInstance(context).log(status.account_key, event)
}
}
if (preferences.getBoolean(KEY_REFRESH_AFTER_TWEET)) {
handler!!.post { twitterWrapper.refreshAll() }
handler.post { twitterWrapper.refreshAll() }
}
stopForeground(false)
notificationManager.cancel(NOTIFICATION_ID_UPDATE_STATUS)