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

updated version

This commit is contained in:
Mariotaku Lee 2017-03-15 16:06:55 +08:00
parent 15f7fa9677
commit 4136579715
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
7 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -33,7 +33,7 @@ subprojects {
buildscript { buildscript {
ext { ext {
libVersions = [ libVersions = [
Kotlin : '1.1.0', Kotlin : '1.1.1',
SupportLib : '25.2.0', SupportLib : '25.2.0',
MariotakuCommons: '0.9.11', MariotakuCommons: '0.9.11',
RestFu : '0.9.42', RestFu : '0.9.42',

2
twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Status.java
View File

@ -96,7 +96,7 @@ public class Status extends TwitterResponseObject implements Comparable<Status>,
@JsonField(name = "in_reply_to_screen_name") @JsonField(name = "in_reply_to_screen_name")
String inReplyToScreenName; String inReplyToScreenName;
@JsonField(name = "user") @JsonField(name = {"user", "friendica_owner"})
User user; User user;
@JsonField(name = "geo") @JsonField(name = "geo")

4
twidere/build.gradle
View File

@ -34,8 +34,8 @@ android {
applicationId "org.mariotaku.twidere" applicationId "org.mariotaku.twidere"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 25 targetSdkVersion 25
versionCode 299 versionCode 300
versionName '3.4.37' versionName '3.4.38'
multiDexEnabled true multiDexEnabled true
buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")' buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")'

2
twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.kt
View File

@ -417,7 +417,7 @@ abstract class ParcelableStatusesAdapter(
val indices = (data as ObjectCursor).indices as ParcelableStatusCursorIndices val indices = (data as ObjectCursor).indices as ParcelableStatusCursorIndices
return readCursorValueAction(cursor, indices) return readCursorValueAction(cursor, indices)
} }
return readStatusValueAction(getStatus(position)) return readStatusValueAction(getStatus(position, raw))
} }
private fun getStatus(position: Int, countIndex: Int, raw: Boolean = false): ParcelableStatus { private fun getStatus(position: Int, countIndex: Int, raw: Boolean = false): ParcelableStatus {

5
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt
View File

@ -297,8 +297,9 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() {
refreshEnabled = true refreshEnabled = true
showContentOrError() showContentOrError()
if (event.exception is GetStatusesTask.GetTimelineException && userVisibleHint) { val exception = event.exception
Toast.makeText(context, event.exception.getToastMessage(context), Toast.LENGTH_SHORT).show() if (exception is GetStatusesTask.GetTimelineException && userVisibleHint) {
Toast.makeText(context, exception.getToastMessage(context), Toast.LENGTH_SHORT).show()
} }
} }
} }

5
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt
View File

@ -269,8 +269,9 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() {
refreshEnabled = true refreshEnabled = true
showContentOrError() showContentOrError()
if (event.exception is GetStatusesTask.GetTimelineException && userVisibleHint) { val exception = event.exception
Toast.makeText(context, event.exception.getToastMessage(context), Toast.LENGTH_SHORT).show() if (exception is GetStatusesTask.GetTimelineException && userVisibleHint) {
Toast.makeText(context, exception.getToastMessage(context), Toast.LENGTH_SHORT).show()
} }
} }
} }

4
twidere/src/main/kotlin/org/mariotaku/twidere/service/StreamingService.kt
View File

@ -176,10 +176,6 @@ class StreamingService : BaseService() {
stopForeground(true) stopForeground(true)
} }
private fun buildNotification() {
}
private fun newStreamingRunnable(account: AccountDetails, preferences: AccountPreferences): StreamingRunnable<*>? { private fun newStreamingRunnable(account: AccountDetails, preferences: AccountPreferences): StreamingRunnable<*>? {
when (account.type) { when (account.type) {
AccountType.TWITTER -> { AccountType.TWITTER -> {