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

fixed status quoted media opening 

implementing buffer update
This commit is contained in:
Mariotaku Lee 2017-03-25 23:04:01 +08:00
parent 2bcb06aea2
commit 57ec043a8a
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
10 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -36,7 +36,7 @@ subprojects {
Kotlin : '1.1.1',
SupportLib : '25.3.0',
MariotakuCommons: '0.9.11',
RestFu : '0.9.42',
RestFu : '0.9.43',
ObjectCursor : '0.9.16',
PlayServices : '10.2.0',
MapsUtils : '0.4.4',

1
twidere.component.common/src/main/java/org/mariotaku/twidere/constant/IntentConstants.java
View File

@ -65,6 +65,7 @@ public interface IntentConstants {
String INTENT_ACTION_EXTENSION_SETTINGS = INTENT_PACKAGE_PREFIX + "EXTENSION_SETTINGS";
String INTENT_ACTION_UPDATE_STATUS = INTENT_PACKAGE_PREFIX + "UPDATE_STATUS";
String INTENT_ACTION_SCHEDULE_STATUS = INTENT_PACKAGE_PREFIX + "SCHEDULE_STATUS";
String INTENT_ACTION_SEND_DIRECT_MESSAGE = INTENT_PACKAGE_PREFIX + "SEND_DIRECT_MESSAGE";
String INTENT_ACTION_DISCARD_DRAFT = INTENT_PACKAGE_PREFIX + "DISCARD_DRAFT";
String INTENT_ACTION_SEND_DRAFT = INTENT_PACKAGE_PREFIX + "SEND_DRAFT";

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

@ -1383,7 +1383,12 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
update.in_reply_to_status = inReplyToStatus
update.is_possibly_sensitive = isPossiblySensitive
update.attachment_url = (draft?.action_extras as? UpdateStatusActionExtras)?.attachmentUrl
LengthyOperationsService.updateStatusesAsync(this, action, update)
val scheduleInfo = this.scheduleInfo
if (scheduleInfo != null) {
LengthyOperationsService.scheduleStatus(this, action, update, scheduleInfo)
} else {
LengthyOperationsService.updateStatusesAsync(this, action, update)
}
if (preferences[noCloseAfterTweetSentKey] && inReplyToStatus == null) {
possiblySensitive = false
shouldSaveAccounts = true

4
twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt
View File

@ -60,8 +60,8 @@ class MessagesConversationAdapter(
val nameFirst: Boolean = preferences[nameFirstKey]
val linkify: TwidereLinkify = TwidereLinkify(DirectMessageOnLinkClickHandler(context, null, preferences))
val mediaClickListener: OnMediaClickListener = object : OnMediaClickListener {
override fun onMediaClick(view: View, media: ParcelableMedia, accountKey: UserKey?, id: Long) {
listener?.onMediaClick(id.toInt(), media, accountKey)
override fun onMediaClick(view: View, current: ParcelableMedia, accountKey: UserKey?, id: Long) {
listener?.onMediaClick(id.toInt(), current, accountKey)
}
}
val messageRange: IntRange

13
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StatusFragment.kt
View File

@ -356,12 +356,17 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
null)
}
override fun onMediaClick(view: View, media: ParcelableMedia, accountKey: UserKey?, id: Long) {
override fun onMediaClick(view: View, current: ParcelableMedia, accountKey: UserKey?, id: Long) {
val status = adapter.status ?: return
IntentUtils.openMediaDirectly(activity, accountKey, status, media,
preferences[newDocumentApiKey], null)
if ((view.parent as View).id == R.id.quotedMediaPreview && status.quoted_media != null) {
IntentUtils.openMediaDirectly(activity, accountKey, status.quoted_media!!, current,
newDocument = preferences[newDocumentApiKey], status = status)
} else if (status.media != null) {
IntentUtils.openMediaDirectly(activity, accountKey, status.media!!, current,
newDocument = preferences[newDocumentApiKey], status = status)
} else return
// BEGIN HotMobi
val event = MediaEvent.create(activity, status, media, TimelineType.OTHER,
val event = MediaEvent.create(activity, status, current, TimelineType.OTHER,
adapter.mediaPreviewEnabled)
HotMobiLogger.getInstance(activity).log(status.account_key, event)
// END HotMobi

23
twidere/src/main/kotlin/org/mariotaku/twidere/service/LengthyOperationsService.kt
View File

@ -61,6 +61,7 @@ import org.mariotaku.twidere.TwidereConstants.*
import org.mariotaku.twidere.model.*
import org.mariotaku.twidere.model.draft.SendDirectMessageActionExtras
import org.mariotaku.twidere.model.draft.StatusObjectExtras
import org.mariotaku.twidere.model.schedule.ScheduleInfo
import org.mariotaku.twidere.model.util.AccountUtils
import org.mariotaku.twidere.model.util.ParcelableStatusUpdateUtils
import org.mariotaku.twidere.provider.TwidereDataStore.Drafts
@ -94,6 +95,9 @@ class LengthyOperationsService : BaseIntentService("lengthy_operations") {
INTENT_ACTION_UPDATE_STATUS -> {
handleUpdateStatusIntent(intent)
}
INTENT_ACTION_SCHEDULE_STATUS -> {
handleScheduleStatusIntent(intent)
}
INTENT_ACTION_SEND_DIRECT_MESSAGE -> {
handleSendDirectMessageIntent(intent)
}
@ -233,6 +237,15 @@ class LengthyOperationsService : BaseIntentService("lengthy_operations") {
updateStatuses(*statuses)
}
private fun handleScheduleStatusIntent(intent: Intent) {
val status = intent.getParcelableExtra<ParcelableStatusUpdate>(EXTRA_STATUS)
val scheduleInfo = intent.getParcelableExtra<ScheduleInfo>(EXTRA_SCHEDULE_INFO)
@Draft.Action
val actionType = intent.getStringExtra(EXTRA_ACTION)
status.draft_action = actionType
}
private fun updateStatuses(vararg statuses: ParcelableStatusUpdate) {
val context = this
val builder = Builder(context)
@ -460,6 +473,16 @@ class LengthyOperationsService : BaseIntentService("lengthy_operations") {
context.startService(intent)
}
fun scheduleStatus(context: Context, @Draft.Action action: String,
status: ParcelableStatusUpdate, scheduleInfo: ScheduleInfo) {
val intent = Intent(context, LengthyOperationsService::class.java)
intent.action = INTENT_ACTION_SCHEDULE_STATUS
intent.putExtra(EXTRA_STATUS, status)
intent.putExtra(EXTRA_SCHEDULE_INFO, scheduleInfo)
intent.putExtra(EXTRA_ACTION, action)
context.startService(intent)
}
fun sendMessageAsync(context: Context, message: ParcelableNewMessage) {
val intent = Intent(context, LengthyOperationsService::class.java)
intent.action = INTENT_ACTION_SEND_DIRECT_MESSAGE

2
twidere/src/main/kotlin/org/mariotaku/twidere/view/CardMediaContainer.kt
View File

@ -353,7 +353,7 @@ class CardMediaContainer(context: Context, attrs: AttributeSet? = null) : ViewGr
}
interface OnMediaClickListener {
fun onMediaClick(view: View, media: ParcelableMedia, accountKey: UserKey?, id: Long)
fun onMediaClick(view: View, current: ParcelableMedia, accountKey: UserKey?, id: Long)
}
private class MediaItemViewClickListener(

2
twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/MediaStatusViewHolder.kt
View File

@ -97,7 +97,7 @@ class MediaStatusViewHolder(private val adapter: IStatusesAdapter<*>, itemView:
return false
}
override fun onMediaClick(view: View, media: ParcelableMedia, accountKey: UserKey?, id: Long) {
override fun onMediaClick(view: View, current: ParcelableMedia, accountKey: UserKey?, id: Long) {
}
override fun setStatusClickListener(listener: IStatusViewHolder.StatusClickListener?) {

6
twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt
View File

@ -456,11 +456,11 @@ class StatusViewHolder(private val adapter: IStatusesAdapter<*>, itemView: View)
}
}
override fun onMediaClick(view: View, media: ParcelableMedia, accountKey: UserKey?, id: Long) {
override fun onMediaClick(view: View, current: ParcelableMedia, accountKey: UserKey?, id: Long) {
if (view.parent == quotedMediaPreview) {
statusClickListener?.onQuotedMediaClick(this, view, media, layoutPosition)
statusClickListener?.onQuotedMediaClick(this, view, current, layoutPosition)
} else {
statusClickListener?.onMediaClick(this, view, media, layoutPosition)
statusClickListener?.onMediaClick(this, view, current, layoutPosition)
}
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/iface/IStatusViewHolder.kt
View File

@ -41,7 +41,7 @@ interface IStatusViewHolder : CardMediaContainer.OnMediaClickListener {
val profileTypeView: ImageView?
override fun onMediaClick(view: View, media: ParcelableMedia, accountKey: UserKey?, id: Long)
override fun onMediaClick(view: View, current: ParcelableMedia, accountKey: UserKey?, id: Long)
fun setStatusClickListener(listener: StatusClickListener?)