diff --git a/build.gradle b/build.gradle index 426deebd7..79527ef31 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ subprojects { buildscript { ext { libVersions = [ - Kotlin : '1.1.0', + Kotlin : '1.1.1', SupportLib : '25.2.0', MariotakuCommons: '0.9.11', RestFu : '0.9.42', diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Status.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Status.java index 0eec7f50d..2fbeaf0f8 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Status.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Status.java @@ -96,7 +96,7 @@ public class Status extends TwitterResponseObject implements Comparable, @JsonField(name = "in_reply_to_screen_name") String inReplyToScreenName; - @JsonField(name = "user") + @JsonField(name = {"user", "friendica_owner"}) User user; @JsonField(name = "geo") diff --git a/twidere/build.gradle b/twidere/build.gradle index 7d8fd39c1..eec9d81fa 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -34,8 +34,8 @@ android { applicationId "org.mariotaku.twidere" minSdkVersion 14 targetSdkVersion 25 - versionCode 299 - versionName '3.4.37' + versionCode 300 + versionName '3.4.38' multiDexEnabled true buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")' diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.kt index 628abefbc..86bef76e3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.kt @@ -417,7 +417,7 @@ abstract class ParcelableStatusesAdapter( val indices = (data as ObjectCursor).indices as ParcelableStatusCursorIndices return readCursorValueAction(cursor, indices) } - return readStatusValueAction(getStatus(position)) + return readStatusValueAction(getStatus(position, raw)) } private fun getStatus(position: Int, countIndex: Int, raw: Boolean = false): ParcelableStatus { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt index 597b48fee..65b1199c7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt @@ -297,8 +297,9 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() { refreshEnabled = true showContentOrError() - if (event.exception is GetStatusesTask.GetTimelineException && userVisibleHint) { - Toast.makeText(context, event.exception.getToastMessage(context), Toast.LENGTH_SHORT).show() + val exception = event.exception + if (exception is GetStatusesTask.GetTimelineException && userVisibleHint) { + Toast.makeText(context, exception.getToastMessage(context), Toast.LENGTH_SHORT).show() } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt index 458bb841c..7541bbd8a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt @@ -269,8 +269,9 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { refreshEnabled = true showContentOrError() - if (event.exception is GetStatusesTask.GetTimelineException && userVisibleHint) { - Toast.makeText(context, event.exception.getToastMessage(context), Toast.LENGTH_SHORT).show() + val exception = event.exception + if (exception is GetStatusesTask.GetTimelineException && userVisibleHint) { + Toast.makeText(context, exception.getToastMessage(context), Toast.LENGTH_SHORT).show() } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/service/StreamingService.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/service/StreamingService.kt index e16a13785..e9f786bfa 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/service/StreamingService.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/service/StreamingService.kt @@ -176,10 +176,6 @@ class StreamingService : BaseService() { stopForeground(true) } - private fun buildNotification() { - - } - private fun newStreamingRunnable(account: AccountDetails, preferences: AccountPreferences): StreamingRunnable<*>? { when (account.type) { AccountType.TWITTER -> {