Merge pull request #1184 from Torvin/issue_1181
Temporary fix for #1181
This commit is contained in:
commit
1ba3bca1cf
|
@ -4,9 +4,10 @@ buildscript {
|
||||||
jcenter()
|
jcenter()
|
||||||
maven { url 'https://plugins.gradle.org/m2/' }
|
maven { url 'https://plugins.gradle.org/m2/' }
|
||||||
maven { url 'https://maven.google.com' }
|
maven { url 'https://maven.google.com' }
|
||||||
|
google()
|
||||||
}
|
}
|
||||||
dependencies {
|
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
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
}
|
}
|
||||||
|
@ -35,7 +36,7 @@ allprojects {
|
||||||
subprojects {
|
subprojects {
|
||||||
buildscript {
|
buildscript {
|
||||||
ext {
|
ext {
|
||||||
kotlinVersion = '1.1.51'
|
kotlinVersion = '1.3.0'
|
||||||
pluginVersions = [
|
pluginVersions = [
|
||||||
AndroidSvgDrawable: '3.0.0',
|
AndroidSvgDrawable: '3.0.0',
|
||||||
PlayServices : '3.1.1',
|
PlayServices : '3.1.1',
|
||||||
|
|
|
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
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
|
||||||
|
|
|
@ -1372,7 +1372,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
|
||||||
menu.setItemAvailability(R.id.attachment_visibility_submenu, hasAttachmentStatusVisibility)
|
menu.setItemAvailability(R.id.attachment_visibility_submenu, hasAttachmentStatusVisibility)
|
||||||
menu.setItemAvailability(R.id.location_submenu, hasLocationOption)
|
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)
|
ThemeUtils.resetCheatSheet(menuBar)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1510,7 +1510,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
LengthyOperationsService.updateStatusesAsync(this, update.draft_action, statuses = update,
|
LengthyOperationsService.updateStatusesAsync(this, update.draft_action, statuses = *arrayOf(update),
|
||||||
scheduleInfo = scheduleInfo)
|
scheduleInfo = scheduleInfo)
|
||||||
finishComposing()
|
finishComposing()
|
||||||
}
|
}
|
||||||
|
|
|
@ -89,7 +89,9 @@ class ConversationLoader(
|
||||||
canLoadAllReplies = false
|
canLoadAllReplies = false
|
||||||
when (account.type) {
|
when (account.type) {
|
||||||
AccountType.TWITTER -> {
|
AccountType.TWITTER -> {
|
||||||
val isOfficial = account.isOfficial(context)
|
// TODO: temporary workaround for issue #1181
|
||||||
|
// val isOfficial = account.isOfficial(context)
|
||||||
|
val isOfficial = false
|
||||||
canLoadAllReplies = isOfficial
|
canLoadAllReplies = isOfficial
|
||||||
if (isOfficial) {
|
if (isOfficial) {
|
||||||
return microBlog.showConversation(status.id, paging).mapMicroBlogToPaginated {
|
return microBlog.showConversation(status.id, paging).mapMicroBlogToPaginated {
|
||||||
|
|
|
@ -468,7 +468,7 @@ class DetailStatusViewHolder(
|
||||||
retweetProvider.init(itemView.menuBar, retweetItem)
|
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.mediaPreviewLoad.setOnClickListener(this)
|
||||||
itemView.profileContainer.setOnClickListener(this)
|
itemView.profileContainer.setOnClickListener(this)
|
||||||
retweetedByView.setOnClickListener(this)
|
retweetedByView.setOnClickListener(this)
|
||||||
|
|
Loading…
Reference in New Issue