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

Merge pull request #1184 from Torvin/issue_1181 

Temporary fix for #1181
This commit is contained in:
Mariotaku 2019-06-26 14:00:53 +09:00 committed by GitHub
parent 8451179926 add0af58a9
commit 1ba3bca1cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@ -4,9 +4,10 @@ buildscript {
jcenter()
maven { url 'https://plugins.gradle.org/m2/' }
maven { url 'https://maven.google.com' }
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.android.tools.build:gradle:3.3.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@ -35,7 +36,7 @@ allprojects {
subprojects {
buildscript {
ext {
kotlinVersion = '1.1.51'
kotlinVersion = '1.3.0'
pluginVersions = [
AndroidSvgDrawable: '3.0.0',
PlayServices : '3.1.1',

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

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

@ -1372,7 +1372,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
menu.setItemAvailability(R.id.attachment_visibility_submenu, hasAttachmentStatusVisibility)
menu.setItemAvailability(R.id.location_submenu, hasLocationOption)
ThemeUtils.wrapMenuIcon(menuBar, excludeGroups = MENU_GROUP_IMAGE_EXTENSION)
ThemeUtils.wrapMenuIcon(menuBar, excludeGroups = *intArrayOf(MENU_GROUP_IMAGE_EXTENSION))
ThemeUtils.resetCheatSheet(menuBar)
}
@ -1510,7 +1510,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
return
}
LengthyOperationsService.updateStatusesAsync(this, update.draft_action, statuses = update,
LengthyOperationsService.updateStatusesAsync(this, update.draft_action, statuses = *arrayOf(update),
scheduleInfo = scheduleInfo)
finishComposing()
}

4
twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/ConversationLoader.kt
View File

@ -89,7 +89,9 @@ class ConversationLoader(
canLoadAllReplies = false
when (account.type) {
AccountType.TWITTER -> {
val isOfficial = account.isOfficial(context)
// TODO: temporary workaround for issue #1181
// val isOfficial = account.isOfficial(context)
val isOfficial = false
canLoadAllReplies = isOfficial
if (isOfficial) {
return microBlog.showConversation(status.id, paging).mapMicroBlogToPaginated {

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

@ -468,7 +468,7 @@ class DetailStatusViewHolder(
retweetProvider.init(itemView.menuBar, retweetItem)
}
ThemeUtils.wrapMenuIcon(itemView.menuBar, excludeGroups = Constants.MENU_GROUP_STATUS_SHARE)
ThemeUtils.wrapMenuIcon(itemView.menuBar, excludeGroups = *intArrayOf(Constants.MENU_GROUP_STATUS_SHARE))
itemView.mediaPreviewLoad.setOnClickListener(this)
itemView.profileContainer.setOnClickListener(this)
retweetedByView.setOnClickListener(this)